sage_pay 0.2.13 → 1.0.0

data/lib/sage_pay/server/response.rb

@@ -1,7 +1,8 @@
 module SagePay
   module Server
     class Response
-      class_inheritable_hash :key_converter, :value_converter, :match_converter, :instance_writer => false
+
+      class_attribute :key_converter, :value_converter, :match_converter, :instance_writer => false
 
       self.key_converter = {
         "VPSProtocol"  => :vps_protocol,

data/lib/sage_pay/uri_fixups.rb

@@ -1,42 +1,8 @@
+# Need to not fail when uri contains curly braces
+# This overrides the DEFAULT_PARSER with the UNRESERVED key, including '{' and '}'
+# DEFAULT_PARSER is used everywhere, so its better to override it once
 module URI
-  module REGEXP
-    module PATTERN
-
-      # FIXME: SagePay insists that curly brackets in URLs is OK, so we have
-      # to convince the URI parser that's the case. First we have to update
-      # the constant in question.
-      remove_const :UNRESERVED
-      UNRESERVED = "-_.!~*'()#{ALNUM}\{\}"
-
-      # FIXME: Then we have to update all the dependent constants we care
-      # about.
-      remove_const :URIC
-      remove_const :QUERY
-      remove_const :X_ABS_URI
-      URIC = "(?:[#{UNRESERVED}#{RESERVED}]|#{ESCAPED})"
-      QUERY = "#{URIC}*"
-      X_ABS_URI = "
-        (#{PATTERN::SCHEME}):                     (?# 1: scheme)
-        (?:
-           (#{PATTERN::OPAQUE_PART})              (?# 2: opaque)
-        |
-           (?:(?:
-             //(?:
-                 (?:(?:(#{PATTERN::USERINFO})@)?  (?# 3: userinfo)
-                   (?:(#{PATTERN::HOST})(?::(\\d*))?))?(?# 4: host, 5: port)
-               |
-                 (#{PATTERN::REG_NAME})           (?# 6: registry)
-               )
-             |
-             (?!//))                              (?# XXX: '//' is the mark for hostport)
-             (#{PATTERN::ABS_PATH})?              (?# 7: path)
-           )(?:\\?(#{PATTERN::QUERY}))?           (?# 8: query)
-        )
-        (?:\\#(#{PATTERN::FRAGMENT}))?            (?# 9: fragment)
-      "
-    end
-    remove_const :ABS_URI
-    ABS_URI = Regexp.new('^' + PATTERN::X_ABS_URI + '$', #'
-                         Regexp::EXTENDED, 'N').freeze
-  end
+  remove_const :DEFAULT_PARSER
+  unreserved = REGEXP::PATTERN::UNRESERVED
+  DEFAULT_PARSER = Parser.new(:UNRESERVED => unreserved + "\{\}")
 end

data/lib/sage_pay/validators.rb

@@ -0,0 +1,36 @@
+module SagePay
+  module Validators
+    VENDOR_NAME_FORMAT = /\A[A-Za-z0-9\-_]*\z/.freeze
+    VENDOR_TX_CODE_FORMAT = /\A[A-Za-z0-9\-_\.{}]*\z/.freeze
+
+    # The following lack the requisite accented character matchers
+    NAME_FORMAT = /\A[[:alpha:] \\\/&'\.\-]*\z/.freeze
+    ADDRESS_FORMAT = /\A[[:alnum:][:space:]\+\\\/&'\.:,\(\)\-]*\z/.freeze
+
+    POST_CODE_FORMAT = /\A[[:alnum:] -]*\z/.freeze
+    PHONE_FORMAT = /\A[[:alnum:] \+\(\)-]*\z/.freeze
+
+    # Basic
+    EMAIL_FORMAT = /@/.freeze
+
+    COUNTRY_OPTIONS = %w{AF AX AL DZ AS AD AO AI AQ AG AR AM AW AU AT AZ BS BH
+                         BD BB BY BE BZ BJ BM BT BO BQ BA BW BV BR IO BN BG BF
+                         BI KH CM CA CV KY CF TD CL CN CX CC CO KM CG CD CK CR
+                         CI HR CU CW CY CZ DK DJ DM DO EC EG SV GQ ER EE ET FK
+                         FO FJ FI FR GF PF TF GA GM GE DE GH GI GR GL GD GP GU
+                         GT GG GN GW GY HT HM VA HN HK HU IS IN ID IR IQ IE IM
+                         IL IT JM JP JE JO KZ KE KI KP KR KW KG LA LV LB LS LR
+                         LY LI LT LU MO MK MG MW MY MV ML MT MH MQ MR MU YT MX
+                         FM MD MC MN ME MS MA MZ MM NA NR NP NL NC NZ NI NE NG
+                         NU NF MP NO OM PK PW PS PA PG PY PE PH PN PL PT PR QA
+                         RE RO RU RW BL SH KN LC MF PM VC WS SM ST SA SN RS SC
+                         SL SG SX SK SI SB SO ZA GS SS ES LK SD SR SJ SZ SE CH
+                         SY TW TJ TZ TH TL TG TK TO TT TN TR TM TC TV UG UA AE
+                         GB US UM UY UZ VU VE VN VG VI WF EH YE ZM ZW}.freeze
+
+    US_STATE_OPTIONS = %w{AL AK AZ AR CA CO CT DE DC FL GA HI ID IL IN IA KS KY
+                          LA ME MD MA MI MN MS MO MT NE NV NH NJ NM NY NC ND OH
+                          OK OR PA RI SC SD TN TX UT VT VA WA WV WI WY AS GU MP
+                          PR VI FM MH PW AA AE AP}.freeze
+  end
+end

data/lib/sage_pay/version.rb

@@ -0,0 +1,3 @@
+module SagePay
+  VERSION = '1.0.0'
+end

data/sage_pay.gemspec

@@ -1,63 +1,52 @@
+$: << 'lib'
+require 'sage_pay/version'
+
 Gem::Specification.new do |s|
   s.specification_version = 2 if s.respond_to? :specification_version=
+  s.required_ruby_version = '>= 1.9.2'
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.rubygems_version = '1.3.6'
 
-  ## Leave these as is they will be modified for you by the rake gemspec task.
-  ## If your rubyforge_project name is different, then edit it and comment out
-  ## the sub! line in the Rakefile
   s.name              = 'sage_pay'
-  s.version           = '0.2.13'
-  s.date              = '2010-08-15'
+  s.version           = SagePay::VERSION
+  s.date              = '2012-07-21'
   s.rubyforge_project = 'sage_pay'
 
-  ## Make sure your summary is short. The description may be as long
-  ## as you like.
   s.summary     = "Ruby implementation of the SagePay payment gateway protocol."
   s.description = <<-DESCRIPTION
 This is a Ruby library for integrating with SagePay. SagePay is a payment
 gateway for accepting credit card payments through your web app.
   DESCRIPTION
 
-  ## List the primary authors. If there are a bunch of authors, it's probably
-  ## better to set the email to an email list or something. If you don't have
-  ## a custom homepage, consider using your GitHub URL or the like.
   s.authors  = ["Graeme Mathieson"]
   s.email    = 'mathie@woss.name'
   s.homepage = 'http://github.com/mathie/sage_pay'
 
-  ## This gets added to the $LOAD_PATH so that 'lib/NAME.rb' can be required as
-  ## require 'NAME.rb' or'/lib/NAME/file.rb' can be as require 'NAME/file.rb'
   s.require_paths = %w[lib]
 
-  ## Specify any RDoc options here. You'll want to add your README and
-  ## LICENSE files to the extra_rdoc_files list.
   s.rdoc_options = ["--charset=UTF-8"]
   s.extra_rdoc_files = %w[README.md LICENSE]
 
-  ## List your runtime dependencies here. Runtime dependencies are those
-  ## that are needed for an end user to actually USE your code.
-  s.add_dependency('activesupport', [">= 2.3.8"])
-  s.add_dependency('validatable',   [">= 1.6.7"])
+  s.add_dependency('activesupport', [">= 3.1.3"])
+  s.add_dependency('activemodel',   [">= 3.1.0"])
   s.add_dependency('uuid',          [">= 2.3.0"])
+  s.add_dependency('i18n',          [">= 0.6.0"])
 
-  ## List your development dependencies here. Development dependencies are
-  ## those that are only needed during development
   s.add_development_dependency('rspec')
+  s.add_development_dependency('rake')
 
-  ## Leave this section as-is. It will be automatically generated from the
-  ## contents of your Git repository via the gemspec task. DO NOT REMOVE
-  ## THE MANIFEST COMMENTS, they are used as delimiters by the task.
-  # = MANIFEST =
   s.files = %w[
+    .rbenv-version
+    .rspec
     CHANGELOG.md
     Gemfile
-    Gemfile.lock
     LICENSE
     README.md
     Rakefile
     TODO
+    config/locales/en.yml
     lib/sage_pay.rb
+    lib/sage_pay/locale_initializer.rb
     lib/sage_pay/server.rb
     lib/sage_pay/server/abort.rb
     lib/sage_pay/server/address.rb
@@ -78,8 +67,8 @@ gateway for accepting credit card payments through your web app.
     lib/sage_pay/server/signature_verification_details.rb
     lib/sage_pay/server/transaction_code.rb
     lib/sage_pay/uri_fixups.rb
-    lib/validatable-ext.rb
-    lib/validations/validates_inclusion_of.rb
+    lib/sage_pay/validators.rb
+    lib/sage_pay/version.rb
     sage_pay.gemspec
     spec/integration/sage_pay/server_spec.rb
     spec/sage_pay/server/address_spec.rb
@@ -96,9 +85,6 @@ gateway for accepting credit card payments through your web app.
     spec/support/integration.rb
     spec/support/validation_matchers.rb
   ]
-  # = MANIFEST =
 
-  ## Test files will be grabbed from the file list. Make sure the path glob
-  ## matches what you actually use.
   s.test_files = s.files.select { |path| path =~ /^spec\/.*_spec\.rb/ }
 end

data/spec/integration/sage_pay/server_spec.rb

@@ -5,8 +5,8 @@ if run_integration_specs?
     before(:each) do
       SagePay::Server.default_registration_options = {
         :mode => :simulator,
-        :vendor => "rubaidh",
-        :notification_url => "http://test.host/notification"
+        :vendor => ENV["VENDOR_NAME"],
+        :notification_url => 'http://test.host/notification'
       }
     end
 
@@ -106,7 +106,7 @@ if run_integration_specs?
 
     describe ".deferred" do
       before(:each) do
-        @payment = SagePay::Server.deferred(
+        @deferred = SagePay::Server.deferred(
           :description => "Demo payment",
           :amount => 12.34,
           :currency => "GBP",
@@ -115,21 +115,21 @@ if run_integration_specs?
       end
 
       it "should successfully register the deferred payment with SagePay" do
-        @payment.run!.should_not be_nil
+        @deferred.run!.should_not be_nil
       end
 
       it "should be a valid deferred payment" do
-        registration = @payment.run!
+        registration = @deferred.run!
         registration.should be_ok
       end
 
       it "should have a next URL" do
-        registration = @payment.run!
+        registration = @deferred.run!
         registration.next_url.should_not be_nil
       end
 
       it "should allow us to follow the next URL and the response should be successful" do
-        registration = @payment.run!
+        registration = @deferred.run!
         uri = URI.parse(registration.next_url)
         request = Net::HTTP::Get.new(uri.request_uri)
         http = Net::HTTP.new(uri.host, uri.port)
@@ -140,8 +140,8 @@ if run_integration_specs?
       end
 
       it "should allow us to retrieve signature verification details" do
-        @payment.run!
-        sig_details = @payment.signature_verification_details
+        @deferred.run!
+        sig_details = @deferred.signature_verification_details
 
         sig_details.should_not                be_nil
         sig_details.security_key.should_not   be_nil

data/spec/sage_pay/server/address_spec.rb

@@ -103,21 +103,21 @@ describe SagePay::Server::Address do
     it "should require a US state to be present if the country is the US" do
       address = address_factory(:country => "US", :state => "")
       address.should_not be_valid
-      address.errors.on(:state).should == "is required if the country is US"
+      address.errors[:state].should == ["is required if the country is US"]
     end
 
     it "should require the US state to be absent if the country is not in the US" do
       address = address_factory(:country => "GB", :state => "WY")
       address.should_not be_valid
-      address.errors.on(:state).should == "is present but the country is not US"
+      address.errors[:state].should == ["is present but the country is not US"]
     end
 
     it "should validate the state against a list of US states" do
       address = address_factory(:country => "US", :state => "WY")
       address.should be_valid
-      address = address_factory(:country => "US", :state => "AA")
+      address = address_factory(:country => "US", :state => "AB")
       address.should_not be_valid
-      address.errors.on(:state).should == "is not a US state"
+      address.errors[:state].should == ["is not a US state"]
     end
 
     it "should validate the country against a list of ISO 3166-1 country codes" do
@@ -125,7 +125,7 @@ describe SagePay::Server::Address do
       address.should be_valid
       address = address_factory(:country => "AA")
       address.should_not be_valid
-      address.errors.on(:country).should == "is not an ISO3166-1 country code"
+      address.errors[:country].should == ["is not an ISO3166-1 country code"]
     end
   end
 end

data/spec/sage_pay/server/notification_response_spec.rb

@@ -22,7 +22,7 @@ describe NotificationResponse do
 
       notification_response = notification_response_factory(:status => :invalid, :status_detail => "")
       notification_response.should_not be_valid
-      notification_response.errors.on(:status_detail).should include("can't be empty")
+      notification_response.errors[:status_detail].should include("can't be empty")
     end
 
     it { validates_the_length_of(:notification_response, :redirect_url,  :max => 255) }
@@ -40,7 +40,7 @@ describe NotificationResponse do
 
       notification_response = notification_response_factory(:status => :chickens)
       notification_response.should_not be_valid
-      notification_response.errors.on(:status).should include("is not in the list")
+      notification_response.errors[:status].should include("is not in the list")
     end
   end
 

data/spec/sage_pay/server/registration_spec.rb

@@ -71,11 +71,11 @@ describe Registration do
 
       registration = registration_factory(:amount => "0.00")
       registration.should_not be_valid
-      registration.errors.on(:amount).should include("is less than the minimum value (0.01)")
+      registration.errors[:amount].should include("is less than the minimum value (0.01)")
 
       registration = registration_factory(:amount => "-23")
       registration.should_not be_valid
-      registration.errors.on(:amount).should include("is less than the minimum value (0.01)")
+      registration.errors[:amount].should include("is less than the minimum value (0.01)")
     end
 
     it "should allow the amount to be a maximum of 100,000.00" do
@@ -84,11 +84,11 @@ describe Registration do
 
       registration = registration_factory(:amount => "100000.01")
       registration.should_not be_valid
-      registration.errors.on(:amount).should include("is greater than the maximum value (100,000.00)")
+      registration.errors[:amount].should include("is greater than the maximum value (100,000.00)")
 
       registration = registration_factory(:amount => "123456")
       registration.should_not be_valid
-      registration.errors.on(:amount).should include("is greater than the maximum value (100,000.00)")
+      registration.errors[:amount].should include("is greater than the maximum value (100,000.00)")
     end
 
     it "should allow the transaction type to be one of :payment, :deferred or :authenticate" do
@@ -103,7 +103,7 @@ describe Registration do
 
       registration = registration_factory(:tx_type => :chickens)
       registration.should_not be_valid
-      registration.errors.on(:tx_type).should include("is not in the list")
+      registration.errors[:tx_type].should include("is not in the list")
     end
 
     it "should allow the mode to be one of :simulator, :test or :live" do
@@ -118,7 +118,7 @@ describe Registration do
 
       registration = registration_factory(:mode => :chickens)
       registration.should_not be_valid
-      registration.errors.on(:mode).should include("is not in the list")
+      registration.errors[:mode].should include("is not in the list")
     end
 
     it "should allow the gift aid setting to be true or false" do
@@ -130,7 +130,7 @@ describe Registration do
 
       registration = registration_factory(:allow_gift_aid => "chickens")
       registration.should_not be_valid
-      registration.errors.on(:allow_gift_aid).should include("is not in the list")
+      registration.errors[:allow_gift_aid].should include("is not in the list")
     end
 
     it "should allow apply_avs_cv2 to be 0 through 3 (see docs for what that means)" do
@@ -148,7 +148,7 @@ describe Registration do
 
       registration = registration_factory(:apply_avs_cv2 => 4)
       registration.should_not be_valid
-      registration.errors.on(:apply_avs_cv2).should include("is not in the list")
+      registration.errors[:apply_avs_cv2].should include("is not in the list")
     end
 
     it "should allow apply_3d_secure to be 0 through 3 (see docs for what that means)" do
@@ -166,7 +166,7 @@ describe Registration do
 
       registration = registration_factory(:apply_3d_secure => 4)
       registration.should_not be_valid
-      registration.errors.on(:apply_3d_secure).should include("is not in the list")
+      registration.errors[:apply_3d_secure].should include("is not in the list")
     end
 
     it "should allow profile to be normal or low" do
@@ -178,7 +178,7 @@ describe Registration do
 
       registration = registration_factory(:profile => :chickens)
       registration.should_not be_valid
-      registration.errors.on(:profile).should include("is not in the list")
+      registration.errors[:profile].should include("is not in the list")
     end
 
     it "should allow billing_agreement to be true or false" do
@@ -190,7 +190,7 @@ describe Registration do
 
       registration = registration_factory(:billing_agreement => "chickens")
       registration.should_not be_valid
-      registration.errors.on(:billing_agreement).should include("is not in the list")
+      registration.errors[:billing_agreement].should include("is not in the list")
     end
 
     it "should allow the account type to be one of ecommerce, continuous authority or mail order" do
@@ -205,7 +205,7 @@ describe Registration do
 
       registration = registration_factory(:account_type => :chickens)
       registration.should_not be_valid
-      registration.errors.on(:account_type).should include("is not in the list")
+      registration.errors[:account_type].should include("is not in the list")
     end
   end
 
@@ -512,7 +512,7 @@ describe Registration do
       it "should raise an exception to say that we couldn't talk to SagePay" do
         lambda {
           @registration.run!
-        }.should raise_error RuntimeError, "I guess SagePay doesn't like us today."
+        }.should raise_error RuntimeError, /I guess SagePay doesn't like us today/
       end
     end
 

data/spec/sage_pay/server_spec.rb

@@ -5,8 +5,8 @@ describe SagePay::Server do
     before(:each) do
       SagePay::Server.default_registration_options = {
         :mode => :test,
-        :vendor => "rubaidh",
-        :notification_url => "http://test.host/notification"
+        :vendor => 'dummyvendor',
+        :notification_url => 'http://test.host/notification'
       }
     end
 
@@ -18,8 +18,8 @@ describe SagePay::Server do
 
       payment = SagePay::Server.payment
       payment.mode.should             == :test
-      payment.vendor.should           == "rubaidh"
-      payment.notification_url.should == "http://test.host/notification"
+      payment.vendor.should           == 'dummyvendor'
+      payment.notification_url.should == 'http://test.host/notification'
     end
 
     it "should generate a vendor transaction code automatically" do

data/spec/sage_pay_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe SagePay do
-  it "should be version 0.2.13" do
-    SagePay::VERSION.should == '0.2.13'
+  it "should be version 1.0.0" do
+    SagePay::VERSION.should == '1.0.0'
   end
 end

data/spec/spec_helper.rb

@@ -1,5 +1,11 @@
 require 'rubygems'
-require 'spec/autorun'
+
+if ENV['COVERAGE']
+  require 'simplecov'
+  SimpleCov.start do
+    add_filter '/spec/'
+  end
+end
 
 $: << File.join(File.dirname(__FILE__), '..', 'lib')
 require 'sage_pay'
@@ -8,7 +14,7 @@ require 'sage_pay'
 # in ./support/ and its subdirectories.
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
   config.include(Factories)
   config.include(ValidationMatchers)
 end