recurly 0.4.3 → 0.4.4

data/lib/recurly/base.rb

@@ -27,7 +27,12 @@ module Recurly
     rescue ActiveResource::ResourceInvalid => error
       case error.response['Content-Type']
       when /application\/xml/
-        errors.from_xml(error.response.body)
+        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
@@ -92,7 +97,7 @@ module Recurly
       def load_errors_from_array(new_errors, save_cache = false)
         errors.clear unless save_cache
         return if new_errors.nil? or new_errors.empty?
-        humanized_attributes = Hash[self.known_attributes.map { |attr_name| [attr_name.humanize, attr_name] }] unless self.known_attributes.nil?
+        humanized_attributes = Hash[self.class.known_attributes.map { |attr_name| [attr_name.humanize, attr_name] }] unless self.class.known_attributes.nil?
         humanized_attributes ||= Hash[@attributes.keys.map { |attr_name| [attr_name.humanize, attr_name] }]
         new_errors.each do |error|
           if error.is_a?(Hash)
@@ -103,8 +108,8 @@ module Recurly
               errors[:base] << message
             end
 
-            humanized_name = field.humanize
-            message = message[(humanized_name.size + 1)..-1] if message[0, humanized_name.size + 1] == "#{humanized_name} "
+            humanized_name = field.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
           elsif error.is_a?(String)

data/lib/recurly/coupon.rb

@@ -1,5 +1,5 @@
 module Recurly
-  class Coupon < RecurlyAccountBase
+  class Coupon < AccountBase
     self.element_name = "coupon"
 
     def self.known_attributes

data/lib/recurly/formats/xml_with_errors.rb

@@ -32,7 +32,7 @@ module Recurly
         elsif node_type == 'array'
           return node.children.collect do |child|
             xml_node_to_hash(child)
-          end
+          end.reject { |n| n.nil? || (n.is_a?(String) && n.blank?) }
         end
         
         return nil if node.children.empty?
@@ -92,7 +92,7 @@ module Recurly
       end
       
       def xml_attributes(node)
-        return nil if node.attribute_nodes.empty?
+        return {} if node.attribute_nodes.empty?
         values = {}
         node.attribute_nodes.each do |attribute|
           values[attribute.name] = attribute.value

data/lib/recurly/rails3/recurly.rake

@@ -38,7 +38,7 @@ namespace :recurly do
 
     # now lets clear site data
     begin
-      RestClient.post( Recurly::Base.site+"/site/test_data",
+      RestClient.post( @recurly_config["site"]+"/site/test_data",
                        {"_method"=>"delete"},
                        :cookies => login_response.cookies)
       raise "Clearing Didn't work for some reason. Is your site setting correct?"
@@ -68,4 +68,4 @@ namespace :recurly do
     # saves the yml file
     Recurly::ConfigParser.save(@recurly_config)
   end
-end
+end

data/lib/recurly/version.rb

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

data/spec/integration/account_spec.rb

@@ -219,8 +219,8 @@ module Recurly
         end
 
         it "should require setting an account code" do
-          @account.errors[:base].should include("account code can't be blank")
-          @account.errors[:base].should include("account code is invalid")
+          @account.errors[:account_code].should include("can't be blank")
+          @account.errors[:account_code].should include("is invalid")
         end
       end
 
@@ -237,7 +237,7 @@ module Recurly
         end
 
         it "should require setting an account code" do
-          @account.errors[:base].should include("account code has already been taken")
+          @account.errors[:account_code].should include("has already been taken")
         end
       end
     end

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

@@ -6,7 +6,7 @@
     body: |
       <?xml version="1.0" encoding="UTF-8"?>
       <account>
-        <account-code>account1-french-1297746103</account-code>
+        <account-code>account1-french-1301979678</account-code>
         <first-name>Verena</first-name>
         <last-name>Test</last-name>
         <email>verena@test.com</email>
@@ -37,15 +37,15 @@
       cache-control: 
       - no-cache
       location: 
-      - http://app.recurly.local:3000/accounts/account1-french-1297746103
+      - http://app.recurly.local:3000/accounts/account1-french-1301979678
       x-runtime: 
-      - "340"
+      - "410"
       content-type: 
       - application/xml; charset=utf-8
       content-length: 
       - "585"
       set-cookie: 
-      - _recurly_session=f0053268a5a52285db50fb2ac850bbb6; domain=.recurly.local; path=/; HttpOnly
+      - _recurly_session=78f3d47f16335f1637aae2e1f7a55b58; domain=.recurly.local; path=/; HttpOnly
       connection: 
       - close
       server: 
@@ -53,8 +53,8 @@
     body: |
       <?xml version="1.0" encoding="UTF-8"?>
       <account>
-        <id>account1-french-1297746103</id>
-        <account_code>account1-french-1297746103</account_code>
+        <id>account1-french-1301979678</id>
+        <account_code>account1-french-1301979678</account_code>
         <username></username>
         <email>verena@test.com</email>
         <first_name>Verena</first_name>
@@ -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>7528d672c9194529b738db26528b8f81</hosted_login_token>
-        <created_at type="datetime">2011-04-04T02:17:56Z</created_at>
+        <hosted_login_token>72d7a2698291442c9d190fd7964886f1</hosted_login_token>
+        <created_at type="datetime">2011-04-05T05:13:31Z</created_at>
         <state>active</state>
       </account>
 

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

@@ -6,7 +6,7 @@
     body: |
       <?xml version="1.0" encoding="UTF-8"?>
       <account>
-        <account-code>account-close-1297746103</account-code>
+        <account-code>account-close-1301979678</account-code>
         <first-name>Verena</first-name>
         <last-name>Test</last-name>
         <email>verena@test.com</email>
@@ -37,15 +37,15 @@
       cache-control: 
       - no-cache
       location: 
-      - http://app.recurly.local:3000/accounts/account-close-1297746103
+      - http://app.recurly.local:3000/accounts/account-close-1301979678
       x-runtime: 
-      - "330"
+      - "260"
       content-type: 
       - application/xml; charset=utf-8
       content-length: 
       - "581"
       set-cookie: 
-      - _recurly_session=9225b6b1bc4bc9e4c294a37a04543860; domain=.recurly.local; path=/; HttpOnly
+      - _recurly_session=2aaa7892408c6fcc89f7c8af997161f1; domain=.recurly.local; path=/; HttpOnly
       connection: 
       - close
       server: 
@@ -53,8 +53,8 @@
     body: |
       <?xml version="1.0" encoding="UTF-8"?>
       <account>
-        <id>account-close-1297746103</id>
-        <account_code>account-close-1297746103</account_code>
+        <id>account-close-1301979678</id>
+        <account_code>account-close-1301979678</account_code>
         <username></username>
         <email>verena@test.com</email>
         <first_name>Verena</first_name>
@@ -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>43d53db8bae74f36bfcef0fad8ff4499</hosted_login_token>
-        <created_at type="datetime">2011-04-04T02:17:42Z</created_at>
+        <hosted_login_token>1e9adf47b89a4fdda1ae4286c0377655</hosted_login_token>
+        <created_at type="datetime">2011-04-05T05:13:20Z</created_at>
         <state>active</state>
       </account>
 
@@ -71,7 +71,7 @@
 - !ruby/struct:VCR::HTTPInteraction 
   request: !ruby/struct:VCR::Request 
     method: :delete
-    uri: http://api-test%40hello-test.com:50a5b8a69a2545db84ac4112ba8cac6f@app.recurly.local:3000/accounts/account-close-1297746103.xml
+    uri: http://api-test%40hello-test.com:50a5b8a69a2545db84ac4112ba8cac6f@app.recurly.local:3000/accounts/account-close-1301979678.xml
     body: 
     headers: 
       authorization: 
@@ -90,13 +90,13 @@
       cache-control: 
       - no-cache
       x-runtime: 
-      - "574"
+      - "280"
       content-type: 
       - application/xml; charset=utf-8
       content-length: 
       - "1"
       set-cookie: 
-      - _recurly_session=a9dd2fed298913d0bf1a222c6eb3f3e7; domain=.recurly.local; path=/; HttpOnly
+      - _recurly_session=66fd174af38f731f69e127e91d43e6d6; domain=.recurly.local; path=/; HttpOnly
       connection: 
       - close
       server: 
@@ -106,7 +106,7 @@
 - !ruby/struct:VCR::HTTPInteraction 
   request: !ruby/struct:VCR::Request 
     method: :get
-    uri: http://api-test%40hello-test.com:50a5b8a69a2545db84ac4112ba8cac6f@app.recurly.local:3000/accounts/account-close-1297746103.xml
+    uri: http://api-test%40hello-test.com:50a5b8a69a2545db84ac4112ba8cac6f@app.recurly.local:3000/accounts/account-close-1301979678.xml
     body: 
     headers: 
       authorization: 
@@ -125,17 +125,17 @@
       message: OK
     headers: 
       x-runtime: 
-      - "291"
+      - "233"
       content-type: 
       - application/xml; charset=utf-8
       etag: 
-      - "\"507894927f1390fd5c54ee01dad7cb82\""
+      - "\"8d3c629b2bdb0b49d4299cd0a9ddf29a\""
       cache-control: 
       - private, max-age=0, must-revalidate
       content-length: 
       - "580"
       set-cookie: 
-      - _recurly_session=5881daad994bb5da5746c645afc5d914; domain=.recurly.local; path=/; HttpOnly
+      - _recurly_session=81d34193a0dc04db21d106606ec1bd05; domain=.recurly.local; path=/; HttpOnly
       connection: 
       - close
       server: 
@@ -143,8 +143,8 @@
     body: |
       <?xml version="1.0" encoding="UTF-8"?>
       <account>
-        <id>account-close-1297746103</id>
-        <account_code>account-close-1297746103</account_code>
+        <id>account-close-1301979678</id>
+        <account_code>account-close-1301979678</account_code>
         <username></username>
         <email>verena@test.com</email>
         <first_name>Verena</first_name>
@@ -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>43d53db8bae74f36bfcef0fad8ff4499</hosted_login_token>
-        <created_at type="datetime">2011-04-04T02:17:42Z</created_at>
+        <hosted_login_token>1e9adf47b89a4fdda1ae4286c0377655</hosted_login_token>
+        <created_at type="datetime">2011-04-05T05:13:20Z</created_at>
         <state>closed</state>
       </account>
 

data/spec/vcr/account/create-blank/{1297746103.yml → 1301979678.yml}

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

data/spec/vcr/account/create-duplicate/{1297746103.yml → 1301979678.yml}

@@ -35,13 +35,13 @@
       location: 
       - http://app.recurly.local:3000/accounts/account-exists
       x-runtime: 
-      - "350"
+      - "257"
       content-type: 
       - application/xml; charset=utf-8
       content-length: 
       - "520"
       set-cookie: 
-      - _recurly_session=f70c5b8b194a8052482a53fbc6efbdde; domain=.recurly.local; path=/; HttpOnly
+      - _recurly_session=2fff90022fb854f6c5b682d92be61009; 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>53395a3557dd49b2af230901bb4cef90</hosted_login_token>
-        <created_at type="datetime">2011-04-04T02:17:52Z</created_at>
+        <hosted_login_token>00ddcb8f6a0844a3b07699cd57d812e4</hosted_login_token>
+        <created_at type="datetime">2011-04-05T05:13:27Z</created_at>
         <state>active</state>
       </account>
 
@@ -98,13 +98,13 @@
       cache-control: 
       - no-cache
       x-runtime: 
-      - "369"
+      - "277"
       content-type: 
       - application/xml; charset=utf-8
       content-length: 
       - "132"
       set-cookie: 
-      - _recurly_session=31d65199d5bbfad981aa3976259582e0; domain=.recurly.local; path=/; HttpOnly
+      - _recurly_session=0b040a0c74413b49458bf06212f3226a; domain=.recurly.local; path=/; HttpOnly
       connection: 
       - close
       server: 

data/spec/vcr/account/create-min/{1297746103.yml → 1301979678.yml}

@@ -6,7 +6,7 @@
     body: |
       <?xml version="1.0" encoding="UTF-8"?>
       <account>
-        <account-code>d00d-1297746103</account-code>
+        <account-code>d00d-1301979678</account-code>
         <billing-info>
           <credit-card>
           </credit-card>
@@ -33,15 +33,15 @@
       cache-control: 
       - no-cache
       location: 
-      - http://app.recurly.local:3000/accounts/d00d-1297746103
+      - http://app.recurly.local:3000/accounts/d00d-1301979678
       x-runtime: 
-      - "367"
+      - "253"
       content-type: 
       - application/xml; charset=utf-8
       content-length: 
       - "522"
       set-cookie: 
-      - _recurly_session=68e1a25da69622bfe1830ece722706a2; domain=.recurly.local; path=/; HttpOnly
+      - _recurly_session=94ac70a1a051c64c8745d4e2cd5c4976; domain=.recurly.local; path=/; HttpOnly
       connection: 
       - close
       server: 
@@ -49,8 +49,8 @@
     body: |
       <?xml version="1.0" encoding="UTF-8"?>
       <account>
-        <id>d00d-1297746103</id>
-        <account_code>d00d-1297746103</account_code>
+        <id>d00d-1301979678</id>
+        <account_code>d00d-1301979678</account_code>
         <username></username>
         <email></email>
         <first_name></first_name>
@@ -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>fd65042d226e47a985026d1792aa3e4c</hosted_login_token>
-        <created_at type="datetime">2011-04-04T02:16:22Z</created_at>
+        <hosted_login_token>8738732c3b574f15bccc39cc4c090304</hosted_login_token>
+        <created_at type="datetime">2011-04-05T05:12:01Z</created_at>
         <state>active</state>
       </account>
 

data/spec/vcr/account/create/{1297746103.yml → 1301979678.yml}

@@ -6,7 +6,7 @@
     body: |
       <?xml version="1.0" encoding="UTF-8"?>
       <account>
-        <account-code>account-create-1297746103</account-code>
+        <account-code>account-create-1301979678</account-code>
         <first-name>Verena</first-name>
         <last-name>Test</last-name>
         <email>verena@test.com</email>
@@ -37,15 +37,15 @@
       cache-control: 
       - no-cache
       location: 
-      - http://app.recurly.local:3000/accounts/account-create-1297746103
+      - http://app.recurly.local:3000/accounts/account-create-1301979678
       x-runtime: 
-      - "504"
+      - "450"
       content-type: 
       - application/xml; charset=utf-8
       content-length: 
       - "583"
       set-cookie: 
-      - _recurly_session=3be44aeebc093d43d059630241101ec5; domain=.recurly.local; path=/; HttpOnly
+      - _recurly_session=f03efef23b2546f21d2a2eb468d35b40; domain=.recurly.local; path=/; HttpOnly
       connection: 
       - close
       server: 
@@ -53,8 +53,8 @@
     body: |
       <?xml version="1.0" encoding="UTF-8"?>
       <account>
-        <id>account-create-1297746103</id>
-        <account_code>account-create-1297746103</account_code>
+        <id>account-create-1301979678</id>
+        <account_code>account-create-1301979678</account_code>
         <username></username>
         <email>verena@test.com</email>
         <first_name>Verena</first_name>
@@ -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>a21454ff6022446686ac375eb352d80f</hosted_login_token>
-        <created_at type="datetime">2011-04-04T02:16:19Z</created_at>
+        <hosted_login_token>ab02259944264bb59259af6a69f917f3</hosted_login_token>
+        <created_at type="datetime">2011-04-05T05:12:00Z</created_at>
         <state>active</state>
       </account>
 

data/spec/vcr/account/find/{1297746103.yml → 1301979678.yml}

@@ -6,7 +6,7 @@
     body: |
       <?xml version="1.0" encoding="UTF-8"?>
       <account>
-        <account-code>account-get-1297746103</account-code>
+        <account-code>account-get-1301979678</account-code>
         <first-name>Verena</first-name>
         <last-name>Test</last-name>
         <email>verena@test.com</email>
@@ -37,15 +37,15 @@
       cache-control: 
       - no-cache
       location: 
-      - http://app.recurly.local:3000/accounts/account-get-1297746103
+      - http://app.recurly.local:3000/accounts/account-get-1301979678
       x-runtime: 
-      - "346"
+      - "256"
       content-type: 
       - application/xml; charset=utf-8
       content-length: 
       - "577"
       set-cookie: 
-      - _recurly_session=076b3fc204a227ffdbcbb5baa1b1e7bc; domain=.recurly.local; path=/; HttpOnly
+      - _recurly_session=72ba38c67776bdce7f015ca96d6a696d; domain=.recurly.local; path=/; HttpOnly
       connection: 
       - close
       server: 
@@ -53,8 +53,8 @@
     body: |
       <?xml version="1.0" encoding="UTF-8"?>
       <account>
-        <id>account-get-1297746103</id>
-        <account_code>account-get-1297746103</account_code>
+        <id>account-get-1301979678</id>
+        <account_code>account-get-1301979678</account_code>
         <username></username>
         <email>verena@test.com</email>
         <first_name>Verena</first_name>
@@ -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>b0bd6254184848b4a6089e319516ae57</hosted_login_token>
-        <created_at type="datetime">2011-04-04T02:16:25Z</created_at>
+        <hosted_login_token>32e4430c040e4fe9afd45fb12c9004af</hosted_login_token>
+        <created_at type="datetime">2011-04-05T05:12:03Z</created_at>
         <state>active</state>
       </account>
 
@@ -71,7 +71,7 @@
 - !ruby/struct:VCR::HTTPInteraction 
   request: !ruby/struct:VCR::Request 
     method: :get
-    uri: http://api-test%40hello-test.com:50a5b8a69a2545db84ac4112ba8cac6f@app.recurly.local:3000/accounts/account-get-1297746103.xml
+    uri: http://api-test%40hello-test.com:50a5b8a69a2545db84ac4112ba8cac6f@app.recurly.local:3000/accounts/account-get-1301979678.xml
     body: 
     headers: 
       authorization: 
@@ -90,17 +90,17 @@
       message: OK
     headers: 
       x-runtime: 
-      - "304"
+      - "229"
       content-type: 
       - application/xml; charset=utf-8
       etag: 
-      - "\"bc219480f0261495ed1e391ccc8505de\""
+      - "\"456629927f3a8df7fcaa92c2e98ebcca\""
       cache-control: 
       - private, max-age=0, must-revalidate
       content-length: 
       - "577"
       set-cookie: 
-      - _recurly_session=83a9b11c6a791dd62d1a1cb35929e583; domain=.recurly.local; path=/; HttpOnly
+      - _recurly_session=0372cb99b64de8f6ac57187045a52a47; domain=.recurly.local; path=/; HttpOnly
       connection: 
       - close
       server: 
@@ -108,8 +108,8 @@
     body: |
       <?xml version="1.0" encoding="UTF-8"?>
       <account>
-        <id>account-get-1297746103</id>
-        <account_code>account-get-1297746103</account_code>
+        <id>account-get-1301979678</id>
+        <account_code>account-get-1301979678</account_code>
         <username></username>
         <email>verena@test.com</email>
         <first_name>Verena</first_name>
@@ -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>b0bd6254184848b4a6089e319516ae57</hosted_login_token>
-        <created_at type="datetime">2011-04-04T02:16:25Z</created_at>
+        <hosted_login_token>32e4430c040e4fe9afd45fb12c9004af</hosted_login_token>
+        <created_at type="datetime">2011-04-05T05:12:03Z</created_at>
         <state>active</state>
       </account>
 
@@ -151,7 +151,7 @@
       content-length: 
       - "93"
       set-cookie: 
-      - _recurly_session=4472db93792a4d8d26a3c55e469d57bf; domain=.recurly.local; path=/; HttpOnly
+      - _recurly_session=55fb191de1c3df427fe600b095eda781; domain=.recurly.local; path=/; HttpOnly
       connection: 
       - close
       server: