recurly 0.4.4 → 0.4.5

data/lib/recurly/base.rb

@@ -105,10 +105,11 @@ module Recurly
             message = error['message']
 
             if field.blank?
-              errors[:base] << message
+              errors.add :base, message
+              next
             end
 
-            humanized_name = field.humanize.downcase
+            humanized_name = field.to_s.humanize.downcase
             message = message[(humanized_name.size + 1)..-1] if message[0, humanized_name.size + 1].downcase == "#{humanized_name} "
 
             errors.add field.to_sym, message
@@ -121,7 +122,7 @@ module Recurly
               end
             end
 
-            errors[:base] << message
+            errors.add :base, message
           end
         end
       end

data/lib/recurly/version.rb

@@ -1,3 +1,3 @@
 module Recurly #:nodoc
-  VERSION = "0.4.4"
+  VERSION = "0.4.5"
 end

data/spec/integration/billing_info_spec.rb

@@ -111,5 +111,38 @@ module Recurly
         }.to raise_error ActiveResource::ResourceNotFound
       end
     end
+    
+    describe "set the appropriate error" do
+      use_vcr_cassette "billing/errors/#{timestamp}"
+      let(:account){ Factory.create_account("billing-errors-#{timestamp}") }
+
+      it "should set an error on base if the card number is blank" do
+        @billing_attributes = Factory.billing_attributes({
+          :account_code => account.account_code,
+          :first_name => account.first_name,
+          :last_name => account.last_name,
+          :credit_card => {
+            :number => '',
+          },
+        })
+
+        billing_info = BillingInfo.create(@billing_attributes)
+        billing_info.errors[:base].count.should == 1
+      end
+      
+      it "should set an error if the card number is invalid" do
+        @billing_attributes = Factory.billing_attributes({
+          :account_code => account.account_code,
+          :first_name => account.first_name,
+          :last_name => account.last_name,
+          :credit_card => {
+            :number => '4000-0000-0000-0002',
+          },
+        })
+
+        billing_info = BillingInfo.create(@billing_attributes)
+        billing_info.errors.count.should == 1
+      end
+    end
   end
 end

data/spec/vcr/account/accept-language-account/1301979678.yml

@@ -39,13 +39,13 @@
       location: 
       - http://app.recurly.local:3000/accounts/account1-french-1301979678
       x-runtime: 
-      - "410"
+      - "653"
       content-type: 
       - application/xml; charset=utf-8
       content-length: 
       - "585"
       set-cookie: 
-      - _recurly_session=78f3d47f16335f1637aae2e1f7a55b58; domain=.recurly.local; path=/; HttpOnly
+      - _recurly_session=3f7bb9cdba35677fd3059b70801e498f; domain=.recurly.local; path=/; HttpOnly
       connection: 
       - close
       server: 
@@ -62,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>72d7a2698291442c9d190fd7964886f1</hosted_login_token>
-        <created_at type="datetime">2011-04-05T05:13:31Z</created_at>
+        <hosted_login_token>d0eeb511e23842c1a0639a4d9c254454</hosted_login_token>
+        <created_at type="datetime">2011-04-05T19:39:07Z</created_at>
         <state>active</state>
       </account>
 

data/spec/vcr/account/close/1301979678.yml

@@ -39,13 +39,13 @@
       location: 
       - http://app.recurly.local:3000/accounts/account-close-1301979678
       x-runtime: 
-      - "260"
+      - "386"
       content-type: 
       - application/xml; charset=utf-8
       content-length: 
       - "581"
       set-cookie: 
-      - _recurly_session=2aaa7892408c6fcc89f7c8af997161f1; domain=.recurly.local; path=/; HttpOnly
+      - _recurly_session=959d6d6bc89a68c40355b4640667c18f; domain=.recurly.local; path=/; HttpOnly
       connection: 
       - close
       server: 
@@ -62,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>1e9adf47b89a4fdda1ae4286c0377655</hosted_login_token>
-        <created_at type="datetime">2011-04-05T05:13:20Z</created_at>
+        <hosted_login_token>51817519b9f04d40b55b7d814d7f0547</hosted_login_token>
+        <created_at type="datetime">2011-04-05T19:38:52Z</created_at>
         <state>active</state>
       </account>
 
@@ -90,13 +90,13 @@
       cache-control: 
       - no-cache
       x-runtime: 
-      - "280"
+      - "674"
       content-type: 
       - application/xml; charset=utf-8
       content-length: 
       - "1"
       set-cookie: 
-      - _recurly_session=66fd174af38f731f69e127e91d43e6d6; domain=.recurly.local; path=/; HttpOnly
+      - _recurly_session=1aaf5360a93701ec0b77d38c9b491e61; domain=.recurly.local; path=/; HttpOnly
       connection: 
       - close
       server: 
@@ -125,17 +125,17 @@
       message: OK
     headers: 
       x-runtime: 
-      - "233"
+      - "372"
       content-type: 
       - application/xml; charset=utf-8
       etag: 
-      - "\"8d3c629b2bdb0b49d4299cd0a9ddf29a\""
+      - "\"cf0446d5715951e4cc9666193af16150\""
       cache-control: 
       - private, max-age=0, must-revalidate
       content-length: 
       - "580"
       set-cookie: 
-      - _recurly_session=81d34193a0dc04db21d106606ec1bd05; domain=.recurly.local; path=/; HttpOnly
+      - _recurly_session=d2cf4862f501fe9ef038695a160e79ed; domain=.recurly.local; path=/; HttpOnly
       connection: 
       - close
       server: 
@@ -152,8 +152,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>1e9adf47b89a4fdda1ae4286c0377655</hosted_login_token>
-        <created_at type="datetime">2011-04-05T05:13:20Z</created_at>
+        <hosted_login_token>51817519b9f04d40b55b7d814d7f0547</hosted_login_token>
+        <created_at type="datetime">2011-04-05T19:38:52Z</created_at>
         <state>closed</state>
       </account>
 

data/spec/vcr/account/create/1301979678.yml

@@ -39,13 +39,13 @@
       location: 
       - http://app.recurly.local:3000/accounts/account-create-1301979678
       x-runtime: 
-      - "450"
+      - "380"
       content-type: 
       - application/xml; charset=utf-8
       content-length: 
       - "583"
       set-cookie: 
-      - _recurly_session=f03efef23b2546f21d2a2eb468d35b40; domain=.recurly.local; path=/; HttpOnly
+      - _recurly_session=a6620e8995822e2d0fa1e86a8dd5a30b; domain=.recurly.local; path=/; HttpOnly
       connection: 
       - close
       server: 
@@ -62,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>ab02259944264bb59259af6a69f917f3</hosted_login_token>
-        <created_at type="datetime">2011-04-05T05:12:00Z</created_at>
+        <hosted_login_token>348c2a6404d541fca19f97711d25bd4d</hosted_login_token>
+        <created_at type="datetime">2011-04-05T19:37:25Z</created_at>
         <state>active</state>
       </account>
 

data/spec/vcr/account/create-blank/1301979678.yml

@@ -33,13 +33,13 @@
       cache-control: 
       - no-cache
       x-runtime: 
-      - "275"
+      - "402"
       content-type: 
       - application/xml; charset=utf-8
       content-length: 
       - "186"
       set-cookie: 
-      - _recurly_session=c20a45e8d0ec88b24423165204a8297d; domain=.recurly.local; path=/; HttpOnly
+      - _recurly_session=9111a3a894c1286c22cb1be2db9253ea; domain=.recurly.local; path=/; HttpOnly
       connection: 
       - close
       server: 

data/spec/vcr/account/create-duplicate/1301979678.yml

@@ -35,13 +35,13 @@
       location: 
       - http://app.recurly.local:3000/accounts/account-exists
       x-runtime: 
-      - "257"
+      - "388"
       content-type: 
       - application/xml; charset=utf-8
       content-length: 
       - "520"
       set-cookie: 
-      - _recurly_session=2fff90022fb854f6c5b682d92be61009; domain=.recurly.local; path=/; HttpOnly
+      - _recurly_session=2ee91ff89ab5b3f2bbd5992341e4c222; domain=.recurly.local; path=/; HttpOnly
       connection: 
       - close
       server: 
@@ -58,8 +58,8 @@
         <company_name></company_name>
         <balance_in_cents type="integer">0</balance_in_cents>
         <closed type="boolean">false</closed>
-        <hosted_login_token>00ddcb8f6a0844a3b07699cd57d812e4</hosted_login_token>
-        <created_at type="datetime">2011-04-05T05:13:27Z</created_at>
+        <hosted_login_token>a3d7cc100f2a4682aaf97c109c39ba9e</hosted_login_token>
+        <created_at type="datetime">2011-04-05T19:39:02Z</created_at>
         <state>active</state>
       </account>
 
@@ -98,13 +98,13 @@
       cache-control: 
       - no-cache
       x-runtime: 
-      - "277"
+      - "669"
       content-type: 
       - application/xml; charset=utf-8
       content-length: 
       - "132"
       set-cookie: 
-      - _recurly_session=0b040a0c74413b49458bf06212f3226a; domain=.recurly.local; path=/; HttpOnly
+      - _recurly_session=0e651159e41aa33d2962cd59cb957517; domain=.recurly.local; path=/; HttpOnly
       connection: 
       - close
       server: 

data/spec/vcr/account/create-min/1301979678.yml

@@ -35,13 +35,13 @@
       location: 
       - http://app.recurly.local:3000/accounts/d00d-1301979678
       x-runtime: 
-      - "253"
+      - "381"
       content-type: 
       - application/xml; charset=utf-8
       content-length: 
       - "522"
       set-cookie: 
-      - _recurly_session=94ac70a1a051c64c8745d4e2cd5c4976; domain=.recurly.local; path=/; HttpOnly
+      - _recurly_session=d08e4ed31d98adee87b8dca95493a8aa; domain=.recurly.local; path=/; HttpOnly
       connection: 
       - close
       server: 
@@ -58,8 +58,8 @@
         <company_name></company_name>
         <balance_in_cents type="integer">0</balance_in_cents>
         <closed type="boolean">false</closed>
-        <hosted_login_token>8738732c3b574f15bccc39cc4c090304</hosted_login_token>
-        <created_at type="datetime">2011-04-05T05:12:01Z</created_at>
+        <hosted_login_token>7dbb7ce567384d84850c138f966a1b15</hosted_login_token>
+        <created_at type="datetime">2011-04-05T19:37:28Z</created_at>
         <state>active</state>
       </account>
 

data/spec/vcr/account/find/1301979678.yml

@@ -39,13 +39,13 @@
       location: 
       - http://app.recurly.local:3000/accounts/account-get-1301979678
       x-runtime: 
-      - "256"
+      - "376"
       content-type: 
       - application/xml; charset=utf-8
       content-length: 
       - "577"
       set-cookie: 
-      - _recurly_session=72ba38c67776bdce7f015ca96d6a696d; domain=.recurly.local; path=/; HttpOnly
+      - _recurly_session=66f382336b15626ead04ebb8f9ab5dfd; domain=.recurly.local; path=/; HttpOnly
       connection: 
       - close
       server: 
@@ -62,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>32e4430c040e4fe9afd45fb12c9004af</hosted_login_token>
-        <created_at type="datetime">2011-04-05T05:12:03Z</created_at>
+        <hosted_login_token>de5c810d258047dea48bc9aeddc2ced0</hosted_login_token>
+        <created_at type="datetime">2011-04-05T19:37:30Z</created_at>
         <state>active</state>
       </account>
 
@@ -90,17 +90,17 @@
       message: OK
     headers: 
       x-runtime: 
-      - "229"
+      - "354"
       content-type: 
       - application/xml; charset=utf-8
       etag: 
-      - "\"456629927f3a8df7fcaa92c2e98ebcca\""
+      - "\"d7698bb87177b42e48b8f73733a6549a\""
       cache-control: 
       - private, max-age=0, must-revalidate
       content-length: 
       - "577"
       set-cookie: 
-      - _recurly_session=0372cb99b64de8f6ac57187045a52a47; domain=.recurly.local; path=/; HttpOnly
+      - _recurly_session=3d05c99afd16003e287668a94ab9c0fe; domain=.recurly.local; path=/; HttpOnly
       connection: 
       - close
       server: 
@@ -117,8 +117,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>32e4430c040e4fe9afd45fb12c9004af</hosted_login_token>
-        <created_at type="datetime">2011-04-05T05:12:03Z</created_at>
+        <hosted_login_token>de5c810d258047dea48bc9aeddc2ced0</hosted_login_token>
+        <created_at type="datetime">2011-04-05T19:37:30Z</created_at>
         <state>active</state>
       </account>
 
@@ -151,7 +151,7 @@
       content-length: 
       - "93"
       set-cookie: 
-      - _recurly_session=55fb191de1c3df427fe600b095eda781; domain=.recurly.local; path=/; HttpOnly
+      - _recurly_session=e55def341fa4fd1bde228f64c5143b26; domain=.recurly.local; path=/; HttpOnly
       connection: 
       - close
       server: