recurly 0.2.3 → 0.2.4

data/lib/recurly.rb

@@ -1,4 +1,5 @@
 require 'active_resource'
+require 'active_support/deprecation'
 require 'cgi'
 
 require 'recurly/version'

data/lib/recurly/charge.rb

@@ -17,5 +17,11 @@ module Recurly
       find(id, :params => { :account_code => account_code })
     end
 
+
+    def destroy
+      reload
+      return false if invoice_id.present?
+      super
+    end
   end
 end

data/lib/recurly/subscription.rb

@@ -7,15 +7,33 @@ module Recurly
       Subscription.delete(nil, {:account_code => account_code, :refund => refund_type})
     end
 
+    # Terminates the subscription immediately and processes a full or partial refund
+    def refund(refund_type)
+      self.class.refund(self.subscription_account_code, refund_type)
+    end
+
+    def self.cancel(account_code)
+      Subscription.delete(account_code)
+    end
+
     # Stops the subscription from renewing. The subscription remains valid until the end of
     # the current term (current_period_ends_at).
-    def cancel(account_code)
-      Subscription.delete(account_code)
+    def cancel(account_code = nil)
+      unless account_code.nil?
+        ActiveSupport::Deprecation.warn('Calling Recurly::Subscription#cancel with an account_code has been deprecated. Use the static method Recurly::Subscription.cancel(account_code) instead', caller)
+      end
+      self.class.cancel(account_code || self.subscription_account_code)
     end
 
