cardconnect 1.0.0 → 1.1.0

data/lib/cardconnect/services/capture/capture.rb

@@ -1,7 +1,6 @@
 module CardConnect
   module Service
     class Capture < ServiceEndpoint
-
       # Initializes a Capture Service
       #
       # @param connection [CardConnect::Connection]
@@ -11,7 +10,6 @@ module CardConnect
         @resource_name = '/capture'
         @rest_method = 'put'
       end
-      
     end
   end
 end

data/lib/cardconnect/services/capture/capture_request.rb

@@ -3,13 +3,13 @@ module CardConnect
     class CaptureRequest
       include Utils
 
-      REQUIRED_FIELDS = [:merchid, :retref]
+      REQUIRED_FIELDS = [:merchid, :retref].freeze
 
-      OPTIONAL_FIELDS = [:authcode, :amount, :invoiceid, :ponumber, :taxamnt]
+      OPTIONAL_FIELDS = [:authcode, :amount, :invoiceid, :ponumber, :taxamnt].freeze
 
       FIELDS = REQUIRED_FIELDS + OPTIONAL_FIELDS
 
-      attr_accessor *FIELDS
+      attr_accessor(*FIELDS)
       attr_reader :errors
 
       # Initializes a new Capture Request
@@ -31,7 +31,7 @@ module CardConnect
       def payload
         payload = {}
         FIELDS.each do |field|
-          payload.merge!({field => send(field)})
+          payload.merge!(field => send(field))
         end
         payload
       end
@@ -44,7 +44,6 @@ module CardConnect
           value.nil? || value.empty? ? errors.push("#{field.capitalize} is missing") : next
         end
       end
-
     end
   end
 end

data/lib/cardconnect/services/capture/capture_response.rb

@@ -3,9 +3,9 @@ module CardConnect
     class CaptureResponse
       include Utils
 
-      FIELDS = [:merchid, :account, :amount, :retref, :setlstat]
+      FIELDS = [:merchid, :account, :amount, :retref, :setlstat].freeze
 
-      attr_accessor *FIELDS
+      attr_accessor(*FIELDS)
 
       def initialize(response)
         set_attributes(response, FIELDS)
@@ -14,11 +14,10 @@ module CardConnect
       def body
         body = {}
         FIELDS.each do |attr|
-          body.merge!({attr => send(attr)})
+          body.merge!(attr => send(attr))
         end
         body
       end
-
     end
   end
 end

data/lib/cardconnect/services/deposit/deposit.rb

@@ -1,7 +1,6 @@
 module CardConnect
   module Service
     class Deposit < ServiceEndpoint
-
       # Initializes a Deposit Service
       #
       # @param connection [CardConnect::Connection]
@@ -11,7 +10,6 @@ module CardConnect
         @resource_name = '/deposit'
         @rest_method = 'get'
       end
-
     end
   end
-end
+end

data/lib/cardconnect/services/deposit/deposit_request.rb

@@ -5,11 +5,11 @@ module CardConnect
     class DepositRequest
       include Utils
 
-      REQUIRED_FIELDS = [:merchid, :date]
+      REQUIRED_FIELDS = [:merchid, :date].freeze
 
       FIELDS = REQUIRED_FIELDS
 
-      attr_accessor *FIELDS
+      attr_accessor(*FIELDS)
       attr_reader :errors
 
       # Initializes a new Deposit Request
@@ -29,7 +29,7 @@ module CardConnect
 
       # Builds the request payload
       def payload
-        payload = "?"
+        payload = '?'
         FIELDS.each do |field|
           payload += "#{field}=#{send(field)}&"
         end
@@ -51,14 +51,11 @@ module CardConnect
       end
 
       def validate_date_format
-        begin
-          raise if date.length != 4
-          Date.parse(date, '%m%d')
-        rescue => e
-          errors.push("Date format is invalid. Please use MMDD format")
-        end
+        raise if date.length != 4
+        Date.parse(date, '%m%d')
+      rescue
+        errors.push('Date format is invalid. Please use MMDD format')
       end
-
     end
   end
-end
+end

data/lib/cardconnect/services/deposit/deposit_response.rb

@@ -4,9 +4,9 @@ module CardConnect
       include Utils
 
       FIELDS = [:depositid, :merchid, :respproc, :accttype, :action, :actdate,
-                :postdate, :currency, :amount, :feeamnt, :cbakamnt, :resptext, :txns]
+                :postdate, :currency, :amount, :feeamnt, :cbakamnt, :resptext, :txns].freeze
 
-      attr_accessor *FIELDS
+      attr_accessor(*FIELDS)
       attr_reader :errors
 
       def initialize(response)
@@ -23,7 +23,7 @@ module CardConnect
       def body
         body = {}
         FIELDS.each do |attr|
