ruby_psigate 0.7.2 → 0.7.3

data/CHANGELOG

@@ -1,3 +1,4 @@
+v0.7.3. fixed bugs related to account information (address, name) not being passed through to server
 v0.7.2. updated project's dependency file
 v0.7.1. project's website points to github's repository instead
 v0.7. project semi functional. most things to should, but a lot of rough edges.

data/lib/ruby_psigate/account.rb

@@ -50,10 +50,6 @@ module RubyPsigate
       result = "#{result_first}_#{result_second}".downcase.to_sym
     end
     
-    # include RubyPsigate::HashVariables
-    # hashable :account_register, %w( AccountID )
-    # hashable :account_update, %w( Condition Update )
-    
     attr_writer :action
     attr_reader :address, :rbcharge
     attr_accessor :account_id, :comments, :email, :serial_no, :store_id
@@ -77,8 +73,9 @@ module RubyPsigate
             
       if type == :account_register
         result[:Account] = Hash.new
+        result[:Account].merge!(:Email => email) unless email.nil?
         result[:Account].merge!({:AccountID => nil})
-        result[:Account].merge!(address.to_hash(:billing)) unless address.nil?
+        result[:Account].merge!(address.to_hash(:account)) unless address.nil?
         result[:Account].merge!({ :CardInfo => cc.to_hash(:card_info) })
       end
       
@@ -134,10 +131,6 @@ module RubyPsigate
       { :AccountID => "123" }
     end
     
-    def update
-      { :Shit => "Fuck" }
-    end
-    
     def address=(input_address)
       raise InvalidAddress unless input_address.is_a?(Address)
       @address = input_address

data/lib/ruby_psigate/address.rb

@@ -6,6 +6,7 @@ module RubyPsigate
     
     hashable :billing, %w( Bname Bcompany Baddress1 Baddress2 Bcity Bprovince Bpostalcode Bcountry Phone Fax )
     hashable :shipping, %w( Sname Scompany Saddress1 Saddress2 Scity Sprovince Spostalcode Scountry )
+    hashable :account, %w( Name Company Address1 Address2 City Province PostalCode Country Phone Fax )
         
     attr_accessor :firstname, :lastname, :line1, :line2, :city, :state, :country, :zipcode, :telephone, :fax, :company
 

data/ruby_psigate.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ruby_psigate}
-  s.version = "0.7.2"
+  s.version = "0.7.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Simon Chiu"]
-  s.date = %q{2010-09-21}
+  s.date = %q{2010-09-26}
   s.description = %q{RubyPsigate parses and packages XML messages to/from Psigate's servers for transactions and recurring billing management.}
   s.email = %q{skhchiu@gmail.com}
   s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "README.markdown", "lib/certs/cacert.pem", "lib/ruby_psigate.rb", "lib/ruby_psigate/account.rb", "lib/ruby_psigate/account_manager_api.rb", "lib/ruby_psigate/account_methods.rb", "lib/ruby_psigate/address.rb", "lib/ruby_psigate/connection.rb", "lib/ruby_psigate/credit_card.rb", "lib/ruby_psigate/credit_card_methods.rb", "lib/ruby_psigate/error.rb", "lib/ruby_psigate/gateway.rb", "lib/ruby_psigate/hash_variables.rb", "lib/ruby_psigate/item.rb", "lib/ruby_psigate/item_option.rb", "lib/ruby_psigate/number_validation_methods.rb", "lib/ruby_psigate/order.rb", "lib/ruby_psigate/recurring_charge.rb", "lib/ruby_psigate/recurring_item.rb", "lib/ruby_psigate/response.rb", "lib/ruby_psigate/serializer.rb", "lib/ruby_psigate/transaction_methods.rb", "lib/ruby_psigate/utils.rb"]

data/test/remote/remote_account_test.rb

@@ -21,7 +21,7 @@ module RubyPsigate
       
       @account.email = "bob@gmail.com"
       @account.cc = @credit_card
-      # @account.address = valid_address
+      @account.address = valid_address
       
       @gateway.account = @account
       

data/test/test_helper.rb

@@ -45,19 +45,20 @@ module RubyPsigate
       @address
     end
     
-    def valid_address_hash
-      {
-        :Bname        => "Bob Parsons",
-        :Bcompany     => "Bob Parson's Co.",
-        :Baddress1    => "1234 West Street",
-        :Baddress2    => "Apt 100",
-        :Bcity        => "Toronto",
-        :Bprovince    => "Ontario",
-        :Bcountry     => "CA",
-        :Bpostalcode  => "L3N9J2",
-        :Phone        => "416-333-3333",
-        :Fax          => "416-322-2222"
-      }
+    def valid_address_hash(type = :billing)
+      # {
+      #   :Bname        => "Bob Parsons",
+      #   :Bcompany     => "Bob Parson's Co.",
+      #   :Baddress1    => "1234 West Street",
+      #   :Baddress2    => "Apt 100",
+      #   :Bcity        => "Toronto",
+      #   :Bprovince    => "Ontario",
+      #   :Bcountry     => "CA",
+      #   :Bpostalcode  => "L3N9J2",
+      #   :Phone        => "416-333-3333",
+      #   :Fax          => "416-322-2222"
+      # }
+      valid_address.to_hash(type)
     end
     
     def valid_credit_card

data/test/unit/account_test.rb

@@ -95,7 +95,7 @@ module RubyPsigate
           :AccountID => nil
         }
       }
-      @expectation[:Account].merge!(valid_address_hash)
+      @expectation[:Account].merge!(valid_address_hash(:account))
       @expectation[:Account][:CardInfo] = valid_credit_card_hash(:card_info)
 
       @account.action = { :account => :register }

data/test/unit/address_test.rb

@@ -95,5 +95,23 @@ module RubyPsigate
       assert_equal @expectation, @address.to_hash(:shipping)
     end
     
+    should "return a hash of account address attributes (for recurring xml transactions)" do
+      @address = valid_address
+      @expectation = {
+        :Name        => "Bob Parsons",
+        :Company     => "Bob Parson's Co.",
+        :Address1    => "1234 West Street",
+        :Address2    => "Apt 100",
+        :City        => "Toronto",
+        :Province    => "Ontario",
+        :PostalCode  => "L3N9J2",
+        :Country     => "CA",
+        :Phone       => "416-333-3333",
+        :Fax         => "416-322-2222"
+      }
+      
+      assert_equal @expectation, @address.to_hash(:account)
+    end
+    
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 7
-  - 2
-  version: 0.7.2
+  - 3
+  version: 0.7.3
 platform: ruby
 authors: 
 - Simon Chiu
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-21 00:00:00 -04:00
+date: 2010-09-26 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency