virtual_merchant 0.3.10 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28da9c31fa38dcda6007436ecf41d42c87b4918a
-  data.tar.gz: 02d3b57afec0ba5875295b8f5e7e718bdb4f1a28
+  metadata.gz: e30717bdee04d446b5cc2417afcc1f9150a6192d
+  data.tar.gz: b6fd4d4393eac6a25c7ab0c30a809da460d74e43
 SHA512:
-  metadata.gz: 47df9fd6c91fd080a7fa3ee94cfe5c54f536f04bc13b6602e739192039ebf043e5e7c1e10252aad0aa20bb9fa65b9951aabddfcd17af1860bc54ea4fe4fa02b0
-  data.tar.gz: 39e93ab7239554ddfca3f6717966571d250056489a5c595a8799b040f0f7c36fffe5974a4a478116dc44d6b4fbcf2e6a690fd24848d3a9405db377c9a86521a9
+  metadata.gz: 945cbe1b26950f5a61cd8a5375cb52d589cede8b9a9bbedeb5a09c4911e0aefa6ff2a68a5a6040177b6624de90fb08eb3baf2d4771598cf7990709a019693da9
+  data.tar.gz: 9cfecd9fa7316803cfed450af806750f46e5807366fc9bcb395cf8124d20cf1c443bb3bf999472b50c83e62f53e5f656ed2dd965dd17ac07985a7ca11b3cbd78

data/lib/virtual_merchant/credit_card.rb

@@ -1,70 +1,26 @@
 require 'virtual_merchant/swipe_extractor'
+require 'virtual_merchant/user_input'
 module VirtualMerchant
   class CreditCard
     attr_accessor :name_on_card, :number, :expiration, :security_code, :swipe, :track2,
-      :encrypted_track_1, :encrypted_track_2, :last_four, :encrypted, :swiped, :valid, :errors
-
-    def self.from_swipe(swipe)
-      if swipe.class == Hash && swipe[:encrypted]
-        new(swipe)
-      else
-        new(swipe: swipe)
-      end
-    end
-
-    def self.from_manual(data)
-      new(data)
-    end
+      :encrypted_track_1, :encrypted_track_2, :last_four, :encrypted, :swiped, :valid,
+      :errors
 
     def initialize(info)
       @errors = {}
+      check_for_errors(info) unless info[:encrypted]
+      return unless valid?
       if info[:encrypted]
-        self.from_encrypted(info)
+        from_encrypted(info)
       elsif info[:swipe]
-        self.from_swipe(info[:swipe])
-      else
-        self.from_manual(info)
-      end
-    end
-
-    def from_encrypted (info)
-      @errors            = {}
-      @encrypted         = true
-      @encrypted_track_1 = info[:track_1]
-      @encrypted_track_2 = info[:track_2]
-      @last_four         = info[:last_four]
-    end
-
-    def from_swipe(swipe_raw)
-      @errors = {}
-      if check_swipe(swipe_raw)
-        @valid        = true
-        @swiped       = true
-        @swipe        = swipe_raw
-        @track2       = SwipeExtractor.get_track_2(swipe)
-        @number       = SwipeExtractor.get_card_number(swipe)
-        @expiration   = SwipeExtractor.get_expiration(swipe)
-        @name_on_card = SwipeExtractor.get_name(swipe)
-        @last_four    = SwipeExtractor.get_last_four(@number)
+        from_unencrypted_swipe(info[:swipe])
       else
-        @valid = false
+        from_manual(info)
       end
     end
 
-    def from_manual(info)
-      @errors = {}
-      if info[:number] && check_luhn(info[:number].to_s.gsub(/\s+/, ""))
-        @name_on_card  = info[:name_on_card]                if info[:name_on_card]
-        @number        = info[:number].to_s.gsub(/\s+/, "")
-        @expiration    = info[:expiration].to_s             if info[:expiration]
-        @security_code = info[:security_code].to_s          if info[:security_code]
-        @track2        = info[:track_2]                     if info[:track_2]
-        @last_four     = SwipeExtractor.get_last_four(@number)
-        @valid = true
-      else
-        errors[5000] = "The Credit Card Number supplied in the authorization request appears to be invalid."
-        @valid = false
-      end
+    def check_for_errors info
+      @errors = VirtualMerchant::UserInput.new(info).errors
     end
 
     def encrypted?
@@ -76,57 +32,55 @@ module VirtualMerchant
     end
 
     def valid?
-      self.valid
+      errors.count == 0
     end
 
-    def check_swipe(swipe_raw)
-      if swipe_raw.index('%') == nil
-        @errors[5012] = "The track data sent appears to be invalid."
-        return false
-      end
-      if swipe_raw.index(';') == nil
-        @errors[5013] = "Transaction requires Track2 data to be sent."
-        return false
+    def blurred_number
+      begin
+        number = self.number.to_s
+        leng = number.length
+        n = number[0..1]
+        (leng-6).times {n+= "*"}
+        n += number[number.length-4..number.length]
+        n
+      rescue Exception => e
+        puts "-"
+        puts "Error in VirtualMerchant-Ruby Gem when trying to blur card number: #{e}."
+        puts "You either passed a nil value for card_number or a number that is too short."
+        puts caller
+        puts "-"
       end
-      track1 = swipe_raw[1.. swipe_raw.index('?')-1]
-      if track1 == nil || track1 == "E"
-        @errors[5012] = "The track data sent appears to be invalid."
-        return false
+    end
+
+    private
+      def from_encrypted (info)
+        @encrypted         = true
+        @encrypted_track_1 = info[:track_1]
+        @encrypted_track_2 = info[:track_2]
+        @last_four         = info[:last_four]
       end
-      track2 = swipe_raw[swipe_raw.index(';')+1.. swipe_raw.length-2]
-      if track2 == nil || track2 == "E"
-        @errors[5013] = "Transaction requires Track2 data to be sent."
-        return false
+
+      def from_unencrypted_swipe(swipe_raw)
+        build_card_from swipe_raw if valid?
       end
-      return true
-    end
 
-    def check_luhn(code)
-      s1 = s2 = 0
-      code.to_s.reverse.chars.each_slice(2) do |odd, even|
-        s1 += odd.to_i
-        double = even.to_i * 2
-        double -= 9 if double >= 10
-        s2 += double
+      def build_card_from swipe
+        @swiped       = true
+        @swipe        = swipe
+        @track2       = SwipeExtractor.get_track_2(swipe)
+        @number       = SwipeExtractor.get_card_number(swipe)
+        @expiration   = SwipeExtractor.get_expiration(swipe)
+        @name_on_card = SwipeExtractor.get_name(swipe)
+        @last_four    = SwipeExtractor.get_last_four(@number)
       end
-      (s1 + s2) % 10 == 0
-    end
 
-   def blurred_number
-     begin
-       number = self.number.to_s
-       leng = number.length
-       n = number[0..1]
-       (leng-6).times {n+= "*"}
-       n += number[number.length-4..number.length]
-       n
-     rescue Exception => e
-       puts "-"
-       puts "Error in VirtualMerchant-Ruby Gem when trying to blur card number: #{e}."
-       puts "You either passed a nil value for card_number or a number that is too short."
-       puts caller
-       puts "-"
-     end
-    end
+      def from_manual(info)
+        @name_on_card  = info[:name_on_card]                if info[:name_on_card]
+        @number        = info[:number].to_s.gsub(/\s+/, "")
+        @expiration    = info[:expiration].to_s             if info[:expiration]
+        @security_code = info[:security_code].to_s          if info[:security_code]
+        @track2        = info[:track_2]                     if info[:track_2]
+        @last_four     = SwipeExtractor.get_last_four(@number)
+      end
   end
 end

data/lib/virtual_merchant/user_input.rb

@@ -0,0 +1,55 @@
+module VirtualMerchant
+  class UserInput
+    attr_accessor :errors
+    def initialize(user_input)
+      @errors = {}
+      if user_input[:swipe]
+        validate_unencrypted_swipe(user_input[:swipe])
+      else
+        validate_card_number(user_input[:number])
+      end
+    end
+
+    def validate_card_number(number)
+      unless number && luhn_validate(number.to_s.gsub(/\s+/, ""))
+        errors[5000] = "The Credit Card Number supplied in the authorization request appears to be invalid."
+      end
+    end
+
+    private
+      def luhn_validate(number)
+        s1 = s2 = 0
+        number.to_s.reverse.chars.each_slice(2) do |odd, even|
+          s1 += odd.to_i
+          double = even.to_i * 2
+          double -= 9 if double >= 10
+          s2 += double
+        end
+        (s1 + s2) % 10 == 0
+      end
+
+      def validate_unencrypted_swipe(swipe_raw)
+        if swipe_raw.index('%') == nil
+          @errors[5012] = "The track data sent appears to be invalid."
+        end
+        validate_track_1 swipe_raw
+        validate_track_2 swipe_raw
+      end
+
+      def validate_track_1 swipe_raw
+        track1 = swipe_raw[1.. swipe_raw.index('?') - 1]
+        if track1 == nil || track1 == "E"
+          @errors[5012] = "The track data sent appears to be invalid."
+        end
+      end
+
+      def validate_track_2 swipe_raw
+        unless swipe_raw.index(';')
+          return @errors[5013] = "Transaction requires Track2 data to be sent."
+        end
+        track2 = swipe_raw[(swipe_raw.index(';') + 1).. swipe_raw.length-2]
+        return unless track2 == nil || track2 == "E"
+        @errors[5013] = "Transaction requires track 2 data to be sent."
+      end
+  end
+end

data/lib/virtual_merchant.rb

@@ -3,10 +3,10 @@ require 'virtual_merchant/amount'
 require 'virtual_merchant/communication'
 require 'virtual_merchant/credentials'
 require 'virtual_merchant/credit_card'
-require 'virtual_merchant/response'
+require 'virtual_merchant/gateway'
 require 'virtual_merchant/logger'
+require 'virtual_merchant/response'
 require 'virtual_merchant/xml_generator'
-require 'virtual_merchant/gateway'
 module VirtualMerchant
   def self.charge(card, amount, creds, custom_fields={}, gateway=Gateway.new(creds))
     gateway.ccsale(card, amount, custom_fields)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: virtual_merchant
 version: !ruby/object:Gem::Version
-  version: 0.3.10
+  version: 0.4.0
 platform: ruby
 authors:
 - Lee Quarella
@@ -21,11 +21,12 @@ files:
 - lib/virtual_merchant/communication.rb
 - lib/virtual_merchant/credentials.rb
 - lib/virtual_merchant/credit_card.rb
-- lib/virtual_merchant/gateway.rb
 - lib/virtual_merchant/logger.rb
 - lib/virtual_merchant/response.rb
 - lib/virtual_merchant/swipe_extractor.rb
+- lib/virtual_merchant/user_input.rb
 - lib/virtual_merchant/xml_generator.rb
+- lib/virtual_merchant/gateway.rb
 homepage: https://github.com/leequarella/VirtualMerchant-Ruby
 licenses:
 - MIT
@@ -36,17 +37,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.1.10
 signing_key: 
 specification_version: 4
 summary: Virtual Merchant API