recurly 0.2.2 → 0.2.3

data/lib/recurly/subscription.rb

@@ -3,7 +3,7 @@ module Recurly
     self.element_name = "subscription"
 
     def self.refund(account_code, refund_type = :partial)
-      raise "Refund type must be :full or :partial." unless refund_type == :full or refund_type == :partial
+      raise "Refund type must be :full, :partial, or :none." unless [:full, :partial, :none].include?(refund_type)
       Subscription.delete(nil, {:account_code => account_code, :refund => refund_type})
     end
 
@@ -15,8 +15,7 @@ module Recurly
 
     # Terminates the subscription immediately and processes a full or partial refund
     def refund(refund_type)
-      raise "Refund type must be :full or :partial." unless refund_type == :full or refund_type == :partial
-      Subscription.delete(nil, {:account_code => self.subscription_account_code, :refund => refund_type})
+      self.class.refund(self.subscription_account_code)
     end
 
     # Valid timeframe: :now or :renewal

data/lib/recurly/version.rb

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

data/spec/integration/account_spec.rb

@@ -102,8 +102,6 @@ module Recurly
 
       context "looking for a non-existant account" do
         it "should raise an ActiveResource::ResourceNotFound exception" do
-          pending "This isn't supposed to throw 500 errors..."
-
           expect {
             Account.find('account-that-doesnt-exist')
           }.to raise_error ActiveResource::ResourceNotFound

data/spec/integration/invoice_spec.rb

@@ -32,7 +32,6 @@ module Recurly
         let(:account) { Factory.create_account_with_billing_info("invoice-create-no-charges-#{timestamp}") }
 
         it "should not be created since no charges were posted" do
-          pending "Server should not throw a 500 error here"
           @invoice = Invoice.create(:account_code => account.account_code)
           @invoice.should_not be_valid
         end

data/spec/integration/subscription_spec.rb

@@ -108,21 +108,60 @@ module Recurly
     end
 
     describe "refund a subscription" do
-      use_vcr_cassette "subscription/refund/#{timestamp}"
+      context "full refund" do
+        use_vcr_cassette "subscription/refund-full/#{timestamp}"
 
-      let(:account){ Factory.create_account("subscription-refund-#{timestamp}") }
+        let(:account){ Factory.create_account("subscription-refund-full-#{timestamp}") }
 
-      before(:each) do
-        Factory.create_subscription(account, :paid)
-        @subscription = Subscription.find(account.account_code)
+        before(:each) do
+          Factory.create_subscription(account, :paid)
+          @subscription = Subscription.find(account.account_code)
+        end
+
+        it "should remove the subscription entry and post a full refund" do
+          @subscription.refund(:full)
+          expect {
+            Subscription.find(account.account_code)
+          }.to raise_error(ActiveResource::ResourceNotFound)
+        end
+      end
+
+      context "partial refund" do
+        use_vcr_cassette "subscription/refund-partial/#{timestamp}"
+
+        let(:account){ Factory.create_account("subscription-refund-partial-#{timestamp}") }
+
+        before(:each) do
+          Factory.create_subscription(account, :paid)
+          @subscription = Subscription.find(account.account_code)
+        end
+
+        it "should remove the subscription entry and post a partial refund" do
+          @subscription.refund(:partial)
+          expect {
+            Subscription.find(account.account_code)
+          }.to raise_error(ActiveResource::ResourceNotFound)
+        end
       end
 
-      it "should remove the subscription entry" do
-        @subscription.refund(:full)
-        expect {
-          Subscription.find(account.account_code)
-        }.to raise_error(ActiveResource::ResourceNotFound)
+      context "no refund" do
+        use_vcr_cassette "subscription/refund-none/#{timestamp}"
+
+        let(:account){ Factory.create_account("subscription-refund-none-#{timestamp}") }
+
+        before(:each) do
+          Factory.create_subscription(account, :paid)
+          @subscription = Subscription.find(account.account_code)
+        end
+
+        it "should remove the subscription entry and not post a refund" do
+          @subscription.refund(:none)
+          expect {
+            Subscription.find(account.account_code)
+          }.to raise_error(ActiveResource::ResourceNotFound)
+        end
       end
+
     end
   end
 end

data/spec/integration/transaction_spec.rb

@@ -134,9 +134,10 @@ module Recurly
       end
 
       it "should refund the transaction" do
-        pending "Server should refund the transaction"
         @transaction.refund(1000)
-        Transaction.list(:refunds).should include(@transaction)
+
+        pending "not showing up in the refunds list for some reason..."
+        Transaction.list(:refunds).map(&:id).should include(@transaction.id)
       end
     end
 

data/spec/support/factory.rb

@@ -168,9 +168,9 @@ module Recurly
         # 10 dollars a month
         :unit_amount_in_cents => 1000,
 
-        # 1 year intervals
+        # 1 month intervals
         :plan_interval_length => 1,
-        :plan_interval_unit => "years",
+        :plan_interval_unit => "months",
 
         # 1 month trial
         :trial_interval_length => 1,

data/spec/vcr/account/close/{1286666929.yml → 1287167046.yml}

@@ -7,7 +7,7 @@
       <?xml version="1.0" encoding="UTF-8"?>
       <account>
         <company-name>Recurly Ruby Gem</company-name>
-        <account-code>account-close-1286666929</account-code>
+        <account-code>account-close-1287167046</account-code>
         <last-name>Test</last-name>
         <email>verena@test.com</email>
         <first-name>Verena</first-name>
@@ -28,30 +28,30 @@
       message: Created
     headers: 
       location: 
-      - https://recurlytest3-test.recurly.com/accounts/account-close-1286666929
+      - https://recurlytest3-test.recurly.com/accounts/account-close-1287167046
       connection: 
       - close
       content-type: 
       - application/xml; charset=utf-8
       x-runtime: 
-      - "568"
+      - "637"
       date: 
-      - Thu, 14 Oct 2010 06:15:45 GMT
+      - Mon, 18 Oct 2010 22:05:03 GMT
       server: 
       - nginx/0.7.65
       content-length: 
       - "581"
       set-cookie: 
-      - account_credentials=8171dfe4bd90db74de529ca5eaed0ff56f00e0aea9dc521fc8f8edcf2b07331ad2fce09b760ae0da68864875b1264defe18058dc980afb476fd7f1b757d5a6ea%3A%3A; domain=.recurly.com; path=/; secure; HttpOnly
+      - account_credentials=db0ebca433101a60ad6cedd66480bae1170b30a910b2f1f7e6fc21ce657a4f1cd6c717d4e13ac31e65c0156e0c10cae3f574f7ab1fda16138b299a164a3af62f%3A%3A; domain=.recurly.com; path=/; secure; HttpOnly
       - ""
-      - _recurly_session=e0596ab5fccf208e071f0695ddd56a64; domain=.recurly.com; path=/; Secure; HttpOnly
+      - _recurly_session=d9709767e3929d0807e9b4711fbf8c3e; 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>
+        <id>account-close-1287167046</id>
+        <account_code>account-close-1287167046</account_code>
         <username></username>
         <email>verena@test.com</email>
         <first_name>Verena</first_name>
@@ -59,8 +59,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>06afe57039224882a15af1101f1d0c79</hosted_login_token>
-        <created_at type="datetime">2010-10-14T06:15:45Z</created_at>
+        <hosted_login_token>45509f9afde9465091a5c30460c2d744</hosted_login_token>
+        <created_at type="datetime">2010-10-18T22:05:03Z</created_at>
         <state>active</state>
       </account>
 
@@ -68,7 +68,7 @@
 - !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
+    uri: https://railsjedi%40sogetthis.com:7PCB2mZC@recurlytest3-test.recurly.com:443/accounts/account-close-1287167046.xml
     body: 
     headers: 
       accept: 
@@ -89,15 +89,15 @@
       content-type: 
       - application/xml; charset=utf-8
       x-runtime: 
-      - "64"
+      - "70"
       date: 
-      - Thu, 14 Oct 2010 06:15:46 GMT
+      - Mon, 18 Oct 2010 22:05:03 GMT
       server: 
       - nginx/0.7.65
       content-length: 
       - "1"
       set-cookie: 
-      - _recurly_session=2309d7d0061fd27d7c9b188e8d2ad903; domain=.recurly.com; path=/; Secure; HttpOnly
+      - _recurly_session=ac1f1fadb737e9e550d7c09e2d86df5a; domain=.recurly.com; path=/; Secure; HttpOnly
       cache-control: 
       - no-cache
     body: " "
@@ -105,7 +105,7 @@
 - !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
+    uri: https://railsjedi%40sogetthis.com:7PCB2mZC@recurlytest3-test.recurly.com:443/accounts/account-close-1287167046.xml
     body: 
     headers: 
       accept: 
@@ -122,28 +122,28 @@
       x-ua-compatible: 
       - IE=Edge
       etag: 
-      - "\"316f3d6beaaba14f31d565352c12f739\""
+      - "\"a81b0cd3656007282ea4b05b6e97feec\""
       connection: 
       - close
       content-type: 
       - application/xml; charset=utf-8
       x-runtime: 
-      - "44"
+      - "74"
       date: 
-      - Thu, 14 Oct 2010 06:15:47 GMT
+      - Mon, 18 Oct 2010 22:05:04 GMT
       server: 
       - nginx/0.7.65
       content-length: 
       - "580"
       set-cookie: 
-      - _recurly_session=b0919023d9048fc518683695361697d8; domain=.recurly.com; path=/; Secure; HttpOnly
+      - _recurly_session=38b580055cd8699f7c121600e1184d98; 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>
+        <id>account-close-1287167046</id>
+        <account_code>account-close-1287167046</account_code>
         <username></username>
         <email>verena@test.com</email>
         <first_name>Verena</first_name>
@@ -151,8 +151,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>06afe57039224882a15af1101f1d0c79</hosted_login_token>
-        <created_at type="datetime">2010-10-14T06:15:45Z</created_at>
+        <hosted_login_token>45509f9afde9465091a5c30460c2d744</hosted_login_token>
+        <created_at type="datetime">2010-10-18T22:05:03Z</created_at>
         <state>closed</state>
       </account>
 

data/spec/vcr/account/create/{1286666929.yml → 1287167046.yml}

@@ -7,7 +7,7 @@
       <?xml version="1.0" encoding="UTF-8"?>
       <account>
         <company-name>Recurly Ruby Gem</company-name>
-        <account-code>account-create-1286666929</account-code>
+        <account-code>account-create-1287167046</account-code>
         <last-name>Test</last-name>
         <email>verena@test.com</email>
         <first-name>Verena</first-name>
@@ -28,30 +28,30 @@
       message: Created
     headers: 
       location: 
-      - https://recurlytest3-test.recurly.com/accounts/account-create-1286666929
+      - https://recurlytest3-test.recurly.com/accounts/account-create-1287167046
       connection: 
       - close
       content-type: 
       - application/xml; charset=utf-8
       x-runtime: 
-      - "577"
+      - "586"
       date: 
-      - Thu, 14 Oct 2010 06:15:15 GMT
+      - Mon, 18 Oct 2010 22:04:33 GMT
       server: 
       - nginx/0.7.65
       content-length: 
       - "583"
       set-cookie: 
-      - account_credentials=a1b2f9114efca34b99d7eedf0684123386dcffaa4f28d02020e63fc8ae256909a014b4fe3bae21ffc8c7408b55357999d3f758f6b7b70df2fd3756e6c8c49537%3A%3A; domain=.recurly.com; path=/; secure; HttpOnly
+      - account_credentials=4b90d853827136ef353b9dcfb847e25672d2dff70fc552c29ee6097b4804bf0f12f4779ec711f1252eb5a3ad8b82e9de3377ed95ae9e2f05143abc0c66c2b498%3A%3A; domain=.recurly.com; path=/; secure; HttpOnly
       - ""
-      - _recurly_session=4e953dedf17b5ab598ce5a8e32d11121; domain=.recurly.com; path=/; Secure; HttpOnly
+      - _recurly_session=0412918da6a71a7800cf996746929a26; domain=.recurly.com; path=/; Secure; HttpOnly
       cache-control: 
       - no-cache
     body: |
       <?xml version="1.0" encoding="UTF-8"?>
       <account>
-        <id>account-create-1286666929</id>
-        <account_code>account-create-1286666929</account_code>
+        <id>account-create-1287167046</id>
+        <account_code>account-create-1287167046</account_code>
         <username></username>
         <email>verena@test.com</email>
         <first_name>Verena</first_name>
@@ -59,8 +59,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>13dd452fcf93457db066710fd65781de</hosted_login_token>
-        <created_at type="datetime">2010-10-14T06:15:15Z</created_at>
+        <hosted_login_token>34c9183da60a419aa67fa0fb89dc6048</hosted_login_token>
+        <created_at type="datetime">2010-10-18T22:04:33Z</created_at>
         <state>active</state>
       </account>
 

data/spec/vcr/account/create-blank/{1286666929.yml → 1287167046.yml}

@@ -28,15 +28,15 @@
       content-type: 
       - application/xml; charset=utf-8
       x-runtime: 
-      - "18"
+      - "19"
       date: 
-      - Thu, 14 Oct 2010 06:15:47 GMT
+      - Mon, 18 Oct 2010 22:05:05 GMT
       server: 
       - nginx/0.7.65
       content-length: 
       - "186"
       set-cookie: 
-      - _recurly_session=5b48160d1ced437e9fcf8b8a6ef37ec9; domain=.recurly.com; path=/; Secure; HttpOnly
+      - _recurly_session=c450df012ad4138c46363fae696f0923; domain=.recurly.com; path=/; Secure; HttpOnly
       cache-control: 
       - no-cache
     body: |

data/spec/vcr/account/create-duplicate/{1286666929.yml → 1287167046.yml}

