sinatra-paypal 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a60ac8cab5ae922c45d7c630945fff359fefbf6
-  data.tar.gz: 47dca80829bd0bfa71148c9e4b90fa00144df985
+  metadata.gz: ea8ac7963161bd4eff32e3b3a8d36a8d7e62d6fa
+  data.tar.gz: 4d449cc884c1f07bc225fa9ba3697b0a3f26957c
 SHA512:
-  metadata.gz: f6b8b5d328770f3e9ad58ac726d2ed1b8644081711ddc86d5500d02db545f43220128cdfc04396f2f47f090d072b483dd8c186a4890784cf77ea0109d349727c
-  data.tar.gz: f7fde5572ccfd005187e8f780b9f84ffa4f324de2d3d22c26edf06c742d75914d2fb04dc1dcb1469ad8cedfc5685d872455951a0884701dc225d2e9e2e90852b
+  metadata.gz: 27b818480e7e132d83561c56f5999b75b53007922fee0879c73eeb86fc6f1c9222e60d68e4772538f0a41054eadd72e5aa505bc55124e2c0c4512143442387d5
+  data.tar.gz: a11548743fc6152d6789f467e528ae258ccbdbe3dd22a596cbbfe323d57684ddcd9f210973d957b3e085ec46c8302dbbb2e7e3e4ad450193310d7ce4f7c8b257

data/lib/sinatra/paypal.rb

@@ -29,6 +29,10 @@ module PayPal
 				:item => item
 			}
 		end
+
+		def _call_paypal_method(key, paypal_request)
+			self.send self.class._paypal_method_name(key), paypal_request
+		end
 	end
 
 	def self.registered(app)
@@ -52,21 +56,21 @@ module PayPal
 			end
 			
 			# check transaction log to make sure this not a replay attack
-			if app._call_paypal_method(:repeated?, paypal_request)
+			if _call_paypal_method(:repeated?, paypal_request)
 				# we also want to return 200, because if it is paypal sending this, it will send 
 				# it again and again until it gets a 200 back
 				halt 200, 'already processed'
 			end
 
-			app._call_paypal_method(:validate!, paypal_request)
+			_call_paypal_method(:validate!, paypal_request)
 			
 			# check that the payment is complete. we still return 200 if not, but
 			# we don't need to do anymore processing (except for marking it as accountable, if it is)
 			if paypal_request.complete?
-				app._call_paypal_method(:complete, paypal_request)
+				_call_paypal_method(:complete, paypal_request)
 			end
 
-			app._call_paypal_method(:finish, paypal_request)
+			_call_paypal_method(:finish, paypal_request)
 
 			return 200
 		end
@@ -93,17 +97,13 @@ module PayPal
 	end
 
 	def _paypal_register_callback(key, &block)
-		self.class.send :define_method, _paypal_method_name(key), &block
+		self.send :define_method, _paypal_method_name(key), &block
 	end
 
 	def _paypal_valid_blocks
 		[:complete, :finish, :validate!, :repeated?]
 	end
 
-	def _call_paypal_method(key, paypal_request)
-		self.send _paypal_method_name(key), paypal_request
-	end
-
 	def _paypal_method_name(key)
 		"payment_event_#{key}".to_sym
 	end

data/lib/sinatra/paypal/version.rb

@@ -1,5 +1,5 @@
 module Sinatra
   module Paypal
-    VERSION = "0.3.0"
+    VERSION = "0.3.1"
   end
 end

data/test/app.rb

@@ -35,6 +35,10 @@ payment :repeated? do |p|
 	end
 end
 
+payment :complete do |p|
+	halt 500, 'rejection requested' if !p.custom_data.nil? && p.custom_data[:reject] == true
+end
+
 get '/payment/form/empty' do
 	return html_payment_form nil
 end

data/test/paypal_test.rb

@@ -110,6 +110,15 @@ class RedditStreamTest < Test::Unit::TestCase
 		assert last_response.ok?, page_error("Payment not accepted")
 	end
 
+	def test_payment_rejected_by_halt
+		data = standard_payment_data
+		data[:custom] = {:username => data[:custom], :reject => true}.to_json
+
+		post '/payment/validate', data
+		assert !last_response.ok?, page_error("Payment should have been rejected")
+		assert last_response.body.include?('requested'), page_error("Incorrect error message")
+	end
+
 	def test_payment_accepted
 		data = standard_payment_data
 		post '/payment/validate', data

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-paypal
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Nathan Reed