recurly 0.4.14 → 0.4.15

data/README.md

@@ -14,27 +14,33 @@ Please see the [documentation](http://support.recurly.com/faqs/api/ruby-client)
 Installation
 ------------
 
-**Stable Version:**
+    gem 'recurly', '~> 0.4'
 
-    gem 'recurly', '~> 0.4.11'
 
-**Bleeding Edge Version:**
-
-    gem 'recurly', :git => "http://github.com/recurly/recurly-client-ruby.git"
+Configuration
+-------------
 
+The Recurly Ruby Client requires an API user to connect. Please see the [Authentication](http://docs.recurly.com/api/authentication/) documentation for more information.
 
-Setup (Rails 3)
---------------
+In a YAML file at 'config/recurly.yml':
 
-The Recurly Ruby Client requires an API user to connect. Please see the [Authentication](http://docs.recurly.com/api/authentication/) documentation for more information.
+    production:
+      api_key: your_api_key
+      private_key: your_private_key
+      subdomain: your_recurly_subdomain
 
-If using Rails 3, the easiest way to get Recurly set up is to run `rake recurly:setup`. This will create a config/recurly.yml that has your recurly account authentication, and the Recurly rails initializer will pick it up on restart of your web app.
+    development:
+      api_key: your_api_key
+      private_key: your_private_key
+      subdomain: your_recurly_subdomain
 
+The environment is optional. If you're using the same account with development and production, it can be simplified to:
 
-Setup (Rails 2 and other frameworks)
---------------
+    api_key: your_api_key
+    private_key: your_private_key
+    subdomain: your_recurly_subdomain
 
-Alternatively, if not using Rails 3, just make sure to call a Recurly configure block somewhere in your applications initialization.
+Or, you may configure the Recurly gem using a `configure` block in 'config/initializers/recurly.rb':
 
     Recurly.configure do |c|
       c.api_key = 'your_api_key'
@@ -42,12 +48,9 @@ Alternatively, if not using Rails 3, just make sure to call a Recurly configure
       c.subdomain = 'your-recurly-subdomain'
     end
 
-In Rails 2.x, this code should be in config/initializers/recurly.rb
-
-In Sinatra, it should be within a `configure` block.
-
 **Please Note:** the setup parameters changed in version 0.4.0. Additional configuration options were also added for the [Transparent Post API](http://docs.recurly.com/transparent-post/basics).
 
+
 Manual Setup via YAML or JSON
 --------------
 You can also configure Recurly via a YAML file by using:
@@ -63,13 +66,6 @@ The Recurly Configuration YAML is in the format of:
 
 The same format could be applied in JSON instead of YAML using: Recurly.configure_from_json('path/to/file.json')
 
-Clearing test data (Rails3)
-----------------
-
-The Recurly Railtie (for rails3) includes a rake task that allows you to easily clear out the test data on your Account. This is useful when automating the testing of the api interation within your own app.
-
-    rake recurly:clear_test_data
-
 
 Rails Demo Application
 ----------------
@@ -82,7 +78,7 @@ Examples
 
 The [API Documentation](http://docs.recurly.com/api/basics) has numerous examples demonstrating how to use the Ruby client library.
 
-All the functionality is demonstrated by the tests in the __spec__ directory.
+All the functionality is also demonstrated by the tests in the __spec__ directory.
 
 
 Running the Specs
@@ -92,41 +88,15 @@ Recurly gem uses RSpec2 for testing. It also uses VCR / Webmock to handle fast a
 
 The way this works is when each spec is first run, it will save each HTTP request generated within the spec/vcr folder. Subsequent http requests will be mocked using the data contained in these YML files.
 
-The first thing to do is install bundler if you don't already have it:
-
-    gem install bundler
-
-The next thing is to setup all the spec dependencies
-
-    bundle
-
-When first running the specs, you'll need to setup a recurly test account. Use the provided rake task to walk you through creating spec/config/recurly.yml with all the authentication info.
-
-    rake recurly:setup
-
-Now when you run `rake` it will hit recurly's api to run all the specs. Subsequent calls will no longer hit the API (and be run locally).
-
-The tests expect certain plans, add ons, and coupons to be present on the Site you'll be testing against.  You'll need:
-    Plan with no trial with a plan_code of 'paid'
-    Plan with a trial with a plan_code of 'trial'
-    Add ons with codes 'special' and special2' on the 'paid' plan
-    Coupon with coupon code 'coupon' which can be applied to all plans
-
-
-Something go Wrong?
-------------------
-
-You can view the full http interactions with Recurly at spec/vcr. Please attached these to any bug reports so we can replicate.
-
-
-Clearing Test Data in Specs
-----------------------------
+The specs require API credentials in '/spec/config/recurly.yml' and the following setup in your Recurly account:
 
-You can delete the spec/vcr folder at any time, and it will regenerate the requests to recurly's apis. However if you do this, you'll also need to clear the test data on your recurly account. To do this run:
+* A plan with no trial, use plan_code "paid".
+* Add-ons with the codes "special" and "special2" on the "paid" plan.
+* A plan with a trial period, use plan_code "trial"
+* A coupon with the coupon_code "coupon" which can be applied to all plans.
 
-    rake recurly:clear
+To re-run specs, you will need to clear the test data from your Recurly account.
 
-This will run `recurly:clear_test_data` (using your spec/config/recurly.yml authentication info) to clear out the test data on the server and then delete the associated spec/vcr files so you can start from scratch.
 
 API Documentation
 -----------------

data/lib/recurly/rails3/recurly.rake

@@ -6,33 +6,6 @@ namespace :recurly do
     @recurly_config = Recurly::ConfigParser.parse
   end
 
-  desc "Clears out the Test data from your configured Recurly site (does not touch your data in production mode)"
-  task :clear_test_data => :load_settings do
-    puts "\n"
-
-    begin
-      require 'restclient'
-    rescue LoadError
-      puts "Install the 'rest-client' gem in order to automatically clear your recurly test data via a rake task. If using Bundler, add it to your project's Gemfile (in :development group) and run again."
-      exit
-    end
-
-    api_key = @recurly_config["api_key"]
-    environment = @recurly_config["environment"]
-
-    # now lets clear site data
-    begin
-      if environment == :development
-        RestClient.delete("http://#{api_key}@api.lvh.me:3000/configuration/test_data")
-      else
-        RestClient.delete("https://#{api_key}@api.recurly.com/configuration/test_data")
-      end
-      raise "Clearing Didn't work for some reason. Is your site setting correct?"
-    rescue RestClient::Found => e
-      puts "Test Data Cleared"
-    end
-  end
-
   def setup_static
     @recurly_config["api_key"] ||= "my_api_key"
     @recurly_config["private_key"] ||= "my_private_key"

data/lib/recurly/transparent.rb

@@ -128,13 +128,16 @@ module Recurly
 
     # recursively process the query data (running to_s on values)
     def self.process_data(data = {})
+      return data unless data.is_a?(Hash)
       data.each do |key, val|
         if val.is_a?(Hash)
           data[key] = process_data(val)
         elsif val.is_a?(String)
           data[key] = val.to_s
         elsif val.is_a?(Enumerable)
-          data[key] = val.map{|i| i.to_s}
+          values = Hash.new
+          val.each_with_index{ |item, index| values[index] = process_data(item) }
+          data[key] = values
         else
           data[key] = val.to_s
         end

data/lib/recurly/version.rb

@@ -1,3 +1,3 @@
 module Recurly #:nodoc
-  VERSION = "0.4.14"
+  VERSION = "0.4.15"
 end

data/spec/integration/transparent_spec.rb

@@ -90,8 +90,10 @@ END
       response.should_receive(:body).at_least(:once).and_return response_xml
 
       subscription = Subscription.new.from_transparent_results(response)
-      subscription.account.billing_info.errors[:number].should_not be_nil
-      subscription.account.billing_info.errors[:verification_value].should_not be_nil
+      subscription.account.billing_info.credit_card.errors[:number].should_not be_empty
+      subscription.account.billing_info.credit_card.errors[:number].should include('is required')
+      subscription.account.billing_info.credit_card.errors[:verification_value].should_not be_empty
+      subscription.account.billing_info.credit_card.errors[:verification_value].should include('is required')
     end
   end
 end

data/spec/vcr/transparent/post-url/1317063400.yml

@@ -0,0 +1,105 @@
+--- 
+- !ruby/struct:VCR::HTTPInteraction 
+  request: !ruby/struct:VCR::Request 
+    method: :post
+    uri: http://2a655d41659d4ae0b37fcaec06331bf5:@api.lvh.me:3000/accounts.xml
+    body: |
+      <?xml version="1.0" encoding="UTF-8"?>
+      <account>
+        <account-code>account-get-1317063400</account-code>
+        <first-name>Verena</first-name>
+        <last-name>Test</last-name>
+        <email>verena@test.com</email>
+        <company-name>Recurly Ruby Gem</company-name>
+        <billing-info>
+          <credit-card>
+          </credit-card>
+        </billing-info>
+        <accept-language nil="true"></accept-language>
+      </account>
+
+    headers: 
+      user-agent: 
+      - Recurly Ruby Client v0.4.14
+      content-type: 
+      - application/xml
+  response: !ruby/struct:VCR::Response 
+    status: !ruby/struct:VCR::ResponseStatus 
+      code: 201
+      message: Created
+    headers: 
+      location: 
+      - http://api.lvh.me:3000/accounts/account-get-1317063400
+      content-type: 
+      - application/xml; charset=utf-8
+      cache-control: 
+      - no-cache
+      x-ua-compatible: 
+      - IE=Edge
+      set-cookie: 
+      - _recurly_session=4e81ed0ba0b7a5432e69da605b4cbbf6; domain=.lvh.me; path=/; HttpOnly
+      server: 
+      - thin 1.2.11 codename Bat-Shit Crazy
+    body: |
+      <?xml version="1.0" encoding="UTF-8"?>
+      <account>
+        <id>account-get-1317063400</id>
+        <account_code>account-get-1317063400</account_code>
+        <username></username>
+        <email>verena@test.com</email>
+        <first_name>Verena</first_name>
+        <last_name>Test</last_name>
+        <company_name>Recurly Ruby Gem</company_name>
+        <balance_in_cents type="integer">0</balance_in_cents>
+        <closed type="boolean">false</closed>
+        <hosted_login_token>5823616e8dc0439c99f45edff05ffaeb</hosted_login_token>
+        <created_at type="datetime">2011-09-26T18:57:16Z</created_at>
+        <state>active</state>
+      </account>
+
+    http_version: "1.1"
+- !ruby/struct:VCR::HTTPInteraction 
+  request: !ruby/struct:VCR::Request 
+    method: :get
+    uri: http://2a655d41659d4ae0b37fcaec06331bf5:@api.lvh.me:3000/accounts/account-get-1317063400.xml
+    body: 
+    headers: 
+      user-agent: 
+      - Recurly Ruby Client v0.4.14
+      accept: 
+      - application/xml
+      accept-encoding: 
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+  response: !ruby/struct:VCR::Response 
+    status: !ruby/struct:VCR::ResponseStatus 
+      code: 200
+      message: OK
+    headers: 
+      content-type: 
+      - application/xml; charset=utf-8
+      etag: 
+      - "\"4207b49346e061c62ef4c8622d1c8be2\""
+      cache-control: 
+      - max-age=0, private, must-revalidate
+      x-ua-compatible: 
+      - IE=Edge
+      server: 
+      - thin 1.2.11 codename Bat-Shit Crazy
+    body: |
+      <?xml version="1.0" encoding="UTF-8"?>
+      <account>
+        <id>account-get-1317063400</id>
+        <account_code>account-get-1317063400</account_code>
+        <username></username>
+        <email>verena@test.com</email>
+        <first_name>Verena</first_name>
+        <last_name>Test</last_name>
+        <company_name>Recurly Ruby Gem</company_name>
+        <balance_in_cents type="integer">0</balance_in_cents>
+        <closed type="boolean">false</closed>
+        <hosted_login_token>5823616e8dc0439c99f45edff05ffaeb</hosted_login_token>
+        <created_at type="datetime">2011-09-26T18:57:16Z</created_at>
+        <state>active</state>
+      </account>
+
+    http_version: "1.1"

data/spec/vcr/transparent/post-url/1317063474.yml

@@ -0,0 +1,105 @@
+--- 
+- !ruby/struct:VCR::HTTPInteraction 
+  request: !ruby/struct:VCR::Request 
+    method: :post
+    uri: http://2a655d41659d4ae0b37fcaec06331bf5:@api.lvh.me:3000/accounts.xml
+    body: |
+      <?xml version="1.0" encoding="UTF-8"?>
+      <account>
+        <account-code>account-get-1317063474</account-code>
+        <first-name>Verena</first-name>
+        <last-name>Test</last-name>
+        <email>verena@test.com</email>
+        <company-name>Recurly Ruby Gem</company-name>
+        <billing-info>
+          <credit-card>
+          </credit-card>
+        </billing-info>
+        <accept-language nil="true"></accept-language>
+      </account>
+
+    headers: 
+      user-agent: 
+      - Recurly Ruby Client v0.4.14
+      content-type: 
+      - application/xml
+  response: !ruby/struct:VCR::Response 
+    status: !ruby/struct:VCR::ResponseStatus 
+      code: 201
+      message: Created
+    headers: 
+      location: 
+      - http://api.lvh.me:3000/accounts/account-get-1317063474
+      content-type: 
+      - application/xml; charset=utf-8
+      cache-control: 
+      - no-cache
+      x-ua-compatible: 
+      - IE=Edge
+      set-cookie: 
+      - _recurly_session=e9a4c74c87d659c65141eb9cc75a0498; domain=.lvh.me; path=/; HttpOnly
+      server: 
+      - thin 1.2.11 codename Bat-Shit Crazy
+    body: |
+      <?xml version="1.0" encoding="UTF-8"?>
+      <account>
+        <id>account-get-1317063474</id>
+        <account_code>account-get-1317063474</account_code>
+        <username></username>
+        <email>verena@test.com</email>
+        <first_name>Verena</first_name>
+        <last_name>Test</last_name>
+        <company_name>Recurly Ruby Gem</company_name>
+        <balance_in_cents type="integer">0</balance_in_cents>
+        <closed type="boolean">false</closed>
+        <hosted_login_token>f535367212dc4ca18e95d4e6b1c5e7e0</hosted_login_token>
+        <created_at type="datetime">2011-09-26T18:57:59Z</created_at>
+        <state>active</state>
+      </account>
+
+    http_version: "1.1"
+- !ruby/struct:VCR::HTTPInteraction 
+  request: !ruby/struct:VCR::Request 
+    method: :get
+    uri: http://2a655d41659d4ae0b37fcaec06331bf5:@api.lvh.me:3000/accounts/account-get-1317063474.xml
+    body: 
+    headers: 
+      user-agent: 
+      - Recurly Ruby Client v0.4.14
+      accept: 
+      - application/xml
+      accept-encoding: 
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+  response: !ruby/struct:VCR::Response 
+    status: !ruby/struct:VCR::ResponseStatus 
+      code: 200
+      message: OK
+    headers: 
+      content-type: 
+      - application/xml; charset=utf-8
+      etag: 
+      - "\"d885948736791ccddc6eb5ad3c5e77c8\""
+      cache-control: 
+      - max-age=0, private, must-revalidate
+      x-ua-compatible: 
+      - IE=Edge
+      server: 
+      - thin 1.2.11 codename Bat-Shit Crazy
+    body: |
+      <?xml version="1.0" encoding="UTF-8"?>
+      <account>
+        <id>account-get-1317063474</id>
+        <account_code>account-get-1317063474</account_code>
+        <username></username>
+        <email>verena@test.com</email>
+        <first_name>Verena</first_name>
+        <last_name>Test</last_name>
+        <company_name>Recurly Ruby Gem</company_name>
+        <balance_in_cents type="integer">0</balance_in_cents>
+        <closed type="boolean">false</closed>
+        <hosted_login_token>f535367212dc4ca18e95d4e6b1c5e7e0</hosted_login_token>
+        <created_at type="datetime">2011-09-26T18:57:59Z</created_at>
+        <state>active</state>
+      </account>
+
+    http_version: "1.1"

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 14
-  version: 0.4.14
+  - 15
+  version: 0.4.15
 platform: ruby
 authors: 
 - Isaac Hall
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-22 00:00:00 -07:00
+date: 2011-10-21 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -235,6 +235,8 @@ files:
 - spec/vcr/transaction/list-initial/1311126815.yml
 - spec/vcr/transaction/lookup/1311126815.yml
 - spec/vcr/transaction/void/1311126815.yml
+- spec/vcr/transparent/post-url/1317063400.yml
+- spec/vcr/transparent/post-url/1317063474.yml
 has_rdoc: true
 homepage: http://github.com/recurly/recurly-client-ruby
 licenses: []
@@ -249,7 +251,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2419922066457854656
+      hash: -363756991346156052
       segments: 
       - 0
       version: "0"
@@ -350,3 +352,5 @@ test_files:
 - spec/vcr/transaction/list-initial/1311126815.yml
 - spec/vcr/transaction/lookup/1311126815.yml
 - spec/vcr/transaction/void/1311126815.yml
+- spec/vcr/transparent/post-url/1317063400.yml
+- spec/vcr/transparent/post-url/1317063474.yml