realex 0.4 → 0.4.1

data/Gemfile

@@ -1,4 +1,4 @@
-source :rubygems
+source 'https://rubygems.org'
 gem 'nokogiri'
 gem 'builder'
 

data/Gemfile.lock

@@ -1,5 +1,5 @@
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
     builder (3.0.0)
     diff-lcs (1.1.3)

data/Rakefile

@@ -25,7 +25,7 @@ begin
     gemspec.email = "paul@rslw.com"
     gemspec.homepage = "http://github.com/paulca/realex"
     gemspec.authors = ["Paul Campbell"]
-    gemspec.version = "0.4"
+    gemspec.version = "0.4.1"
     gemspec.add_dependency 'nokogiri', '~> 1.4'
   end
 rescue LoadError

data/lib/real_ex/recurring.rb

@@ -1,20 +1,20 @@
 module RealEx
   module Recurring
-    
+
     class Transaction < RealEx::Transaction
       def authorize!
         RealEx::Response.new_from_xml(RealEx::Client.call(real_vault_uri, to_xml))
       end
     end
-    
+
     class Payer < Transaction
       attributes :type, :reference, :title, :firstname, :lastname, :address, :company, :comments
       attributes :update
-      
+
       def request_type
         @request_type = update == true ? 'payer-edit' : 'payer-new'
       end
-      
+
       def to_xml
         super do |per|
           per.payer(:type => type, :ref => reference) do |payer|
@@ -22,27 +22,31 @@ module RealEx
             payer.firstname firstname
             payer.surname lastname
             payer.company company
-            payer.address do |add|
-                add.line1 address.line1
-                add.line1 address.line2
-                add.line3 address.line3
-                add.city address.city
-                add.county address.county
-                add.postcode address.post_code
-                add.country(address.country, :country_code => address.country_code)
-            end
-            if address.phone_numbers.kind_of?(Hash)
-              payer.phonenumbers do |numbers|
-                numbers.home address.phone_numbers[:home]
-                numbers.work address.phone_numbers[:work]
-                numbers.fax address.phone_numbers[:fax]
-                numbers.mobile address.phone_numbers[:mobile]
+
+            unless address.nil?
+              payer.address do |add|
+                  add.line1 address.line1
+                  add.line1 address.line2
+                  add.line3 address.line3
+                  add.city address.city
+                  add.county address.county
+                  add.postcode address.post_code
+                  add.country(address.country, :country_code => address.country_code)
               end
+              if address.phone_numbers.kind_of?(Hash)
+                payer.phonenumbers do |numbers|
+                  numbers.home address.phone_numbers[:home]
+                  numbers.work address.phone_numbers[:work]
+                  numbers.fax address.phone_numbers[:fax]
+                  numbers.mobile address.phone_numbers[:mobile]
+                end
+              end
+              payer.email address.email
             end
-            payer.email address.email
+
             if !comments.empty?
               payer.comments do |c|
-                comments.each_with_index do |i,comment|
+                comments.each_with_index do |comment,i|
                   c.comment(comment, :id => i + 1)
                 end
               end
@@ -55,18 +59,18 @@ module RealEx
       def hash
         RealEx::Client.build_hash([RealEx::Client.timestamp, RealEx::Config.merchant_id, order_id, '', '', reference])
       end
-      
+
       def save!
         authorize!
       end
-      
+
       def update!
         self.update = true
         authorize!
       end
 
     end
-    
+
     class Card < Transaction
       attributes :card, :payer, :update, :reference, :cancel
 
@@ -79,7 +83,7 @@ module RealEx
           @request_type = 'card-new'
         end
       end
-      
+
       def to_xml
         super do |per|
           per.card do |c|
@@ -95,7 +99,7 @@ module RealEx
           end
         end
       end
-      
+
       # 20030516181127.yourmerchantid.uniqueid…smithj01.John Smith.498843******9991
       def hash
         if cancel
@@ -106,11 +110,11 @@ module RealEx
           RealEx::Client.build_hash([RealEx::Client.timestamp, RealEx::Config.merchant_id, order_id, '', '', payer.reference,card.cardholder_name,card.number])
         end
       end
-      
+
       def save!
         authorize!
       end
-      
+
       def update!
         self.update = true
         authorize!
@@ -122,15 +126,15 @@ module RealEx
       end
 
     end
-    
+
     class Authorization < Transaction
       attributes :payer, :reference, :customer_number, :variable_reference, :product_id
       attributes :billing_address, :shipping_address
-      
+
       def request_type
         'receipt-in'
       end
-      
+
       def to_xml
         super do |per|
           per.amount(amount, :currency => currency)
@@ -157,13 +161,13 @@ module RealEx
           end
         end
       end
-      
+
       # timesttimestamp.merchantid.orderid.amount.currency.payerref
       def hash
         RealEx::Client.build_hash([RealEx::Client.timestamp, RealEx::Config.merchant_id, order_id, amount, currency, payer.reference])
-      end  
+      end
     end
-    
+
     class Refund < Transaction
       attributes :payer, :reference
 
@@ -183,10 +187,10 @@ module RealEx
       def hash
         RealEx::Client.build_hash([RealEx::Client.timestamp, RealEx::Config.merchant_id, order_id, amount, currency, payer.reference])
       end
-      
+
       def refund_hash
         Digest::SHA1.hexdigest(RealEx::Config.refund_password)
       end
     end
   end
-end
+end

data/lib/real_ex/transaction.rb

@@ -1,7 +1,7 @@
 module RealEx
   class Transaction
     include Initializer
-    attributes :card, :amount, :order_id, :currency, :autosettle, :variable_reference, :remote_uri, :real_vault_uri
+    attributes :card, :amount, :order_id, :currency, :autosettle, :variable_reference, :remote_uri, :real_vault_uri, :account
     attr_accessor :comments
     attr_accessor :authcode, :pasref
     
@@ -14,6 +14,7 @@ module RealEx
       self.currency ||= RealEx::Config.currency || 'EUR'
       self.remote_uri ||= RealEx::Config.remote_uri || '/epage-remote.cgi'
       self.real_vault_uri ||= RealEx::Config.real_vault_uri || '/epage-remote-plugins.cgi'
+      self.account ||= RealEx::Config.account
     end
     
     def request_type
@@ -30,14 +31,14 @@ module RealEx
         r.orderid order_id
         r.authcode authcode if authcode
         r.pasref pasref if pasref
-        r.account RealEx::Config.account
+        r.account account
         if block_given?
           block.call(r)
         end
         if !comments.empty?
           r.comments do |c|
-            comments.each_with_index do |index,comment|
-              c.comment(comment, :id => index)
+            comments.each_with_index do |comment,index|
+              c.comment(comment, :id => index + 1)
             end
           end
         end
@@ -157,8 +158,8 @@ module RealEx
         per.refundhash refund_hash
         if !comments.empty?
           per.comments do |c|
-            comments.each_with_index do |index,comment|
-              c.comment(comment, :id => index)
+            comments.each_with_index do |comment,index|
+              c.comment(comment, :id => index + 1)
             end
           end
         end

data/realex.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "realex"
-  s.version = "0.4"
+  s.version = "0.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Paul Campbell"]
-  s.date = "2012-03-15"
+  s.date = "2013-05-30"
   s.description = "A Ruby library to make use of the payments API at http://realexpayments.com"
   s.email = "paul@rslw.com"
   s.extra_rdoc_files = [
@@ -42,7 +42,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/paulca/realex"
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.15"
+  s.rubygems_version = "1.8.23"
   s.summary = "Ruby interface to http://realexpayments.com"
 
   if s.respond_to? :specification_version then

data/spec/recurring_spec.rb

@@ -35,20 +35,20 @@ describe "RealEx::Recurring" do
                 )
     RealEx::Client.stub!(:timestamp).and_return('20090326160218')
   end
-  
+
   it "should create tasty XML for the payer" do
     @payer.to_xml.should == "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<request type=\"payer-new\" timestamp=\"20090326160218\">\n  <merchantid>paul</merchantid>\n  <orderid></orderid>\n  <account>internet</account>\n  <payer type=\"Business\" ref=\"boom\">\n    <title>Mr.</title>\n    <firstname>Paul</firstname>\n    <surname>Campbell</surname>\n    <company>Contrast</company>\n    <address>\n      <line1>My house</line1>\n      <line1></line1>\n      <line3></line3>\n      <city>Dublin</city>\n      <county>Dublin</county>\n      <postcode>Dublin 2</postcode>\n      <country country_code=\"IE\">Ireland</country>\n    </address>\n    <phonenumbers>\n      <home>1</home>\n      <work>2</work>\n      <fax>3</fax>\n      <mobile>4</mobile>\n    </phonenumbers>\n    <email>paul@contrast.ie</email>\n  </payer>\n  <sha1hash>7e97b1b743c2599b6c1fd0c5515d369d8372df15</sha1hash>\n</request>\n"
   end
-  
+
   it "should create tasty XML for the payer update" do
     @payer.update = true
     @payer.to_xml.should == "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<request type=\"payer-edit\" timestamp=\"20090326160218\">\n  <merchantid>paul</merchantid>\n  <orderid></orderid>\n  <account>internet</account>\n  <payer type=\"Business\" ref=\"boom\">\n    <title>Mr.</title>\n    <firstname>Paul</firstname>\n    <surname>Campbell</surname>\n    <company>Contrast</company>\n    <address>\n      <line1>My house</line1>\n      <line1></line1>\n      <line3></line3>\n      <city>Dublin</city>\n      <county>Dublin</county>\n      <postcode>Dublin 2</postcode>\n      <country country_code=\"IE\">Ireland</country>\n    </address>\n    <phonenumbers>\n      <home>1</home>\n      <work>2</work>\n      <fax>3</fax>\n      <mobile>4</mobile>\n    </phonenumbers>\n    <email>paul@contrast.ie</email>\n  </payer>\n  <sha1hash>7e97b1b743c2599b6c1fd0c5515d369d8372df15</sha1hash>\n</request>\n"
   end
-  
+
   it "should create lovely XML for the card" do
     @card.to_xml.should == "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<request type=\"card-new\" timestamp=\"20090326160218\">\n  <merchantid>paul</merchantid>\n  <orderid></orderid>\n  <account>internet</account>\n  <card>\n    <ref>billabong</ref>\n    <payerref>boom</payerref>\n    <number>4111111111111111</number>\n    <expdate>0802</expdate>\n    <chname>Paul Campbell</chname>\n    <type>VISA</type>\n  </card>\n  <sha1hash>24dc62271ccaddc59082b4db45c80b0241f630f7</sha1hash>\n</request>\n"
   end
-  
+
   it "should create lovely XML for the card update" do
     @card.update = true
     @card.to_xml.should == "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<request type=\"card-update-card\" timestamp=\"20090326160218\">\n  <merchantid>paul</merchantid>\n  <orderid></orderid>\n  <account>internet</account>\n  <card>\n    <ref>billabong</ref>\n    <payerref>boom</payerref>\n    <number>4111111111111111</number>\n    <expdate>0802</expdate>\n    <chname>Paul Campbell</chname>\n    <type>VISA</type>\n  </card>\n  <sha1hash>cdcb4dd95d0d61d7c86685b1e465796ea55bdcea</sha1hash>\n</request>\n"
@@ -62,7 +62,7 @@ describe "RealEx::Recurring" do
   it "should create tasty XML for the authorization" do
     @transaction.to_xml.should == "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<request type=\"receipt-in\" timestamp=\"20090326160218\">\n  <merchantid>paul</merchantid>\n  <orderid>1234</orderid>\n  <account>internet</account>\n  <amount currency=\"EUR\">500</amount>\n  <payerref>boom</payerref>\n  <paymentmethod></paymentmethod>\n  <sha1hash>ec3afd1714b4473210c2b1eda0c6675bd13c411b</sha1hash>\n</request>\n"
   end
-  
+
   it "should create tasty XML for the refund" do
     @refund.to_xml.should == "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<request type=\"payment-out\" timestamp=\"20090326160218\">\n  <merchantid>paul</merchantid>\n  <orderid>1234</orderid>\n  <account>internet</account>\n  <amount currency=\"EUR\">500</amount>\n  <payerref>boom</payerref>\n  <paymentmethod></paymentmethod>\n  <refundhash>5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8</refundhash>\n  <sha1hash>ec3afd1714b4473210c2b1eda0c6675bd13c411b</sha1hash>\n</request>\n"
   end
@@ -85,8 +85,30 @@ describe "RealEx::Recurring without a full address" do
     @payer = RealEx::Recurring::Payer.new(:type => 'Business', :reference => 'boom', :title => 'Mr.', :firstname => 'Paul', :lastname => 'Campbell', :company => 'Contrast')
     @payer.address = RealEx::Address.new(:country => 'Ireland', :country_code => 'IE')
   end
-  
+
   it "should convert the payer" do
     @payer.to_xml.should match(/IE/)
   end
-end
+end
+
+describe "RealEx::Recurring without any address" do
+  before do
+    RealEx::Config.merchant_id = 'paul'
+    RealEx::Config.shared_secret = "He's not dead, he's just asleep!"
+    RealEx::Config.account = 'internet'
+
+    @card = RealEx::Card.new(
+              :number           => '4111111111111111',
+              :cvv              => '509',
+              :expiry_date      => '0802',
+              :cardholder_name  => 'Paul Campbell',
+              :type             => 'VISA',
+              :issue_number     =>  nil
+              )
+    @payer = RealEx::Recurring::Payer.new(:type => 'Business', :reference => 'boom', :title => 'Mr.', :firstname => 'Paul', :lastname => 'Campbell', :company => 'Contrast')
+  end
+
+  it "should convert the payer" do
+    @payer.to_xml.should match(/Paul/)
+  end
+end

data/spec/transaction_spec.rb

@@ -33,6 +33,18 @@ describe "RealEx::Transaction" do
     @transaction.comments.should == ["This is a comment"]
   end
   
+  it "should allow overriding of the account" do
+    @transaction = RealEx::Authorization.new(
+                    :card         => @card,
+                    :amount       => 500,
+                    :order_id     => 1234,
+                    :currency     => 'EUR',
+                    :autosettle   => true,
+                    :account      => "override"
+                    )
+    @transaction.account.should == "override"
+  end
+  
   it "should build the xml" do
     @transaction.to_xml.should == "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<request type=\"auth\" timestamp=\"20090326160218\">\n  <merchantid>paul</merchantid>\n  <orderid>1234</orderid>\n  <account>internet</account>\n  <amount currency=\"EUR\">500</amount>\n  <card>\n    <number>4111111111111111</number>\n    <expdate>0802</expdate>\n    <chname>Paul Campbell</chname>\n    <type>VISA</type>\n  </card>\n  <autosettle flag=\"1\"/>\n  <tssinfo>\n  </tssinfo>\n  <sha1hash>d979885b0a296469d85ada0f08c5577d857142a0</sha1hash>\n</request>\n"
   end

metadata

@@ -1,60 +1,80 @@
 --- !ruby/object:Gem::Specification
 name: realex
 version: !ruby/object:Gem::Version
-  version: '0.4'
   prerelease: 
+  version: 0.4.1
 platform: ruby
 authors:
 - Paul Campbell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-15 00:00:00.000000000 Z
+date: 2013-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: &70166167360980 !ruby/object:Gem::Requirement
+  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  name: nokogiri
   prerelease: false
-  version_requirements: *70166167360980
-- !ruby/object:Gem::Dependency
-  name: builder
-  requirement: &70166167360460 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
   type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  name: builder
   prerelease: false
-  version_requirements: *70166167360460
-- !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: &70166167359960 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
   type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  name: jeweler
   prerelease: false
-  version_requirements: *70166167359960
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: &70166167359440 !ruby/object:Gem::Requirement
+  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.4'
-  type: :runtime
+  name: nokogiri
   prerelease: false
-  version_requirements: *70166167359440
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.4'
 description: A Ruby library to make use of the payments API at http://realexpayments.com
 email: paul@rslw.com
 executables: []
@@ -96,6 +116,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
+      segments:
+      - 0
+      hash: -150098097176807892
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
@@ -105,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Ruby interface to http://realexpayments.com