recurly 0.1.3 → 0.1.4

data/Manifest

@@ -11,6 +11,8 @@ lib/recurly/credit.rb
 lib/recurly/invoice.rb
 lib/recurly/plan.rb
 lib/recurly/subscription.rb
+lib/recurly/transaction.rb
+recurly.gemspec
 test/account_test.rb
 test/billing_info_test.rb
 test/charge_test.rb

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('recurly', '0.1.3') do |p|
+Echoe.new('recurly', '0.1.4') do |p|
   p.description    = "A Ruby API wrapper for Recurly. Super Simple Subscription billing."
   p.url            = "http://github.com/recurly/recurly-client-ruby"
   p.author         = "Isaac Hall"

data/lib/recurly.rb

@@ -7,4 +7,5 @@ require File.dirname(__FILE__) + '/recurly/charge'
 require File.dirname(__FILE__) + '/recurly/credit'
 require File.dirname(__FILE__) + '/recurly/invoice'
 require File.dirname(__FILE__) + '/recurly/plan'
-require File.dirname(__FILE__) + '/recurly/subscription'
+require File.dirname(__FILE__) + '/recurly/subscription'
+require File.dirname(__FILE__) + '/recurly/transaction'

data/lib/recurly/subscription.rb

@@ -25,7 +25,8 @@ module Recurly
     def change(timeframe, options = {})
       raise "Timeframe must be :full or :partial." unless timeframe == 'now' or timeframe == 'renewal'
       options[:timeframe] = timeframe
-      connection.put(element_path(self.subscription_account_code), 
+      path = "/accounts/#{CGI::escape(self.subscription_account_code || '')}/subscription.xml"
+      connection.put(path, 
         self.class.format.encode(options, :root => :subscription), 
         self.class.headers)
     end

data/lib/recurly/transaction.rb

@@ -0,0 +1,6 @@
+module Recurly
+  class Transaction < RecurlyBase
+    self.element_name = "transaction"
+    self.prefix = "/"  
+  end
+end

data/recurly.gemspec

@@ -2,22 +2,22 @@
 
 Gem::Specification.new do |s|
   s.name = %q{recurly}
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Isaac Hall"]
-  s.date = %q{2010-03-08}
+  s.date = %q{2010-04-01}
   s.description = %q{A Ruby API wrapper for Recurly. Super Simple Subscription billing.}
   s.email = %q{support@recurly.com}
-  s.extra_rdoc_files = ["LICENSE", "README.md", "lib/recurly.rb", "lib/recurly/account.rb", "lib/recurly/base.rb", "lib/recurly/billing_info.rb", "lib/recurly/charge.rb", "lib/recurly/credit.rb", "lib/recurly/invoice.rb", "lib/recurly/plan.rb", "lib/recurly/subscription.rb"]
-  s.files = ["LICENSE", "README.md", "Rakefile", "init.rb", "lib/recurly.rb", "lib/recurly/account.rb", "lib/recurly/base.rb", "lib/recurly/billing_info.rb", "lib/recurly/charge.rb", "lib/recurly/credit.rb", "lib/recurly/invoice.rb", "lib/recurly/plan.rb", "lib/recurly/subscription.rb", "test/account_test.rb", "test/billing_info_test.rb", "test/charge_test.rb", "test/credit_test.rb", "test/plan_test.rb", "test/subscription_test.rb", "test/test_helper.rb", "Manifest", "recurly.gemspec"]
+  s.extra_rdoc_files = ["LICENSE", "README.md", "lib/recurly.rb", "lib/recurly/account.rb", "lib/recurly/base.rb", "lib/recurly/billing_info.rb", "lib/recurly/charge.rb", "lib/recurly/credit.rb", "lib/recurly/invoice.rb", "lib/recurly/plan.rb", "lib/recurly/subscription.rb", "lib/recurly/transaction.rb"]
+  s.files = ["LICENSE", "README.md", "Rakefile", "init.rb", "lib/recurly.rb", "lib/recurly/account.rb", "lib/recurly/base.rb", "lib/recurly/billing_info.rb", "lib/recurly/charge.rb", "lib/recurly/credit.rb", "lib/recurly/invoice.rb", "lib/recurly/plan.rb", "lib/recurly/subscription.rb", "lib/recurly/transaction.rb", "recurly.gemspec", "test/account_test.rb", "test/billing_info_test.rb", "test/charge_test.rb", "test/credit_test.rb", "test/plan_test.rb", "test/subscription_test.rb", "test/test_helper.rb", "Manifest", "test/transaction_test.rb"]
   s.homepage = %q{http://github.com/recurly/recurly-client-ruby}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Recurly", "--main", "README.md"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{recurly}
   s.rubygems_version = %q{1.3.6}
   s.summary = %q{A Ruby API wrapper for Recurly. Super Simple Subscription billing.}
-  s.test_files = ["test/account_test.rb", "test/billing_info_test.rb", "test/charge_test.rb", "test/credit_test.rb", "test/plan_test.rb", "test/subscription_test.rb", "test/test_helper.rb"]
+  s.test_files = ["test/account_test.rb", "test/billing_info_test.rb", "test/charge_test.rb", "test/credit_test.rb", "test/plan_test.rb", "test/subscription_test.rb", "test/test_helper.rb", "test/transaction_test.rb"]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION

data/test/subscription_test.rb

@@ -11,7 +11,7 @@ class SubscriptionTest < Test::Unit::TestCase
       :email => 'verena@test.com',
       :company_name => 'Recurly Ruby Gem')
       
-    sub = create_subscription(account, TEST_PLAN_CODE)
+    sub = create_subscription(account)
     assert_not_nil sub
     assert_nil sub.canceled_at
     assert_equal sub.state, 'active'
@@ -20,14 +20,14 @@ class SubscriptionTest < Test::Unit::TestCase
   
   def test_create_subscription_existing_account
     account = create_account('existing-account')
-    sub = create_subscription(account, TEST_PLAN_CODE)
+    sub = create_subscription(account)
     
     assert_equal sub.state, 'active'
   end
   
   def test_update_subscription
     account = create_account('update-subscription')
-    sub = create_subscription(account, TEST_PLAN_CODE)
+    sub = create_subscription(account)
     
     sub.change('now', :quantity => 2)
     
@@ -37,7 +37,7 @@ class SubscriptionTest < Test::Unit::TestCase
   
   def test_cancel_subscription
     account = create_account('cancel-subscription')
-    subscription = create_subscription(account, TEST_PLAN_CODE)
+    subscription = create_subscription(account)
     
     subscription.cancel(account.account_code)
     
@@ -48,7 +48,7 @@ class SubscriptionTest < Test::Unit::TestCase
   
   def test_refund_subscription
     account = create_account('refund-subscription')
-    subscription = create_subscription(account, TEST_PLAN_CODE)
+    subscription = create_subscription(account)
     
     subscription.refund(:full)
     
@@ -57,7 +57,7 @@ class SubscriptionTest < Test::Unit::TestCase
     end
   end
   
-  def create_subscription(account, plan_code, quantity = 1)
+  def create_subscription(account, subscription_attrs={})
     account.billing_info = Recurly::BillingInfo.new(
       :first_name => account.first_name,
       :last_name => account.last_name,
@@ -75,12 +75,13 @@ class SubscriptionTest < Test::Unit::TestCase
       :ip_address => '127.0.0.1'
     )
     
-    sub = Recurly::Subscription.create(
-      :account_code => account.account_code,
-      :plan_code => plan_code, 
-      :quantity => quantity,
-      :account => account
-    )
+    params = {:account_code => account.account_code,
+              :plan_code => TEST_PLAN_CODE, 
+              :quantity => 1,
+              :account => account}.merge subscription_attrs
+    
+    sub = Recurly::Subscription.create(params)
+    
   end
 
 end

data/test/test_helper.rb

@@ -9,7 +9,7 @@ Recurly.configure do |c|
   c.site = ''
 end
 
-TEST_PLAN_CODE = 'test_plan'
+TEST_PLAN_CODE = 'trial'
 
 def create_account(account_code)
   account = Recurly::Account.create(
@@ -18,4 +18,27 @@ def create_account(account_code)
     :last_name => 'Test',
     :email => 'verena@test.com',
     :company_name => 'Recurly Ruby Gem')
+end
+
+def create_account_with_billing_info(account_code)
+  
+  account = create_account(account_code)
+  
+  billing_info = Recurly::BillingInfo.create(
+    :account_code => account.account_code,
+    :first_name => account.first_name,
+    :last_name => account.last_name,
+    :address1 => '123 Test St',
+    :city => 'San Francisco',
+    :state => 'CA',
+    :zip => '94115',
+    :credit_card => {
+      :number => '1',
+      :year => Time.now.year + 1,
+      :month => Time.now.month,
+      :verification_value => '123'
+    }
+  )
+  
+  account
 end

data/test/transaction_test.rb

@@ -0,0 +1,19 @@
+require 'test_helper'
+require "test/unit"
+
+class TransactionTest < Test::Unit::TestCase
+
+  def test_create_transaction
+    account = create_account_with_billing_info('transaction')
+    
+    trans = Recurly::Transaction.create(
+      :account => { :account_code => account.account_code },
+      :amount_in_cents => 500, 
+      :description => "test transaction for $5"
+    )
+    
+    assert_not_nil trans.id
+    assert_equal trans.amount_in_cents, 500
+  end
+  
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Isaac Hall
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-08 00:00:00 -08:00
+date: 2010-04-01 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -36,6 +36,7 @@ extra_rdoc_files:
 - lib/recurly/invoice.rb
 - lib/recurly/plan.rb
 - lib/recurly/subscription.rb
+- lib/recurly/transaction.rb
 files: 
 - LICENSE
 - README.md
@@ -50,6 +51,8 @@ files:
 - lib/recurly/invoice.rb
 - lib/recurly/plan.rb
 - lib/recurly/subscription.rb
+- lib/recurly/transaction.rb
+- recurly.gemspec
 - test/account_test.rb
 - test/billing_info_test.rb
 - test/charge_test.rb
@@ -58,7 +61,6 @@ files:
 - test/subscription_test.rb
 - test/test_helper.rb
 - Manifest
-- recurly.gemspec
 has_rdoc: true
 homepage: http://github.com/recurly/recurly-client-ruby
 licenses: []
@@ -103,3 +105,4 @@ test_files:
 - test/plan_test.rb
 - test/subscription_test.rb
 - test/test_helper.rb
+- test/transaction_test.rb