recurly 0.2.1 → 0.2.2

data/README.md

@@ -21,6 +21,7 @@ This library can be installed as a gem or a plugin. Your choice.
     gem 'recurly'
 
 **Bleeding Edge Version:**
+
     gem 'recurly', :git => "http://github.com/recurly/recurly-client-ruby.git"
 
 
@@ -66,9 +67,9 @@ The Recurly Configuration YAML is in the format of:
 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.
+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
+    rake recurly:clear_test_data
 
 
 Rails Demo Application

data/lib/recurly/invoice.rb

@@ -17,7 +17,7 @@ module Recurly
       # postprocess generated element url.
       # changes /accounts/:account_code/invoices/:id to /invoices/:id
       # this breaks update, however I dont believe recurly allows invoice updates anyways
-      path.sub("/accounts/#{CGI::escape(prefix_options[:account_code] || '')}/invoices/", "/invoices/")
+      path.sub("/accounts/#{CGI::escape(prefix_options[:account_code].to_s)}/invoices/", "/invoices/")
     end
 
   end

data/lib/recurly/subscription.rb

@@ -24,7 +24,7 @@ module Recurly
     def change(timeframe, options = {})
       raise "Timeframe must be :full or :renewal." unless timeframe == 'now' or timeframe == 'renewal'
       options[:timeframe] = timeframe
-      path = "/accounts/#{CGI::escape(self.subscription_account_code || '')}/subscription.xml"
+      path = "/accounts/#{CGI::escape(self.subscription_account_code.to_s)}/subscription.xml"
       connection.put(path,
         self.class.format.encode(options, :root => :subscription),
         self.class.headers)

data/lib/recurly/transaction.rb

@@ -14,7 +14,7 @@ module Recurly
     end
 
     def self.list_for_account(account_code, status = :all)
-      results = find(:all, :from => "/accounts/#{CGI::escape(account_code || '')}/transactions")
+      results = find(:all, :from => "/accounts/#{CGI::escape(account_code.to_s)}/transactions")
 
       # filter by status
       if status != :all

data/lib/recurly/version.rb

@@ -1,3 +1,3 @@
 module Recurly #:nodoc
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/spec/integration/subscription_spec.rb

@@ -49,19 +49,40 @@ module Recurly
     end
 
     describe "updates and downgrades" do
-      use_vcr_cassette "subscription/update/#{timestamp}"
 
-      let(:account){ Factory.create_account("subscription-update-#{timestamp}") }
+      context "normal case" do
+        use_vcr_cassette "subscription/change1/#{timestamp}"
 
-      before(:each) do
-        Factory.create_subscription(account, :paid)
-        @subscription = Subscription.find(account.account_code)
+        let(:account){ Factory.create_account("subscription-change1-#{timestamp}") }
+
+        before(:each) do
+          Factory.create_subscription(account, :paid)
+          @subscription = Subscription.find(account.account_code)
+
+          @subscription.change('now', :quantity => 2)
+        end
 
-        @subscription.change('now', :quantity => 2)
+        it "should update the subscription quantity" do
+          Subscription.find(account.account_code).quantity.should == 2
+        end
       end
 
-      it "should update the subscription quantity" do
-        Subscription.find(account.account_code).quantity.should == 2
+      context "when account code is an integer (issue GH-4)" do
+        use_vcr_cassette "subscription/change2/#{timestamp}"
+
+        let(:account){ Factory.create_account(timestamp) }
+
+        before(:each) do
+          Factory.create_subscription(account, :paid)
+          @subscription = Subscription.find(account.account_code)
+
+          @subscription.id = account.account_code.to_i
+          @subscription.change('now', :quantity => 2)
+        end
+
+        it "should update the subscription quantity" do
+          Subscription.find(account.account_code).quantity.should == 2
+        end
       end
     end
 

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

@@ -0,0 +1,159 @@
+--- 
+- !ruby/struct:VCR::HTTPInteraction 
+  request: !ruby/struct:VCR::Request 
+    method: :post
+    uri: https://railsjedi%40sogetthis.com:7PCB2mZC@recurlytest3-test.recurly.com:443/accounts.xml
+    body: |
+      <?xml version="1.0" encoding="UTF-8"?>
+      <account>
+        <company-name>Recurly Ruby Gem</company-name>
+        <account-code>account-close-1286666929</account-code>
+        <last-name>Test</last-name>
+        <email>verena@test.com</email>
+        <first-name>Verena</first-name>
+      </account>
+
+    headers: 
+      accept: 
+      - "*/*"
+      connection: 
+      - close
+      content-type: 
+      - application/xml
+      authorization: 
+      - Basic cmFpbHNqZWRpQHNvZ2V0dGhpcy5jb206N1BDQjJtWkM=
+  response: !ruby/struct:VCR::Response 
+    status: !ruby/struct:VCR::ResponseStatus 
+      code: 201
+      message: Created
+    headers: 
+      location: 
+      - https://recurlytest3-test.recurly.com/accounts/account-close-1286666929
+      connection: 
+      - close
+      content-type: 
+      - application/xml; charset=utf-8
+      x-runtime: 
+      - "568"
+      date: 
+      - Thu, 14 Oct 2010 06:15:45 GMT
+      server: 
+      - nginx/0.7.65
+      content-length: 
+      - "581"
+      set-cookie: 
+      - account_credentials=8171dfe4bd90db74de529ca5eaed0ff56f00e0aea9dc521fc8f8edcf2b07331ad2fce09b760ae0da68864875b1264defe18058dc980afb476fd7f1b757d5a6ea%3A%3A; domain=.recurly.com; path=/; secure; HttpOnly
+      - ""
+      - _recurly_session=e0596ab5fccf208e071f0695ddd56a64; domain=.recurly.com; path=/; Secure; HttpOnly
+      cache-control: 
+      - no-cache
+    body: |
+      <?xml version="1.0" encoding="UTF-8"?>
+      <account>
+        <id>account-close-1286666929</id>
+        <account_code>account-close-1286666929</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>06afe57039224882a15af1101f1d0c79</hosted_login_token>
+        <created_at type="datetime">2010-10-14T06:15:45Z</created_at>
+        <state>active</state>
+      </account>
+
+    http_version: "1.1"
+- !ruby/struct:VCR::HTTPInteraction 
+  request: !ruby/struct:VCR::Request 
+    method: :delete
+    uri: https://railsjedi%40sogetthis.com:7PCB2mZC@recurlytest3-test.recurly.com:443/accounts/account-close-1286666929.xml
+    body: 
+    headers: 
+      accept: 
+      - application/xml
+      connection: 
+      - close
+      authorization: 
+      - Basic cmFpbHNqZWRpQHNvZ2V0dGhpcy5jb206N1BDQjJtWkM=
+  response: !ruby/struct:VCR::Response 
+    status: !ruby/struct:VCR::ResponseStatus 
+      code: 200
+      message: OK
+    headers: 
+      x-ua-compatible: 
+      - IE=Edge
+      connection: 
+      - close
+      content-type: 
+      - application/xml; charset=utf-8
+      x-runtime: 
+      - "64"
+      date: 
+      - Thu, 14 Oct 2010 06:15:46 GMT
+      server: 
+      - nginx/0.7.65
+      content-length: 
+      - "1"
+      set-cookie: 
+      - _recurly_session=2309d7d0061fd27d7c9b188e8d2ad903; domain=.recurly.com; path=/; Secure; HttpOnly
+      cache-control: 
+      - no-cache
+    body: " "
+    http_version: "1.1"
+- !ruby/struct:VCR::HTTPInteraction 
+  request: !ruby/struct:VCR::Request 
+    method: :get
+    uri: https://railsjedi%40sogetthis.com:7PCB2mZC@recurlytest3-test.recurly.com:443/accounts/account-close-1286666929.xml
+    body: 
+    headers: 
+      accept: 
+      - application/xml
+      connection: 
+      - close
+      authorization: 
+      - Basic cmFpbHNqZWRpQHNvZ2V0dGhpcy5jb206N1BDQjJtWkM=
+  response: !ruby/struct:VCR::Response 
+    status: !ruby/struct:VCR::ResponseStatus 
+      code: 200
+      message: OK
+    headers: 
+      x-ua-compatible: 
+      - IE=Edge
+      etag: 
+      - "\"316f3d6beaaba14f31d565352c12f739\""
+      connection: 
+      - close
+      content-type: 
+      - application/xml; charset=utf-8
+      x-runtime: 
+      - "44"
+      date: 
+      - Thu, 14 Oct 2010 06:15:47 GMT
+      server: 
+      - nginx/0.7.65
+      content-length: 
+      - "580"
+      set-cookie: 
+      - _recurly_session=b0919023d9048fc518683695361697d8; domain=.recurly.com; path=/; Secure; HttpOnly
+      cache-control: 
+      - private, max-age=0, must-revalidate
+    body: |
+      <?xml version="1.0" encoding="UTF-8"?>
+      <account>
+        <id>account-close-1286666929</id>
+        <account_code>account-close-1286666929</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">true</closed>
+        <hosted_login_token>06afe57039224882a15af1101f1d0c79</hosted_login_token>
+        <created_at type="datetime">2010-10-14T06:15:45Z</created_at>
+        <state>closed</state>
+      </account>
+
+    http_version: "1.1"

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

@@ -0,0 +1,49 @@
+--- 
+- !ruby/struct:VCR::HTTPInteraction 
+  request: !ruby/struct:VCR::Request 
+    method: :post
+    uri: https://railsjedi%40sogetthis.com:7PCB2mZC@recurlytest3-test.recurly.com:443/accounts.xml
+    body: |
+      <?xml version="1.0" encoding="UTF-8"?>
+      <account>
+        <account-code></account-code>
+      </account>
+
+    headers: 
+      accept: 
+      - "*/*"
+      connection: 
+      - close
+      content-type: 
+      - application/xml
+      authorization: 
+      - Basic cmFpbHNqZWRpQHNvZ2V0dGhpcy5jb206N1BDQjJtWkM=
+  response: !ruby/struct:VCR::Response 
+    status: !ruby/struct:VCR::ResponseStatus 
+      code: 422
+      message: ""
+    headers: 
+      connection: 
+      - close
+      content-type: 
+      - application/xml; charset=utf-8
+      x-runtime: 
+      - "18"
+      date: 
+      - Thu, 14 Oct 2010 06:15:47 GMT
+      server: 
+      - nginx/0.7.65
+      content-length: 
+      - "186"
+      set-cookie: 
+      - _recurly_session=5b48160d1ced437e9fcf8b8a6ef37ec9; domain=.recurly.com; path=/; Secure; HttpOnly
+      cache-control: 
+      - no-cache
+    body: |
+      <?xml version="1.0" encoding="UTF-8"?>
+      <errors>
+        <error field="account_code">Account code can't be blank</error>
+        <error field="account_code">Account code is invalid</error>
+      </errors>
+
+    http_version: "1.1"

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

@@ -0,0 +1,95 @@
+--- 
+- !ruby/struct:VCR::HTTPInteraction 
+  request: !ruby/struct:VCR::Request 
+    method: :post
+    uri: https://railsjedi%40sogetthis.com:7PCB2mZC@recurlytest3-test.recurly.com:443/accounts.xml
+    body: |
+      <?xml version="1.0" encoding="UTF-8"?>
+      <account>
+        <account-code>account-exists</account-code>
+      </account>
+
+    headers: 
+      accept: 
+      - "*/*"
+      connection: 
+      - close
+      content-type: 
+      - application/xml
+      authorization: 
+      - Basic cmFpbHNqZWRpQHNvZ2V0dGhpcy5jb206N1BDQjJtWkM=
+  response: !ruby/struct:VCR::Response 
+    status: !ruby/struct:VCR::ResponseStatus 
+      code: 422
+      message: ""
+    headers: 
+      connection: 
+      - close
+      content-type: 
+      - application/xml; charset=utf-8
+      x-runtime: 
+      - "30"
+      date: 
+      - Thu, 14 Oct 2010 06:15:48 GMT
+      server: 
+      - nginx/0.7.65
+      content-length: 
+      - "132"
+      set-cookie: 
+      - _recurly_session=383e9b0854b010f9178cecd8a89f30fe; domain=.recurly.com; path=/; Secure; HttpOnly
+      cache-control: 
+      - no-cache
+    body: |
+      <?xml version="1.0" encoding="UTF-8"?>
+      <errors>
+        <error field="account_code">Account code has already been taken</error>
+      </errors>
+
+    http_version: "1.1"
+- !ruby/struct:VCR::HTTPInteraction 
+  request: !ruby/struct:VCR::Request 
+    method: :post
+    uri: https://railsjedi%40sogetthis.com:7PCB2mZC@recurlytest3-test.recurly.com:443/accounts.xml
+    body: |
+      <?xml version="1.0" encoding="UTF-8"?>
+      <account>
+        <account-code>account-exists</account-code>
+      </account>
+
+    headers: 
+      accept: 
+      - "*/*"
+      connection: 
+      - close
+      content-type: 
+      - application/xml
+      authorization: 
+      - Basic cmFpbHNqZWRpQHNvZ2V0dGhpcy5jb206N1BDQjJtWkM=
+  response: !ruby/struct:VCR::Response 
+    status: !ruby/struct:VCR::ResponseStatus 
+      code: 422
+      message: ""
+    headers: 
+      connection: 
+      - close
+      content-type: 
+      - application/xml; charset=utf-8
+      x-runtime: 
+      - "18"
+      date: 
+      - Thu, 14 Oct 2010 06:15:49 GMT
+      server: 
+      - nginx/0.7.65
+      content-length: 
+      - "132"
+      set-cookie: 
+      - _recurly_session=5d4c19f3669a1ddde3c95819026f63df; domain=.recurly.com; path=/; Secure; HttpOnly
+      cache-control: 
+      - no-cache
+    body: |
+      <?xml version="1.0" encoding="UTF-8"?>
+      <errors>
+        <error field="account_code">Account code has already been taken</error>
+      </errors>
+
+    http_version: "1.1"

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

@@ -0,0 +1,63 @@
+--- 
+- !ruby/struct:VCR::HTTPInteraction 
+  request: !ruby/struct:VCR::Request 
+    method: :post
+    uri: https://railsjedi%40sogetthis.com:7PCB2mZC@recurlytest3-test.recurly.com:443/accounts.xml
+    body: |
+      <?xml version="1.0" encoding="UTF-8"?>
+      <account>
+        <account-code>d00d-1286666929</account-code>
+      </account>
+
+    headers: 
+      accept: 
+      - "*/*"
+      connection: 
+      - close
+      content-type: 
+      - application/xml
+      authorization: 
+      - Basic cmFpbHNqZWRpQHNvZ2V0dGhpcy5jb206N1BDQjJtWkM=
+  response: !ruby/struct:VCR::Response 
+    status: !ruby/struct:VCR::ResponseStatus 
+      code: 201
+      message: Created
+    headers: 
+      location: 
+      - https://recurlytest3-test.recurly.com/accounts/d00d-1286666929
+      connection: 
+      - close
+      content-type: 
+      - application/xml; charset=utf-8
+      x-runtime: 
+      - "567"
+      date: 
+      - Thu, 14 Oct 2010 06:15:16 GMT
+      server: 
+      - nginx/0.7.65
+      content-length: 
+      - "522"
+      set-cookie: 
+      - account_credentials=279a5d85932ab7f16c10dfd48b8a4ba39dd6fdab67a66480d7164cd6d9c8a30e7ed2e5cca7bb4450e7ad8ef283cb2e594213becdc25eb05b5f4660813fc24846%3A%3A; domain=.recurly.com; path=/; secure; HttpOnly
+      - ""
+      - _recurly_session=773baa0f87c9badfa95f2b5c192bea85; domain=.recurly.com; path=/; Secure; HttpOnly
+      cache-control: 
+      - no-cache
+    body: |
+      <?xml version="1.0" encoding="UTF-8"?>
+      <account>
+        <id>d00d-1286666929</id>
+        <account_code>d00d-1286666929</account_code>
+        <username></username>
+        <email></email>
+        <first_name></first_name>
+        <last_name></last_name>
+        <company_name></company_name>
+        <balance_in_cents type="integer">0</balance_in_cents>
+        <closed type="boolean">false</closed>
+        <hosted_login_token>ad58f7eb915d44139f523a50e3882017</hosted_login_token>
+        <created_at type="datetime">2010-10-14T06:15:16Z</created_at>
+        <state>active</state>
+      </account>
+
+    http_version: "1.1"