recurly 0.4.5 → 0.4.6

data/lib/recurly/base.rb

@@ -135,10 +135,6 @@ module Recurly
         result
       end
 
-      def build_request_headers(headers, http_method, uri)
-        super(headers, http_method, uri).update({'User-Agent' => "Recurly Ruby Client v#{VERSION}"})
-      end
-
       def handle_response(response)
         case response.code.to_i
         when 401
@@ -168,3 +164,14 @@ module Recurly
   # backwards compatibility
   RecurlyBase = Base
 end
+
+module ActiveResource
+  class Connection
+    private
+    def default_header
+      @default_header ||= {}
+      @default_header['User-Agent'] = "Recurly Ruby Client v#{Recurly::VERSION}"
+      @default_header
+    end
+  end
+end

data/lib/recurly/billing_info.rb

@@ -13,7 +13,8 @@ module Recurly
         "zip",
         "country",
         "phone",
-        "ip_address"
+        "ip_address",
+        "vat_number"
       ]
     end
 

data/lib/recurly/charge.rb

@@ -6,7 +6,9 @@ module Recurly
     def self.known_attributes
       [
         "account_code",
-        "amount_in_cents",
+        "quantity",
+        "unit_amount_in_cents",
+        "amount_in_cents", # quantity * unit_amount_in_cents
         "start_date",
         "end_date",
         "description",

data/lib/recurly/credit.rb

@@ -6,7 +6,9 @@ module Recurly
     def self.known_attributes
       [
         "account_code",
-        "amount_in_cents",
+        "quantity",
+        "unit_amount_in_cents",
+        "amount_in_cents", # quantity * unit_amount_in_cents
         "start_date",
         "end_date",
         "description",

data/lib/recurly/subscription.rb

@@ -6,7 +6,7 @@ module Recurly
       [
         "plan_code",
         "coupon_code",
-        "unit_amount",
+        "unit_amount_in_cents",
         "quantity",
         "trial_ends_at"
       ]

data/lib/recurly/version.rb

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

data/spec/config/recurly.yml

@@ -1,8 +1,8 @@
 ---
-username: api-test@hello-test.com
-password: 50a5b8a69a2545db84ac4112ba8cac6f 
-private_key: 54922a65b9ba4d49a486de7f0b2057c3
-subdomain: hello-test
+username: api-test@facebook.com
+password: c012090130704e748dae49f56f05f68f
+private_key: 1e114f7c047b4a82a270061b71247332
+subdomain: facebook-test
 environment: :development
 
 #username: api-test@isaactest.com

data/spec/unit/billing_info_spec.rb

@@ -15,6 +15,7 @@ module Recurly
       it { should respond_to(:country)}
       it { should respond_to(:phone)}
       it { should respond_to(:ip_address)}
+      it { should respond_to(:vat_number)}
 
       context "embedded credit card" do
         before(:each) do

data/spec/unit/charge_spec.rb

@@ -7,6 +7,8 @@ module Recurly
 
       it { should respond_to(:id)}
       it { should respond_to(:account_code)}
+      it { should respond_to(:quantity)}
+      it { should respond_to(:unit_amount_in_cents)}
       it { should respond_to(:amount_in_cents)}
       it { should respond_to(:start_date)}
       it { should respond_to(:end_date)}

data/spec/unit/credit_spec.rb

@@ -7,6 +7,8 @@ module Recurly
 
       it { should respond_to(:id)}
       it { should respond_to(:account_code)}
+      it { should respond_to(:quantity)}
+      it { should respond_to(:unit_amount_in_cents)}
       it { should respond_to(:amount_in_cents)}
       it { should respond_to(:start_date)}
       it { should respond_to(:end_date)}

data/spec/unit/subscription_spec.rb

@@ -7,7 +7,7 @@ module Recurly
 
       it { should respond_to(:plan_code)}
       it { should respond_to(:coupon_code)}
-      it { should respond_to(:unit_amount)}
+      it { should respond_to(:unit_amount_in_cents)}
       it { should respond_to(:quantity)}
       it { should respond_to(:trial_ends_at)}
 

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

@@ -2,7 +2,7 @@
 - !ruby/struct:VCR::HTTPInteraction 
   request: !ruby/struct:VCR::Request 
     method: :post
-    uri: http://api-test%40hello-test.com:50a5b8a69a2545db84ac4112ba8cac6f@app.recurly.local:3000/accounts.xml
+    uri: http://api-test%40facebook.com:c012090130704e748dae49f56f05f68f@app.recurly.local:3000/accounts.xml
     body: |
       <?xml version="1.0" encoding="UTF-8"?>
       <account>
@@ -20,36 +20,38 @@
 
     headers: 
       authorization: 
-      - Basic YXBpLXRlc3RAaGVsbG8tdGVzdC5jb206NTBhNWI4YTY5YTI1NDVkYjg0YWM0MTEyYmE4Y2FjNmY=
+      - Basic YXBpLXRlc3RAZmFjZWJvb2suY29tOmMwMTIwOTAxMzA3MDRlNzQ4ZGFlNDlmNTZmMDVmNjhm
+      user-agent: 
+      - Recurly Ruby Client v0.4.6
       content-type: 
       - application/xml
       accept: 
       - "*/*"
-      user-agent: 
-      - Ruby
       connection: 
       - close
   response: !ruby/struct:VCR::Response 
     status: !ruby/struct:VCR::ResponseStatus 
       code: 201
-      message: Created
+      message: "Created "
     headers: 
       cache-control: 
       - no-cache
       location: 
       - http://app.recurly.local:3000/accounts/account1-french-1301979678
       x-runtime: 
-      - "653"
+      - "235"
       content-type: 
       - application/xml; charset=utf-8
       content-length: 
       - "585"
-      set-cookie: 
-      - _recurly_session=3f7bb9cdba35677fd3059b70801e498f; domain=.recurly.local; path=/; HttpOnly
+      server: 
+      - WEBrick/1.3.1 (Ruby/1.9.2/2011-02-18)
+      date: 
+      - Thu, 21 Apr 2011 17:58:54 GMT
       connection: 
       - close
-      server: 
-      - thin 1.2.7 codename No Hup
+      set-cookie: 
+      - _recurly_session=7869f2db79a7ca292c9af350696f94ea; domain=.recurly.local; path=/; HttpOnly
     body: |
       <?xml version="1.0" encoding="UTF-8"?>
       <account>
@@ -62,8 +64,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>d0eeb511e23842c1a0639a4d9c254454</hosted_login_token>
-        <created_at type="datetime">2011-04-05T19:39:07Z</created_at>
+        <hosted_login_token>eb46e4e3be45482f9e99fe2f6a50ae84</hosted_login_token>
+        <created_at type="datetime">2011-04-21T17:58:54Z</created_at>
         <state>active</state>
       </account>
 

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

@@ -2,7 +2,7 @@
 - !ruby/struct:VCR::HTTPInteraction 
   request: !ruby/struct:VCR::Request 
     method: :post
-    uri: http://api-test%40hello-test.com:50a5b8a69a2545db84ac4112ba8cac6f@app.recurly.local:3000/accounts.xml
+    uri: http://api-test%40facebook.com:c012090130704e748dae49f56f05f68f@app.recurly.local:3000/accounts.xml
     body: |
       <?xml version="1.0" encoding="UTF-8"?>
       <account>
@@ -20,36 +20,38 @@
 
     headers: 
       authorization: 
-      - Basic YXBpLXRlc3RAaGVsbG8tdGVzdC5jb206NTBhNWI4YTY5YTI1NDVkYjg0YWM0MTEyYmE4Y2FjNmY=
+      - Basic YXBpLXRlc3RAZmFjZWJvb2suY29tOmMwMTIwOTAxMzA3MDRlNzQ4ZGFlNDlmNTZmMDVmNjhm
+      user-agent: 
+      - Recurly Ruby Client v0.4.6
       content-type: 
       - application/xml
       accept: 
       - "*/*"
-      user-agent: 
-      - Ruby
       connection: 
       - close
   response: !ruby/struct:VCR::Response 
     status: !ruby/struct:VCR::ResponseStatus 
       code: 201
-      message: Created
+      message: "Created "
     headers: 
       cache-control: 
       - no-cache
       location: 
       - http://app.recurly.local:3000/accounts/account-close-1301979678
       x-runtime: 
-      - "386"
+      - "278"
       content-type: 
       - application/xml; charset=utf-8
       content-length: 
       - "581"
-      set-cookie: 
-      - _recurly_session=959d6d6bc89a68c40355b4640667c18f; domain=.recurly.local; path=/; HttpOnly
+      server: 
+      - WEBrick/1.3.1 (Ruby/1.9.2/2011-02-18)
+      date: 
+      - Thu, 21 Apr 2011 17:58:43 GMT
       connection: 
       - close
-      server: 
-      - thin 1.2.7 codename No Hup
+      set-cookie: 
+      - _recurly_session=710d71f19faee26a480df8bf881cda1f; domain=.recurly.local; path=/; HttpOnly
     body: |
       <?xml version="1.0" encoding="UTF-8"?>
       <account>
@@ -62,8 +64,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>51817519b9f04d40b55b7d814d7f0547</hosted_login_token>
-        <created_at type="datetime">2011-04-05T19:38:52Z</created_at>
+        <hosted_login_token>c54c971474064630bf90147a73f37232</hosted_login_token>
+        <created_at type="datetime">2011-04-21T17:58:43Z</created_at>
         <state>active</state>
       </account>
 
@@ -71,75 +73,79 @@
 - !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-1301979678.xml
+    uri: http://api-test%40facebook.com:c012090130704e748dae49f56f05f68f@app.recurly.local:3000/accounts/account-close-1301979678.xml
     body: 
     headers: 
       authorization: 
-      - Basic YXBpLXRlc3RAaGVsbG8tdGVzdC5jb206NTBhNWI4YTY5YTI1NDVkYjg0YWM0MTEyYmE4Y2FjNmY=
+      - Basic YXBpLXRlc3RAZmFjZWJvb2suY29tOmMwMTIwOTAxMzA3MDRlNzQ4ZGFlNDlmNTZmMDVmNjhm
+      user-agent: 
+      - Recurly Ruby Client v0.4.6
       accept: 
       - application/xml
-      user-agent: 
-      - Ruby
       connection: 
       - close
   response: !ruby/struct:VCR::Response 
     status: !ruby/struct:VCR::ResponseStatus 
       code: 200
-      message: OK
+      message: "OK "
     headers: 
       cache-control: 
       - no-cache
       x-runtime: 
-      - "674"
+      - "293"
       content-type: 
       - application/xml; charset=utf-8
       content-length: 
       - "1"
-      set-cookie: 
-      - _recurly_session=1aaf5360a93701ec0b77d38c9b491e61; domain=.recurly.local; path=/; HttpOnly
+      server: 
+      - WEBrick/1.3.1 (Ruby/1.9.2/2011-02-18)
+      date: 
+      - Thu, 21 Apr 2011 17:58:45 GMT
       connection: 
       - close
-      server: 
-      - thin 1.2.7 codename No Hup
+      set-cookie: 
+      - _recurly_session=ebfc242c25c7d65847dc94ee1eacc814; 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%40hello-test.com:50a5b8a69a2545db84ac4112ba8cac6f@app.recurly.local:3000/accounts/account-close-1301979678.xml
+    uri: http://api-test%40facebook.com:c012090130704e748dae49f56f05f68f@app.recurly.local:3000/accounts/account-close-1301979678.xml
     body: 
     headers: 
       authorization: 
-      - Basic YXBpLXRlc3RAaGVsbG8tdGVzdC5jb206NTBhNWI4YTY5YTI1NDVkYjg0YWM0MTEyYmE4Y2FjNmY=
+      - Basic YXBpLXRlc3RAZmFjZWJvb2suY29tOmMwMTIwOTAxMzA3MDRlNzQ4ZGFlNDlmNTZmMDVmNjhm
+      user-agent: 
+      - Recurly Ruby Client v0.4.6
       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 
     status: !ruby/struct:VCR::ResponseStatus 
       code: 200
-      message: OK
+      message: "OK "
     headers: 
       x-runtime: 
-      - "372"
+      - "244"
       content-type: 
       - application/xml; charset=utf-8
       etag: 
-      - "\"cf0446d5715951e4cc9666193af16150\""
+      - "\"2c9473340f44d35a479ac39ec178c672\""
       cache-control: 
       - private, max-age=0, must-revalidate
       content-length: 
       - "580"
-      set-cookie: 
-      - _recurly_session=d2cf4862f501fe9ef038695a160e79ed; domain=.recurly.local; path=/; HttpOnly
+      server: 
+      - WEBrick/1.3.1 (Ruby/1.9.2/2011-02-18)
+      date: 
+      - Thu, 21 Apr 2011 17:58:47 GMT
       connection: 
       - close
-      server: 
-      - thin 1.2.7 codename No Hup
+      set-cookie: 
+      - _recurly_session=1de6e95b75fd5a065f06480dc916e9e5; domain=.recurly.local; path=/; HttpOnly
     body: |
       <?xml version="1.0" encoding="UTF-8"?>
       <account>
@@ -152,8 +158,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>51817519b9f04d40b55b7d814d7f0547</hosted_login_token>
-        <created_at type="datetime">2011-04-05T19:38:52Z</created_at>
+        <hosted_login_token>c54c971474064630bf90147a73f37232</hosted_login_token>
+        <created_at type="datetime">2011-04-21T17:58:43Z</created_at>
         <state>closed</state>
       </account>
 

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

@@ -2,7 +2,7 @@
 - !ruby/struct:VCR::HTTPInteraction 
   request: !ruby/struct:VCR::Request 
     method: :post
-    uri: http://api-test%40hello-test.com:50a5b8a69a2545db84ac4112ba8cac6f@app.recurly.local:3000/accounts.xml
+    uri: http://api-test%40facebook.com:c012090130704e748dae49f56f05f68f@app.recurly.local:3000/accounts.xml
     body: |
       <?xml version="1.0" encoding="UTF-8"?>
       <account>
@@ -16,13 +16,13 @@
 
     headers: 
       authorization: 
-      - Basic YXBpLXRlc3RAaGVsbG8tdGVzdC5jb206NTBhNWI4YTY5YTI1NDVkYjg0YWM0MTEyYmE4Y2FjNmY=
+      - Basic YXBpLXRlc3RAZmFjZWJvb2suY29tOmMwMTIwOTAxMzA3MDRlNzQ4ZGFlNDlmNTZmMDVmNjhm
+      user-agent: 
+      - Recurly Ruby Client v0.4.6
       content-type: 
       - application/xml
       accept: 
       - "*/*"
-      user-agent: 
-      - Ruby
       connection: 
       - close
   response: !ruby/struct:VCR::Response 
@@ -33,17 +33,19 @@
       cache-control: 
       - no-cache
       x-runtime: 
-      - "402"
+      - "289"
       content-type: 
       - application/xml; charset=utf-8
       content-length: 
       - "186"
-      set-cookie: 
-      - _recurly_session=9111a3a894c1286c22cb1be2db9253ea; domain=.recurly.local; path=/; HttpOnly
+      server: 
+      - WEBrick/1.3.1 (Ruby/1.9.2/2011-02-18)
+      date: 
+      - Thu, 21 Apr 2011 17:58:49 GMT
       connection: 
       - close
-      server: 
-      - thin 1.2.7 codename No Hup
+      set-cookie: 
+      - _recurly_session=76ff90799de7ce3e6d5a56edc9fea733; domain=.recurly.local; path=/; HttpOnly
     body: |
       <?xml version="1.0" encoding="UTF-8"?>
       <errors>

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

@@ -2,7 +2,7 @@
 - !ruby/struct:VCR::HTTPInteraction 
   request: !ruby/struct:VCR::Request 
     method: :post
-    uri: http://api-test%40hello-test.com:50a5b8a69a2545db84ac4112ba8cac6f@app.recurly.local:3000/accounts.xml
+    uri: http://api-test%40facebook.com:c012090130704e748dae49f56f05f68f@app.recurly.local:3000/accounts.xml
     body: |
       <?xml version="1.0" encoding="UTF-8"?>
       <account>
@@ -16,36 +16,38 @@
 
     headers: 
       authorization: 
-      - Basic YXBpLXRlc3RAaGVsbG8tdGVzdC5jb206NTBhNWI4YTY5YTI1NDVkYjg0YWM0MTEyYmE4Y2FjNmY=
+      - Basic YXBpLXRlc3RAZmFjZWJvb2suY29tOmMwMTIwOTAxMzA3MDRlNzQ4ZGFlNDlmNTZmMDVmNjhm
+      user-agent: 
+      - Recurly Ruby Client v0.4.6
       content-type: 
       - application/xml
       accept: 
       - "*/*"
-      user-agent: 
-      - Ruby
       connection: 
       - close
   response: !ruby/struct:VCR::Response 
     status: !ruby/struct:VCR::ResponseStatus 
       code: 201
-      message: Created
+      message: "Created "
     headers: 
       cache-control: 
       - no-cache
       location: 
       - http://app.recurly.local:3000/accounts/account-exists
       x-runtime: 
-      - "388"
+      - "236"
       content-type: 
       - application/xml; charset=utf-8
       content-length: 
       - "520"
-      set-cookie: 
-      - _recurly_session=2ee91ff89ab5b3f2bbd5992341e4c222; domain=.recurly.local; path=/; HttpOnly
+      server: 
+      - WEBrick/1.3.1 (Ruby/1.9.2/2011-02-18)
+      date: 
+      - Thu, 21 Apr 2011 17:58:51 GMT
       connection: 
       - close
-      server: 
-      - thin 1.2.7 codename No Hup
+      set-cookie: 
+      - _recurly_session=f9af84adfde49c441fb52f74ac02bdf3; domain=.recurly.local; path=/; HttpOnly
     body: |
       <?xml version="1.0" encoding="UTF-8"?>
       <account>
@@ -58,8 +60,8 @@
         <company_name></company_name>
         <balance_in_cents type="integer">0</balance_in_cents>
         <closed type="boolean">false</closed>
-        <hosted_login_token>a3d7cc100f2a4682aaf97c109c39ba9e</hosted_login_token>
-        <created_at type="datetime">2011-04-05T19:39:02Z</created_at>
+        <hosted_login_token>8fdd44c166d24cbdad17fcbc31968927</hosted_login_token>
+        <created_at type="datetime">2011-04-21T17:58:51Z</created_at>
         <state>active</state>
       </account>
 
@@ -67,7 +69,7 @@
 - !ruby/struct:VCR::HTTPInteraction 
   request: !ruby/struct:VCR::Request 
     method: :post
-    uri: http://api-test%40hello-test.com:50a5b8a69a2545db84ac4112ba8cac6f@app.recurly.local:3000/accounts.xml
+    uri: http://api-test%40facebook.com:c012090130704e748dae49f56f05f68f@app.recurly.local:3000/accounts.xml
     body: |
       <?xml version="1.0" encoding="UTF-8"?>
       <account>
@@ -81,13 +83,13 @@
 
     headers: 
       authorization: 
-      - Basic YXBpLXRlc3RAaGVsbG8tdGVzdC5jb206NTBhNWI4YTY5YTI1NDVkYjg0YWM0MTEyYmE4Y2FjNmY=
+      - Basic YXBpLXRlc3RAZmFjZWJvb2suY29tOmMwMTIwOTAxMzA3MDRlNzQ4ZGFlNDlmNTZmMDVmNjhm
+      user-agent: 
+      - Recurly Ruby Client v0.4.6
       content-type: 
       - application/xml
       accept: 
       - "*/*"
-      user-agent: 
-      - Ruby
       connection: 
       - close
   response: !ruby/struct:VCR::Response 
@@ -98,17 +100,19 @@
       cache-control: 
       - no-cache
       x-runtime: 
-      - "669"
+      - "264"
       content-type: 
       - application/xml; charset=utf-8
       content-length: 
       - "132"
-      set-cookie: 
-      - _recurly_session=0e651159e41aa33d2962cd59cb957517; domain=.recurly.local; path=/; HttpOnly
+      server: 
+      - WEBrick/1.3.1 (Ruby/1.9.2/2011-02-18)
+      date: 
+      - Thu, 21 Apr 2011 17:58:53 GMT
       connection: 
       - close
-      server: 
-      - thin 1.2.7 codename No Hup
+      set-cookie: 
+      - _recurly_session=5c5f8b3a22da2ddc5b1252d78ee7fb8f; domain=.recurly.local; path=/; HttpOnly
     body: |
       <?xml version="1.0" encoding="UTF-8"?>
       <errors>