@@ -20,30 +20,45 @@
       - Basic cmFpbHNqZWRpQHNvZ2V0dGhpcy5jb206N1BDQjJtWkM=
   response: !ruby/struct:VCR::Response 
     status: !ruby/struct:VCR::ResponseStatus 
-      code: 422
-      message: ""
+      code: 201
+      message: Created
     headers: 
+      location: 
+      - https://recurlytest3-test.recurly.com/accounts/account-exists
       connection: 
       - close
       content-type: 
       - application/xml; charset=utf-8
       x-runtime: 
-      - "30"
+      - "609"
       date: 
-      - Thu, 14 Oct 2010 06:15:48 GMT
+      - Mon, 18 Oct 2010 22:05:06 GMT
       server: 
       - nginx/0.7.65
       content-length: 
-      - "132"
+      - "520"
       set-cookie: 
-      - _recurly_session=383e9b0854b010f9178cecd8a89f30fe; domain=.recurly.com; path=/; Secure; HttpOnly
+      - account_credentials=4755d8b2ea8a11ed6f5dc2c496af8890aa143cc43f3825c24a9a9af9ccbebdab4a35ce34b617ab80cce7bf4dd4f51f8a45eee7566b90c8b50bbae7e3fda9387d%3A%3A; domain=.recurly.com; path=/; secure; HttpOnly
+      - ""
+      - _recurly_session=cbf99b64bd47cb150a0acf0ab8450f0e; 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>
+      <account>
+        <id>account-exists</id>
+        <account_code>account-exists</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>c34fc059dd1e46cb877956b3efd59656</hosted_login_token>
+        <created_at type="datetime">2010-10-18T22:05:06Z</created_at>
+        <state>active</state>
+      </account>
 
     http_version: "1.1"
 - !ruby/struct:VCR::HTTPInteraction 
@@ -75,15 +90,15 @@
       content-type: 
       - application/xml; charset=utf-8
       x-runtime: 
-      - "18"
+      - "19"
       date: 
-      - Thu, 14 Oct 2010 06:15:49 GMT
+      - Mon, 18 Oct 2010 22:05:07 GMT
       server: 
       - nginx/0.7.65
       content-length: 
       - "132"
       set-cookie: 
-      - _recurly_session=5d4c19f3669a1ddde3c95819026f63df; domain=.recurly.com; path=/; Secure; HttpOnly
+      - _recurly_session=1b8b754a9997b44599939a56996ffdd7; domain=.recurly.com; path=/; Secure; HttpOnly
       cache-control: 
       - no-cache
     body: |

data/spec/vcr/account/create-min/{1286666929.yml → 1287167046.yml}

@@ -6,7 +6,7 @@
     body: |
       <?xml version="1.0" encoding="UTF-8"?>
       <account>
-        <account-code>d00d-1286666929</account-code>
+        <account-code>d00d-1287167046</account-code>
       </account>
 
     headers: 
@@ -24,30 +24,30 @@
       message: Created
     headers: 
       location: 
-      - https://recurlytest3-test.recurly.com/accounts/d00d-1286666929
+      - https://recurlytest3-test.recurly.com/accounts/d00d-1287167046
       connection: 
       - close
       content-type: 
       - application/xml; charset=utf-8
       x-runtime: 
-      - "567"
+      - "582"
       date: 
-      - Thu, 14 Oct 2010 06:15:16 GMT
+      - Mon, 18 Oct 2010 22:04:34 GMT
       server: 
       - nginx/0.7.65
       content-length: 
       - "522"
       set-cookie: 
-      - account_credentials=279a5d85932ab7f16c10dfd48b8a4ba39dd6fdab67a66480d7164cd6d9c8a30e7ed2e5cca7bb4450e7ad8ef283cb2e594213becdc25eb05b5f4660813fc24846%3A%3A; domain=.recurly.com; path=/; secure; HttpOnly
+      - account_credentials=3e6605b0a6e3038ebc4e757a359c346818ca21d8d0f28322d20d2daf0574255ab0f421fd14283f2b358bd27fa6863cbb9ed5ae93022526102c4268c6385546dd%3A%3A; domain=.recurly.com; path=/; secure; HttpOnly
       - ""
-      - _recurly_session=773baa0f87c9badfa95f2b5c192bea85; domain=.recurly.com; path=/; Secure; HttpOnly
+      - _recurly_session=bd9a1732331f6a8c00369df453d3d32e; 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>
+        <id>d00d-1287167046</id>
+        <account_code>d00d-1287167046</account_code>
         <username></username>
         <email></email>
         <first_name></first_name>
@@ -55,8 +55,8 @@
         <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>
+        <hosted_login_token>4a9ad1a443b549c3b71b4a71320e7121</hosted_login_token>
+        <created_at type="datetime">2010-10-18T22:04:34Z</created_at>
         <state>active</state>
       </account>