-          body.merge!({attr => send(attr)})
+          body.merge!(attr => send(attr))
         end
         body
       end
@@ -32,9 +32,8 @@ module CardConnect
 
       def parse_transactions
         return if txns.nil?
-        txns.each_with_index { |txn, i| self.txns[i] = symbolize_keys(txn) }
+        txns.each_with_index { |txn, i| txns[i] = symbolize_keys(txn) }
       end
-
     end
   end
 end

data/lib/cardconnect/services/inquire/inquire.rb

@@ -1,7 +1,6 @@
 module CardConnect
   module Service
     class Inquire < ServiceEndpoint
-
       # Initializes a Inquire Service
       #
       # @param connection [CardConnect::Connection]
@@ -11,7 +10,6 @@ module CardConnect
         @resource_name = '/inquire'
         @rest_method = 'get'
       end
-
     end
   end
 end

data/lib/cardconnect/services/inquire/inquire_request.rb

@@ -3,11 +3,11 @@ module CardConnect
     class InquireRequest
       include Utils
 
-      REQUIRED_FIELDS = [:merchid, :retref]
+      REQUIRED_FIELDS = [:merchid, :retref].freeze
 
       FIELDS = REQUIRED_FIELDS
 
-      attr_accessor *FIELDS
+      attr_accessor(*FIELDS)
       attr_reader :errors
 
       # Initializes a new Inquire Request
@@ -38,7 +38,6 @@ module CardConnect
           value.nil? || value.empty? ? errors.push("#{field.capitalize} is missing") : next
         end
       end
-
     end
   end
-end
+end

data/lib/cardconnect/services/inquire/inquire_response.rb

@@ -4,9 +4,9 @@ module CardConnect
       include Utils
 
       FIELDS = [:merchid, :account, :amount, :currency, :retref, :respcode,
-                :respproc, :respstat, :resptext, :setlstat]
+                :respproc, :respstat, :resptext, :setlstat].freeze
 
-      attr_accessor *FIELDS
+      attr_accessor(*FIELDS)
       attr_reader :errors
 
       def initialize(response)
@@ -21,11 +21,10 @@ module CardConnect
       def body
         body = {}
         FIELDS.each do |attr|
-          body.merge!({attr => send(attr)})
+          body.merge!(attr => send(attr))
         end
         body
       end
-
     end
   end
 end

data/lib/cardconnect/services/refund/refund.rb

@@ -1,7 +1,6 @@
 module CardConnect
   module Service
     class Refund < ServiceEndpoint
-
       # Initializes a Refund Service
       #
       # @param connection [CardConnect::Connection]
@@ -13,4 +12,4 @@ module CardConnect
       end
     end
   end
-end
+end

data/lib/cardconnect/services/refund/refund_request.rb

@@ -3,13 +3,13 @@ module CardConnect
     class RefundRequest
       include Utils
 
-      REQUIRED_FIELDS = [:merchid, :retref]
+      REQUIRED_FIELDS = [:merchid, :retref].freeze
 
-      OPTIONAL_FIELDS = [:amount]
+      OPTIONAL_FIELDS = [:amount].freeze
 
       FIELDS = REQUIRED_FIELDS + OPTIONAL_FIELDS
 
-      attr_accessor *FIELDS
+      attr_accessor(*FIELDS)
       attr_reader :errors
 
       # Initializes a new Refund Request
@@ -31,7 +31,7 @@ module CardConnect
       def payload
         payload = {}
         FIELDS.each do |field|
-          payload.merge!({field => send(field)})
+          payload.merge!(field => send(field))
         end
         payload
       end
@@ -44,7 +44,6 @@ module CardConnect
           value.nil? || value.empty? ? errors.push("#{field.capitalize} is missing") : next
         end
       end
-
     end
   end
-end
+end

data/lib/cardconnect/services/refund/refund_response.rb

@@ -3,14 +3,14 @@ module CardConnect
     class RefundResponse
       include Utils
 
-      FIELDS = [:merchid, :amount, :retref, :authcode, :respcode, :respproc, :respstat, :resptext]
+      FIELDS = [:merchid, :amount, :retref, :authcode, :respcode, :respproc, :respstat, :resptext].freeze
 
-      attr_accessor *FIELDS
+      attr_accessor(*FIELDS)
       attr_reader :errors
 
-      STATUS_APPROVED = 'A'
-      STATUS_RETRY = 'B'
-      STATUS_DECLINED = 'C'
+      STATUS_APPROVED = 'A'.freeze
+      STATUS_RETRY = 'B'.freeze
+      STATUS_DECLINED = 'C'.freeze
 
       def initialize(response)
         set_attributes(response, FIELDS)
