chargify_api_ares 0.3.9 → 0.4.0

data/README.md

@@ -29,17 +29,9 @@ See the `samples` directory for more usage examples.
 
 ### Installation
 
-This library can be installed as a gem.  It is hosted on [Gemcutter](http://gemcutter.org).
+This library can be installed as a gem. It is hosted on [Rubygems](http://rubygems.org).
 
-If you don't have your system set up to use gemcutter, follow the instructions on their site
-<http://gemcutter.org>, i.e.:
-
-$ gem install gemcutter
-$ gem tumble
-
-This will install Gemcutter and set your gem sources to search the gemcutter repos.
-
-Then you can install this library as a gem:
+You can install this library as a gem using the following command:
 
 $ gem install chargify_api_ares
 
@@ -70,11 +62,4 @@ Now you'll have access to classes the interact with the Chargify API, such as:
 `Chargifiy::Subscription`
 
 Check out the examples in the `samples` directory.  If you're not familiar with how ActiveResource works,
-you may be interested in some [ActiveResource Documentation](http://apidock.com/rails/ActiveResource/Base)
-
-
-
-### Contributors
-
-* Michael Klett (Grasshopper Labs and Chargify)
-* The Lab Rats @ Phase Two Labs
+you may be interested in some [ActiveResource Documentation](http://apidock.com/rails/ActiveResource/Base)

data/Rakefile

@@ -1,14 +1,9 @@
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gemspec|
-    gemspec.name = "chargify_api_ares"
-    gemspec.summary = "A Chargify API wrapper for Ruby using ActiveResource"
-    gemspec.description = ""
-    gemspec.email = "mklett@grasshopper.com"
-    gemspec.homepage = "http://github.com/grasshopperlabs/chargify_api_ares"
-    gemspec.authors = ["Michael Klett", "The Lab Rats @ Phase Two Labs", "Brian Rose","Nathan Verni"]
-    Jeweler::GemcutterTasks.new
-  end
-rescue LoadError
-  puts "Jeweler not available. Install it with: sudo gem install jeweler"
-end
+require 'rake'
+require 'rspec/core/rake_task'
+
+desc 'Run the spec suite'
+RSpec::Core::RakeTask.new('spec') {|t|
+  t.rspec_opts = ['--colour', '--format Fuubar']
+}
+
+task :default => :spec

data/chargify_api_ares.gemspec

@@ -1,17 +1,12 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
-
 Gem::Specification.new do |s|
   s.name = %q{chargify_api_ares}
-  s.version = "0.3.9"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Michael Klett", "Nathan Verni", "The Lab Rats @ Phase Two Labs", "Brian Rose"]
-  s.date = %q{2011-3-2}
+  s.authors = ["Michael Klett", "Nathan Verni", "Rodrigo Franco"]
+  s.date = %q{2011-03-02}
   s.description = %q{}
-  s.email = %q{mklett@grasshopper.com}
+  s.email = %q{support@chargify.com}
   s.extra_rdoc_files = [
     "LICENSE.txt",
      "README.md"
@@ -72,4 +67,3 @@ Gem::Specification.new do |s|
   else
   end
 end
-

data/lib/chargify_api_ares.rb

@@ -1,5 +1,7 @@
 # Chargify API Wrapper using ActiveResource.
 #
+require 'thread'
+
 begin
   require 'active_resource'
 rescue LoadError
@@ -8,7 +10,7 @@ rescue LoadError
     require 'active_resource'
   rescue LoadError
     abort <<-ERROR
-The 'activeresource' library could not be loaded. If you have RubyGems 
+The 'activeresource' library could not be loaded. If you have RubyGems
 installed you can install ActiveResource by doing "gem install activeresource".
 ERROR
   end
@@ -48,48 +50,51 @@ end
 
 
 module Chargify
-  
+
   class << self
     attr_accessor :subdomain, :api_key, :site, :format, :timeout
-    
+
     def configure
       yield self
-      
+
       Base.user      = api_key
       Base.password  = 'X'
       Base.timeout   = timeout unless (timeout.blank?)
-      
+
       self.site ||= "https://#{subdomain}.chargify.com"
 
-      Base.site                     = site
-      Subscription::Component.site  = site + "/subscriptions/:subscription_id"
-      Subscription::Statement.site  = site + "/subscriptions/:subscription_id"
+      Base.site                       = site
+      Subscription::Component.site    = site + "/subscriptions/:subscription_id"
+      Subscription::Statement.site    = site + "/subscriptions/:subscription_id"
       Subscription::Transaction.site  = site + "/subscriptions/:subscription_id"
+      Coupon.site                     = site + "/product_families/:product_family_id"
     end
   end
-  
+
   class Base < ActiveResource::Base
+    self.format = :xml
+
     def self.element_name
       name.split(/::/).last.underscore
     end
-    
+
     def to_xml(options = {})
       options.merge!(:dasherize => false)
       super
     end
   end
-  
+
   class Site < Base
     def self.clear_data!(params = {})
       post(:clear_data, params)
     end
   end
-  
+
   class Customer < Base
     def self.find_by_reference(reference)
       Customer.new get(:lookup, :reference => reference)
     end
-    
+
     def subscriptions(params = {})
       params.merge!({:customer_id => self.id})
       Subscription.find(:all, :params => params)
@@ -100,13 +105,13 @@ module Chargify
       PaymentProfile.find(:all, :params => params)
     end
   end
-  
+
   class Subscription < Base
     def self.find_by_customer_reference(reference)
       customer = Customer.find_by_reference(reference)
-      find(:first, :params => {:customer_id => customer.id}) 
+      find(:first, :params => {:customer_id => customer.id})
     end
-    
+
     # Strip off nested attributes of associations before saving, or type-mismatch errors will occur
     def save
       self.attributes.delete('customer')
@@ -114,47 +119,47 @@ module Chargify
       self.attributes.delete('credit_card')
       super
     end
-    
+
     def cancel
       destroy
     end
-    
+
     def component(id)
       Component.find(id, :params => {:subscription_id => self.id})
     end
-    
+
     def components(params = {})
       params.merge!({:subscription_id => self.id})
       Component.find(:all, :params => params)
     end
-    
+
     def payment_profile
       credit_card
     end
-    
+
     # Perform a one-time charge on an existing subscription.
-    # For more information, please see the one-time charge API docs available 
+    # For more information, please see the one-time charge API docs available
     # at: http://support.chargify.com/faqs/api/api-charges
     def charge(attrs = {})
       post :charges, {}, attrs.to_xml(:root => :charge)
     end
-    
+
     def credit(attrs = {})
       post :credits, {}, attrs.to_xml(:root => :credit)
     end
-    
+
     def refund(attrs = {})
       post :refunds, {}, attrs.to_xml(:root => :refund)
     end
-    
+
     def reactivate(params = {})
       put :reactivate, params
     end
-    
+
     def reset_balance
       put :reset_balance
     end
-    
+
     def migrate(attrs = {})
       post :migrations, :migration => attrs
     end
@@ -164,24 +169,36 @@ module Chargify
       raise ActiveResource::ResourceNotFound.new(nil) if (statement.subscription_id != self.id)
       statement
     end
-      
+
     def statements(params = {})
       params.merge!(:subscription_id => self.id)
       Statement.find(:all, :params => params)
     end
-    
+
     def transactions(params = {})
       params.merge!(:subscription_id => self.id)
       Transaction.find(:all, :params => params)
     end
-    
+
+    def adjustment(attrs = {})
+      post :adjustments, {}, attrs.to_xml(:root => :adjustment)
+    end
+
+    def add_coupon(code)
+      post :add_coupon, :code => code
+    end
+
+    def remove_coupon(code)
+      delete :remove_coupon, :code => code
+    end
+
     class Component < Base
       # All Subscription Components are considered already existing records, but the id isn't used
       def id
         self.component_id
       end
     end
-    
+
     class Statement < Base
     end
 
@@ -206,12 +223,12 @@ module Chargify
     def self.find_by_handle(handle)
       Product.new get(:lookup, :handle => handle)
     end
-    
+
     protected
-    
+
     # Products are created in the scope of a ProductFamily, i.e. /product_families/nnn/products
     #
-    # This alters the collection path such that it uses the product_family_id that is set on the 
+    # This alters the collection path such that it uses the product_family_id that is set on the
     # attributes.
     def create
       pfid = begin
@@ -225,22 +242,22 @@ module Chargify
       end
     end
   end
-  
+
   class ProductFamily < Base
     def self.find_by_handle(handle, attributes = {})
       ProductFamily.find(:one, :from => :lookup, :handle => handle)
     end
   end
-    
+
   class Usage < Base
     def subscription_id=(i)
       self.prefix_options[:subscription_id] = i
     end
     def component_id=(i)
       self.prefix_options[:component_id] = i
-    end    
+    end
   end
-  
+
   class Component < Base
   end
 
@@ -262,8 +279,22 @@ module Chargify
       Subscription.find(self.subscription_id).refund(attrs)
     end
   end
-  
+
   class PaymentProfile < Base
   end
-  
+
+  class Coupon < Base
+    def self.find_by_product_family_id_and_code(product_family_id, code)
+       Coupon.new get(:lookup, :product_family_id => product_family_id, :code => code)
+    end
+
+    def usage
+      get :usage
+    end
+
+    def archive
+      self.destroy
+    end
+  end
+
 end

data/spec/customer_spec.rb

@@ -5,7 +5,7 @@ describe Chargify::Customer do
   context 'find by reference' do
     before do
       @reference = 'ref0123'
-      @existing_customer = Factory(:customer, :reference => @reference, :id => Factory.next(:customer_id))
+      @existing_customer = Factory(:customer, :reference => @reference, :id => FactoryGirl.generate(:customer_id))
       FakeWeb.register_uri(:get, "#{test_domain}/customers/lookup.xml?reference=#{@existing_customer.reference}", :body => @existing_customer.attributes.to_xml)
     end
     

data/spec/factories.rb

@@ -1,62 +1,64 @@
-Factory.sequence :email do |n|
-  "customer#{n}@example.com"
-end
+FactoryGirl.define do
+  sequence :email do |n|
+    "customer#{n}@example.com"
+  end
 
-Factory.sequence :customer_id do |n|
-  n
-end
+  sequence :customer_id do |n|
+    n
+  end
 
-Factory.define :customer, :class => Chargify::Customer do |c|
-  c.first_name { Faker::Name.first_name }
-  c.last_name { Faker::Name.last_name }
-  c.email { Factory.next(:email) }
-  c.organization { Faker::Company.name }
-  c.created_at { 2.days.ago }
-  c.updated_at { 1.hour.ago }
-end
+  factory :customer, :class => Chargify::Customer do |c|
+    c.first_name { Faker::Name.first_name }
+    c.last_name { Faker::Name.last_name }
+    c.email { FactoryGirl.generate(:email) }
+    c.organization { Faker::Company.name }
+    c.created_at { 2.days.ago }
+    c.updated_at { 1.hour.ago }
+  end
 
 
-Factory.sequence :product_id do |n|
-  n
-end
+  sequence :product_id do |n|
+    n
+  end
 
-Factory.sequence :product_name do |n|
-  "Product #{n}"
-end
+  sequence :product_name do |n|
+    "Product #{n}"
+  end
 
-Factory.define :product, :class => Chargify::Product do |p|
-  p.name { Factory.next(:product_name) }
-end
+  factory :product, :class => Chargify::Product do |p|
+    p.name { FactoryGirl.generate(:product_name) }
+  end
 
-Factory.sequence :subscription_id do |n|
-  n
-end
+  sequence :subscription_id do |n|
+    n
+  end
 
-Factory.define :subscription, :class => Chargify::Subscription do |s|
-  s.balance_in_cents 500
-  s.current_period_ends_at 3.days.from_now
-end
+  factory :subscription, :class => Chargify::Subscription do |s|
+    s.balance_in_cents 500
+    s.current_period_ends_at 3.days.from_now
+  end
 
-Factory.define :subscription_with_extra_attrs, :parent => :subscription do |swea|
-  swea.customer Chargify::Customer.new
-  swea.product Chargify::Product.new
-  swea.credit_card "CREDIT CARD"
-end
+  factory :subscription_with_extra_attrs, :parent => :subscription do |swea|
+    swea.customer Chargify::Customer.new
+    swea.product Chargify::Product.new
+    swea.credit_card "CREDIT CARD"
+  end
 
-Factory.define :component, :class => Chargify::Component do |f|
-  f.name { Faker::Company.bs }
-  f.unit_name 'unit'
-end
+  factory :component, :class => Chargify::Component do |f|
+    f.name { Faker::Company.bs }
+    f.unit_name 'unit'
+  end
 
-Factory.define :quantity_based_component, :class => Chargify::Component do |f|
-  f.name { Faker::Company.bs }
-  f.unit_name 'unit'
-  f.pricing_scheme 'tiered'
-  f.component_type 'quantity_based_component'
-end
+  factory :quantity_based_component, :class => Chargify::Component do |f|
+    f.name { Faker::Company.bs }
+    f.unit_name 'unit'
+    f.pricing_scheme 'tiered'
+    f.component_type 'quantity_based_component'
+  end
 
-Factory.define :subscriptions_component, :class => Chargify::Subscription::Component do |f|
-  f.name { Faker::Company.bs }
-  f.unit_name 'unit'
-  f.component_type 'quantity_based_component'
-end
+  factory :subscriptions_component, :class => Chargify::Subscription::Component do |f|
+    f.name { Faker::Company.bs }
+    f.unit_name 'unit'
+    f.component_type 'quantity_based_component'
+  end
+end

data/spec/product_spec.rb

@@ -5,7 +5,7 @@ describe Chargify::Product do
   context 'find by handle' do
     before do
       @handle = 'handle1'
-      @existing_product = Factory(:product, :handle => @handle, :id => Factory.next(:product_id))
+      @existing_product = Factory(:product, :handle => @handle, :id => FactoryGirl.generate(:product_id))
       FakeWeb.register_uri(:get, "#{test_domain}/products/lookup.xml?handle=#{@existing_product.handle}", :body => @existing_product.attributes.to_xml)
     end
 

data/spec/remote/spec_helper.rb

@@ -1,11 +1,11 @@
 require 'rubygems'
-require 'spec'
+require 'rspec'
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..', 'lib'))
 
 require 'chargify_api_ares'
 
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
   config.before(:all) do
     Chargify.configure do |c|
       c.subdomain = remote_configuration['subdomain']

data/spec/spec_helper.rb

@@ -1,5 +1,5 @@
 require 'rubygems'
-require 'spec'
+require 'rspec'
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
@@ -18,7 +18,7 @@ Chargify.configure do |c|
   c.api_key   = 'test'
 end
  
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
   config.after(:each) do
     ActiveResource::FakeResource.clean
   end

data/spec/subscription_spec.rb

@@ -4,7 +4,7 @@ describe Chargify::Subscription do
   
   context 'strips nested association attributes before saving' do
     before do
-      @subscription = Factory.build(:subscription_with_extra_attrs)
+      @subscription = FactoryGirl.build(:subscription_with_extra_attrs)
     end
     
     it 'strips customer' do
@@ -26,17 +26,18 @@ describe Chargify::Subscription do
     end
     
     it 'doesn\'t strip other attrs' do
-      subscription = Factory.build(:subscription)
+      subscription = FactoryGirl.build(:subscription)
       
       lambda { subscription.save! }.should_not change(subscription, :attributes)
     end
   end
   
   it 'creates a one-time charge' do
-    id = Factory.next(:subscription_id)
+    id = FactoryGirl.generate(:subscription_id)
     subscription = Factory(:subscription, :id => id)
+    subscription.stub!(:persisted?).and_return(true)
     expected_response = {:charge => {:amount_in_cents => 1000, :memo => "one-time charge", :success => true}}.to_xml
-    FakeWeb.register_uri(:post, "#{test_domain}/subscriptions/#{id}/charges.xml?charge%5Bamount%5D=10.00&charge%5Bmemo%5D=one-time+charge", :status => 201, :body => expected_response)
+    FakeWeb.register_uri(:post, "#{test_domain}/subscriptions/#{id}/charges.xml", :status => 201, :body => expected_response)
     
     response = subscription.charge(:amount => "10.00", "memo" => "one-time charge")
     
@@ -59,14 +60,17 @@ describe Chargify::Subscription do
     @subscription = Factory(:subscription, :id => 1)
     find_subscription = lambda { Chargify::Subscription.find(1) }
     
+    FakeWeb.register_uri(:get, "#{test_domain}/subscriptions/1.xml", :body => @subscription.attributes.to_xml)
+    
     find_subscription.should_not raise_error
     @subscription.cancel
     find_subscription.should raise_error
   end
 
   it 'migrates the subscription' do
-    id = Factory.next(:subscription_id)
+    id = FactoryGirl.generate(:subscription_id)
     subscription = Factory(:subscription, :id => id)
+    subscription.stub!(:persisted?).and_return(true)
     expected_response = [subscription.attributes].to_xml(:root => 'subscription')
     FakeWeb.register_uri(:post, "#{test_domain}/subscriptions/#{id}/migrations.xml?migration%5Bproduct_handle%5D=upgraded-plan", :status => 201, :body => expected_response)
     

metadata

@@ -1,29 +1,28 @@
 --- !ruby/object:Gem::Specification 
 name: chargify_api_ares
 version: !ruby/object:Gem::Version 
-  hash: 1
-  prerelease: false
+  hash: 15
+  prerelease: 
   segments: 
   - 0
-  - 3
-  - 9
-  version: 0.3.9
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Michael Klett
 - Nathan Verni
-- The Lab Rats @ Phase Two Labs
-- Brian Rose
+- Rodrigo Franco
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-03-02 00:00:00 -05:00
+date: 2011-03-02 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
 description: ""
-email: mklett@grasshopper.com
+email: support@chargify.com
 executables: []
 
 extensions: []
@@ -87,7 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A Chargify API wrapper for Ruby using ActiveResource