jsmestad-chargify 0.3.0.pre5 → 0.3.0.pre6

data/VERSION

@@ -1 +1 @@
-0.3.0.pre5
+0.3.0.pre6

data/jsmestad-chargify.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{jsmestad-chargify}
-  s.version = "0.3.0.pre5"
+  s.version = "0.3.0.pre6"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wynn Netherland", "Justin Smestad"]

data/lib/chargify/base.rb

@@ -26,19 +26,20 @@ module Chargify
           raise(Chargify::Error::ConnectionFailed.new, "Failed to connect to payment gateway.")
         end
 
-        if raise_errors
-          case response.code.to_i
-          when 401
-            raise(Chargify::Error::AccessDenied.new(response), response.body)
-          when 403
-            raise(Chargify::Error::Forbidden.new(response), response.body)
-          when 422
-            raise(Chargify::Error::BadRequest.new(response), response.body)
-          when 404
-            raise(Chargify::Error::NotFound.new(response), response.body)
-          when 504
-            raise(Chargify::Error::GatewayTimeout.new(response), response.body)
-          end
+
+        case response.code.to_i
+        when 401
+          raise(Chargify::Error::AccessDenied.new(response), response.body)
+        when 403
+          raise(Chargify::Error::Forbidden.new(response), response.body)
+        when 422
+          raise(Chargify::Error::BadRequest.new(response), response.body)
+        when 404
+          raise(Chargify::Error::NotFound.new(response), response.body)
+        when 500
+          raise(Chargify::Error::ServerError.new(response), response.body)
+        when 504
+          raise(Chargify::Error::GatewayTimeout.new(response), response.body)
         end
         
         Chargify::Config.logger.debug("[CHARGIFY] Response from #{self.base_uri}#{path} was #{response.code}: #{response.body}") if Chargify::Config.debug

data/lib/chargify/customer.rb

@@ -9,13 +9,18 @@ module Chargify
         customers.map{|c| Hashie::Mash.new c['customer']}
       end
 
-      def find(id)
+      def find!(id)
         return all if id == :all
 
         request = api_request(:get, "/customers/#{id}.json")
-        success = request.code == 200
-        response = Hashie::Mash.new(request).customer if success
-        Hashie::Mash.new(response || {}).update(:success? => success)
+        response = Hashie::Mash.new(request)
+        response
+      end
+      
+      def find(id)
+        find!(id)
+      rescue Chargify::Error::Base => e
+        return nil
       end
 
       # def find!(id)
@@ -23,11 +28,16 @@ module Chargify
         # response = Hashie::Mash.new(request).customer
       # end
 
-      def lookup(reference_id)
+      def lookup!(reference_id)
         request = api_request(:get, "/customers/lookup.json?reference=#{reference_id}")
-        success = request.code == 200
-        response = Hashie::Mash.new(request).customer if success
-        Hashie::Mash.new(response || {}).update(:success? => success)
+        response = Hashie::Mash.new(request)
+        response.customer
+      end
+      
+      def lookup(reference_id)
+        lookup!(reference_id)
+      rescue Chargify::Error::Base => e
+        return nil
       end
 
       #
@@ -37,12 +47,18 @@ module Chargify
       # * organization (Optional) Company/Organization name
       # * reference (Optional, but encouraged) The unique identifier used within your own application for this customer
       #
-      def create(info={})
+      def create!(info={})
         result = api_request(:post, "/customers.json", :body => {:customer => info})
         created = true if result.code == 201
         response = Hashie::Mash.new(result)
         (response.customer || response).update(:success? => created)
       end
+      
+      def create(info={})
+        create!(info)
+      rescue Chargify::Error::Base => e
+        return false
+      end
 
       #
       # * first_name (Required)
@@ -51,7 +67,7 @@ module Chargify
       # * organization (Optional) Company/Organization name
       # * reference (Optional, but encouraged) The unique identifier used within your own application for this customer
       #
-      def update(info={})
+      def update!(info={})
         info.stringify_keys!
         chargify_id = info.delete('id')
         result = api_request(:put, "/customers/#{chargify_id}.json", :body => {:customer => info})
@@ -60,6 +76,12 @@ module Chargify
         return response.customer unless response.customer.to_a.empty?
         response
       end
+      
+      def update(info={})
+        update!(info)
+      rescue Chargify::Error::Base => e
+        return false
+      end
 
       def subscriptions(id)
         subscriptions = api_request(:get, "/customers/#{id}/subscriptions.json")

data/lib/chargify/error.rb

@@ -13,6 +13,7 @@ module Chargify
     class Forbidden           < Base; end # 403 errors
     class BadRequest          < Base; end # 422 errors
     class NotFound            < Base; end # 404 errors
+    class ServerError         < Base; end # 500 errors
     class GatewayTimeout      < Base; end # 504 errors
     class ConnectionFailed    < Base; end
     

data/lib/chargify/product.rb

@@ -8,14 +8,26 @@ module Chargify
         result.map{|p| Hashie::Mash.new p['product']}
       end
 
-      def find(id)
+      def find!(id)
         return all if id == :all
 
         result = api_request(:get, "/products/#{id}.json")
         Hashie::Mash.new(result).product
       end
-
+      
+      def find(id)
+        find!(id)
+      rescue Chargify::Error::Base => e
+        return nil
+      end
+      
       def find_by_handle(handle)
+        find_by_handle!(handle)
+      rescue Chargify::Error::Base => e
+        return nil
+      end
+
+      def find_by_handle!(handle)
         result = api_request(:get, "/products/handle/#{handle}.json")
         Hashie::Mash.new(result).product
       end

data/lib/chargify/subscription.rb

@@ -3,88 +3,142 @@ module Chargify
 
     class << self
 
-      def find(id)
+      def find!(id)
         result = api_request(:get, "/subscriptions/#{id}.json")
-        return nil if result.code != 200
         Hashie::Mash.new(result).subscription
       end
+      
+      def find(id)
+        find!(id)
+      rescue Chargify::Error::Base => e
+        return nil
+      end
 
-      # Returns all elements outputted by Chargify plus:
-      # response.success? -> true if response code is 201, false otherwise
-      def create(subscription_attributes={})
+      def create!(subscription_attributes={})
         result = api_request(:post, "/subscriptions.json", :body => {:subscription => subscription_attributes})
-        created  = true if result.code == 201
         response = Hashie::Mash.new(result)
-        (response.subscription || response).update(:success? => created)
+        response.subscription
+      end
+      
+      def create(subscription_attributes={})
+        create!(subscription_attributes)
+      rescue Chargify::Error::Base => e
+        return false
       end
 
-      # Returns all elements outputted by Chargify plus:
-      # response.success? -> true if response code is 200, false otherwise
-      def update(sub_id, subscription_attributes = {})
+      def update!(sub_id, subscription_attributes={})
         result = api_request(:put, "/subscriptions/#{sub_id}.json", :body => {:subscription => subscription_attributes})
-        updated = true if result.code == 200
         response = Hashie::Mash.new(result)
-        (response.subscription || response).update(:success? => updated)
+        response.subscription
+      end
+      
+      def update(sub_id, subscription_attributes={})
+        update!(sub_id, subscription_attributes)
+      rescue Chargify::Error::Base => e
+        return false
       end
 
-      # Returns all elements outputted by Chargify plus:
-      # response.success? -> true if response code is 200, false otherwise
-      def cancel(sub_id, message="")
+      def cancel!(sub_id, message="")
         result = api_request(:delete, "/subscriptions/#{sub_id}.json", :body => {:subscription => {:cancellation_message => message} })
-        deleted = true if result.code == 200
-        response = Hashie::Mash.new(result)
-        (response.subscription || response).update(:success? => deleted)
+        true if result.code == 200
+      end
+      
+      def cancel(sub_id, message="")
+        cancel!(sub_id, message)
+      rescue Chargify::Error::Base => e
+        return false
       end
 
-      def reactivate(sub_id)
+      def reactivate!(sub_id)
         result = api_request(:put, "/subscriptions/#{sub_id}/reactivate.json", :body => "")
-        reactivated  = true if result.code == 200
-        response = Hashie::Mash.new(result) rescue Hashie::Mash.new
-        (response.subscription || response).update(:success? => reactivated)
+        response = Hashie::Mash.new(result)
+        response.subscription
+      end
+      
+      def reactivate(sub_id)
+        reactivate!(sub_id)
+      rescue Chargify::Error::Base => e
+        return false
       end
 
-      def charge(sub_id, subscription_attributes={})
+      def charge!(sub_id, subscription_attributes={})
         result = api_request(:post, "/subscriptions/#{sub_id}/charges.json", :body => { :charge => subscription_attributes })
-        success = result.code == 201
-        result = {} if result.code == 404
-
         response = Hashie::Mash.new(result)
-        (response.charge || response).update(:success? => success)
+        response.charge
+      end
+      
+      def charge(sub_id, subscription_attributes={})
+        charge!(sub_id, subscription_attributes)
+      rescue Chargify::Error::Base => e
+        return false
       end
 
-      def migrate(sub_id, product_id)
+      def migrate!(sub_id, product_id)
         result = api_request(:post, "/subscriptions/#{sub_id}/migrations.json", :body => {:product_id => product_id })
-        success = true if result.code == 200
         response = Hashie::Mash.new(result)
-        (response.subscription || {}).update(:success? => success)
+        response.subscription
+      end
+      
+      def migrate(sub_id, product_id)
+        migrate!(sub_id, product_id)
+      rescue Chargify::Error::Base => e
+        return false
       end
 
-      def transactions(sub_id, options={})
+      def transactions!(sub_id, options={})
         result = api_request(:get, "/subscriptions/#{sub_id}/transactions.json", :query => options)
         result.map{|t| Hashie::Mash.new t['transaction']}
       end
+      
+      def transactions(sub_id, options={})
+        transactions!(sub_id, options)
+      rescue Chargify::Error::Base => e
+        return false
+      end
 
-      def components(subscription_id)
+      def components!(subscription_id)
         result = api_request(:get, "/subscriptions/#{subscription_id}/components.json")
         result.map{|c| Hashie::Mash.new c['component']}
       end
+      
+      def components(subscription_id)
+        components!(subscription_id)
+      rescue Chargify::Error::Base => e
+        return false
+      end
 
-      def find_component(subscription_id, component_id)
-        result = get("/subscriptions/#{subscription_id}/components/#{component_id}.json")
+      def find_component!(subscription_id, component_id)
+        result = api_request(:get, "/subscriptions/#{subscription_id}/components/#{component_id}.json")
         Hashie::Mash.new(result).component
       end
+      
+      def find_component(subscription_id, component_id)
+        find_component!(subscription_id, component_id)
+      rescue Chargify::Error::Base => e
+        return false
+      end
 
-      def update_component(subscription_id, component_id, quantity)
+      def update_component!(subscription_id, component_id, quantity)
         result = api_request(:put, "/subscriptions/#{subscription_id}/components/#{component_id}.json", :body => {:component => {:allocated_quantity => quantity}})
-        result[:success?] = result.code == 200
         Hashie::Mash.new(result)
       end
+      
+      def update_component(subscription_id, component_id, quantity)
+        update_component!(subscription_id, component_id, quantity)
+      rescue Chargify::Error::Base => e
+        return false
+      end
 
-      def component_usage(subscription_id, component_id)
+      def component_usage!(subscription_id, component_id)
         result = api_request(:get, "/subscriptions/#{subscription_id}/components/#{component_id}/usages.json")
-        success = result.code == 200
         response = Hashie::Mash.new(result)
-        response.update(:success? => success)
+        response
+      end
+      
+      def component_usage(subscription_id, component_id)
+        component_usage!(subscription_id, component_id)
+      rescue Chargify::Error::Base => e
+        return false
       end
 
     end

data/spec/unit/chargify/customer_spec.rb

@@ -9,37 +9,59 @@ describe Chargify::Customer do
     end
   end
 
-  describe '.find' do
+  describe '.find!' do
 
     it 'should pass to Chargified::Customer.all' do
       Chargify::Customer.should_receive(:all)
-      Chargify::Customer.find(:all)
+      Chargify::Customer.find!(:all)
     end
 
     it "should be able to be found by a <chargify_id>" do
       stub_get "https://OU812:x@pengwynn.chargify.com/customers/16.json", "customer.json"
