paypal-express 0.4.1 → 0.4.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    paypal-express (0.4.0)
+    paypal-express (0.4.1)
       activesupport (>= 2.3)
       attr_required (>= 0.0.3)
       i18n
@@ -10,7 +10,7 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.1.0)
+    activesupport (3.1.3)
       multi_json (~> 1.0)
     attr_required (0.0.3)
     bouncy-castle-java (1.5.0146.1)
@@ -19,7 +19,7 @@ GEM
     i18n (0.6.0)
     jruby-openssl (0.7.4)
       bouncy-castle-java
-    mime-types (1.16)
+    mime-types (1.17.2)
     multi_json (1.0.3)
     rake (0.9.2)
     rcov (0.9.10)

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.2

data/lib/paypal/nvp/response.rb

@@ -85,7 +85,16 @@ module Paypal
               :period => attrs.delete(:BILLINGPERIOD),
               :frequency => attrs.delete(:BILLINGFREQUENCY),
               :total_cycles => attrs.delete(:TOTALBILLINGCYCLES),
-              :trial_amount_paid => attrs.delete(:TRIALAMTPAID)
+              :trial => {
+                :period => attrs.delete(:TRIALBILLINGPERIOD),
+                :frequency => attrs.delete(:TRIALBILLINGFREQUENCY),
+                :total_cycles => attrs.delete(:TRIALTOTALBILLINGCYCLES),
+                :currency_code => attrs.delete(:TRIALCURRENCYCODE),
+                :amount => attrs.delete(:TRIALAMT),
+                :tax_amount => attrs.delete(:TRIALTAXAMT),
+                :shipping_amount => attrs.delete(:TRIALSHIPPINGAMT),
+                :paid => attrs.delete(:TRIALAMTPAID)
+              }
             )
           end
           if attrs[:REGULARAMT]

data/lib/paypal/payment/recurring/billing.rb

@@ -1,8 +1,8 @@
 module Paypal
   module Payment
     class Recurring::Billing < Base
-      attr_optional :period, :frequency, :paid, :currency_code, :total_cycles, :trial_period, :trial_frequency, :trial_total_cycles, :trial_amount, :trial_amount_paid
-      attr_accessor :amount
+      attr_optional :period, :frequency, :paid, :currency_code, :total_cycles
+      attr_accessor :amount, :trial
 
       def initialize(attributes = {})
         @amount = if attributes[:amount].is_a?(Common::Amount)
@@ -14,23 +14,25 @@ module Paypal
             :shipping => attributes[:shipping_amount]
           )
         end
+        @trial = Recurring::Billing.new(attributes[:trial]) if attributes[:trial].present?
         super
       end
 
       def to_params
-        {
+        trial_params = (trial.try(:to_params) || {}).inject({}) do |trial_params, (key, value)|
+          trial_params.merge(
+            :"TRIAL#{key}" => value
+          )
+        end
+        trial_params.merge(
           :BILLINGPERIOD => self.period,
           :BILLINGFREQUENCY => self.frequency,
           :TOTALBILLINGCYCLES => self.total_cycles,
           :AMT => Util.formatted_amount(self.amount.total),
-          :TRIALBILLINGPERIOD => self.trial_period,
-          :TRIALBILLINGFREQUENCY => self.trial_frequency,
-          :TRIALTOTALBILLINGCYCLES => self.trial_total_cycles,
-          :TRIALAMT => Util.formatted_amount(self.trial_amount),
           :CURRENCYCODE => self.currency_code,
           :SHIPPINGAMT => Util.formatted_amount(self.amount.shipping),
           :TAXAMT => Util.formatted_amount(self.amount.tax)
-        }
+        )
       end
     end
   end

data/spec/paypal/express/request_spec.rb

@@ -215,14 +215,11 @@ describe Paypal::Express::Request do
       instance._method_.should == :CreateRecurringPaymentsProfile
       instance._sent_params_.should == {
         :DESC => 'Recurring Profile',
-        :TRIALAMT => '0.00',
         :TOKEN => 'token',
         :SHIPPINGAMT => '0.00',
         :AMT => '1000.00',
-        :TRIALTOTALBILLINGCYCLES => 0,
         :BILLINGFREQUENCY => 1,
         :MAXFAILEDPAYMENTS => 0,
-        :TRIALBILLINGFREQUENCY => 0,
         :BILLINGPERIOD => :Month,
         :TAXAMT => '0.00',
         :PROFILESTARTDATE => '2011-02-08 09:00:00',

data/spec/paypal/payment/recurring_spec.rb

@@ -5,6 +5,10 @@ describe Paypal::Payment::Recurring do
     Paypal::Payment::Recurring.optional_attributes
   end
 
+  let :trial_attributes do
+    {}
+  end
+
   let :attributes do
     {
       :identifier => '12345',
@@ -27,7 +31,7 @@ describe Paypal::Payment::Recurring do
         :period => 'Month',
         :frequency => '1',
         :total_cycles => '0',
-        :trial_amount_paid => '0'
+        :trial => trial_attributes
       },
       :regular_billing => {
         :amount => '1000',
@@ -61,6 +65,24 @@ describe Paypal::Payment::Recurring do
       instance.description.should == 'Subscription Payment Profile'
       instance.status.should == 'Active'
       instance.start_date.should == '2011-02-03T15:00:00Z'
+      instance.billing.trial.should be_nil
+    end
+
+    context 'when optional trial info given' do
+      let :trial_attributes do
+        {
+          :period => 'Month',
+          :frequency => '1',
+          :total_cycles => '0',
+          :currency_code => 'JPY',
+          :amount => '1000',
+          :shipping_amount => '0',
+          :tax_amount => '0'
+        }
+      end
+      it 'should setup trial billing info' do
+        instance.billing.trial.should == Paypal::Payment::Recurring::Billing.new(trial_attributes)
+      end
     end
   end
 
@@ -69,7 +91,6 @@ describe Paypal::Payment::Recurring do
       instance.to_params.should == {
         :AUTOBILLOUTAMT => 'NoAutoBill',
         :BILLINGFREQUENCY => 1,
-        :TRIALTOTALBILLINGCYCLES => 0,
         :SHIPPINGAMT => '0.00',
         :DESC => 'Subscription Payment Profile',
         :SUBSCRIBERNAME => 'Nov Matake',
@@ -77,9 +98,7 @@ describe Paypal::Payment::Recurring do
         :AMT => '1000.00',
         :MAXFAILEDPAYMENTS => 0,
         :TOTALBILLINGCYCLES => 0,
-        :TRIALBILLINGFREQUENCY => 0,
         :TAXAMT => '0.00',
-        :TRIALAMT => '0.00',
         :PROFILESTARTDATE => '2011-02-03T15:00:00Z',
         :CURRENCYCODE => 'JPY'
       }
@@ -94,6 +113,43 @@ describe Paypal::Payment::Recurring do
         instance.to_params[:PROFILESTARTDATE].should == '2011-02-08 15:00:00'
       end
     end
+
+    context 'when optional trial setting given' do
+      let :trial_attributes do
+        {
+          :period => 'Month',
+          :frequency => '1',
+          :total_cycles => '0',
+          :currency_code => 'JPY',
+          :amount => '1000',
+          :shipping_amount => '0',
+          :tax_amount => '0'
+        }
+      end
+      it 'should setup trial billing info' do
+        instance.to_params.should == {
+          :TRIALBILLINGPERIOD => "Month",
+          :TRIALBILLINGFREQUENCY => 1,
+          :TRIALTOTALBILLINGCYCLES => 0,
+          :TRIALAMT => "1000.00",
+          :TRIALCURRENCYCODE => "JPY",
+          :TRIALSHIPPINGAMT => "0.00",
+          :TRIALTAXAMT => "0.00",
+          :BILLINGPERIOD => "Month",
+          :BILLINGFREQUENCY => 1,
+          :TOTALBILLINGCYCLES => 0,
+          :AMT => "1000.00",
+          :CURRENCYCODE => "JPY",
+          :SHIPPINGAMT => "0.00",
+          :TAXAMT => "0.00",
+          :DESC => "Subscription Payment Profile",
+          :MAXFAILEDPAYMENTS => 0,
+          :AUTOBILLOUTAMT => "NoAutoBill",
+          :PROFILESTARTDATE => "2011-02-03T15:00:00Z",
+          :SUBSCRIBERNAME => "Nov Matake"
+        }
+      end
+    end
   end
 
   describe '#numeric_attribute?' do

metadata

@@ -1,115 +1,113 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: paypal-express
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.4.2
   prerelease: 
-  version: 0.4.1
 platform: ruby
-authors: 
+authors:
 - nov matake
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-10-31 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-12-12 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activesupport
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70322854319420 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "2.3"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2.3'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: i18n
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70322854319420
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: &70322854315180 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: restclient_with_cert
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70322854315180
+- !ruby/object:Gem::Dependency
+  name: restclient_with_cert
+  requirement: &70322854310980 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: attr_required
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70322854310980
+- !ruby/object:Gem::Dependency
+  name: attr_required
+  requirement: &70322854675020 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.0.3
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70322854675020
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70322854724440 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0.8"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.8'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rcov
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *70322854724440
+- !ruby/object:Gem::Dependency
+  name: rcov
+  requirement: &70322854758020 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0.9"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.9'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *70322854758020
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70322854774440 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "2"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: fakeweb
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *70322854774440
+- !ruby/object:Gem::Dependency
+  name: fakeweb
+  requirement: &70322854785300 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.3.0
   type: :development
-  version_requirements: *id008
-description: PayPal Express Checkout API Client for Instance, Recurring and Digital Goods Payment.
+  prerelease: false
+  version_requirements: *70322854785300
+description: PayPal Express Checkout API Client for Instance, Recurring and Digital
+  Goods Payment.
 email: nov@matake.jp
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.rdoc
-files: 
+files:
 - .document
 - .gitignore
 - .rspec
@@ -191,32 +189,31 @@ files:
 - spec/spec_helper.rb
 homepage: http://github.com/nov/paypal-express
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.12
 signing_key: 
 specification_version: 3
-summary: PayPal Express Checkout API Client for Instance, Recurring and Digital Goods Payment.
-test_files: 
+summary: PayPal Express Checkout API Client for Instance, Recurring and Digital Goods
+  Payment.
+test_files:
 - spec/fake_response/BillAgreementUpdate/fetch.txt
 - spec/fake_response/BillAgreementUpdate/revoke.txt
 - spec/fake_response/CreateBillingAgreement/success.txt