Revert "Revert "Support subdomain configuration""

This reverts commit f7fedfa.

Author: stephencelis

README.markdown

@@ -31,6 +31,7 @@ $ rails g recurly:config
 If you're not using Rails, use the following template:
 
 ``` ruby
+Recurly.subdomain      = ENV['RECURLY_SUBDOMAIN']
 Recurly.api_key        = ENV['RECURLY_API_KEY']
 Recurly.js.private_key = ENV['RECURLY_JS_PRIVATE_KEY']
 ```

bin/recurly

@@ -18,6 +18,10 @@ options = {}
 OptionParser.new do |opts|
   opts.banner = 'Usage: recurly [options] -- [irb options]'
 
+  opts.on '-s', '--subdomain [subdomain]', 'Your subdomain' do |subdomain|
+    options[:subdomain] = subdomain
+  end
+
   opts.on '-k', '--api-key [api key]', 'Your API key' do |key|
     options[:api_key] = key
   end
@@ -50,6 +54,7 @@ OptionParser.new do |opts|
 end.parse!
 
 require 'recurly/all'
+Recurly.subdomain = options[:subdomain] || ENV['RECURLY_SUBDOMAIN']
 Recurly.api_key = options[:api_key] || ENV['RECURLY_API_KEY']
 Recurly.js.private_key = options[:private_key] || ENV['RECURLY_JS_PRIVATE_KEY']
 include Recurly

lib/rails/generators/recurly/config_generator.rb

@@ -6,6 +6,7 @@ class ConfigGenerator < Rails::Generators::Base
     # when running <tt>rails g recurly:config</tt>.
     def create_recurly_file
       create_file 'config/initializers/recurly.rb', <<EOF
+Recurly.subdomain        = ENV['RECURLY_SUBDOMAIN']
 Recurly.api_key          = ENV['RECURLY_API_KEY']
 Recurly.js.private_key   = ENV['RECURLY_JS_PRIVATE_KEY']
 

lib/recurly.rb

@@ -36,6 +36,15 @@ class ConfigurationError < Error
   end
 
   class << self
+    # @return [String] A subdomain.
+    # @raise [ConfigurationError] If not configured.
+    def subdomain
+      defined? @subdomain and @subdomain or raise(
+        ConfigurationError, "Recurly.subdomain not configured"
+      )
+    end
+    attr_writer :subdomain
+
     # @return [String] An API key.
     # @raise [ConfigurationError] If not configured.
     def api_key

lib/recurly/api.rb

@@ -70,7 +70,7 @@ def delete uri, options = {}
 
       # @return [URI::Generic]
       def base_uri
-        URI.parse @@base_uri
+        URI.parse @@base_uri.sub('api', Recurly.subdomain)
       end
 
       # @return [String]

spec/environment.rb

@@ -13,7 +13,9 @@
 
 require 'recurly'
 include Recurly
+Recurly.subdomain = 'api'
 Recurly.api_key = 'api_key'
 
 require 'logger'
 Recurly.logger = Logger.new nil
+