-    # Terminates the subscription immediately and processes a full or partial refund
-    def refund(refund_type)
-      self.class.refund(self.subscription_account_code)
+    def self.reactivate(account_code, options = {})
+      path = "/accounts/#{CGI::escape(account_code.to_s)}/subscription/reactivate"
+      connection.post(path, "", headers)
+    rescue ActiveResource::Redirection => e
+      return true
+    end
+
+    def reactivate
+      self.class.reactivate(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.3"
+  VERSION = "0.2.4"
 end

data/spec/integration/charge_spec.rb

@@ -127,5 +127,50 @@ module Recurly
         account.lookup_charge(@charge.id).should == @charge
       end
     end
+
+    describe "delete a charge" do
+      context "uninvoiced charge" do
+        use_vcr_cassette "charge/delete-uninvoiced/#{timestamp}"
+
+        let(:account) { Factory.create_account("charge-delete-uinvoiced-#{timestamp}")}
+
+        before(:each) do
+          charge = Factory.create_charge account.account_code,
+                                          :amount => 13.15,
+                                          :description => "inconvenience fee"
+
+          @charge = Charge.lookup(account.account_code, charge.id)
+
+          @charge.destroy
+        end
+
+        it "should remove the charge" do
+          expect{
+            Charge.lookup(account.account_code, @charge.id)
+          }.to raise_error ActiveResource::ResourceNotFound
+        end
+      end
+
+      context "invoiced charge" do
+        use_vcr_cassette "charge/delete-uninvoiced/#{timestamp}"
+
+        let(:account) { Factory.create_account("charge-delete-uinvoiced-#{timestamp}")}
+
+        before(:each) do
+          charge = Factory.create_charge account.account_code,
+                                          :amount => 13.15,
+                                          :description => "inconvenience fee"
+
+          @charge = Charge.lookup(account.account_code, charge.id)
+          Invoice.create(:account_code => account.account_code)
+
+        end
+
+        it "should not remove the charge" do
+          @charge.destroy.should be_false
+          Charge.lookup(account.account_code, @charge.id).should == @charge
+        end
+      end
+    end
   end
 end

data/spec/integration/credit_spec.rb

@@ -81,7 +81,26 @@ module Recurly
       it "should also be available via Account#lookup_credit" do
         account.lookup_credit(@credit.id).should == @credit
       end
+    end
+
+    describe "delete credit" do
+      use_vcr_cassette "credit/delete/#{timestamp}"
+      let(:account) { Factory.create_account("delete-uninvoiced-#{timestamp}") }
 
+      before(:each) do
+        credit = Factory.create_credit account.account_code,
+                                        :amount => 13.15,
+                                        :description => "free moniez 4 u"
+        @credit = Credit.lookup(account.account_code, credit.id)
+
+        @credit.destroy
+      end
+
+      it "should remove the credit" do
+        expect {
+          Credit.lookup(account.account_code, @credit.id)
+        }.to raise_error ActiveResource::ResourceNotFound
+      end
     end
   end
 end

data/spec/integration/subscription_spec.rb

@@ -1,5 +1,8 @@
 require 'spec_helper'
 
+require 'test/unit'
+require 'active_support/testing/deprecation'
+
 module Recurly
   describe Subscription do
     # version accounts based on this current files modification dates
@@ -86,24 +89,74 @@ module Recurly
       end
     end
 
-    describe "cancel a subscription" do
-      use_vcr_cassette "subscription/cancel/#{timestamp}"
+    describe "reactivate a subscription" do
+      use_vcr_cassette "subscription/reactivate/#{timestamp}"
 
-      let(:account){ Factory.create_account("subscription-cancel-#{timestamp}") }
+      let(:account){ Factory.create_account("subscription-reactivate-#{timestamp}") }
       before(:each) do
         Factory.create_subscription(account, :paid)
         @subscription = Subscription.find(account.account_code)
+        @subscription.cancel
+
+        Subscription.reactivate(account.account_code)
+      end
 
-        # cancel subscription
-        @subscription.cancel(account.account_code)
+      it "should mark the subscription as active" do
+        subscription = Subscription.find(account.account_code)
+        subscription.state.should == "active"
       end
 
-      it "should mark the subscription state as canceled" do
-        Subscription.find(account.account_code).state.should == "canceled"
+    end
+
+    describe "cancel a subscription" do
+      context "without account_code" do
+
+        use_vcr_cassette "subscription/cancel/#{timestamp}"
+
+        let(:account){ Factory.create_account("subscription-cancel-#{timestamp}") }
+        before(:each) do
+          Factory.create_subscription(account, :paid)
+          @subscription = Subscription.find(account.account_code)
+
+          # cancel subscription
+          @subscription.cancel
+        end
+
+        it "should mark the subscription state as canceled" do
+          Subscription.find(account.account_code).state.should == "canceled"
+        end
+
+        it "should mark the subscription canceled_at" do
+          Subscription.find(account.account_code).canceled_at.should_not be_nil
+        end
+
       end
 
-      it "should mark the subscription canceled_at" do
-        Subscription.find(account.account_code).canceled_at.should_not be_nil
+      context "with account_code (backward compat)" do
+        use_vcr_cassette "subscription/cancel-with-code/#{timestamp}"
+
+        include ActiveSupport::Testing::Deprecation
+
+        # ghetto workaround for rspec2 (till i figure out how to use test/unit helpers within rspec)
+        def assert(value, msg = nil)
+          raise "#{value} should have been true" unless value
+        end
+
+        let(:account){ Factory.create_account("subscription-cancel-with-code-#{timestamp}") }
+        before(:each) do
+          Factory.create_subscription(account, :paid)
+          @subscription = Subscription.find(account.account_code)
+
+          assert_deprecated("Calling Recurly::Subscription#cancel with an account_code has been deprecated. Use the static method Recurly::Subscription.cancel(account_code) instead") do
+            # cancel subscription
+            @subscription.cancel(account.account_code)
+          end
+        end
+
+        it "should mark the subscription state as canceled" do
+          Subscription.find(account.account_code).state.should == "canceled"
+          Subscription.find(account.account_code).canceled_at.should_not be_nil
+        end
       end
     end
 

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

@@ -34,17 +34,17 @@
       content-type: 
       - application/xml; charset=utf-8
       x-runtime: 
-      - "637"
+      - "609"
       date: 
-      - Mon, 18 Oct 2010 22:05:03 GMT
+      - Tue, 19 Oct 2010 03:18:58 GMT
       server: 
       - nginx/0.7.65
       content-length: 
       - "581"
       set-cookie: 
-      - account_credentials=db0ebca433101a60ad6cedd66480bae1170b30a910b2f1f7e6fc21ce657a4f1cd6c717d4e13ac31e65c0156e0c10cae3f574f7ab1fda16138b299a164a3af62f%3A%3A; domain=.recurly.com; path=/; secure; HttpOnly
+      - account_credentials=06392fef571b9ee7d9c1882c09b29b75d142d5d68c80899e1256844e7a9c5bd955c5f8a93fa63789d66c27a7895db5aea6b992b3a79fb4559463dedde850ec21%3A%3A; domain=.recurly.com; path=/; secure; HttpOnly
       - ""
-      - _recurly_session=d9709767e3929d0807e9b4711fbf8c3e; domain=.recurly.com; path=/; Secure; HttpOnly
+      - _recurly_session=5e0292a892483661424a3cc0909360fb; domain=.recurly.com; path=/; Secure; HttpOnly
       cache-control: 
       - no-cache
     body: |
@@ -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>45509f9afde9465091a5c30460c2d744</hosted_login_token>
-        <created_at type="datetime">2010-10-18T22:05:03Z</created_at>
+        <hosted_login_token>a8f733ecab7d471eb94ae072c9c8c924</hosted_login_token>
+        <created_at type="datetime">2010-10-19T03:18:58Z</created_at>
         <state>active</state>
       </account>
 
@@ -89,15 +89,15 @@
       content-type: 
       - application/xml; charset=utf-8
       x-runtime: 
-      - "70"
+      - "40"
       date: 
-      - Mon, 18 Oct 2010 22:05:03 GMT
+      - Tue, 19 Oct 2010 03:18:58 GMT
       server: 
       - nginx/0.7.65
       content-length: 
       - "1"
       set-cookie: 
-      - _recurly_session=ac1f1fadb737e9e550d7c09e2d86df5a; domain=.recurly.com; path=/; Secure; HttpOnly
+      - _recurly_session=b9c63067736a5f4ce4a1904eb1eda748; domain=.recurly.com; path=/; Secure; HttpOnly
       cache-control: 
       - no-cache
     body: " "
@@ -122,21 +122,21 @@
       x-ua-compatible: 
       - IE=Edge
       etag: 
-      - "\"a81b0cd3656007282ea4b05b6e97feec\""
+      - "\"8865b761556fb64c9b83e236b3459161\""
       connection: 
       - close
       content-type: 
       - application/xml; charset=utf-8
       x-runtime: 
-      - "74"
+      - "46"
       date: 
-      - Mon, 18 Oct 2010 22:05:04 GMT
+      - Tue, 19 Oct 2010 03:18:59 GMT
       server: 
       - nginx/0.7.65
       content-length: 
       - "580"
       set-cookie: 
-      - _recurly_session=38b580055cd8699f7c121600e1184d98; domain=.recurly.com; path=/; Secure; HttpOnly
+      - _recurly_session=11e61212ec47341497139e3ef6851637; domain=.recurly.com; path=/; Secure; HttpOnly
       cache-control: 
       - private, max-age=0, must-revalidate
     body: |
@@ -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>45509f9afde9465091a5c30460c2d744</hosted_login_token>
-        <created_at type="datetime">2010-10-18T22:05:03Z</created_at>
+        <hosted_login_token>a8f733ecab7d471eb94ae072c9c8c924</hosted_login_token>
+        <created_at type="datetime">2010-10-19T03:18:58Z</created_at>
         <state>closed</state>
       </account>
 

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

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

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

@@ -30,17 +30,17 @@
       content-type: 
       - application/xml; charset=utf-8
       x-runtime: 
-      - "609"
+      - "585"
       date: 
-      - Mon, 18 Oct 2010 22:05:06 GMT
+      - Tue, 19 Oct 2010 03:19:01 GMT
       server: 
       - nginx/0.7.65
       content-length: 
       - "520"
       set-cookie: 
-      - account_credentials=4755d8b2ea8a11ed6f5dc2c496af8890aa143cc43f3825c24a9a9af9ccbebdab4a35ce34b617ab80cce7bf4dd4f51f8a45eee7566b90c8b50bbae7e3fda9387d%3A%3A; domain=.recurly.com; path=/; secure; HttpOnly
+      - account_credentials=4260726b9264f7ec172bf4da4f2db3238aab1a794ae10ee6c615263f423b5b34e5701217bbaae001329700ee2d1c8f9efd0f89b10a8b6ce86b009777adadccf3%3A%3A; domain=.recurly.com; path=/; secure; HttpOnly
       - ""
-      - _recurly_session=cbf99b64bd47cb150a0acf0ab8450f0e; domain=.recurly.com; path=/; Secure; HttpOnly
+      - _recurly_session=be25096fcfd998349799062b7b94f980; domain=.recurly.com; path=/; Secure; HttpOnly
       cache-control: 
       - no-cache
     body: |
@@ -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>c34fc059dd1e46cb877956b3efd59656</hosted_login_token>
-        <created_at type="datetime">2010-10-18T22:05:06Z</created_at>
+        <hosted_login_token>7fecbf6a942749759b8312c0e9a3a518</hosted_login_token>
+        <created_at type="datetime">2010-10-19T03:19:01Z</created_at>
         <state>active</state>
       </account>
 
@@ -92,13 +92,13 @@
       x-runtime: 
       - "19"
       date: 
-      - Mon, 18 Oct 2010 22:05:07 GMT
+      - Tue, 19 Oct 2010 03:19:02 GMT
       server: 
       - nginx/0.7.65
       content-length: 
       - "132"
       set-cookie: 
-      - _recurly_session=1b8b754a9997b44599939a56996ffdd7; domain=.recurly.com; path=/; Secure; HttpOnly
+      - _recurly_session=0fd3053a93351a282a96ea151dd6b780; domain=.recurly.com; path=/; Secure; HttpOnly
       cache-control: 
       - no-cache
     body: |

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

@@ -30,17 +30,17 @@
       content-type: 
       - application/xml; charset=utf-8
       x-runtime: 
-      - "582"
+      - "615"
       date: 
-      - Mon, 18 Oct 2010 22:04:34 GMT
+      - Tue, 19 Oct 2010 03:18:32 GMT
       server: 
       - nginx/0.7.65
       content-length: 
       - "522"
       set-cookie: 
-      - account_credentials=3e6605b0a6e3038ebc4e757a359c346818ca21d8d0f28322d20d2daf0574255ab0f421fd14283f2b358bd27fa6863cbb9ed5ae93022526102c4268c6385546dd%3A%3A; domain=.recurly.com; path=/; secure; HttpOnly
+      - account_credentials=8f321b919e5358cac2a0b2e9f7c7f3fa3a1058933422ebaf0706d022014491c31a296f3e3b88cf02b024eba0169eba25d66accb8d4aa1c200fb38e03cb8c56d5%3A%3A; domain=.recurly.com; path=/; secure; HttpOnly
       - ""
-      - _recurly_session=bd9a1732331f6a8c00369df453d3d32e; domain=.recurly.com; path=/; Secure; HttpOnly
+      - _recurly_session=d8b8b996efcb9a95c894d99041b424a7; domain=.recurly.com; path=/; Secure; HttpOnly
       cache-control: 
       - no-cache
     body: |
@@ -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>4a9ad1a443b549c3b71b4a71320e7121</hosted_login_token>
-        <created_at type="datetime">2010-10-18T22:04:34Z</created_at>
+        <hosted_login_token>38a10f50fa8042cb9229e6da36bca6eb</hosted_login_token>
+        <created_at type="datetime">2010-10-19T03:18:32Z</created_at>
         <state>active</state>
       </account>
 

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

@@ -34,17 +34,17 @@
       content-type: 
       - application/xml; charset=utf-8
       x-runtime: 
-      - "586"
+      - "754"
       date: 
-      - Mon, 18 Oct 2010 22:04:33 GMT
+      - Tue, 19 Oct 2010 03:18:30 GMT
       server: 
       - nginx/0.7.65
       content-length: 
       - "583"
       set-cookie: 
-      - account_credentials=4b90d853827136ef353b9dcfb847e25672d2dff70fc552c29ee6097b4804bf0f12f4779ec711f1252eb5a3ad8b82e9de3377ed95ae9e2f05143abc0c66c2b498%3A%3A; domain=.recurly.com; path=/; secure; HttpOnly
+      - account_credentials=57b5a4b3c88e2b41ee03482040df1eacbe4e76d0cabdce8c04f3293b1deaa69403545b07df03b6e9d1e6c099b62ee36bd7c0554ee6d62f96f60e613f78e3a126%3A%3A; domain=.recurly.com; path=/; secure; HttpOnly
       - ""
-      - _recurly_session=0412918da6a71a7800cf996746929a26; domain=.recurly.com; path=/; Secure; HttpOnly
+      - _recurly_session=8f518240dc27810f0345bad4dd9b67d7; domain=.recurly.com; path=/; Secure; HttpOnly
       cache-control: 
       - no-cache
     body: |
@@ -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>34c9183da60a419aa67fa0fb89dc6048</hosted_login_token>
-        <created_at type="datetime">2010-10-18T22:04:33Z</created_at>
+        <hosted_login_token>17829e82231f40fd88c8453ec6ce4404</hosted_login_token>
+        <created_at type="datetime">2010-10-19T03:18:30Z</created_at>
         <state>active</state>
       </account>