@@ -25,7 +25,7 @@ module CardConnect
       def body
         body = {}
         FIELDS.each do |attr|
-          body.merge!({attr => send(attr)})
+          body.merge!(attr => send(attr))
         end
         body
       end
@@ -37,4 +37,4 @@ module CardConnect
       end
     end
   end
-end
+end

data/lib/cardconnect/services/service_endpoint.rb

@@ -22,12 +22,12 @@ module CardConnect
 
       def build_request(params = {})
         req = symbolize_keys(params)
-        req = req.merge(merchid: @config.merchant_id) unless req.has_key?(:merchid)
+        req = req.merge(merchid: @config.merchant_id) unless req.key?(:merchid)
         @request = request_class.new(req)
       end
 
       def submit
-        raise CardConnect::Error, "Request has not been built" if request.nil?
+        raise CardConnect::Error, 'Request has not been built' if request.nil?
         @response = send(rest_method)
       end
 
@@ -38,19 +38,15 @@ module CardConnect
       end
 
       def get
-        begin
-          response_class.new(connection.get(path + request.payload).body)
-        rescue Faraday::ResourceNotFound => e
-          puts e.message
-        end
+        response_class.new(connection.get(path + request.payload).body)
+      rescue Faraday::ResourceNotFound => e
+        puts e.message
       end
 
       def put
-        begin
-          response_class.new(connection.put(path, request.payload).body)
-        rescue Faraday::ResourceNotFound => e
-          puts e.message
-        end
+        response_class.new(connection.put(path, request.payload).body)
+      rescue Faraday::ResourceNotFound => e
+        puts e.message
       end
 
       def request_class
@@ -62,8 +58,8 @@ module CardConnect
       end
 
       def string_to_class(str)
-        str.split('::').inject(Object) { |mod, class_name| mod.const_get(class_name) }
+        str.split('::').inject(Object) { |a, e| a.const_get(e) }
       end
     end
   end
-end
+end

data/lib/cardconnect/services/settlement_status/settlement_status.rb

@@ -1,7 +1,6 @@
 module CardConnect
   module Service
     class SettlementStatus < ServiceEndpoint
-
       # Initializes a Settlement Status Service
       #
       # @param connection [CardConnect::Connection]
@@ -11,7 +10,6 @@ module CardConnect
         @resource_name = '/settlestat'
         @rest_method = 'get'
       end
-
     end
   end
 end

data/lib/cardconnect/services/settlement_status/settlement_status_request.rb

@@ -5,11 +5,11 @@ module CardConnect
     class SettlementStatusRequest
       include Utils
 
-      REQUIRED_FIELDS = [:merchid, :date]
+      REQUIRED_FIELDS = [:merchid, :date].freeze
 
       FIELDS = REQUIRED_FIELDS
 
-      attr_accessor *FIELDS
+      attr_accessor(*FIELDS)
       attr_reader :errors
 
       # Initializes a new Settlement Status Request
@@ -29,7 +29,7 @@ module CardConnect
 
       # Builds the request payload
       def payload
-        payload = "?"
+        payload = '?'
         FIELDS.each do |field|
           payload += "#{field}=#{send(field)}&"
         end
@@ -51,14 +51,11 @@ module CardConnect
       end
 
       def validate_date_format
-        begin
-          raise if date.length != 4
-          Date.parse(date, '%m%d')
-        rescue => e
-          errors.push("Date format is invalid. Please use MMDD format")
-        end
+        raise if date.length != 4
+        Date.parse(date, '%m%d')
+      rescue
+        errors.push('Date format is invalid. Please use MMDD format')
       end
-
     end
   end
-end
+end

data/lib/cardconnect/services/settlement_status/settlement_status_response.rb

@@ -3,9 +3,9 @@ module CardConnect
     class SettlementStatusResponse
       include Utils
 
-      FIELDS = [:merchid, :batchid, :hoststat, :hostbatch, :respproc, :txns]
+      FIELDS = [:merchid, :batchid, :hoststat, :hostbatch, :respproc, :txns].freeze
 
-      attr_accessor *FIELDS
+      attr_accessor(*FIELDS)
       attr_reader :errors
 
       def initialize(response)
@@ -22,7 +22,7 @@ module CardConnect
       def body
         body = {}
         FIELDS.each do |attr|
-          body.merge!({attr => send(attr)})
+          body.merge!(attr => send(attr))
         end
         body
       end
@@ -31,9 +31,8 @@ module CardConnect
 
       def parse_transactions
         return if txns.nil?
-        txns.each_with_index { |txn, i| self.txns[i] = symbolize_keys(txn) }
+        txns.each_with_index { |txn, i| txns[i] = symbolize_keys(txn) }
       end
-
     end
   end
 end