chargify 0.2.8 → 0.3.0

data/Rakefile

@@ -1,15 +1,11 @@
 require "mg"
-require 'active_support/inflector'
 require 'shoulda/tasks'
 
-
 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'
+desc 'Run tests'
+task :test do
+  sh 'testrb -I.:lib test/*_test.rb'
 end
 
 task :default => :test

data/changelog.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.3.0 May 21, 2011
+* Add api calls: adjust_subscription and subscription_statements
+* Get tests to work on 1.9.2
+* Updated development dependencies
+
 ## 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)
@@ -18,4 +23,4 @@
 
 ## 0.1.0 November 18, 2009
 
-* Initial version
+* Initial version

data/chargify.gemspec

@@ -1,82 +1,28 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
+require File.dirname(__FILE__) + '/lib/chargify.rb'
+
 Gem::Specification.new do |s|
   s.name = %q{chargify}
-  s.version = "0.2.8"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.version = Chargify::VERSION.dup
   s.authors = ["Wynn Netherland", "Nash Kabbara"]
-  s.date = %q{2010-05-24}
-  s.description = %q{Ruby wrapper for the chargify.com SAAS and billing API}
   s.email = %q{wynn.netherland@gmail.com}
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.markdown"
-  ]
-  s.files = [
-    ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.markdown",
-     "Rakefile",
-     "VERSION",
-     "changelog.md",
-     "chargify.gemspec",
-     "lib/chargify.rb",
-     "lib/chargify/client.rb",
-     "test/fixtures/customer.json",
-     "test/fixtures/customers.json",
-     "test/fixtures/deleted_subscription.json",
-     "test/fixtures/invalid_subscription.json",
-     "test/fixtures/new_customer.json",
-     "test/fixtures/product.json",
-     "test/fixtures/products.json",
-     "test/fixtures/subscription.json",
-     "test/fixtures/subscription_not_found.json",
-     "test/fixtures/subscriptions.json",
-     "test/helper.rb",
-     "test/chargify_test.rb"
-  ]
   s.homepage = %q{http://github.com/pengwynn/chargify}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
   s.summary = %q{Ruby wrapper for the chargify.com SAAS and billing API}
-  s.test_files = [
-    "test/helper.rb",
-     "test/chargify_test.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  s.description = %q{Ruby wrapper for the chargify.com SAAS and billing API using httparty}
+  s.extra_rdoc_files = [ "LICENSE", "README.markdown" ]
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.required_rubygems_version = ">= 1.3.6"
+  s.files = %w{.document .gitignore LICENSE README.markdown Rakefile changelog.md chargify.gemspec} +
+    Dir.glob(['{lib,test}/**/*.rb', 'test/fixtures/*.json'])
+  s.test_files = [ "test/helper.rb", "test/chargify_test.rb" ]
 
-    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.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.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"])
-      s.add_dependency(%q<shoulda>, [">= 2.10.1"])
-      s.add_dependency(%q<jnunemaker-matchy>, ["= 0.4.0"])
-      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.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.8"])
-    s.add_dependency(%q<fakeweb>, [">= 1.2.5"])
-  end
+  s.add_runtime_dependency(%q<hashie>, ["~> 1.0.0"])
+  s.add_runtime_dependency(%q<httparty>, ["~> 0.7.4"])
+  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.8"])
+  s.add_development_dependency(%q<fakeweb>, [">= 1.2.5"])
+  s.add_development_dependency('mg', ['>= 0.0.8'])
+  s.add_development_dependency('test-unit', ['>= 2.3.0'])
 end
-

data/lib/chargify.rb

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

data/lib/chargify/client.rb

@@ -144,6 +144,14 @@ module Chargify
       (response.subscription || {}).update(:success? => success)
     end
 
+    def adjust_subscription(sub_id, attributes = {})
+      raw_response = post("/subscriptions/#{sub_id}/adjustments.json",
+                          :body => { :adjustment => attributes })
+      created = true if raw_response.code == 201
+      response = Hashie::Mash.new(raw_response)
+      (response.adjustment || response).update(:success? => created)
+    end
+
     def list_products
       products = get("/products.json")
       products.map{|p| Hashie::Mash.new p['product']}
@@ -169,6 +177,11 @@ module Chargify
       transactions.map{|t| Hashie::Mash.new t['transaction']}
     end
 
+    def subscription_statements(sub_id, options={})
+      statements = get("/subscriptions/#{sub_id}/statements.json", :query => options)
+      statements.map{|t| Hashie::Mash.new t['statement']}
+    end
+
     def site_transactions(options={})
       transactions = get("/transactions.json", :query => options)
       transactions.map{|t| Hashie::Mash.new t['transaction']}

data/test/chargify_test.rb

@@ -1,4 +1,4 @@
-require 'helper'
+require 'test/helper'
 
 class ChargifyTest < Test::Unit::TestCase
   context "Chargify API client" do
@@ -305,7 +305,14 @@ class ChargifyTest < Test::Unit::TestCase
       subscription.success?.should == true
       subscription.product.id.should == 354
     end
-    
+
+    should "adjust a subscription" do
+      @client.expects(:post).with("/subscriptions/123/adjustments.json", :body => {:adjustment => {}}).
+        returns(Hashie::Mash.new(:adjustment => {}, :code => 201))
+      response = @client.adjust_subscription 123
+      response.success?.should == true
+    end
+
     should "return a list of products" do
       stub_get "https://OU812:x@pengwynn.chargify.com/products.json", "products.json"
       products = @client.list_products
@@ -385,6 +392,18 @@ class ChargifyTest < Test::Unit::TestCase
       end
     end
 
+    should "return a list of transactions" do
+      @client.expects(:get).with("/subscriptions/123/transactions.json", :query => {}).
+        returns([{:transaction => {}}])
+      @client.subscription_transactions 123
+    end
+
+    should "return a list of statements" do
+      @client.expects(:get).with("/subscriptions/123/statements.json", :query => {}).
+        returns([{:statement => {}}])
+      @client.subscription_statements 123
+    end
+
     context "aliased methods" do
       setup do
         stub_put "https://OU812:x@pengwynn.chargify.com/subscriptions/123/components/16.json", "component.json"

data/test/fixtures/charge_subscription.json

@@ -0,0 +1,5 @@
+{"charge":{
+  "success":true,
+  "memo":"This is the description of the one time charge.",
+  "amount_in_cents":100
+}}

data/test/fixtures/charge_subscription_missing_parameters.json

@@ -0,0 +1,4 @@
+{"errors":[
+  "Memo: cannot be blank.",
+  "Amount: is not a number."
+]}

data/test/fixtures/component.json

@@ -0,0 +1,11 @@
+{
+  "component": {
+    "kind": "quantity_based_component",
+    "name": "Extra Rubies",
+    "allocated_quantity": 42,
+    "subscription_id": 16,
+    "pricing_scheme": "per_unit",
+    "component_id": 84,
+    "unit_name": "band"
+  }
+}

data/test/fixtures/components.json

@@ -0,0 +1,24 @@
+[
+  {
+    "component": {
+      "kind": "quantity_based_component",
+      "name": "Extra Rubies",
+      "allocated_quantity": 42,
+      "subscription_id": 16,
+      "pricing_scheme": "per_unit",
+      "component_id": 84,
+      "unit_name": "band"
+    }
+  },
+  {
+    "component": {
+      "kind": "quantity_based_component",
+      "name": "IP addresses",
+      "allocated_quantity": 2,
+      "subscription_id": 16,
+      "pricing_scheme": "per_unit",
+      "component_id": 24,
+      "unit_name": "address"
+    }
+  }
+]

data/test/fixtures/list_metered_subscriptions.json

@@ -0,0 +1,3 @@
+{
+  "usages": []
+}

data/test/fixtures/migrate_subscription.json

@@ -0,0 +1,51 @@
+{
+    "subscription": {
+        "id": 123,
+        "state": "active",
+        "balance_in_cents": "auto generated",
+        "current_period_started_at": "auto generated",
+        "current_period_ends_at": "auto generated",
+        "activated_at": "auto generated",
+        "trial_ended_at": "auto generated",
+        "trial_started_at": "auto generated",
+        "expires_at": "auto generated",
+        "created_at": "auto generated",
+        "updated_at": "auto generated",
+        "cancellation_message": null,
+        "customer": {
+            "id": "auto generated",
+            "first_name": "your value",
+            "last_name": "your value",
+            "email": "your value",
+            "organization": "your value",
+            "reference": "your value",
+            "updated_at": "auto generated",
+            "created_at": "auto generated"
+        },
+        "product": {
+            "id": 354,
+            "name": "[@products.last.name]",
+            "handle": 354,
+            "price_in_cents": 1000,
+            "accounting_code": "[@products.last.accounting_code]",
+            "description": "your value",
+            "interval": 3600,
+            "interval_unit": "[@products.last.interval_unit]",
+            "product_family": {
+                "id": 15,
+                "name": "[@products.last.product_family.name]",
+                "handle": "[@products.last.product_family.handle]",
+                "accounting_code": "[@products.last.product_family.accounting_code]",
+                "description": "your value"
+            }
+        },
+        "credit_card": {
+            "first_name": "your value",
+            "last_name": "your value",
+            "masked_card_number": "your value",
+            "card_type": "auto generated",
+            "expiration_month": "your value",
+            "expiration_year": "your value"
+        }
+    }
+}

data/test/helper.rb

@@ -1,3 +1,7 @@
+unless ENV['NO_RUBYGEMS']
+  require 'rubygems'
+  gem 'test-unit'
+end
 require 'test/unit'
 require 'pathname'
 
@@ -5,10 +9,6 @@ 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__))
 require 'chargify'
 
 class Test::Unit::TestCase

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: chargify
 version: !ruby/object:Gem::Version 
-  hash: 7
-  prerelease: false
-  segments: 
-  - 0
-  - 2
-  - 8
-  version: 0.2.8
+  prerelease: 
+  version: 0.3.0
 platform: ruby
 authors: 
 - Wynn Netherland
@@ -16,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-24 00:00:00 -05:00
+date: 2011-05-21 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,12 +22,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 0
-        - 1
-        - 3
-        version: 0.1.3
+        version: 1.0.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -43,12 +33,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 0
-        - 5
-        - 2
-        version: 0.5.2
+        version: 0.7.4
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -59,11 +44,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 37
-        segments: 
-        - 2
-        - 10
-        - 1
         version: 2.10.1
   type: :development
   version_requirements: *id003
@@ -75,11 +55,6 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 0
-        - 4
-        - 0
         version: 0.4.0
   type: :development
   version_requirements: *id004
@@ -91,11 +66,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 43
-        segments: 
-        - 0
-        - 9
-        - 8
         version: 0.9.8
   type: :development
   version_requirements: *id005
@@ -107,31 +77,32 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 1
-        - 2
-        - 5
         version: 1.2.5
   type: :development
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: redgreen
+  name: mg
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 1
-        - 2
-        - 2
-        version: 1.2.2
+        version: 0.0.8
   type: :development
   version_requirements: *id007
-description: Ruby wrapper for the chargify.com SAAS and billing API
+- !ruby/object:Gem::Dependency 
+  name: test-unit
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.3.0
+  type: :development
+  version_requirements: *id008
+description: Ruby wrapper for the chargify.com SAAS and billing API using httparty
 email: wynn.netherland@gmail.com
 executables: []
 
@@ -146,23 +117,28 @@ files:
 - LICENSE
 - README.markdown
 - Rakefile
-- VERSION
 - changelog.md
 - chargify.gemspec
-- lib/chargify.rb
 - lib/chargify/client.rb
+- lib/chargify.rb
+- test/chargify_test.rb
+- test/helper.rb
+- test/fixtures/charge_subscription.json
+- test/fixtures/charge_subscription_missing_parameters.json
+- test/fixtures/component.json
+- test/fixtures/components.json
 - test/fixtures/customer.json
 - test/fixtures/customers.json
 - test/fixtures/deleted_subscription.json
 - test/fixtures/invalid_subscription.json
+- test/fixtures/list_metered_subscriptions.json
+- test/fixtures/migrate_subscription.json
 - test/fixtures/new_customer.json
 - test/fixtures/product.json
 - test/fixtures/products.json
 - test/fixtures/subscription.json
 - test/fixtures/subscription_not_found.json
 - test/fixtures/subscriptions.json
-- test/helper.rb
-- test/chargify_test.rb
 has_rdoc: true
 homepage: http://github.com/pengwynn/chargify
 licenses: []
@@ -177,23 +153,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+      version: 1.3.6
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Ruby wrapper for the chargify.com SAAS and billing API

data/VERSION

@@ -1 +0,0 @@
-0.2.7