subscription_fu 0.1.0 → 0.2.0

data/Gemfile

@@ -6,6 +6,7 @@ gemspec
 group :development, :test do
   gem 'rails'
   gem 'sqlite3'
+  gem 'rake', "0.8.7"
   gem 'haml'
   gem 'rspec', '>= 2.5.0'
   gem 'rspec-rails'

data/app/models/subscription_fu/subscription.rb

@@ -55,7 +55,7 @@ class SubscriptionFu::Subscription < ActiveRecord::Base
   # billing time data about the subscription
 
   def next_billing_date
-    paypal_recurring_details[:next_billing_date]
+    paypal_recurring_details[:next_billing_date] if paypal?
   end
 
   def estimated_next_billing_date
@@ -64,7 +64,7 @@ class SubscriptionFu::Subscription < ActiveRecord::Base
   end
 
   def last_billing_date
-    paypal_recurring_details[:last_payment_date]
+    paypal_recurring_details[:last_payment_date] if paypal?
   end
 
   def successor_start_date(new_plan_name)
@@ -103,8 +103,14 @@ class SubscriptionFu::Subscription < ActiveRecord::Base
 
   private
 
+  def paypal?
+    ! paypal_profile_id.blank?
+  end
+
   def paypal_recurring_details
-    @paypal_recurring_details ||= (paypal_profile_id.blank? ? {} : SubscriptionFu::Paypal.paypal.recurring_details(paypal_profile_id))
+    @paypal_recurring_details ||= begin
+      SubscriptionFu::Paypal.recurring_details(paypal_profile_id)
+    end
   end
 
   def convert_paypal_status(paypal_status)

data/app/models/subscription_fu/transaction.rb

@@ -77,9 +77,15 @@ class SubscriptionFu::Transaction < ActiveRecord::Base
   private
 
   def start_checkout_paypal(return_url, cancel_url)
-    token = SubscriptionFu::Paypal.paypal.start_checkout(return_url, cancel_url, initiator_email, sub_plan.price_with_tax, sub_plan.currency, sub_human_description)
-    update_attributes!(:identifier => token)
-    "#{SubscriptionFu.config.paypal_landing_url}?cmd=_express-checkout&token=#{CGI.escape(token)}"
+    # TODO: set initiator_email
+    pay_req = Paypal::Payment::Request.new(
+      :currency_code => sub_plan.currency,
+      :billing_type  => :RecurringPayments,
+      :billing_agreement_description => sub_human_description)
+
+    response = SubscriptionFu::Paypal.express_request.setup(pay_req, return_url, cancel_url, :no_shipping => true)
+    update_attributes!(:identifier => response.token)
+    response.redirect_uri
   end
 
   def start_checkout_nogw(return_url, cancel_url)
@@ -91,9 +97,17 @@ class SubscriptionFu::Transaction < ActiveRecord::Base
     raise "did you call start_checkout first?" if identifier.blank?
     raise "already activated" if sub_activated?
 
-    paypal_profile_id, paypal_status =
-      SubscriptionFu::Paypal.paypal.create_recurring(identifier, sub_billing_starts_at, sub_plan.price, sub_plan.price_tax, sub_plan.currency, sub_human_description)
-    subscription.update_attributes!(:paypal_profile_id => paypal_profile_id, :activated_at => Time.now)
+    profile = Paypal::Payment::Recurring.new(
+      :start_date => sub_billing_starts_at,
+      :description => sub_human_description,
+      :billing => {
+        :period        => :Month,
+        :frequency     => 1,
+        :amount        => sub_plan.price,
+        :tax           => 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)
     complete_activation
   end
 
@@ -114,7 +128,7 @@ class SubscriptionFu::Transaction < ActiveRecord::Base
     # update the record beforehand, because paypal raises an error if
     # the profile is already cancelled
     complete_cancellation(opts)
-    SubscriptionFu::Paypal.paypal.cancel_recurring(sub_paypal_profile_id, sub_cancel_reason)
+    SubscriptionFu::Paypal.express_request.renew!(sub_paypal_profile_id, :Cancel, :note => sub_cancel_reason)
   end
 
   def complete_cancellation_nogw(opts)

data/lib/subscription_fu/config.rb

@@ -1,22 +1,23 @@
+require "paypal"
+
 module SubscriptionFu
   class Config
-    attr_accessor :plan_class_name, :paypal_nvp_api_url, :paypal_api_user_id, :paypal_api_pwd, :paypal_api_sig, :paypal_landing_url
+    attr_accessor :plan_class_name, :paypal_api_user_id, :paypal_api_pwd, :paypal_api_sig
     attr_reader :available_plans
 
     def initialize
       @available_plans = {}
       @plan_class_name = "SubscriptionFu::Plan"
       paypal_use_production!
+      ::Paypal.logger = Rails.logger
     end
 
     def paypal_use_sandbox!
-      self.paypal_nvp_api_url = "https://api-3t.sandbox.paypal.com/nvp"
-      self.paypal_landing_url = "https://www.sandbox.paypal.com/cgi-bin/webscr"
+      ::Paypal.sandbox = true
     end
 
     def paypal_use_production!
-      self.paypal_nvp_api_url = "https://api-3t.paypal.com/nvp"
-      self.paypal_landing_url = "https://www.paypal.com/cgi-bin/webscr"
+      ::Paypal.sandbox = false
     end
 
     def add_plan(key, price, data = {})

data/lib/subscription_fu/paypal.rb

@@ -1,101 +1,19 @@
-require "rest-client"
+require "paypal"
 
-class SubscriptionFu::Paypal
+module SubscriptionFu::Paypal
+  UTC_TZ = ActiveSupport::TimeZone.new("UTC")
 
-  def self.paypal
-    new(SubscriptionFu.config.paypal_api_user_id,
-        SubscriptionFu.config.paypal_api_pwd,
-        SubscriptionFu.config.paypal_api_sig,
-        SubscriptionFu.config.paypal_nvp_api_url,
-        Rails.logger)
+  def self.express_request
+    config = SubscriptionFu.config
+    ::Paypal::Express::Request.new(
+      :username   => config.paypal_api_user_id,
+      :password   => config.paypal_api_pwd,
+      :signature  => config.paypal_api_sig)
   end
 
-  class Failure < RuntimeError
-    attr_reader :request_opts, :response
-
-    def initialize(request_opts, response)
-      @request_opts = request_opts
-      @response = response
-      super "PayPal did not return success: #{@response.inspect}"
-    end
-    alias :data :request_opts
-  end
-
-  def initialize(user, pwd, sig, api_url, logger)
-    @user = user
-    @pwd = pwd
-    @sig = sig
-    @api_url = api_url
-    @logger = logger
-  end
-
-  def start_checkout(return_url, cancel_url, email, maxamt, currency_code, desc)
-    res = call_paypal('SetExpressCheckout',
-                      'RETURNURL' => return_url,
-                      'CANCELURL' => cancel_url,
-                      'EMAIL' => email,
-                      'NOSHIPPING' => 1,
-                      'MAXAMT' => maxamt,
-                      'PAYMENTREQUEST_0_AMT' => 0,
-                      'PAYMENTREQUEST_0_CURRENCYCODE' => currency_code,
-                      'L_BILLINGTYPE0' => 'RecurringPayments',
-                      'L_BILLINGAGREEMENTDESCRIPTION0' => desc)
-    res['TOKEN'].first
-  end
-
-  def create_recurring(token, start_date, amt, taxamt, currency_code, desc)
-    res = call_paypal('CreateRecurringPaymentsProfile',
-                      'PROFILESTARTDATE' => start_date.utc.iso8601,
-                      'BILLINGPERIOD' => 'Month',
-                      'BILLINGFREQUENCY' => 1,
-                      'MAXFAILEDPAYMENTS' => 0,
-                      'AUTOBILLOUTAMT' => 'AddToNextBilling',
-                      'AMT' => amt,
-                      'TAXAMT' => taxamt,
-                      'CURRENCYCODE' => currency_code,
-                      'DESC' => desc,
-                      'TOKEN' => token)
-    [res['PROFILEID'].first, res['PROFILESTATUS'].first || res['STATUS'].first]
-  end
-
-  def recurring_details(profile_id)
-    utc = ActiveSupport::TimeZone.new("UTC")
-    res = call_paypal('GetRecurringPaymentsProfileDetails', 'PROFILEID' => profile_id)
-    { :id => res['PROFILEID'].first,
-      :status => res['PROFILESTATUS'].first || res['STATUS'].first,
-      :next_billing_date => utc.parse(res['NEXTBILLINGDATE'].first.to_s),
-      :start_date => utc.parse(res['PROFILESTARTDATE'].first.to_s),
-      :cycles_completed => res['NUMCYCLESCOMPLETED'].first.to_i,
-      :outstanding_balance => res['OUTSTANDINGBALANCE'].first.to_f,
-      :last_payment_date => utc.parse(res['LASTPAYMENTDATE'].first.to_s) }
+  def self.recurring_details(profile_id)
+    res = SubscriptionFu::Paypal.express_request.subscription(profile_id)
+    { :next_billing_date => UTC_TZ.parse(res.recurring.summary.next_billing_date.to_s),
+      :last_payment_date => UTC_TZ.parse(res.recurring.summary.last_payment_date.to_s), }
   end
-
-  def cancel_recurring(profile_id, reason)
-    call_paypal('ManageRecurringPaymentsProfileStatus',
-                'PROFILEID' => profile_id,
-                'ACTION' => 'Cancel',
-                'NOTE' => I18n.t(reason, :scope => [:subscription_fu, :subscription, :cancel_notes]))
-  end
-
-  private
-
-  def call_paypal(method, opts)
-    full_opts = paypal_api_opts(method, opts)
-    CGI.parse(RestClient.post(@api_url, full_opts)).tap do |result|
-      if result['ACK'].first != 'Success'
-        @logger.warn("PayPal did not return success for call to #{method}")
-        @logger.info("  called with: #{full_opts.inspect}")
-        @logger.info("  result: #{result.inspect}")
-        raise Failure.new(full_opts, result)
-      else
-        @logger.info("PayPal returned success for call to #{method}")
-        @logger.info("  result: #{result.inspect}")
-      end
-    end
-  end
-
-  def paypal_api_opts(method, opts)
-    opts.merge('USER' => @user, 'PWD' => @pwd, 'SIGNATURE' => @sig, 'VERSION' => '65.0', 'METHOD' => method)
-  end
-
 end

data/lib/subscription_fu/version.rb

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

data/spec/support/paypal_test_helper.rb

@@ -74,7 +74,7 @@ module PaypalTestHelper
   end
 
   def paypal_profile_res(profile, status, opts = {})
-    paypal_res(opts.merge("PROFILEID"=>profile,"STATUS"=>status))
+    paypal_res(opts.merge("PROFILEID"=>profile,"STATUS"=>status,"REGULARAMT"=>"0"))
   end
 
 end

data/subscription_fu.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.rubyforge_project = "subscriptionfu"
 
   s.add_dependency 'rails', '>= 3.0.3'
-  s.add_dependency 'rest-client', '>= 1.6.1'
+  s.add_dependency 'paypal-express', '~> 0.3.0'
  
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
 end

metadata

@@ -2,7 +2,7 @@
 name: subscription_fu
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Paul McMahon
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-20 00:00:00 +09:00
+date: 2011-05-29 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,14 +26,14 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rest-client
+  name: paypal-express
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.6.1
+        version: 0.3.0
   type: :runtime
   version_requirements: *id002
 description: SubscriptionFu helps with building services which have paid subscriptions. It includes the models to store subscription status, and provides integration with PayPal for paid subscriptions.
@@ -126,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: subscriptionfu
-rubygems_version: 1.6.2
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Rails support for handling free/paid subscriptions