-      customer = Chargify::Customer.find(16)
-      customer.success?.should == true
+      customer = Chargify::Customer.find!(16)
+      customer.should be_a(Hashie::Mash)
     end
 
-    it "should return an empty Hash with success? set to false" do
+    it "should raise an error if nothing is found" do
       stub_get "https://OU812:x@pengwynn.chargify.com/customers/16.json", "", 404
-      customer = Chargify::Customer.find(16)
-      customer.success?.should == false
+      lambda {
+        Chargify::Customer.find!(16)
+      }.should raise_error(Chargify::Error::NotFound)
     end
 
   end
+  
+  describe '.find' do
 
+    it "should return nil if nothing is found" do
+      stub_get "https://OU812:x@pengwynn.chargify.com/customers/16.json", "", 404
+      Chargify::Customer.find(16).should == nil
+    end
 
-  describe '.lookup' do
+  end
 
-    before do
+
+  describe '.lookup!' do
+
+    it "should be able to be found by a <reference_id>" do
       stub_get "https://OU812:x@pengwynn.chargify.com/customers/lookup.json?reference=bradleyjoyce", "customer.json"
+      customer = Chargify::Customer.lookup!("bradleyjoyce")
+      customer.should be_a(Hashie::Mash)
     end
 
-    it "should be able to be found by a <reference_id>" do
-      customer = Chargify::Customer.lookup("bradleyjoyce")
-      customer.success?.should == true
+    it "should raise an error if nothing is found" do
+      stub_get "https://OU812:x@pengwynn.chargify.com/customers/lookup.json?reference=bradleyjoyce", "", 404
+      lambda {
+        Chargify::Customer.lookup!("bradleyjoyce")
+      }.should raise_error(Chargify::Error::NotFound)
+    end
+
+  end
+  
+  describe '.lookup' do
+
+    it 'should return nil if nothing is found' do
+      Chargify::Customer.lookup("bradleyjoyce") == nil
     end
 
   end
@@ -60,42 +82,68 @@ describe Chargify::Customer do
 
   end
 
-  describe '.create' do
-
-    before do
-      stub_post "https://OU812:x@pengwynn.chargify.com/customers.json", "new_customer.json"
-    end
+  describe '.create!' do
 
     it "should create a new customer" do
+      stub_post "https://OU812:x@pengwynn.chargify.com/customers.json", "new_customer.json"
       info = {
         :first_name   => "Wynn",
         :last_name    => "Netherland",
         :email        => "wynn@example.com"
       }
-      customer = Chargify::Customer.create(info)
+      customer = Chargify::Customer.create!(info)
       customer.first_name.should == "Wynn"
     end
+    
+    it "should raise an error if customer creation fails" do
+      stub_post "https://OU812:x@pengwynn.chargify.com/customers.json", "", 422
+      lambda {
+        Chargify::Customer.create!
+      }.should raise_error(Chargify::Error::BadRequest)
+    end
 
   end
-
-  describe '.update' do
-
-    before do
-      stub_put "https://OU812:x@pengwynn.chargify.com/customers/16.json", "new_customer.json"
+  
+  describe '.create' do
+    
+    it "should return false if creation fails" do
+      stub_post "https://OU812:x@pengwynn.chargify.com/customers.json", "", 422
+      Chargify::Customer.create.should == false
     end
+    
+  end
+
+  describe '.update!' do
 
     it "should update a customer" do
+      stub_put "https://OU812:x@pengwynn.chargify.com/customers/16.json", "new_customer.json"
       info = {
         :id           => 16,
         :first_name   => "Wynn",
         :last_name    => "Netherland",
         :email        => "wynn@example.com"
       }
-      customer = Chargify::Customer.update(info)
+      customer = Chargify::Customer.update!(info)
       customer.first_name.should == "Wynn"
     end
+    
+    it "should raise an error if the customer cannot be found" do
+      stub_put "https://OU812:x@pengwynn.chargify.com/customers/16.json", "", 404
+      lambda {
+        Chargify::Customer.update!(:id => 16)
+      }.should raise_error(Chargify::Error::NotFound)
+    end
 
   end
+  
+  describe '.update' do
+    
+    it "should return false if the customer cannot be found" do
+      stub_put "https://OU812:x@pengwynn.chargify.com/customers/16.json", "", 404
+      Chargify::Customer.update(:id => 16).should == false
+    end
+    
+  end
 
   describe '.subscriptions' do
 

data/spec/unit/chargify/product_spec.rb

@@ -19,6 +19,11 @@ describe Chargify::Product do
       product = Chargify::Product.find(8)
       product.accounting_code.should == 'TSMO'
     end
+    
+    it "should return nil if the product does not exist for a product" do
+      stub_get "https://OU812:x@pengwynn.chargify.com/products/99.json", "", 404
+      Chargify::Product.find(99).should == nil
+    end
 
   end
 

data/spec/unit/chargify/subscription_spec.rb

@@ -9,23 +9,33 @@ describe Chargify::Subscription do
     end
   end
 
-  describe '.find' do
+  describe '.find!' do
 
     it "should return info for a subscription" do
       stub_get "https://OU812:x@pengwynn.chargify.com/subscriptions/13.json", "subscription.json"
-      subscription = Chargify::Subscription.find(13)
+      subscription = Chargify::Subscription.find!(13)
       subscription.customer.reference.should == 'bradleyjoyce'
     end
 
+    it "should throw a not found error if a subscription is not found" do
+      stub_get "https://OU812:x@pengwynn.chargify.com/subscriptions/18.json", "subscription_not_found.json", 404
+      lambda {
+        Chargify::Subscription.find!(18)
+      }.should raise_error(Chargify::Error::NotFound)
+    end
+
+  end
+  
+  describe '.find' do
+
     it "should return nil if a subscription is not found" do
       stub_get "https://OU812:x@pengwynn.chargify.com/subscriptions/18.json", "subscription_not_found.json", 404
-      subscription = Chargify::Subscription.find(18)
-      subscription.should == nil
+      Chargify::Subscription.find(18).should == nil
     end
 
   end
 
-  describe '.create' do
+  describe '.create!' do
 
     it "should create a customer subscription" do
       stub_post "https://OU812:x@pengwynn.chargify.com/subscriptions.json", "subscription.json"
@@ -38,7 +48,7 @@ describe Chargify::Subscription do
           :email        => "wynn@example.com"
         }
       }
-      subscription = Chargify::Subscription.create(options)
+      subscription = Chargify::Subscription.create!(options)
       subscription.customer.organization.should == 'Squeejee'
     end
 
@@ -54,11 +64,12 @@ describe Chargify::Subscription do
         },
         :coupon_code => "EARLYBIRD"
       }
-      subscription = Chargify::Subscription.create(options)
+      subscription = Chargify::Subscription.create!(options)
+      subscription.should be_a(Hashie::Mash)
       #subscription.coupon.should == 'Squeejee'
     end
 
-    it "should set success? to true when subscription is created successfully" do
+    it "should raise error to true when subscription is created successfully" do
       stub_post "https://OU812:x@pengwynn.chargify.com/subscriptions.json", "subscription.json", 201
       options = {
         :product_handle     => 'monthly',
@@ -69,12 +80,12 @@ describe Chargify::Subscription do
           :email        => "wynn@example.com"
         }
       }
-      subscription = Chargify::Subscription.create(options)
-      subscription.success?.should == true
+      subscription = Chargify::Subscription.create!(options)
+      subscription.should be_a(Hashie::Mash)
     end
 
-    it "should set success? to nil when subscription is not created successfully" do
-      stub_post "https://OU812:x@pengwynn.chargify.com/subscriptions.json", "subscription.json", 400
+    it "should raise error to nil when subscription is not created successfully" do
+      stub_post "https://OU812:x@pengwynn.chargify.com/subscriptions.json", "subscription.json", 422
       options = {
         :product_handle     => 'monthly',
         :customer_reference => 'bradleyjoyce',
@@ -84,8 +95,10 @@ describe Chargify::Subscription do
           :email        => "wynn@example.com"
         }
       }
-      subscription = Chargify::Subscription.create(options)
-      subscription.success?.should == nil
+      lambda {
+        Chargify::Subscription.create!(options)
+      }.should raise_error(Chargify::Error::BadRequest)
+
     end
 
     it "should raise UnexpectedResponseError when reponse is invalid JSON" do
