recurly 0.4.7 → 0.4.8

data/README.md

@@ -110,6 +110,12 @@ When first running the specs, you'll need to setup a recurly test account. Use t
 
 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?
 ------------------

data/lib/recurly/base.rb

@@ -24,19 +24,8 @@ module Recurly
         save_without_validation
       end
       true
-    rescue ActiveResource::ResourceInvalid => error
-      case error.response['Content-Type']
-      when /application\/xml/
-        begin
-          f = Recurly::Formats::XmlWithErrorsFormat.new
-          load_errors_from_array(f.decode(error.response.body))
-        rescue
-          errors.from_xml(error.response.body)
-        end
-      when /application\/json/
-        errors.from_json(error.response.body)
-      end
-      false
+    rescue ActiveResource::ResourceInvalid => e
+      load_errors e.response.body
     end
 
     # patch persisted? so it looks to see if it actually is persisted
@@ -51,7 +40,7 @@ module Recurly
     end
 
     # patched to read Errors array
-    def load(attributes)
+    def load(attributes, remove_root = false)
       raise ArgumentError, "expected an attributes Hash, got #{attributes.inspect}" unless attributes.is_a?(Hash)
       @prefix_options, attributes = split_options(attributes)
       attributes.each do |key, value|
@@ -92,6 +81,18 @@ module Recurly
         super
         @persisted = true
       end
+
+      def load_errors xml
+        load_errors_from_array(
+          Recurly::Formats::XmlWithErrorsFormat.new.decode(error)
+        )
+      rescue => e
+        logger.warn "Recurly::Base#load_errors exception parsing nested error information"
+        # Fallback to default errors parsing
+        errors.from_xml xml
+      ensure
+        return false
+      end
       
       # Patched to read errors with field information
       def load_errors_from_array(new_errors, save_cache = false)

data/lib/recurly/subscription.rb

@@ -63,6 +63,8 @@ module Recurly
       connection.put(path,
         self.class.format.encode(options, :root => :subscription),
         self.class.headers)
+    rescue ActiveResource::ResourceInvalid => e
+      self.load_errors e.response.body
     end
 
     def subscription_account_code

data/lib/recurly/version.rb

@@ -1,3 +1,3 @@
 module Recurly #:nodoc
-  VERSION = "0.4.7"
+  VERSION = "0.4.8"
 end

data/spec/config/recurly.yml

@@ -1,12 +1,6 @@
 ---
-username: api-test@facebook.com
-password: c012090130704e748dae49f56f05f68f
-private_key: 1e114f7c047b4a82a270061b71247332
-subdomain: facebook-test
+username: api-test@litle.com
+password: 6499f1cd3ae14875beb91417d31e91b7
+private_key: 78753d36439c423aba60e581be828a2a
+subdomain: litle-test
 environment: :development
-
-#username: api-test@isaactest.com
-#password: e94fb95953454b1dad4abf26af382a5d 
-#private_key: 2b656f0351e345faa1d29b2d7a455202
-#subdomain: isaachall-test
-#environment: :sandbox

data/spec/integration/transparent_spec.rb

@@ -6,6 +6,7 @@ module Recurly
     timestamp = File.mtime(__FILE__).to_i
 
     describe ".url" do
+      
       use_vcr_cassette "transparent/post-url/#{timestamp}"
 
       it "should not change after calling account.find()" do
@@ -21,5 +22,76 @@ module Recurly
       
       end
     end
+    
+    it "should parse errors on nested objects" do
+      response_xml = <<END
+<?xml version="1.0" encoding="UTF-8"?>
+<subscription>
+  <id nil="true"></id>
+  <account_code>2345</account_code>
+<account>
+  <account_code>12345</account_code>
+  <username></username>
+  <email>verena@test.com</email>
+  <first_name>Verena</first_name>
+  <last_name>Test User</last_name>
+  <company_name></company_name>
+  <closed type="boolean">false</closed>
+  <hosted_login_token>abcd1234123412341234123412341234</hosted_login_token>
+  <created_at type="datetime">2011-07-20T01:49:24Z</created_at>
+  <state>active</state>
+<billing_info>
+  <account_code>12345</account_code>
+  <first_name>Verena</first_name>
+  <last_name>Test User</last_name>
+  <address1></address1>
+  <address2></address2>
+  <city></city>
+  <state></state>
+  <country></country>
+  <zip></zip>
+  <phone></phone>
+  <vat_number></vat_number>
+  <ip_address>127.0.0.1</ip_address>
+  <credit_card>
+    <type></type>
+    <last_four></last_four>
+    <month type="integer">7</month>
+    <year type="integer">2011</year>
+  </credit_card>
+  <updated_at type="datetime">2011-07-20T01:49:35Z</updated_at>
+<errors>
+  <error field="number">is required</error>
+  <error field="verification_value">is required</error>
+</errors>
+</billing_info>
+</account>
+  <plan>
+    <plan_code>gold-plan</plan_code>
+    <name>Gold Plan</name>
+  </plan>
+  <state>pending</state>
+  <quantity type="integer">1</quantity>
+  <total_amount_in_cents type="integer">1200</total_amount_in_cents>
+  <activated_at nil="true" type="datetime"></activated_at>
+  <canceled_at nil="true" type="datetime"></canceled_at>
+  <expires_at nil="true" type="datetime"></expires_at>
+  <current_period_started_at type="datetime">2011-07-20T01:49:35Z</current_period_started_at>
+  <current_period_ends_at type="datetime">2011-07-20T01:49:35Z</current_period_ends_at>
+  <trial_started_at nil="true" type="datetime"></trial_started_at>
+  <trial_ends_at nil="true" type="datetime"></trial_ends_at>
+  <add_ons type="array">
+  </add_ons>
+</subscription>
+END
+
+      response = mock
+      response.should_receive(:[]).at_least(:once).with('Content-Length').and_return '123'
+      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
+    end
   end
 end

data/spec/unit/transparent_spec.rb

@@ -22,9 +22,9 @@ module Recurly
           config.environment = :sandbox
           config.subdomain = 'testtest'
         end
-        Transparent.url(Action::CreateSubscription).should == "https://api-sandbox.recurly.com/transparent/testtest/subscription"
-        Transparent.url(Action::UpdateBilling).should == "https://api-sandbox.recurly.com/transparent/testtest/billing_info"
-        Transparent.url(Action::CreateTransaction).should == "https://api-sandbox.recurly.com/transparent/testtest/transaction"
+        Transparent.url(Action::CreateSubscription).should == "#{Recurly::Base.site}/transparent/testtest/subscription"
+        Transparent.url(Action::UpdateBilling).should == "#{Recurly::Base.site}/transparent/testtest/billing_info"
+        Transparent.url(Action::CreateTransaction).should == "#{Recurly::Base.site}/transparent/testtest/transaction"
       end
 
       it "should equal api-production for sandbox" do
@@ -32,9 +32,9 @@ module Recurly
           config.environment = :production
           config.subdomain = 'testtest'
         end
-        Transparent.url(Action::CreateSubscription).should == "https://api-production.recurly.com/transparent/testtest/subscription"
-        Transparent.url(Action::UpdateBilling).should == "https://api-production.recurly.com/transparent/testtest/billing_info"
-        Transparent.url(Action::CreateTransaction).should == "https://api-production.recurly.com/transparent/testtest/transaction"
+        Transparent.url(Action::CreateSubscription).should == "#{Recurly::Base.site}/transparent/testtest/subscription"
+        Transparent.url(Action::UpdateBilling).should == "#{Recurly::Base.site}/transparent/testtest/billing_info"
+        Transparent.url(Action::CreateTransaction).should == "#{Recurly::Base.site}/transparent/testtest/transaction"
       end
     end
 

data/spec/vcr/account/accept-language-account/{1301979678.yml → 1296674173.yml}

@@ -2,31 +2,27 @@
 - !ruby/struct:VCR::HTTPInteraction 
   request: !ruby/struct:VCR::Request 
     method: :post
-    uri: http://api-test%40facebook.com:c012090130704e748dae49f56f05f68f@app.recurly.local:3000/accounts.xml
+    uri: http://isaac%40recurly.com:isaac1024@litle-test.recurly.local:3000/accounts.xml
     body: |
       <?xml version="1.0" encoding="UTF-8"?>
       <account>
-        <account-code>account1-french-1301979678</account-code>
+        <account-code>account1-french-1296674173</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>fr</accept-language>
       </account>
 
     headers: 
       authorization: 
-      - Basic YXBpLXRlc3RAZmFjZWJvb2suY29tOmMwMTIwOTAxMzA3MDRlNzQ4ZGFlNDlmNTZmMDVmNjhm
-      user-agent: 
-      - Recurly Ruby Client v0.4.6
+      - Basic aXNhYWNAcmVjdXJseS5jb206aXNhYWMxMDI0
       content-type: 
       - application/xml
       accept: 
       - "*/*"
+      user-agent: 
+      - Ruby
       connection: 
       - close
   response: !ruby/struct:VCR::Response 
@@ -37,26 +33,28 @@
       cache-control: 
       - no-cache
       location: 
-      - http://app.recurly.local:3000/accounts/account1-french-1301979678
+      - http://litle-test.recurly.local:3000/accounts/account1-french-1296674173
       x-runtime: 
-      - "235"
+      - "583"
       content-type: 
       - application/xml; charset=utf-8
       content-length: 
       - "585"
       server: 
-      - WEBrick/1.3.1 (Ruby/1.9.2/2011-02-18)
+      - WEBrick/1.3.1 (Ruby/1.9.2/2010-08-18)
       date: 
-      - Thu, 21 Apr 2011 17:58:54 GMT
+      - Thu, 03 Feb 2011 22:17:14 GMT
       connection: 
       - close
       set-cookie: 
-      - _recurly_session=7869f2db79a7ca292c9af350696f94ea; domain=.recurly.local; path=/; HttpOnly
+      - account_credentials=efc5fa78ea4fc57bad02b327f1cb8935698f5378749dcf787532fefdf181210f399cf370898720389cdc4b30d7ce50c251fa1bdb911e4eb77395624ce6f39ba7%3A%3A; domain=.recurly.local; path=/
+      - ""
+      - _recurly_session=d8966c6817ac71fc093284ed2ef96a91; domain=.recurly.local; path=/; HttpOnly
     body: |
       <?xml version="1.0" encoding="UTF-8"?>
       <account>
-        <id>account1-french-1301979678</id>
-        <account_code>account1-french-1301979678</account_code>
+        <id>account1-french-1296674173</id>
+        <account_code>account1-french-1296674173</account_code>
         <username></username>
         <email>verena@test.com</email>
         <first_name>Verena</first_name>
@@ -64,8 +62,8 @@
         <company_name>Recurly Ruby Gem</company_name>
         <balance_in_cents type="integer">0</balance_in_cents>
         <closed type="boolean">false</closed>
-        <hosted_login_token>eb46e4e3be45482f9e99fe2f6a50ae84</hosted_login_token>
-        <created_at type="datetime">2011-04-21T17:58:54Z</created_at>
+        <hosted_login_token>a88be6968cb348ceb8d7503aebdaa483</hosted_login_token>
+        <created_at type="datetime">2011-02-03T22:17:14Z</created_at>
         <state>active</state>
       </account>
 

data/spec/vcr/account/close/{1301979678.yml → 1296674173.yml}

@@ -2,31 +2,27 @@
 - !ruby/struct:VCR::HTTPInteraction 
   request: !ruby/struct:VCR::Request 
     method: :post
-    uri: http://api-test%40facebook.com:c012090130704e748dae49f56f05f68f@app.recurly.local:3000/accounts.xml
+    uri: http://isaac%40recurly.com:isaac1024@litle-test.recurly.local:3000/accounts.xml
     body: |
       <?xml version="1.0" encoding="UTF-8"?>
       <account>
-        <account-code>account-close-1301979678</account-code>
+        <account-code>account-close-1296674173</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 type="yaml" nil="true"></accept-language>
       </account>
 
     headers: 
       authorization: 
-      - Basic YXBpLXRlc3RAZmFjZWJvb2suY29tOmMwMTIwOTAxMzA3MDRlNzQ4ZGFlNDlmNTZmMDVmNjhm
-      user-agent: 
-      - Recurly Ruby Client v0.4.6
+      - Basic aXNhYWNAcmVjdXJseS5jb206aXNhYWMxMDI0
       content-type: 
       - application/xml
       accept: 
       - "*/*"
+      user-agent: 
+      - Ruby
       connection: 
       - close
   response: !ruby/struct:VCR::Response 
@@ -37,26 +33,28 @@
       cache-control: 
       - no-cache
       location: 
-      - http://app.recurly.local:3000/accounts/account-close-1301979678
+      - http://litle-test.recurly.local:3000/accounts/account-close-1296674173
       x-runtime: 
-      - "278"
+      - "549"
       content-type: 
       - application/xml; charset=utf-8
       content-length: 
       - "581"
       server: 
-      - WEBrick/1.3.1 (Ruby/1.9.2/2011-02-18)
+      - WEBrick/1.3.1 (Ruby/1.9.2/2010-08-18)
       date: 
-      - Thu, 21 Apr 2011 17:58:43 GMT
+      - Thu, 03 Feb 2011 22:17:02 GMT
       connection: 
       - close
       set-cookie: 
-      - _recurly_session=710d71f19faee26a480df8bf881cda1f; domain=.recurly.local; path=/; HttpOnly
+      - account_credentials=1b6b26473ff7d8493d62462e15141df13d06979db5d284e1698a94c5b0c126c9bbb539b3b5045cfbd10f8bd30c3db173cc163a017b00c9597786a91eb9ab2a32%3A%3A; domain=.recurly.local; path=/
+      - ""
+      - _recurly_session=d431edb8ee4e7cedb0b2bffd6b1b432b; domain=.recurly.local; path=/; HttpOnly
     body: |
       <?xml version="1.0" encoding="UTF-8"?>
       <account>
-        <id>account-close-1301979678</id>
-        <account_code>account-close-1301979678</account_code>
+        <id>account-close-1296674173</id>
+        <account_code>account-close-1296674173</account_code>
         <username></username>
         <email>verena@test.com</email>
         <first_name>Verena</first_name>
@@ -64,8 +62,8 @@
         <company_name>Recurly Ruby Gem</company_name>
         <balance_in_cents type="integer">0</balance_in_cents>
         <closed type="boolean">false</closed>
-        <hosted_login_token>c54c971474064630bf90147a73f37232</hosted_login_token>
-        <created_at type="datetime">2011-04-21T17:58:43Z</created_at>
+        <hosted_login_token>5fd1762fb57f4d9b80fbbddad074fd3f</hosted_login_token>
+        <created_at type="datetime">2011-02-03T22:17:01Z</created_at>
         <state>active</state>
       </account>
 
@@ -73,15 +71,15 @@
 - !ruby/struct:VCR::HTTPInteraction 
   request: !ruby/struct:VCR::Request 
     method: :delete
-    uri: http://api-test%40facebook.com:c012090130704e748dae49f56f05f68f@app.recurly.local:3000/accounts/account-close-1301979678.xml
+    uri: http://isaac%40recurly.com:isaac1024@litle-test.recurly.local:3000/accounts/account-close-1296674173.xml
     body: 
     headers: 
       authorization: 
-      - Basic YXBpLXRlc3RAZmFjZWJvb2suY29tOmMwMTIwOTAxMzA3MDRlNzQ4ZGFlNDlmNTZmMDVmNjhm
-      user-agent: 
-      - Recurly Ruby Client v0.4.6
+      - Basic aXNhYWNAcmVjdXJseS5jb206aXNhYWMxMDI0
       accept: 
       - application/xml
+      user-agent: 
+      - Ruby
       connection: 
       - close
   response: !ruby/struct:VCR::Response 
@@ -92,35 +90,35 @@
       cache-control: 
       - no-cache
       x-runtime: 
-      - "293"
+      - "356"
       content-type: 
       - application/xml; charset=utf-8
       content-length: 
       - "1"
       server: 
-      - WEBrick/1.3.1 (Ruby/1.9.2/2011-02-18)
+      - WEBrick/1.3.1 (Ruby/1.9.2/2010-08-18)
       date: 
-      - Thu, 21 Apr 2011 17:58:45 GMT
+      - Thu, 03 Feb 2011 22:17:04 GMT
       connection: 
       - close
       set-cookie: 
-      - _recurly_session=ebfc242c25c7d65847dc94ee1eacc814; domain=.recurly.local; path=/; HttpOnly
+      - _recurly_session=87d11d401895ced9897e0024de5403f4; domain=.recurly.local; path=/; HttpOnly
     body: " "
     http_version: "1.1"
 - !ruby/struct:VCR::HTTPInteraction 
   request: !ruby/struct:VCR::Request 
     method: :get
-    uri: http://api-test%40facebook.com:c012090130704e748dae49f56f05f68f@app.recurly.local:3000/accounts/account-close-1301979678.xml
+    uri: http://isaac%40recurly.com:isaac1024@litle-test.recurly.local:3000/accounts/account-close-1296674173.xml
     body: 
     headers: 
       authorization: 
-      - Basic YXBpLXRlc3RAZmFjZWJvb2suY29tOmMwMTIwOTAxMzA3MDRlNzQ4ZGFlNDlmNTZmMDVmNjhm
-      user-agent: 
-      - Recurly Ruby Client v0.4.6
+      - Basic aXNhYWNAcmVjdXJseS5jb206aXNhYWMxMDI0
       accept: 
       - application/xml
       accept-encoding: 
       - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      user-agent: 
+      - Ruby
       connection: 
       - close
   response: !ruby/struct:VCR::Response 
@@ -129,28 +127,28 @@
       message: "OK "
     headers: 
       x-runtime: 
-      - "244"
+      - "184"
       content-type: 
       - application/xml; charset=utf-8
       etag: 
-      - "\"2c9473340f44d35a479ac39ec178c672\""
+      - "\"0d31c946c075a2c560335a916d4b359f\""
       cache-control: 
       - private, max-age=0, must-revalidate
       content-length: 
       - "580"
       server: 
-      - WEBrick/1.3.1 (Ruby/1.9.2/2011-02-18)
+      - WEBrick/1.3.1 (Ruby/1.9.2/2010-08-18)
       date: 
-      - Thu, 21 Apr 2011 17:58:47 GMT
+      - Thu, 03 Feb 2011 22:17:05 GMT
       connection: 
       - close
       set-cookie: 
-      - _recurly_session=1de6e95b75fd5a065f06480dc916e9e5; domain=.recurly.local; path=/; HttpOnly
+      - _recurly_session=22d04ea39adc6f1d7a86140c413f6326; domain=.recurly.local; path=/; HttpOnly
     body: |
       <?xml version="1.0" encoding="UTF-8"?>
       <account>
-        <id>account-close-1301979678</id>
-        <account_code>account-close-1301979678</account_code>
+        <id>account-close-1296674173</id>
+        <account_code>account-close-1296674173</account_code>
         <username></username>
         <email>verena@test.com</email>
         <first_name>Verena</first_name>
@@ -158,8 +156,8 @@
         <company_name>Recurly Ruby Gem</company_name>
         <balance_in_cents type="integer">0</balance_in_cents>
         <closed type="boolean">true</closed>
-        <hosted_login_token>c54c971474064630bf90147a73f37232</hosted_login_token>
-        <created_at type="datetime">2011-04-21T17:58:43Z</created_at>
+        <hosted_login_token>5fd1762fb57f4d9b80fbbddad074fd3f</hosted_login_token>
+        <created_at type="datetime">2011-02-03T22:17:01Z</created_at>
         <state>closed</state>
       </account>