subscription_fu 0.2.0 → 0.2.1

data/app/models/subscription_fu/plan.rb

@@ -7,7 +7,7 @@ class SubscriptionFu::Plan
   attr_accessor :key
   attr_accessor :price
 
-  def initialize(key, price, data)
+  def initialize(key, price, data = {})
     self.key = key
     self.price = price
     data.each {|k,v| self.send("#{k}=", v) }

data/app/models/subscription_fu/transaction.rb

@@ -104,7 +104,7 @@ class SubscriptionFu::Transaction < ActiveRecord::Base
         :period        => :Month,
         :frequency     => 1,
         :amount        => sub_plan.price,
-        :tax           => sub_plan.price_tax,
+        :tax_amount    => sub_plan.price_tax,
         :currency_code => sub_plan.currency } )
     response = SubscriptionFu::Paypal.express_request.subscribe!(identifier, profile)
     subscription.update_attributes!(:paypal_profile_id => response.recurring.identifier, :activated_at => Time.now)

data/lib/subscription_fu/version.rb

@@ -1,3 +1,3 @@
 module SubscriptionFu
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/spec/models/subscription_plan_spec.rb

@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe SubscriptionFu::Plan do
+  it "should calculate tax" do
+    plan = described_class.new("basic", 1000)
+    plan.price_with_tax.should == 1050
+    plan.price_tax.should == 50
+  end
+end

data/spec/models/subscription_spec.rb

@@ -103,14 +103,14 @@ describe SubscriptionFu::Subscription do
             instance_variable_get("@#{sub_instance}").subject.pending_transaction("token123").should == @trans
           end
           context "complete" do
-            before { mock_paypal_create_profile("token123", "6bvsaksd9j") }
+            before { mock_paypal_create_profile("token123", :new_profile_id => "6bvsaksd9j") }
             before { mock_paypal_delete_profile("fgsga564aa") } unless first_sub
             before { @trans.complete }
             should_activate_subscription(sub_instance)
             should_cancel_previous_subscription(sub_instance) unless first_sub
           end
           context "complete with error in cancel" do
-            before { mock_paypal_create_profile("token123", "6bvsaksd9j") }
+            before { mock_paypal_create_profile("token123", :new_profile_id => "6bvsaksd9j") }
             before { mock_paypal_delete_profile_with_error("fgsga564aa") }
             before { @trans.complete }
             should_activate_subscription(sub_instance)

data/spec/models/subscription_transaction_spec.rb

@@ -132,4 +132,12 @@ describe SubscriptionFu::Transaction do
     should_not_support_start_checkout
   end
 
+  it "should calculate tax correctly" do
+    trans = Factory(:transaction, :gateway => "paypal", :status => "initiated", :action => "activation", :identifier => "foo")
+    trans.sub_plan.price_tax.should == 250
+    mock_paypal_create_profile("foo", "AMT" => "5000.00", "TAXAMT" => "250.00")
+    trans.complete
+    trans.status.should == "complete"
+  end
+
 end

data/spec/support/paypal_test_helper.rb

@@ -41,10 +41,12 @@ module PaypalTestHelper
       with{|request| PaypalRequestMatcher.new("GetRecurringPaymentsProfileDetails", "PROFILEID" => profile) =~ request }
   end
 
-  def mock_paypal_create_profile(token, new_profile_id = "49vnq320dsj", status = "ActiveProfile")
+  def mock_paypal_create_profile(token, args = {})
+    new_profile_id = args.delete(:new_profile_id) || "49vnq320dsj"
+    status = args.delete(:status) || "ActiveProfile"
     stub_request(:post, "https://api-3t.paypal.com/nvp").
       to_return(:status => 200, :body => paypal_profile_res(new_profile_id, status), :headers => {}).
-      with{|request| PaypalRequestMatcher.new("CreateRecurringPaymentsProfile", "TOKEN" => token) =~ request }
+      with{|request| PaypalRequestMatcher.new("CreateRecurringPaymentsProfile", {"TOKEN" => token}.merge(args)) =~ request }
   end
 
   def mock_paypal_create_profile_with_error(token)

metadata

@@ -1,8 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: subscription_fu
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.2.0
+  prerelease: false
+  segments: 
+  - 0
+  - 2
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Paul McMahon
@@ -11,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-29 00:00:00 +09:00
+date: 2011-06-07 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,6 +26,10 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 3
+        - 0
+        - 3
         version: 3.0.3
   type: :runtime
   version_requirements: *id001
@@ -33,6 +41,10 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 3
+        - 0
         version: 0.3.0
   type: :runtime
   version_requirements: *id002
@@ -97,6 +109,7 @@ files:
 - spec/factories/subject.rb
 - spec/factories/subscription.rb
 - spec/factories/transaction.rb
+- spec/models/subscription_plan_spec.rb
 - spec/models/subscription_spec.rb
 - spec/models/subscription_transaction_spec.rb
 - spec/spec_helper.rb
@@ -116,17 +129,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: subscriptionfu
-rubygems_version: 1.5.2
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Rails support for handling free/paid subscriptions