@@ -100,12 +113,31 @@ describe Chargify::Subscription do
         }
       }
       lambda {
-        Chargify::Subscription.create(options)
+        Chargify::Subscription.create!(options)
       }.should raise_error(Chargify::Error::UnexpectedResponse)
     end
+
+  end
+  
+  describe '.create' do
+    
+    it "should return false if creation errors out" do
+      stub_post "https://OU812:x@pengwynn.chargify.com/subscriptions.json", "subscription.json", 422
+      options = {
+        :product_handle     => 'monthly',
+        :customer_reference => 'bradleyjoyce',
+        :customer_attributes => {
+          :first_name   => "Wynn",
+          :last_name    => "Netherland",
+          :email        => "wynn@example.com"
+        }
+      }
+      Chargify::Subscription.create(options).should == false
+    end
+    
   end
 
-  describe '.update' do
+  describe '.update!' do
 
     it "should update a customer subscription" do
       stub_put "https://OU812:x@pengwynn.chargify.com/subscriptions/123.json", "subscription.json"
@@ -118,11 +150,11 @@ describe Chargify::Subscription do
           :email        => "wynn@example.com"
         }
       }
-      subscription = Chargify::Subscription.update(123, options)
+      subscription = Chargify::Subscription.update!(123, options)
       subscription.customer.organization.should == 'Squeejee'
     end
 
-    it "should set success? to true when subscription is updated successfully" do
+    it "should raise error to true when subscription is updated successfully" do
       stub_put "https://OU812:x@pengwynn.chargify.com/subscriptions/123.json", "subscription.json", 200
       options = {
         :product_handle     => 'monthly',
@@ -133,11 +165,11 @@ describe Chargify::Subscription do
           :email        => "wynn@example.com"
         }
       }
-      subscription = Chargify::Subscription.update(123, options)
-      subscription.success?.should == true
+      subscription = Chargify::Subscription.update!(123, options)
+      subscription.should be_a(Hashie::Mash)
     end
 
-    it "should set success? to false when subscription is not updated successfully" do
+    it "should raise error to false when subscription is not updated successfully" do
       stub_put "https://OU812:x@pengwynn.chargify.com/subscriptions/123.json", "subscription.json", 500
       options = {
         :product_handle     => 'monthly',
@@ -148,64 +180,91 @@ describe Chargify::Subscription do
           :email        => "wynn@example.com"
         }
       }
-      subscription = Chargify::Subscription.update(123, options)
-      subscription.success?.should == nil
+      
+      lambda { 
+        Chargify::Subscription.update!(123, options) 
+      }.should raise_error(Chargify::Error::ServerError)
     end
 
   end
+  
+  describe '.update' do
+    
+    it "should return false if subscription update fails" do
+      stub_put "https://OU812:x@pengwynn.chargify.com/subscriptions/123.json", "subscription.json", 500
+      options = {
+        :product_handle     => 'monthly',
+        :customer_reference => 'bradleyjoyce',
+        :customer_attributes => {
+          :first_name   => "Wynn",
+          :last_name    => "Netherland",
+          :email        => "wynn@example.com"
+        }
+      }
+      Chargify::Subscription.update(123, options)
+    end
+    
+  end
 
-  describe '.reactivate' do
+  describe '.reactivate!' do
 
     it "should reactivate a subscription" do
       stub_put "https://OU812:x@pengwynn.chargify.com/subscriptions/123/reactivate.json", "subscription.json", 200
-      subscription = Chargify::Subscription.reactivate(123)
-
+      subscription = Chargify::Subscription.reactivate!(123)
       subscription.state.should == "active"
     end
 
-    it "should set success? to nil when subscription is not reactivated successfully" do
-      stub_put "https://OU812:x@pengwynn.chargify.com/subscriptions/123/reactivate.json", "subscription_not_found.json", 500
-      subscription = Chargify::Subscription.reactivate(123)
-
-      subscription.success?.should == nil
+    it "should raise error to nil when subscription is not reactivated successfully" do
+      stub_put "https://OU812:x@pengwynn.chargify.com/subscriptions/123/reactivate.json", "subscription_not_found.json", 422
+      lambda {
+        Chargify::Subscription.reactivate!(123)
+      }.should raise_error(Chargify::Error::BadRequest)
     end
 
-    it "should set success? to false when subscription is reactivated successfully" do
+    it "should raise error to false when subscription is reactivated successfully" do
       stub_put "https://OU812:x@pengwynn.chargify.com/subscriptions/123/reactivate.json", "subscription.json", 200
-      subscription = Chargify::Subscription.reactivate(123)
-
-      subscription.success?.should == true
+      subscription = Chargify::Subscription.reactivate!(123)
+      subscription.should be_a(Hashie::Mash)
     end
 
   end
+  
+  describe '.reactivate' do
 
-  describe '.cancel' do
+    it "should return false if an error occurs" do
+      stub_put "https://OU812:x@pengwynn.chargify.com/subscriptions/123/reactivate.json", "subscription_not_found.json", 422
+      Chargify::Subscription.reactivate(123).should == false
+    end
 
-    it "should cancel subscription" do
-      stub_delete "https://OU812:x@pengwynn.chargify.com/subscriptions/123.json", "deleted_subscription.json", 200
-      subscription = Chargify::Subscription.cancel(123)
+  end
 
-      subscription.state.should == "canceled"
-    end
+  describe '.cancel!' do
 
-    it "should set success? to nil when subscription is not cancelled successfully" do
+    it "should raise error to nil when subscription is not cancelled successfully" do
       stub_delete "https://OU812:x@pengwynn.chargify.com/subscriptions/123.json", "deleted_subscription.json", 500
-      subscription = Chargify::Subscription.cancel(123)
-
-      subscription.success?.should == nil
+      
+      lambda { 
+        Chargify::Subscription.cancel!(123)
+      }.should raise_error(Chargify::Error::ServerError)
     end
 
-    it "should set success? to true when subscription is cancelled successfully" do
+    it "should raise error to true when subscription is cancelled successfully" do
       stub_delete "https://OU812:x@pengwynn.chargify.com/subscriptions/123.json", "deleted_subscription.json", 200
-      subscription = Chargify::Subscription.cancel(123)
-
-      subscription.success?.should == true
+      Chargify::Subscription.cancel!(123).should == true
     end
 
   end
+  
+  describe '.cancel' do
+    
+    it "should return false if an error occurs" do
+      stub_delete "https://OU812:x@pengwynn.chargify.com/subscriptions/123.json", "deleted_subscription.json", 500
+      Chargify::Subscription.cancel(123).should == false
+    end
 
+  end
 
-  describe '.charge' do
+  describe '.charge!' do
 
       before do
         stub_post "https://OU812:x@pengwynn.chargify.com/subscriptions/123/charges.json", "charge_subscription.json", 201
@@ -217,48 +276,75 @@ describe Chargify::Subscription do
       end
 
       it "should accept :amount as a parameter" do
-        subscription = Chargify::Subscription.charge(123, @options)
+        subscription = Chargify::Subscription.charge!(123, @options)
 
+        subscription.should be_a(Hashie::Mash)
         subscription.amount_in_cents.should == @options[:amount]*100
-        subscription.success?.should == true
       end
 
       it "should accept :amount_in_cents as a parameter" do
-        subscription = Chargify::Subscription.charge(123, @options)
+        subscription = Chargify::Subscription.charge!(123, @options)
 
+        subscription.should be_a(Hashie::Mash)
         subscription.amount_in_cents.should == @options[:amount_in_cents]
-        subscription.success?.should == true
       end
 
       it "should have success? as false if parameters are missing" do
         stub_post "https://OU812:x@pengwynn.chargify.com/subscriptions/123/charges.json", "charge_subscription_missing_parameters.json", 422
 
-        subscription = Chargify::Subscription.charge(123, {})
-        subscription.success?.should == false
+        lambda {
+          Chargify::Subscription.charge!(123, {})
+        }.should raise_error(Chargify::Error::BadRequest)
       end
 
       it "should have success? as false if the subscription is not found" do
         stub_post "https://OU812:x@pengwynn.chargify.com/subscriptions/9999/charges.json", "", 404
 
-        subscription = Chargify::Subscription.charge(9999, @options)
-        subscription.success?.should == false
+        lambda {
+          Chargify::Subscription.charge!(9999, @options)
+        }.should raise_error(Chargify::Error::NotFound)
       end
 
   end
+  
+  describe '.charge' do
+
+    it "should return false if an error occurs" do
+      stub_post "https://OU812:x@pengwynn.chargify.com/subscriptions/123/charges.json", "charge_subscription_missing_parameters.json", 422
+      Chargify::Subscription.charge(123, {}).should == false
+    end
+
+  end
 
-  describe '.migrate' do
+  describe '.migrate!' do
 
     it "should migrate a subscription from one product to another" do
       stub_post "https://OU812:x@pengwynn.chargify.com/subscriptions/123/migrations.json", "migrate_subscription.json"
 
-      subscription = Chargify::Subscription.migrate(123, 354);
-      subscription.success?.should == true
+      subscription = Chargify::Subscription.migrate!(123, 354)
+      subscription.should be_a(Hashie::Mash)
       subscription.product.id.should == 354
     end
+    
+    it "should throw an error if one occurs" do
+      stub_post "https://OU812:x@pengwynn.chargify.com/subscriptions/123/migrations.json", "", 422
+      lambda {
+        Chargify::Subscription.migrate!(123, 354)
+      }.should raise_error(Chargify::Error::BadRequest)
+    end
 
   end
+  
+  describe '.migrate' do
 
-  describe '.components' do
+    it "should return false if an error occurs" do
+      stub_post "https://OU812:x@pengwynn.chargify.com/subscriptions/123/migrations.json", "", 422
+      Chargify::Subscription.migrate(123, 354).should == false
+    end
+
+  end
+
+  describe '.components!' do
 
     it "should list components" do
       stub_get "https://OU812:x@pengwynn.chargify.com/subscriptions/123/components.json", "components.json"
@@ -267,38 +353,70 @@ describe Chargify::Subscription do
       components.last.allocated_quantity.should == 2
     end
 
+    it "should throw an error if one occurs"
+
+  end
+  
+  describe '.components' do
+    
+    it 'should return false if an error occurs'
+    
   end
 
-  describe '.find_component' do
+  describe '.find_component!' do
 
     it "should show a specific component" do
       stub_get "https://OU812:x@pengwynn.chargify.com/subscriptions/123/components/16.json", "component.json"
-      component = Chargify::Subscription.find_component(123, 16)
+      component = Chargify::Subscription.find_component!(123, 16)
       component.name.should == "Extra Rubies"
       component.allocated_quantity.should == 42
     end
 
+    it "should throw an error if one occurs"
+
+  end
+  
+  describe '.find_component!' do
+    
+    it 'should return false if an error occurs'
+    
   end
 
-  describe '.update_component' do
+  describe '.update_component!' do
 
     it "should update the allocated_quantity for a component" do
       stub_put "https://OU812:x@pengwynn.chargify.com/subscriptions/123/components/16.json", "component.json"
-      response = Chargify::Subscription.update_component(123, 16, 20_000_000)
-      response.success?.should == true
+      response = Chargify::Subscription.update_component!(123, 16, 20_000_000)
+      response.should be_a(Hashie::Mash)
     end
+    
+    it "should throw an error if one occurs"
 
   end
 
-  describe '.component_usage' do
+  describe '.update_component' do
+    
+    it 'should return false if an error occurs'
+    
+  end
+
+  describe '.component_usage!' do
 
     it "should list usage for a subscription" do
       stub_get "https://OU812:x@pengwynn.chargify.com/subscriptions/123/components/456/usages.json", "list_metered_subscriptions.json", 200
 
       subscription = Chargify::Subscription.component_usage(123, 456)
-      subscription.success?.should == true
+      subscription.should be_a(Hashie::Mash)
     end
+    
+    it "should throw an error if one occurs"
 
   end
+  
+  describe '.component_usage' do
+    
+    it 'should return false if an error occurs'
+    
+  end
 
 end

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 3
   - 0
-  - pre5
-  version: 0.3.0.pre5
+  - pre6
+  version: 0.3.0.pre6
 platform: ruby
 authors: 
 - Wynn Netherland