sage_pay 0.2.12 → 0.2.13

data/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## 0.2.13
+
+* If the country for an address is the US, then the US state is required.
+  Otherwise, it should not be supplied since it only make sense in the context
+  of US states.
+
+* Use Bundler to track development dependencies.
+
+* Record that ActiveSupport is actually a dependency.
+
+## 0.2.12
+
+* Somehow didn't make it into the ChangeLog. Some bug fix or other I'd
+  imagine. :)
+
 ## 0.2.11
 
 * Cancel support for cancelling existing authorised transactions.

data/Gemfile

@@ -0,0 +1,11 @@
+# Source gems from the default public repository
+source :rubygems
+
+gem 'activesupport', '>= 2.3.8'
+gem 'validatable',   '>= 1.6.7'
+gem 'uuid',          '>= 2.3.1'
+
+group :development do
+  gem 'rake'
+  gem 'rspec'
+end

data/Gemfile.lock

@@ -0,0 +1,39 @@
+--- 
+dependencies: 
+  rake: 
+    group: 
+    - :development
+    version: ">= 0"
+  uuid: 
+    group: 
+    - :default
+    version: ">= 2.3.1"
+  rspec: 
+    group: 
+    - :development
+    version: ">= 0"
+  activesupport: 
+    group: 
+    - :default
+    version: ">= 2.3.8"
+  validatable: 
+    group: 
+    - :default
+    version: ">= 1.6.7"
+specs: 
+- rake: 
+    version: 0.8.7
+- activesupport: 
+    version: 2.3.8
+- macaddr: 
+    version: 1.0.0
+- rspec: 
+    version: 1.3.0
+- uuid: 
+    version: 2.3.1
+- validatable: 
+    version: 1.6.7
+hash: 64c077bdede3436c2ce404a8f1824f50cf7a1f7c
+sources: 
+- Rubygems: 
+    uri: http://gemcutter.org

data/lib/sage_pay.rb

@@ -7,7 +7,7 @@ require 'md5'
 require 'uuid'
 
 module SagePay
-  VERSION = '0.2.12'
+  VERSION = '0.2.13'
 end
 
 require 'validatable-ext'

data/lib/sage_pay/server/address.rb

@@ -35,11 +35,20 @@ module SagePay
       validates_inclusion_of :state,   :in => us_states,              :allow_blank => true, :message => "is not a US state"
       validates_inclusion_of :country, :in => iso_3166_country_codes, :allow_blank => true, :message => "is not an ISO3166-1 country code"
 
+      # The state's presence is required if the country is the US, and
+      # verboten otherwise.
+      validates_true_for :state, :key => :state_required_in_us, :logic => lambda { in_us? ? state.present? : true }, :message => "is required if the country is US"
+      validates_true_for :state, :key => :verboten_outside_us,  :logic => lambda { in_us? ? true : !state.present? }, :message => "is present but the country is not US"
+
       def initialize(attributes = {})
         attributes.each do |k, v|
           send("#{k}=", v)
         end
       end
+
+      def in_us?
+        country == "US"
+      end
     end
   end
 end

data/sage_pay.gemspec

@@ -7,8 +7,8 @@ Gem::Specification.new do |s|
   ## 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.12'
-  s.date              = '2010-04-28'
+  s.version           = '0.2.13'
+  s.date              = '2010-08-15'
   s.rubyforge_project = 'sage_pay'
 
   ## Make sure your summary is short. The description may be as long
@@ -37,8 +37,9 @@ gateway for accepting credit card payments through your web app.
 
   ## List your runtime dependencies here. Runtime dependencies are those
   ## that are needed for an end user to actually USE your code.
-  s.add_dependency('validatable', [">= 1.6.7"])
-  s.add_dependency('uuid',        [">= 2.3.0"])
+  s.add_dependency('activesupport', [">= 2.3.8"])
+  s.add_dependency('validatable',   [">= 1.6.7"])
+  s.add_dependency('uuid',          [">= 2.3.0"])
 
   ## List your development dependencies here. Development dependencies are
   ## those that are only needed during development
@@ -50,6 +51,8 @@ gateway for accepting credit card payments through your web app.
   # = MANIFEST =
   s.files = %w[
     CHANGELOG.md
+    Gemfile
+    Gemfile.lock
     LICENSE
     README.md
     Rakefile

data/spec/integration/sage_pay/server_spec.rb

@@ -59,6 +59,51 @@ if run_integration_specs?
       end
     end
 
+    describe ".payment with a US address" do
+      before(:each) do
+        @payment = SagePay::Server.payment(
+          :description => "Demo payment",
+          :amount => 12.34,
+          :currency => "GBP",
+          :billing_address => address_factory(:country => "US", :state => "WY")
+        )
+      end
+
+      it "should successfully register the payment with SagePay" do
+        @payment.run!.should_not be_nil
+      end
+
+      it "should be a valid registered payment" do
+        registration = @payment.run!
+        registration.should be_ok
+      end
+
+      it "should have a next URL" do
+        registration = @payment.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!
+        uri = URI.parse(registration.next_url)
+        request = Net::HTTP::Get.new(uri.request_uri)
+        http = Net::HTTP.new(uri.host, uri.port)
+        http.use_ssl = true if uri.scheme == "https"
+        http.start { |http|
+          http.request(request)
+        }
+      end
+
+      it "should allow us to retrieve signature verification details" do
+        @payment.run!
+        sig_details = @payment.signature_verification_details
+
+        sig_details.should_not                be_nil
+        sig_details.security_key.should_not   be_nil
+        sig_details.vendor.should_not         be_nil
+      end
+    end
+
     describe ".deferred" do
       before(:each) do
         @payment = SagePay::Server.deferred(

data/spec/sage_pay/server/address_spec.rb

@@ -100,10 +100,22 @@ describe SagePay::Server::Address do
       ]
     end
 
+    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"
+    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"
+    end
+
     it "should validate the state against a list of US states" do
-      address = address_factory(:state => "WY")
+      address = address_factory(:country => "US", :state => "WY")
       address.should be_valid
-      address = address_factory(:state => "AA")
+      address = address_factory(:country => "US", :state => "AA")
       address.should_not be_valid
       address.errors.on(:state).should == "is not a US state"
     end

data/spec/sage_pay_spec.rb

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

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sage_pay
 version: !ruby/object:Gem::Version 
+  hash: 13
   prerelease: false
   segments: 
   - 0
   - 2
-  - 12
-  version: 0.2.12
+  - 13
+  version: 0.2.13
 platform: ruby
 authors: 
 - Graeme Mathieson
@@ -14,49 +15,71 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-28 00:00:00 +01:00
+date: 2010-08-15 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: validatable
+  name: activesupport
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 2
+        - 3
+        - 8
+        version: 2.3.8
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: validatable
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 1
         segments: 
         - 1
         - 6
         - 7
         version: 1.6.7
   type: :runtime
-  version_requirements: *id001
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: uuid
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 2
         - 3
         - 0
         version: 2.3.0
   type: :runtime
-  version_requirements: *id002
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :development
-  version_requirements: *id003
+  version_requirements: *id004
 description: |
   This is a Ruby library for integrating with SagePay. SagePay is a payment
   gateway for accepting credit card payments through your web app.
@@ -71,6 +94,8 @@ extra_rdoc_files:
 - LICENSE
 files: 
 - CHANGELOG.md
+- Gemfile
+- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -123,23 +148,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: sage_pay
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 2
 summary: Ruby implementation of the SagePay payment gateway protocol.