From 55f248f992421e382f923451792dfc46b093a6a0 Mon Sep 17 00:00:00 2001 From: Jairo Diaz Date: Fri, 13 Jan 2012 16:09:52 +0000 Subject: [PATCH] changed validates_true_for for validates with :numerality --- lib/sage_pay/server/authorise.rb | 4 ++-- lib/sage_pay/server/refund.rb | 5 ++--- lib/sage_pay/server/registration.rb | 4 ++-- lib/sage_pay/server/release.rb | 5 ++--- lib/sage_pay/server/repeat.rb | 4 ++-- spec/integration/sage_pay/server_spec.rb | 2 +- 6 files changed, 11 insertions(+), 13 deletions(-) diff --git a/lib/sage_pay/server/authorise.rb b/lib/sage_pay/server/authorise.rb index f9aeb48..444311c 100644 --- a/lib/sage_pay/server/authorise.rb +++ b/lib/sage_pay/server/authorise.rb @@ -12,8 +12,8 @@ class Authorise < Command validates_inclusion_of :apply_avs_cv2, :allow_blank => true, :in => (0..3).to_a - validates_true_for :amount, :key => :amount_minimum_value, :logic => lambda { amount.nil? || amount >= BigDecimal.new("0.01") }, :message => "is less than the minimum value (0.01)" - validates_true_for :amount, :key => :amount_maximum_value, :logic => lambda { amount.nil? || amount <= BigDecimal.new("100000") }, :message => "is greater than the maximum value (100,000.00)" + validates :amount, :numericality => {:message => "is less than the minimum value (0.01)", :greater_than_or_equal_to => BigDecimal.new("0.01")} + validates :amount, :numericality => {:message => "is greater than the maximum value (100,000.00)", :less_than_or_equal_toi => BigDecimal.new("100000")} def post_params params = super.merge({ diff --git a/lib/sage_pay/server/refund.rb b/lib/sage_pay/server/refund.rb index 66daa83..e9877c2 100644 --- a/lib/sage_pay/server/refund.rb +++ b/lib/sage_pay/server/refund.rb @@ -11,9 +11,8 @@ class Refund < Command validates_length_of :currency, :is => 3 validates_length_of :description, :maximum => 100 - - validates_true_for :amount, :key => :amount_minimum_value, :logic => lambda { amount.nil? || amount >= BigDecimal.new("0.01") }, :message => "is less than the minimum value (0.01)" - validates_true_for :amount, :key => :amount_maximum_value, :logic => lambda { amount.nil? || amount <= BigDecimal.new("100000") }, :message => "is greater than the maximum value (100,000.00)" + validates :amount, :numericality => {:message => "is less than the minimum value (0.01)", :greater_than_or_equal_to => BigDecimal.new("0.01")} + validates :amount, :numericality => {:message => "is greater than the maximum value (100,000.00)", :less_than_or_equal_to => BigDecimal.new("100000")} def post_params super.merge({ diff --git a/lib/sage_pay/server/registration.rb b/lib/sage_pay/server/registration.rb index 8e79403..8adb837 100644 --- a/lib/sage_pay/server/registration.rb +++ b/lib/sage_pay/server/registration.rb @@ -24,8 +24,8 @@ class Registration < Command validates_inclusion_of :billing_agreement, :allow_blank => true, :in => [true, false] validates_inclusion_of :account_type, :allow_blank => true, :in => [:ecommerce, :continuous_authority, :mail_order] - validates_true_for :amount, :key => :amount_minimum_value, :logic => lambda { amount.nil? || amount >= BigDecimal.new("0.01") }, :message => "is less than the minimum value (0.01)" - validates_true_for :amount, :key => :amount_maximum_value, :logic => lambda { amount.nil? || amount <= BigDecimal.new("100000") }, :message => "is greater than the maximum value (100,000.00)" + validates :amount, :numericality => {:message => "is less than the minimum value (0.01)", :greater_than_or_equal_to => BigDecimal.new("0.01")} + validates :amount, :numericality => {:message => "is greater than the maximum value (100,000.00)", :less_than_or_equal_to => BigDecimal.new("100000")} def run! if @response.nil? || (@vendor_tx_code_sent != vendor_tx_code) diff --git a/lib/sage_pay/server/release.rb b/lib/sage_pay/server/release.rb index 6d577a9..9f241b6 100644 --- a/lib/sage_pay/server/release.rb +++ b/lib/sage_pay/server/release.rb @@ -12,9 +12,8 @@ class Release < Command validates_length_of :vps_tx_id, :is => 38 validates_length_of :security_key, :is => 10 - - validates_true_for :release_amount, :key => :release_amount_minimum_value, :logic => lambda { release_amount.nil? || release_amount >= BigDecimal.new("0.01") }, :message => "is less than the minimum value (0.01)" - validates_true_for :release_amount, :key => :release_amount_maximum_value, :logic => lambda { release_amount.nil? || release_amount <= BigDecimal.new("100000") }, :message => "is greater than the maximum value (100,000.00)" + validates :amount, :numericality => {:message => "is less than the minimum value (0.01)", :greater_than_or_equal_to => BigDecimal.new("0.01")} + validates :amount, :numericality => {:message => "is greater than the maximum value (100,000.00)", :less_than_or_equal_toi => BigDecimal.new("100000")} def post_params super.merge({ diff --git a/lib/sage_pay/server/repeat.rb b/lib/sage_pay/server/repeat.rb index dcef67f..41233f9 100644 --- a/lib/sage_pay/server/repeat.rb +++ b/lib/sage_pay/server/repeat.rb @@ -11,8 +11,8 @@ class Repeat < Command validates_length_of :currency, :is => 3 validates_length_of :description, :maximum => 100 - validates_true_for :amount, :key => :amount_minimum_value, :logic => lambda { amount.nil? || amount >= BigDecimal.new("0.01") }, :message => "is less than the minimum value (0.01)" - validates_true_for :amount, :key => :amount_maximum_value, :logic => lambda { amount.nil? || amount <= BigDecimal.new("100000") }, :message => "is greater than the maximum value (100,000.00)" + validates :amount, :numericality => {:message => "is less than the minimum value (0.01)", :greater_than_or_equal_to => BigDecimal.new("0.01")} + validates :amount, :numericality => {:message => "is greater than the maximum value (100,000.00)", :less_than_or_equal_toi => BigDecimal.new("100000")} def post_params params = super.merge({ diff --git a/spec/integration/sage_pay/server_spec.rb b/spec/integration/sage_pay/server_spec.rb index 53f49ba..53c836c 100644 --- a/spec/integration/sage_pay/server_spec.rb +++ b/spec/integration/sage_pay/server_spec.rb @@ -3,7 +3,7 @@ if run_integration_specs? describe SagePay::Server, "integration specs" do before(:each) do - @vendor = "codescrumpills" + @vendor = "codescrumjairo" #@notification_url = "https://test.sagepay.com/Simulator/VSPServerGateway.asp?Service=VendorRegisterTx" @notification_url = "http://190.146.87.50"