sinatra-paypal 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dbbe8b8b2351d5cf7d643aabff1146ea783b4729
-  data.tar.gz: 6095033aa3049ec0307a63960c936b025bc91b11
+  metadata.gz: 9a60ac8cab5ae922c45d7c630945fff359fefbf6
+  data.tar.gz: 47dca80829bd0bfa71148c9e4b90fa00144df985
 SHA512:
-  metadata.gz: e6bba20dbb1049f2ccd157a7331bae400bcb495ef316eb18cadac06876d6dc1ca717982bc3a6e25aa1501448a5f05777fb1a766b21959efb7977fb9063cca87a
-  data.tar.gz: cdc5ac4baf40951a567cdeccdaec36abdab8ef7a16ab03d38c51088054b0ab573b88603381e57f59a3a94a53b4bdbd9c5487b22d0fb6f4dda6eb7d7dd7128d35
+  metadata.gz: f6b8b5d328770f3e9ad58ac726d2ed1b8644081711ddc86d5500d02db545f43220128cdfc04396f2f47f090d072b483dd8c186a4890784cf77ea0109d349727c
+  data.tar.gz: f7fde5572ccfd005187e8f780b9f84ffa4f324de2d3d22c26edf06c742d75914d2fb04dc1dcb1469ad8cedfc5685d872455951a0884701dc225d2e9e2e90852b

data/lib/sinatra/paypal.rb

@@ -4,15 +4,9 @@ require 'sinatra/paypal/version'
 require 'sinatra/paypal/paypal-helper'
 require 'sinatra/paypal/paypal-request'
 
-PAYPAL_BLOCKS = {}
-
 module PayPal
 
 	module Helpers
-		def _paypal_block(name)
-			return Proc.new{} if !PAYPAL_BLOCKS.key? name
-			PAYPAL_BLOCKS[name]
-		end
 
 		def paypal_form_url
 			PaypalHelper.form_url(settings.paypal.sandbox?)
@@ -39,6 +33,7 @@ module PayPal
 
 	def self.registered(app)
 		app.helpers PayPal::Helpers
+		app._paypal_register_default_callbacks
 
 		app.set :paypal, OpenStruct.new({
 			:return_url => '/payment/complete',
@@ -53,27 +48,25 @@ module PayPal
 			
 			# first we check the request against paypal to make sure it is ok
 			if settings.production?
-				halt 400, 'request could not be validated' if !paypal_helper.ipn_valid? params
+				halt 500, 'request could not be validated' if !paypal_helper.ipn_valid? params
 			end
-
-			halt 400, 'no username provided' if paypal_request.username.nil?
 			
 			# check transaction log to make sure this not a replay attack
-			if instance_exec(paypal_request, &_paypal_block(:repeated?))
+			if app._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
 
-			instance_exec(paypal_request, &_paypal_block(:validate!))
+			app._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?
-				instance_exec(paypal_request, &_paypal_block(:complete))
+				app._call_paypal_method(:complete, paypal_request)
 			end
 
-			instance_exec(paypal_request, &_paypal_block(:finish))
+			app._call_paypal_method(:finish, paypal_request)
 
 			return 200
 		end
@@ -89,8 +82,32 @@ module PayPal
 	# 	end
 	#
 	def payment(name, &block)
-		PAYPAL_BLOCKS[name] = block
+		raise "#{name.to_s} is not a valid payment callback" if !_paypal_valid_blocks.include? name
+		_paypal_register_callback name, &block
+	end
+
+	def _paypal_register_default_callbacks
+		_paypal_valid_blocks.each do |key|
+			_paypal_register_callback(key) { |p| }
+		end
+	end
+
+	def _paypal_register_callback(key, &block)
+		self.class.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
+
 end
 
 

data/lib/sinatra/paypal/paypal-request.rb

@@ -83,6 +83,7 @@ class PaypalRequest
 	# 	payment.username # => reednj
 	#
 	def username
+		return nil if !custom_data?
 		self.custom_data[:username]
 	end
 
@@ -96,10 +97,10 @@ class PaypalRequest
 	# Note that this field can be modified by the user before submitting the form, 
 	# so you should verify the contents of it before using it.
 	#
-	# payment.custom_data # => { :username => 'dave' }
+	#    payment.custom_data # => { :username => 'dave' }
 	#
 	def custom_data
-		if @custom_data.nil?
+		if @custom_data.nil? && !@fields[:custom].nil?
 			if @fields[:custom].strip.start_with? '{'
 				# we could get a json object through, in which case it needs to be parsed...
 				@custom_data = JSON.parse(@fields[:custom], {:symbolize_names => true})
@@ -113,9 +114,8 @@ class PaypalRequest
 		return @custom_data
 	end
 
-	# an alias for +custom_data+
-	def data
-		custom_data
+	def custom_data?
+		!custom_data.nil?
 	end
 
 	# The payment status. The most common is Completed, but you might also see
@@ -126,7 +126,7 @@ class PaypalRequest
 	#  - Canceled_Reversal
 	#  - Completed
 	#
-	# 	payment.status # => Pending
+	#     payment.status # => Pending
 	#
 	def status
 		@fields[:payment_status]
@@ -198,6 +198,9 @@ class PaypalRequest
 	def fields
 		@fields
 	end
+
+	alias_method :data, :custom_data
+	alias_method :accountable?, :is_accountable?
 end
 
 # extensions needed for the paypal request to work

data/lib/sinatra/paypal/version.rb

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

data/test/app.rb

@@ -4,6 +4,7 @@ Bundler.require
 
 require 'sinatra'
 require 'sinatra/paypal'
+require 'fileutils'
 
 # this allows us to handle errors in test without the default page
 # getting generated (which isn't very useful inside unit-tests)
@@ -19,15 +20,18 @@ error do
 end
 
 payment :repeated? do |p|
-	path = '/tmp/test.sinatra-payment.log'
+	path = 'test.sinatra-payment.log'
+	path = File.join '/tmp', path if !Gem.win_platform?
+	FileUtils.touch path if !File.exist? path
+	
 	data = File.read path
 	id = "#{p.id}\n"
 
 	if data.include? id
-		true
+		return true
 	else
 		File.append path, "#{p.id}\n"
-		false
+		return false
 	end
 end
 

data/test/form_test.rb

@@ -52,6 +52,7 @@ class RedditStreamTest < Test::Unit::TestCase
 		get '/payment/form/empty'
 		assert last_response.ok?, page_error('could not generate payment form')
 		assert last_response.body.include?(app.paypal.email), 'account email not found in form'
+		assert !last_response.body.include?('"username":'), 'should not include username custom_data by default'
 	end
 
 	def test_form_helper_with_item
@@ -69,7 +70,7 @@ class RedditStreamTest < Test::Unit::TestCase
 		
 		code = 'ITEM-0'
 		desc = 'item description'
-		get '/payment/form', { :item_code => code, :item_price => '5.00', :item_name => desc}
+		get '/payment/form', { :item_code => code, :item_price => '5.00', :item_name => desc }
 		assert last_response.ok?, page_error('could not generate payment form')
 		assert last_response.body.include?(app.paypal.email), 'account email not found in form'
 		assert last_response.body.include?(code), 'item_code not found in form'

data/test/paypal_test.rb

@@ -99,7 +99,7 @@ class RedditStreamTest < Test::Unit::TestCase
 		}.to_json
 
 		post '/payment/validate', data
-		assert_equal last_response.status, 400
+		assert last_response.ok?, page_error("Payment not accepted")
 	end
 
 	def test_payment_accepted_json_custom_data
@@ -112,10 +112,32 @@ class RedditStreamTest < Test::Unit::TestCase
 
 	def test_payment_accepted
 		data = standard_payment_data
-		username = data[:custom]
+		post '/payment/validate', data
+		assert last_response.ok?, page_error("Payment not accepted")
+	end
+
+	def test_payment_accepted_no_custom_data
+		data = standard_payment_data
+		data[:custom] = nil
 
 		post '/payment/validate', data
 		assert last_response.ok?, page_error("Payment not accepted")
+
+		data[:custom] = '{}'
+		post '/payment/validate', data
+		assert last_response.ok?, page_error("Payment not accepted")
+	end
+
+	def test_invalid_callbacks_error
+		ex = false
+		begin
+			app.payment :fake_callback do |p|
+			end
+		rescue => e
+			ex = true
+		end
+
+		assert ex, 'callback did not raise exception'
 	end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-paypal
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Nathan Reed
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-19 00:00:00.000000000 Z
+date: 2015-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler