safecharge 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f4ff9528287b8bad1b1eaf5145beb288868f4f1
-  data.tar.gz: 93ecc7d0e7a7a5df3b734d4fc2a11b4f48e0b150
+  metadata.gz: 803b939f2a7601288a6bee3f4ceaefd4446ea5c9
+  data.tar.gz: dbdba6a50bbe8a55547fef373a5f648d8de3f7dd
 SHA512:
-  metadata.gz: 8798d81ecc52e01558831966e2cfc1e376fa76634e4d5982355d1269e710fd9e09f6a83eb5523c14a4c2497d82234e4481005281287d4ce925558b9e093caa66
-  data.tar.gz: 1576c2aa11831a82c037d17c5933d079b621ea54aa5bb2b4a3189b139e7e75662e7fd92b9fd1d362db21711a775648ae01f8cbb11b2439b6b7ffeef8308f74ee
+  metadata.gz: 29a20198c0e45c1782c910fd5df59f63375c808d1fd6f386fcaa7e7231c573f4a8e8edf92f3b5fa09a05ca164eaf538f96bd7c5345c518f913ac37df371aa30f
+  data.tar.gz: 5995a85b6ed331383de67280b9007d115f2a2c019f715f6787588991140bb978b7037805b156644bd8da49d9409c6c237029f92b4e1fdbb6577ea0b518f8866f

data/README.md

@@ -5,7 +5,7 @@ the SafeCharge Web Cashier API v1.1 (Revised 10 July 2013).
 
 ## Status
 
-This project is under active development right now, and not suitable for use.
+This project is under active development right now, and may not suitable for use.
 
 ## Installation
 

data/lib/safecharge/request.rb

@@ -63,32 +63,47 @@ module Safecharge
       'encoding' => Safecharge::Constants::DEFAULT_ENCODING
     }
 
-    def initialize(url, params = {})
-      raise ArgumentError, "missing url" if url == nil || url.empty?
-      if url === Safecharge::Constants::SERVER_TEST
+    def initialize(a_url, some_params = {})
+      raise ArgumentError, "missing url" if a_url == nil || a_url.empty?
+      if a_url === Safecharge::Constants::SERVER_TEST
         self.mode = 'test'
-      elsif url === Safecharge::Constants::SERVER_LIVE
+      elsif a_url === Safecharge::Constants::SERVER_LIVE
         self.mode = 'live'
       else
-        raise ArgumentError, "invalid url #{url}"
+        raise ArgumentError, "invalid url #{a_url}"
       end
-      self.url = url
-      self.full_url = url
-      core_params, items, extracted_items = self.extract_items(convert_symbols_to_strings(params))
+      self.url = a_url
+      self.full_url = a_url
+      core_params, items, extracted_items = self.extract_items(convert_symbols_to_strings(some_params))
       raise ValidationException, "Missing array of Items." if items == nil || items.empty?
       self.items = items
       self.params = DEFAULT_PARAMS.merge(core_params)
       self.validate_parameters(self.params)
       items.each {|i| self.validate_parameters(i, self.class::ALLOWED_ITEM_FIELDS)}
       self.params.merge!(extracted_items)
-      self.params.merge!({'numberofitems' => items.size,
-                          'time_stamp' => Time.now.utc.strftime("%Y-%m-%d.%H:%M:%S"),
-                          'checksum' => calculate_checksum})
+      self.params.merge!({'numberofitems' => items.size, 'time_stamp' => Time.now.utc.strftime("%Y-%m-%d.%H:%M:%S")})
+      self.params.merge!({'checksum' => calculate_checksum}) # must happen after the previous merge!
       self.construct_url
     end
 
     protected
 
+    def convert_symbols_to_strings(a_hash = {})
+      raise ArgumentError, "Expected a Hash" unless a_hash.is_a?(Hash)
+      return {} if a_hash.empty?
+      result = {}
+      a_hash.each do |key, value|
+        if value.is_a?(Array)
+          result[key.to_s] = value.map { |av| av.is_a?(Hash) ? convert_symbols_to_strings(av) : av }
+        elsif value.is_a?(Hash)
+          result[key.to_s] = convert_symbols_to_strings(value)
+        else
+          result[key.to_s] = value
+        end
+      end
+      return result
+    end
+
     def extract_items(params)
       items = params.delete('items')
       return params, nil, nil if items.nil?
@@ -174,22 +189,6 @@ module Safecharge
       return uri
     end
 
-    def convert_symbols_to_strings(a_hash = {})
-      return {} if a_hash.empty?
-      result = {}
-      a_hash.each do |key, value|
-        val = value
-        if value.is_a?(Hash)
-          val = convert_symbols_to_strings(value)
-        elsif value.is_a?(Array)
-          val = value.map { |va| va.is_a?(Hash) ? convert_symbols_to_strings(va) : va }
-        end
-        result[key] = val if key.is_a?(String)
-        result[key.to_s] = val if key.is_a?(Symbol)
-      end
-      return result
-    end
-
 #     def calculate_item_total
 #      # item_amount_N - item_discount_N + item_shipping_N + item_handling_N) * item_quantity_N
 #      return 0.0 if self.items == nil || self.items.empty?

data/lib/safecharge/version.rb

@@ -2,5 +2,5 @@
 #coding: utf-8
 
 module Safecharge
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: safecharge
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Dave Sag
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-29 00:00:00.000000000 Z
+date: 2013-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler