chargify 0.2.3 → 0.2.4

data/Rakefile

@@ -1,60 +1,15 @@
-require 'rake'
+require "mg"
+require 'active_support/inflector'
 require 'shoulda/tasks'
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "chargify"
-    gem.summary = %Q{Ruby wrapper for the chargify.com SAAS and billing API}
-    gem.description = %Q{Ruby wrapper for the chargify.com SAAS and billing API}
-    gem.email = "wynn.netherland@gmail.com"
-    gem.homepage = "http://github.com/pengwynn/chargify"
-    gem.authors = ["Wynn Netherland","Nash Kabbara"]
-    
-    gem.add_dependency('hashie', '~> 0.1.3')
-    gem.add_dependency('httparty', '~> 0.4.5')
 
-    gem.add_development_dependency('thoughtbot-shoulda', '>= 2.10.1')
-    gem.add_development_dependency('jnunemaker-matchy', '0.4.0')
-    gem.add_development_dependency('mocha', '0.9.4')
-    gem.add_development_dependency('fakeweb', '>= 1.2.5')
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
-end
+MG.new("chargify.gemspec")
 
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
+  test.ruby_opts = ['-rubygems'] if defined? Gem
   test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
-
-begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |test|
-    test.libs << 'test'
-    test.pattern = 'test/**/test_*.rb'
-    test.verbose = true
-  end
-rescue LoadError
-  task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
-  end
+  test.pattern = 'test/**/*_test.rb'
 end
 
-task :test => :check_dependencies
-
 task :default => :test
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "chargify #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.2.4

data/chargify.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{chargify}
-  s.version = "0.2.3"
+  s.version = "0.2.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wynn Netherland", "Nash Kabbara"]
@@ -38,7 +38,7 @@ Gem::Specification.new do |s|
      "test/fixtures/subscription_not_found.json",
      "test/fixtures/subscriptions.json",
      "test/helper.rb",
-     "test/test_chargify.rb"
+     "test/chargify_test.rb"
   ]
   s.homepage = %q{http://github.com/pengwynn/chargify}
   s.rdoc_options = ["--charset=UTF-8"]
@@ -47,7 +47,7 @@ Gem::Specification.new do |s|
   s.summary = %q{Ruby wrapper for the chargify.com SAAS and billing API}
   s.test_files = [
     "test/helper.rb",
-     "test/test_chargify.rb"
+     "test/chargify_test.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -56,25 +56,25 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<hashie>, ["~> 0.1.3"])
-      s.add_runtime_dependency(%q<httparty>, ["~> 0.4.5"])
-      s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 2.10.1"])
+      s.add_runtime_dependency(%q<httparty>, ["~> 0.5.2"])
+      s.add_development_dependency(%q<shoulda>, [">= 2.10.1"])
       s.add_development_dependency(%q<jnunemaker-matchy>, ["= 0.4.0"])
-      s.add_development_dependency(%q<mocha>, ["= 0.9.4"])
+      s.add_development_dependency(%q<mocha>, ["~> 0.9.8"])
       s.add_development_dependency(%q<fakeweb>, [">= 1.2.5"])
     else
       s.add_dependency(%q<hashie>, ["~> 0.1.3"])
-      s.add_dependency(%q<httparty>, ["~> 0.4.5"])
-      s.add_dependency(%q<thoughtbot-shoulda>, [">= 2.10.1"])
+      s.add_dependency(%q<httparty>, ["~> 0.5.2"])
+      s.add_dependency(%q<shoulda>, [">= 2.10.1"])
       s.add_dependency(%q<jnunemaker-matchy>, ["= 0.4.0"])
-      s.add_dependency(%q<mocha>, ["= 0.9.4"])
+      s.add_dependency(%q<mocha>, ["~> 0.9.8"])
       s.add_dependency(%q<fakeweb>, [">= 1.2.5"])
     end
   else
     s.add_dependency(%q<hashie>, ["~> 0.1.3"])
-    s.add_dependency(%q<httparty>, ["~> 0.4.5"])
-    s.add_dependency(%q<thoughtbot-shoulda>, [">= 2.10.1"])
+    s.add_dependency(%q<httparty>, ["~> 0.5.2"])
+    s.add_dependency(%q<shoulda>, [">= 2.10.1"])
     s.add_dependency(%q<jnunemaker-matchy>, ["= 0.4.0"])
-    s.add_dependency(%q<mocha>, ["= 0.9.4"])
+    s.add_dependency(%q<mocha>, ["~> 0.9.8"])
     s.add_dependency(%q<fakeweb>, [">= 1.2.5"])
   end
 end

data/lib/chargify.rb

@@ -1,9 +1,13 @@
 require 'hashie'
 require 'httparty'
-require "json"
+require 'json/pure'
 
 directory = File.expand_path(File.dirname(__FILE__))
 
 Hash.send :include, Hashie::HashExtensions
 
 require File.join(directory, 'chargify', 'client')
+
+module Chargify
+  VERSION = "0.2.4".freeze
+end

data/lib/chargify/client.rb

@@ -1,21 +1,21 @@
 module Chargify
-  class UnexpectedResponseError < RuntimeError;end
-
-  def self.custom_parser
-    proc do |data|  
+  class UnexpectedResponseError < RuntimeError
+  end
+  
+  class Parser < HTTParty::Parser
+    def parse
       begin
-        Crack::JSON.parse(data)
+        Crack::JSON.parse(body)
       rescue => e
-        error_msg = "Crack could not parse JSON. It said: #{e.message}. Chargify's raw response: #{data}"
-        raise UnexpectedResponseError, error_msg
+        raise UnexpectedResponseError, "Crack could not parse JSON. It said: #{e.message}. Chargify's raw response: #{body}"
       end
     end
   end
-    
+  
   class Client
     include HTTParty
-    format :json
-    parser Chargify::custom_parser
+    
+    parser Chargify::Parser
     headers 'Content-Type' => 'application/json' 
     
     attr_reader :api_key, :subdomain
@@ -36,10 +36,23 @@ module Chargify
       customers.map{|c| Hashie::Mash.new c['customer']}
     end
     
-    def customer(chargify_id)
-      Hashie::Mash.new(self.class.get("/customers/lookup.json?reference=#{chargify_id}")).customer
+    def customer_by_id(chargify_id)
+      request = self.class.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}")
+      success = request.code == 200
+      response = Hashie::Mash.new(request).customer if success
+      Hashie::Mash.new(response || {}).update(:success? => success)
     end
     
+    alias customer customer_by_reference
+    
+    
     #
     # * first_name (Required)
     # * last_name (Required)
@@ -73,6 +86,8 @@ module Chargify
       subscriptions.map{|s| Hashie::Mash.new s['subscription']}
     end
     
+    
+    
     def subscription(subscription_id)
       raw_response = self.class.get("/subscriptions/#{subscription_id}.json")
       return nil if raw_response.code != 200
@@ -112,6 +127,24 @@ module Chargify
       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 })
+      success      = raw_response.code == 201
+      if raw_response.code == 404
+        raw_response = {}
+      end
+
+      response = Hashie::Mash.new(raw_response)
+      (response.charge || response).update(:success? => success)
+    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)
+      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")
@@ -126,5 +159,12 @@ module Chargify
       Hashie::Mash.new(self.class.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")
+      success      = raw_response.code == 200
+      response     = Hashie::Mash.new(raw_response)
+      response.update(:success? => success)
+    end
+    
   end
 end

data/test/{test_chargify.rb → chargify_test.rb}

@@ -1,26 +1,10 @@
 require 'helper'
 
-class TestChargify < Test::Unit::TestCase
+class ChargifyTest < Test::Unit::TestCase
   context "When hitting the Chargify API" do
     setup do
       @client = Chargify::Client.new('OU812', 'pengwynn')
     end
-
-    should "raise UnexpectedResponseError when reponse is invalid JSON" do
-      stub_post "https://OU812:x@pengwynn.chargify.com/subscriptions.json", "invalid_subscription.json"
-      options = {
-        :product_handle     => 'monthly',
-        :customer_reference => 'bradleyjoyce',
-        :customer_attributes => {
-          :first_name   => "Wynn",
-          :last_name    => "Netherland",
-          :email        => "wynn@example.com"
-        }
-      }
-      assert_raise Chargify::UnexpectedResponseError do
-        @client.create_subscription(options)
-      end
-    end
     
     should "return a list of customers" do
       stub_get "https://OU812:x@pengwynn.chargify.com/customers.json", "customers.json"
@@ -30,12 +14,24 @@ class TestChargify < Test::Unit::TestCase
       customers.first.organization.should == 'Squeejee'
     end
     
+    context "when finding customers" do
+      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 = @client.customer("bradleyjoyce")
+        customer.success?.should == true
+      end
+    
+      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 = @client.customer_by_id(16)
+        customer.success?.should == true
+      end
     
-    should "return info for a customer" do
-      stub_get "https://OU812:x@pengwynn.chargify.com/customers/lookup.json?reference=16", "customer.json"
-      customer = @client.customer(16)
-      customer.reference.should == 'bradleyjoyce'
-      customer.organization.should == 'Squeejee'
+      should "return an empty Hash with success? set to false" do
+        stub_get "https://OU812:x@pengwynn.chargify.com/customers/16.json", "", 404
+        customer = @client.customer_by_id(16)
+        customer.success?.should == false
+      end
     end
     
     should "create a new customer" do
@@ -61,12 +57,25 @@ class TestChargify < Test::Unit::TestCase
       customer.first_name.should == "Wynn"
     end
     
-    should_eventually "raise an exception if a customer is not found" do
-      
-    end
-    
-    should_eventually "delete a customer" do
-      
+    # Depends on Chargify:
+    # should_eventually "delete a customer" do
+    #   
+    # end
+
+    should "raise UnexpectedResponseError when reponse is invalid JSON" do
+      stub_post "https://OU812:x@pengwynn.chargify.com/subscriptions.json", "invalid_subscription.json"
+      options = {
+        :product_handle     => 'monthly',
+        :customer_reference => 'bradleyjoyce',
+        :customer_attributes => {
+          :first_name   => "Wynn",
+          :last_name    => "Netherland",
+          :email        => "wynn@example.com"
+        }
+      }
+      assert_raise Chargify::UnexpectedResponseError do
+        @client.create_subscription(options)
+      end
     end
 
     should "return a list of customer subscriptions" do
@@ -148,7 +157,23 @@ class TestChargify < Test::Unit::TestCase
       subscription = @client.create_subscription(options)
       subscription.customer.organization.should == 'Squeejee'
     end
-
+    
+    should "create a customer subscription with a coupon code" do
+      stub_post "https://OU812:x@pengwynn.chargify.com/subscriptions.json", "subscription.json"
+      options = {
+        :product_handle     => 'monthly',
+        :customer_reference => 'bradleyjoyce',
+        :customer_attributes => {
+          :first_name   => "Wynn",
+          :last_name    => "Netherland",
+          :email        => "wynn@example.com"
+        },
+        :coupon_code => "EARLYBIRD"
+      }
+      subscription = @client.create_subscription(options)
+      #subscription.coupon.should == 'Squeejee'
+    end
+    
     should "set success? to true when subscription is created successfully" do 
       stub_post "https://OU812:x@pengwynn.chargify.com/subscriptions.json", "subscription.json", 201
       options = {
@@ -221,24 +246,64 @@ class TestChargify < Test::Unit::TestCase
       subscription.success?.should == true
     end
     
-    should_eventually "create a one-off charge for a subscription" do
-      
-    end
-    
-    should_eventually "list metered usage for a subscription" do
-      
+    context "when creating a one-off charge for a subscription" do
+      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.",
+          :amount => 1.00,
+          :amount_in_cents => 100
+        }
+      end
+
+      should "accept :amount as a parameter" do
+        subscription = @client.charge_subscription(123, @options)
+        
+        subscription.amount_in_cents.should == @options[:amount]*100
+        subscription.success?.should == true
+      end
+
+      should "accept :amount_in_cents as a parameter" do
+        subscription = @client.charge_subscription(123, @options)
+        
+        subscription.amount_in_cents.should == @options[:amount_in_cents]
+        subscription.success?.should == true
+      end
+
+      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 = @client.charge_subscription(123, {})
+        subscription.success?.should == false
+      end
+
+      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 = @client.charge_subscription(9999, @options)
+        subscription.success?.should == false
+      end
     end
     
-    should_eventually "record metered usage for a subscription" do
-      
-    end
+    context "for metered subscriptions" do
+      should_eventually "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 = @client.list_subscription_usage(123, 456)
+        subscription.success?.should == true
+      end
     
-    should_eventually "migrate a subscription to a new product" do
+      should_eventually "record usage for a subscription" do
       
+      end
     end
     
-    should_eventually "create one-time coupons" do
+    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 = @client.migrate_subscription(123, 354);
+      subscription.success?.should == true
+      subscription.product.id.should == 354
     end
     
     should "return a list of products" do
@@ -258,7 +323,7 @@ class TestChargify < Test::Unit::TestCase
       product = @client.product_by_handle('tweetsaver')
       product.accounting_code.should == 'TSMO'
     end
-
+    
     
   end
 end

data/test/helper.rb

@@ -1,11 +1,5 @@
 require 'test/unit'
 require 'pathname'
-require 'rubygems'
-
-gem 'thoughtbot-shoulda', '>= 2.10.1'
-gem 'jnunemaker-matchy', '0.4.0'
-gem 'mocha', '0.9.4'
-gem 'fakeweb', '>= 1.2.5'
 
 require 'shoulda'
 require 'matchy'
@@ -21,10 +15,6 @@ end
 
 FakeWeb.allow_net_connect = false
 
-
-class Test::Unit::TestCase
-end
-
 def fixture_file(filename)
   return '' if filename == ''
   file_path = File.expand_path(File.dirname(__FILE__) + '/fixtures/' + filename)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - Wynn Netherland
@@ -41,13 +41,13 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 4
         - 5
-        version: 0.4.5
+        - 2
+        version: 0.5.2
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: thoughtbot-shoulda
+  name: shoulda
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
@@ -79,13 +79,13 @@ dependencies:
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 0
         - 9
-        - 4
-        version: 0.9.4
+        - 8
+        version: 0.9.8
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -133,7 +133,7 @@ files:
 - test/fixtures/subscription_not_found.json
 - test/fixtures/subscriptions.json
 - test/helper.rb
-- test/test_chargify.rb
+- test/chargify_test.rb
 has_rdoc: true
 homepage: http://github.com/pengwynn/chargify
 licenses: []
@@ -166,4 +166,4 @@ specification_version: 3
 summary: Ruby wrapper for the chargify.com SAAS and billing API
 test_files: 
 - test/helper.rb
-- test/test_chargify.rb
+- test/chargify_test.rb