chargify 0.2.5 → 0.2.6

data/.gitignore

@@ -1,6 +1,6 @@
 ## MAC OS
 .DS_Store
-
+dist
 ## TEXTMATE
 *.tmproj
 tmtags
@@ -19,3 +19,4 @@ rdoc
 pkg
 
 ## PROJECT::SPECIFIC
+dist/*

data/README.markdown

@@ -4,8 +4,6 @@ Ruby wrapper for the chargify.com SAAS and billing API
 
 ## Installation
 
-    sudo gem install gemcutter
-    gem tumble
     sudo gem install chargify
     
 ## Example Usage

data/VERSION

@@ -1 +1 @@
-0.2.5
+0.2.6

data/changelog.md

@@ -1,4 +1,10 @@
 # Changelog
+
+## 0.2.6 May 27, 2010
+* Fix #charge_subscription to submit it's body as json [@will](http://github.com/will) and [@ignat](http://github.com/ignat)
+* API coverage for quantity components [@will](http://github.com/will)
+* API coverage for site and subscription transactions [@ignat](http://github.com/ignat)
+
 ## 0.2.5 May 24, 2010
 * Require fix from [@will](http://github.com/will)
 

data/chargify.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{chargify}
-  s.version = "0.2.5"
+  s.version = "0.2.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wynn Netherland", "Nash Kabbara"]
-  s.date = %q{2010-05-24}
+  s.date = %q{2010-05-27}
   s.description = %q{Ruby wrapper for the chargify.com SAAS and billing API}
   s.email = %q{wynn.netherland@gmail.com}
   s.extra_rdoc_files = [
@@ -61,6 +61,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<jnunemaker-matchy>, ["= 0.4.0"])
       s.add_development_dependency(%q<mocha>, ["~> 0.9.8"])
       s.add_development_dependency(%q<fakeweb>, [">= 1.2.5"])
+      s.add_development_dependency(%q<redgreen>, [">= 1.2.2"])
     else
       s.add_dependency(%q<hashie>, ["~> 0.1.3"])
       s.add_dependency(%q<httparty>, ["~> 0.5.2"])

data/lib/chargify.rb

@@ -9,5 +9,5 @@ Hash.send :include, Hashie::HashExtensions
 require File.join(directory, 'chargify', 'client')
 
 module Chargify
-  VERSION = "0.2.5".freeze
+  VERSION = "0.2.6".freeze
 end

data/lib/chargify/client.rb

@@ -32,19 +32,19 @@ module Chargify
     
     # options: page
     def list_customers(options={})
-      customers = self.class.get("/customers.json", :query => options)
+      customers = get("/customers.json", :query => options)
       customers.map{|c| Hashie::Mash.new c['customer']}
     end
     
     def customer_by_id(chargify_id)
-      request = self.class.get("/customers/#{chargify_id}.json")
+      request = get("/customers/#{chargify_id}.json")
       success = request.code == 200
       response = Hashie::Mash.new(request).customer if success
       Hashie::Mash.new(response || {}).update(:success? => success)
     end
     
     def customer_by_reference(reference_id)
-      request = self.class.get("/customers/lookup.json?reference=#{reference_id}")
+      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)
@@ -61,7 +61,7 @@ module Chargify
     # * reference (Optional, but encouraged) The unique identifier used within your own application for this customer
     # 
     def create_customer(info={})
-      response = Hashie::Mash.new(self.class.post("/customers.json", :body => {:customer => info}.to_json))
+      response = Hashie::Mash.new(post("/customers.json", :body => {:customer => info}))
       return response.customer if response.customer
       response
     end
@@ -76,20 +76,18 @@ module Chargify
     def update_customer(info={})
       info.stringify_keys!
       chargify_id = info.delete('id')
-      response = Hashie::Mash.new(self.class.put("/customers/#{chargify_id}.json", :body => {:customer => info}))
+      response = Hashie::Mash.new(put("/customers/#{chargify_id}.json", :body => {:customer => info}))
       return response.customer unless response.customer.to_a.empty?
       response
     end
     
     def customer_subscriptions(chargify_id)
-      subscriptions = self.class.get("/customers/#{chargify_id}/subscriptions.json")
+      subscriptions = get("/customers/#{chargify_id}/subscriptions.json")
       subscriptions.map{|s| Hashie::Mash.new s['subscription']}
     end
     
-    
-    
     def subscription(subscription_id)
-      raw_response = self.class.get("/subscriptions/#{subscription_id}.json")
+      raw_response = get("/subscriptions/#{subscription_id}.json")
       return nil if raw_response.code != 200
       Hashie::Mash.new(raw_response).subscription
     end
@@ -97,7 +95,7 @@ module Chargify
     # Returns all elements outputted by Chargify plus:
     # response.success? -> true if response code is 201, false otherwise
     def create_subscription(subscription_attributes={})
-      raw_response = self.class.post("/subscriptions.json", :body => {:subscription => subscription_attributes}.to_json)
+      raw_response = post("/subscriptions.json", :body => {:subscription => subscription_attributes})
       created  = true if raw_response.code == 201
       response = Hashie::Mash.new(raw_response)
       (response.subscription || response).update(:success? => created)
@@ -106,7 +104,7 @@ module Chargify
     # Returns all elements outputted by Chargify plus:
     # response.success? -> true if response code is 200, false otherwise
     def update_subscription(sub_id, subscription_attributes = {})
-      raw_response = self.class.put("/subscriptions/#{sub_id}.json", :body => {:subscription => subscription_attributes}.to_json)
+      raw_response = put("/subscriptions/#{sub_id}.json", :body => {:subscription => subscription_attributes})
       updated      = true if raw_response.code == 200
       response     = Hashie::Mash.new(raw_response)
       (response.subscription || response).update(:success? => updated)
@@ -115,21 +113,21 @@ module Chargify
     # Returns all elements outputted by Chargify plus:
     # response.success? -> true if response code is 200, false otherwise
     def cancel_subscription(sub_id, message="")
-      raw_response = self.class.delete("/subscriptions/#{sub_id}.json", :body => {:subscription => {:cancellation_message => message} }.to_json)
+      raw_response = delete("/subscriptions/#{sub_id}.json", :body => {:subscription => {:cancellation_message => message} })
       deleted      = true if raw_response.code == 200
       response     = Hashie::Mash.new(raw_response)
       (response.subscription || response).update(:success? => deleted)
     end
 
     def reactivate_subscription(sub_id)
-      raw_response = self.class.put("/subscriptions/#{sub_id}/reactivate.json", :body => "")
+      raw_response = put("/subscriptions/#{sub_id}/reactivate.json", :body => "")
       reactivated  = true if raw_response.code == 200
       response     = Hashie::Mash.new(raw_response) rescue Hashie::Mash.new
       (response.subscription || response).update(:success? => reactivated)
     end
       
     def charge_subscription(sub_id, subscription_attributes={})
-      raw_response = self.class.post("/subscriptions/#{sub_id}/charges.json", :body => { :charge => subscription_attributes })
+      raw_response = post("/subscriptions/#{sub_id}/charges.json", :body => { :charge => subscription_attributes })
       success      = raw_response.code == 201
       if raw_response.code == 404
         raw_response = {}
@@ -140,31 +138,85 @@ module Chargify
     end
     
     def migrate_subscription(sub_id, product_id)
-      raw_response = self.class.post("/subscriptions/#{sub_id}/migrations.json", :body => {:product_id => product_id }.to_json)
+      raw_response = post("/subscriptions/#{sub_id}/migrations.json", :body => {:product_id => product_id })
       success      = true if raw_response.code == 200
       response     = Hashie::Mash.new(raw_response)
       (response.subscription || {}).update(:success? => success)
     end
 
     def list_products
-      products = self.class.get("/products.json")
+      products = get("/products.json")
       products.map{|p| Hashie::Mash.new p['product']}
     end
     
     def product(product_id)
-      Hashie::Mash.new( self.class.get("/products/#{product_id}.json")).product
+      Hashie::Mash.new( get("/products/#{product_id}.json")).product
     end
     
     def product_by_handle(handle)
-      Hashie::Mash.new(self.class.get("/products/handle/#{handle}.json")).product
+      Hashie::Mash.new(get("/products/handle/#{handle}.json")).product
     end
     
     def list_subscription_usage(subscription_id, component_id)
-      raw_response = self.class.get("/subscriptions/#{subscription_id}/components/#{component_id}/usages.json")
+      raw_response = get("/subscriptions/#{subscription_id}/components/#{component_id}/usages.json")
       success      = raw_response.code == 200
       response     = Hashie::Mash.new(raw_response)
       response.update(:success? => success)
     end
     
+    def subscription_transactions(sub_id, options={})
+      transactions = get("/subscriptions/#{sub_id}/transactions.json", :query => options)
+      transactions.map{|t| Hashie::Mash.new t['transaction']}
+    end
+
+    def site_transactions(options={})
+      transactions = get("/transactions.json", :query => options)
+      transactions.map{|t| Hashie::Mash.new t['transaction']}
+    end
+
+    def list_components(subscription_id)
+      components = get("/subscriptions/#{subscription_id}/components.json")
+      components.map{|c| Hashie::Mash.new c['component']}
+    end
+    
+    def subscription_component(subscription_id, component_id)
+      response = get("/subscriptions/#{subscription_id}/components/#{component_id}.json")
+      Hashie::Mash.new(response).component
+    end
+    
+    def update_subscription_component_allocated_quantity(subscription_id, component_id, quantity)
+      response = put("/subscriptions/#{subscription_id}/components/#{component_id}.json", :body => {:component => {:allocated_quantity => quantity}})
+      response[:success?] = response.code == 200
+      Hashie::Mash.new(response)
+    end
+      
+      
+      
+    private
+    
+      def post(path, options={})
+        jsonify_body!(options)
+        self.class.post(path, options)
+      end
+    
+      def put(path, options={})
+        jsonify_body!(options)
+        self.class.put(path, options)
+      end
+    
+      def delete(path, options={})
+        jsonify_body!(options)
+        self.class.delete(path, options)
+      end
+    
+      def get(path, options={})
+        jsonify_body!(options)
+        self.class.get(path, options)
+      end
+    
+      def jsonify_body!(options)
+        options[:body] = options[:body].to_json if options[:body]
+
+      end
   end
 end

data/test/chargify_test.rb

@@ -1,7 +1,7 @@
 require 'helper'
 
 class ChargifyTest < Test::Unit::TestCase
-  context "When hitting the Chargify API" do
+  context "Chargify API client" do
     setup do
       @client = Chargify::Client.new('OU812', 'pengwynn')
     end
@@ -250,7 +250,7 @@ class ChargifyTest < Test::Unit::TestCase
       setup do
         stub_post "https://OU812:x@pengwynn.chargify.com/subscriptions/123/charges.json", "charge_subscription.json", 201
         @options = {
-          :meno   => "This is the description of the one time charge.",
+          :memo   => "This is the description of the one time charge.",
           :amount => 1.00,
           :amount_in_cents => 100
         }
@@ -324,6 +324,27 @@ class ChargifyTest < Test::Unit::TestCase
       product.accounting_code.should == 'TSMO'
     end
     
+    context "for quantity based components" do
+      should "list components" do
+        stub_get "https://OU812:x@pengwynn.chargify.com/subscriptions/123/components.json", "components.json"
+        components = @client.list_components(123)
+        components.first.allocated_quantity.should == 42
+        components.last.allocated_quantity.should == 2 
+      end
+      
+      should "show a specific component" do
+        stub_get "https://OU812:x@pengwynn.chargify.com/subscriptions/123/components/16.json", "component.json"
+        component = @client.subscription_component 123, 16
+        component.name.should == "Extra Rubies"
+        component.allocated_quantity.should == 42
+      end
+      
+      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 = @client.update_subscription_component_allocated_quantity 123, 16, 20_000_000
+        response.success?.should == true
+      end
+    end
     
   end
 end

data/test/helper.rb

@@ -5,6 +5,7 @@ require 'shoulda'
 require 'matchy'
 require 'mocha'
 require 'fakeweb'
+require 'redgreen'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 5
-  version: 0.2.5
+  - 6
+  version: 0.2.6
 platform: ruby
 authors: 
 - Wynn Netherland
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-24 00:00:00 -05:00
+date: 2010-05-27 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -102,6 +102,20 @@ dependencies:
         version: 1.2.5
   type: :development
   version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: redgreen
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        - 2
+        version: 1.2.2
+  type: :development
+  version_requirements: *id007
 description: Ruby wrapper for the chargify.com SAAS and billing API
 email: wynn.netherland@gmail.com
 executables: []