subscription_fu 0.3.1 → 0.4.0

data/.gitignore

@@ -1,4 +1,3 @@
 .bundle
-Gemfile.lock
 pkg/*
 log

data/Gemfile.lock

@@ -0,0 +1,138 @@
+PATH
+  remote: .
+  specs:
+    subscription_fu (0.4.0)
+      paypal-express (~> 0.4.1)
+      rails (>= 3.0.3)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionmailer (3.1.1)
+      actionpack (= 3.1.1)
+      mail (~> 2.3.0)
+    actionpack (3.1.1)
+      activemodel (= 3.1.1)
+      activesupport (= 3.1.1)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      i18n (~> 0.6)
+      rack (~> 1.3.2)
+      rack-cache (~> 1.1)
+      rack-mount (~> 0.8.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.0.2)
+    activemodel (3.1.1)
+      activesupport (= 3.1.1)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activerecord (3.1.1)
+      activemodel (= 3.1.1)
+      activesupport (= 3.1.1)
+      arel (~> 2.2.1)
+      tzinfo (~> 0.3.29)
+    activeresource (3.1.1)
+      activemodel (= 3.1.1)
+      activesupport (= 3.1.1)
+    activesupport (3.1.1)
+      multi_json (~> 1.0)
+    addressable (2.2.6)
+    arel (2.2.1)
+    attr_required (0.0.3)
+    builder (3.0.0)
+    crack (0.3.1)
+    diff-lcs (1.1.3)
+    erubis (2.7.0)
+    factory_girl (2.2.0)
+      activesupport
+    haml (3.1.3)
+    hike (1.2.1)
+    i18n (0.6.0)
+    json (1.6.1)
+    mail (2.3.0)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.17.2)
+    multi_json (1.0.3)
+    paypal-express (0.4.1)
+      activesupport (>= 2.3)
+      attr_required (>= 0.0.3)
+      i18n
+      restclient_with_cert
+    polyglot (0.3.3)
+    rack (1.3.5)
+    rack-cache (1.1)
+      rack (>= 0.4)
+    rack-mount (0.8.3)
+      rack (>= 1.0.0)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.1)
+      rack (>= 1.0)
+    rails (3.1.1)
+      actionmailer (= 3.1.1)
+      actionpack (= 3.1.1)
+      activerecord (= 3.1.1)
+      activeresource (= 3.1.1)
+      activesupport (= 3.1.1)
+      bundler (~> 1.0)
+      railties (= 3.1.1)
+    railties (3.1.1)
+      actionpack (= 3.1.1)
+      activesupport (= 3.1.1)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (~> 0.14.6)
+    rake (0.9.2.2)
+    rdoc (3.11)
+      json (~> 1.4)
+    rest-client (1.6.7)
+      mime-types (>= 1.16)
+    restclient_with_cert (0.0.8)
+      rest-client (>= 1.6)
+    rspec (2.7.0)
+      rspec-core (~> 2.7.0)
+      rspec-expectations (~> 2.7.0)
+      rspec-mocks (~> 2.7.0)
+    rspec-core (2.7.1)
+    rspec-expectations (2.7.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.7.0)
+    rspec-rails (2.7.0)
+      actionpack (~> 3.0)
+      activesupport (~> 3.0)
+      railties (~> 3.0)
+      rspec (~> 2.7.0)
+    shoulda-matchers (1.0.0)
+    sprockets (2.0.3)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sqlite3 (1.3.4)
+    thor (0.14.6)
+    tilt (1.3.3)
+    time_travel (0.1.0)
+    treetop (1.4.10)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.31)
+    webmock (1.7.7)
+      addressable (~> 2.2, > 2.2.5)
+      crack (>= 0.1.7)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  factory_girl
+  haml
+  rails
+  rspec (>= 2.5.0)
+  rspec-rails
+  shoulda-matchers
+  sqlite3
+  subscription_fu!
+  time_travel (= 0.1.0)
+  webmock

data/app/models/subscription_fu/transaction.rb

@@ -53,13 +53,24 @@ class SubscriptionFu::Transaction < ActiveRecord::Base
       send("complete_#{action}_#{gateway}", opts)
       update_attributes!(:status => "complete")
     rescue Exception => err
+      data = {
+        :subscription => subscription.inspect,
+        :transaction => self.inspect }
+      if err.instance_of?(Paypal::Exception::APIError)
+        data[:paypal_response] = err.response.inspect
+        data[:paypal_error_message] = err.message
+      elsif err.instance_of?(Paypal::Exception::HttpError)
+        data[:http_error_code] = err.code
+        data[:http_error_message] = err.message
+      end
+
       if defined? ::ExceptionNotifier
-        data = {:api_response => err.respond_to?(:response) ? err.response : nil, :subscription => subscription.inspect, :transaction => self.inspect}
         ::ExceptionNotifier::Notifier.background_exception_notification(err, :data => data).deliver
       elsif defined? ::HoptoadNotifier
-        data = {:subscription => subscription.inspect, :transaction => self.inspect}
         ::HoptoadNotifier.notify(err, :parameters => data)
       else
+        logger.info("could not complete #{action} on #{gateway}")
+        logger.info("details: #{data.inspect}")
         logger.warn(err)
         logger.debug(err.backtrace.join("\n"))
       end
@@ -109,9 +120,11 @@ class SubscriptionFu::Transaction < ActiveRecord::Base
         :amount        => sub_plan.price,
         :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)
-    complete_activation
+    begin
+      response = SubscriptionFu::Paypal.express_request.subscribe!(identifier, profile)
+      subscription.update_attributes!(:paypal_profile_id => response.recurring.identifier, :activated_at => Time.now)
+      complete_activation
+    end
   end
 
   def complete_activation_nogw(opts)

data/lib/subscription_fu/version.rb

@@ -1,3 +1,3 @@
 module SubscriptionFu
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

data/spec/models/subscription_transaction_spec.rb

@@ -20,26 +20,6 @@ describe SubscriptionFu::Transaction do
         lambda { @trans.start_checkout("url1", "url2") }.should raise_error RuntimeError
       end
     end
-    def complete_should_transition_to_activated
-      context "complete" do
-        before { @res = @trans.complete }
-        it("should return true") { @res.should == true }
-        it "should transition" do
-          @trans.status.should == "complete"
-          @trans.subscription.should be_activated
-        end
-      end
-    end
-    def complete_should_transition_to_canceled
-      context "complete" do
-        before { @res = @trans.complete }
-        it("should return true") { @res.should == true }
-        it "should transition" do
-          @trans.status.should == "complete"
-          @trans.subscription.should be_canceled
-        end
-      end
-    end
   end
 
   it { should belong_to :subscription }
@@ -62,6 +42,22 @@ describe SubscriptionFu::Transaction do
   %w( initiated complete failed aborted ).each {|v| it { should allow_value(v).for(:status) } }
   it { should_not allow_value("unknown").for(:status) }
 
+
+  shared_examples "successful checkout" do
+    before { @res = @trans.complete }
+    it("should return true") { @res.should == true }
+    it "should transition" do
+      @trans.status.should == "complete"
+      @trans.subscription.should be_activated
+    end
+  end
+
+  shared_examples "failed checkout" do
+    before { @res = @trans.complete }
+    it("should return false") { @res.should == false }
+    it("should fail") { @trans.status.should == "failed" }
+  end
+
   context "initiated activation nogw transaction" do
     before do
       @sub = Factory(:subscription, :plan_key => 'free')
@@ -70,13 +66,9 @@ describe SubscriptionFu::Transaction do
     should_have_nogw_initiated_status
 
     context "checkout" do
-      before do
-        @redirect_target = @trans.start_checkout("url1", "url2")
-      end
-      it "should redirect to confirmation URL" do
-        @redirect_target.should == "url1"
-      end
-      complete_should_transition_to_activated
+      before { @redirect_target = @trans.start_checkout("url1", "url2") }
+      it("should redirect to confirmation URL") { @redirect_target.should == "url1" }
+      it_should_behave_like "successful checkout"
     end
   end
 
@@ -87,7 +79,14 @@ describe SubscriptionFu::Transaction do
     end
     should_have_nogw_initiated_status
     should_not_support_start_checkout
-    complete_should_transition_to_canceled
+    context "complete" do
+      before { @res = @trans.complete }
+      it("should return true") { @res.should == true }
+      it "should transition" do
+        @trans.status.should == "complete"
+        @trans.subscription.should be_canceled
+      end
+    end
   end
 
   context "complete nogw transaction" do
@@ -106,19 +105,27 @@ describe SubscriptionFu::Transaction do
     context "checkout" do
       before do
         mock_paypal_express_checkout("bgds65sd")
-        mock_paypal_create_profile("bgds65sd")
         @redirect_target = @trans.start_checkout("url1", "url2")
       end
       it "should redirect to paypal" do
         @redirect_target.should == "https://www.paypal.com/cgi-bin/webscr?cmd=_express-checkout&token=bgds65sd"
         @trans.identifier.should == "bgds65sd"
       end
-      complete_should_transition_to_activated
+      context "ok" do
+        before { mock_paypal_create_profile("bgds65sd") }
+        it_should_behave_like "successful checkout"
+      end
+      context "error (paypal)" do
+        before { mock_paypal_create_profile_with_error("bgds65sd") }
+        it_should_behave_like "failed checkout"
+      end
+      context "error (http)" do
+        before { stub_request(:post, "https://api-3t.paypal.com/nvp").to_return(:status => 500, :body => "Internal Server Error") }
+        it_should_behave_like "failed checkout"
+      end
     end
-    context "complete without checkout" do
-      before { @res = @trans.complete }
-      it("should return false") { @res.should == false }
-      it("should fail") { @trans.status.should == "failed" }
+    context "without checkout" do
+      it_should_behave_like "failed checkout"
     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 'paypal-express', '~> 0.3.0'
+  s.add_dependency 'paypal-express', '~> 0.4.1'
  
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
 end

metadata

@@ -1,52 +1,50 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: subscription_fu
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.4.0
   prerelease: 
-  version: 0.3.1
 platform: ruby
-authors: 
+authors:
 - Paul McMahon
 - Michael Reinsch
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-05 00:00:00 +09:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-11-07 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rails
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &21534640 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.0.3
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: paypal-express
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *21534640
+- !ruby/object:Gem::Dependency
+  name: paypal-express
+  requirement: &21533440 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.3.0
+      - !ruby/object:Gem::Version
+        version: 0.4.1
   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.
+  prerelease: false
+  version_requirements: *21533440
+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.
 email: info@mobalean.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -107,33 +105,28 @@ files:
 - spec/spec_helper.rb
 - spec/support/paypal_test_helper.rb
 - subscription_fu.gemspec
-has_rdoc: true
 homepage: http://www.mobalean.com
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-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 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: subscriptionfu
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Rails support for handling free/paid subscriptions
 test_files: []
-