paypal-recurring 0.1.2 → 0.1.3

data/.gitignore

@@ -1,3 +1,4 @@
 .DS_Store
 pkg
 tmp
+examples

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    paypal-recurring (0.1.2)
+    paypal-recurring (0.1.3)
 
 GEM
   remote: http://rubygems.org/

data/lib/paypal/recurring/notification.rb

@@ -13,6 +13,18 @@ module PayPal
         end
       end
 
+      def type
+        params[:txn_type]
+      end
+
+      def express_checkout?
+        type == "express_checkout"
+      end
+
+      def recurring_payment?
+        type == "recurring_payment"
+      end
+
       def request
         @request ||= PayPal::Recurring::Request.new.tap do |request|
           request.uri = URI.parse("#{PayPal::Recurring.site_endpoint}?cmd=_notify-validate")
@@ -24,7 +36,7 @@ module PayPal
       end
 
       def valid?
-        completed? && verified? && params[:receiver_email] == PayPal::Recurring.email && params[:receiver_id] == PayPal::Recurring.seller_id && params[:txn_type] == "recurring_payment"
+        completed? && verified? && params[:receiver_email] == PayPal::Recurring.email && params[:receiver_id] == PayPal::Recurring.seller_id
       end
 
       def completed?

data/lib/paypal/recurring/request.rb

@@ -53,7 +53,7 @@ module PayPal
         :payment_action        => "PAYMENTREQUEST_0_PAYMENTACTION",
         :period                => "BILLINGPERIOD",
         :profile_id            => "PROFILEID",
-        :reference             => "PROFILEREFERENCE",
+        :reference             => ["PROFILEREFERENCE", "PAYMENTREQUEST_0_CUSTOM", "PAYMENTREQUEST_0_INVNUM"],
         :return_url            => "RETURNURL",
         :signature             => "SIGNATURE",
         :start_at              => "PROFILESTARTDATE",

data/lib/paypal/recurring/version.rb

@@ -3,7 +3,7 @@ module PayPal
     module Version
       MAJOR = 0
       MINOR = 1
-      PATCH = 2
+      PATCH = 3
       STRING = "#{MAJOR}.#{MINOR}.#{PATCH}"
     end
   end

data/spec/paypal/notification_spec.rb

@@ -1,6 +1,16 @@
 require "spec_helper"
 
 describe PayPal::Recurring::Notification do
+  it "detects express checkout" do
+    subject.params[:txn_type] = "express_checkout"
+    subject.should be_express_checkout
+  end
+
+  it "detects recurring payment" do
+    subject.params[:txn_type] = "recurring_payment"
+    subject.should be_recurring_payment
+  end
+
   context "when successful" do
     use_vcr_cassette "notification/success"
 

data/spec/paypal/request_spec.rb

@@ -107,5 +107,9 @@ describe PayPal::Recurring::Request do
       subject.normalize_params(:initial_amount_action => :cancel).should == {:FAILEDINITAMTACTION => "CancelOnFailure"}
       subject.normalize_params(:initial_amount_action => :continue).should == {:FAILEDINITAMTACTION => "ContinueOnFailure"}
     end
+
+    it "normalizes reference" do
+      subject.normalize_params(:reference => "abc").should == {:PROFILEREFERENCE => "abc", :PAYMENTREQUEST_0_CUSTOM => "abc", :PAYMENTREQUEST_0_INVNUM => "abc"}
+    end
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: paypal-recurring
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Nando Vieira
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-01 00:00:00 Z
+date: 2011-07-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -142,7 +142,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2223999469554791748
+      hash: 507875766264394818
       segments: 
       - 0
       version: "0"
@@ -151,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2223999469554791748
+      hash: 507875766264394818
       segments: 
       - 0
       version: "0"