safecharge 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a57096f081b18d3b46f07a5cb7a2149288f06c9
-  data.tar.gz: 385034c763fa1739a30711760db1d297b228eaae
+  metadata.gz: 3f4ff9528287b8bad1b1eaf5145beb288868f4f1
+  data.tar.gz: 93ecc7d0e7a7a5df3b734d4fc2a11b4f48e0b150
 SHA512:
-  metadata.gz: 7a85ea248cc301f2863825d4c6573325bc655ae167879c5b947ef17c4060da6eb42dd46e5ab7b9290df8225d47cbc1d7249332aa092de1ec32abc99984d1d08e
-  data.tar.gz: a98711e2c4c354c378b91f25a5dab1d2d0d7decca2230287ad58d5a1b9a2d7f590ebf6c74aaf3f3d3f5279423ceec119d00af0ae2f3e690aea28afa5f7ad4a30
+  metadata.gz: 8798d81ecc52e01558831966e2cfc1e376fa76634e4d5982355d1269e710fd9e09f6a83eb5523c14a4c2497d82234e4481005281287d4ce925558b9e093caa66
+  data.tar.gz: 1576c2aa11831a82c037d17c5933d079b621ea54aa5bb2b4a3189b139e7e75662e7fd92b9fd1d362db21711a775648ae01f8cbb11b2439b6b7ffeef8308f74ee

data/README.md

@@ -113,7 +113,15 @@ and insert that items array into an array of params like so
 
 Note you must supply the following environment variables for this API to work.
 
-    SAFECHARGE_SECRET_KEY, SAFECHARGE_MERCHANT_ID, SAFECHARGE_MERCHANT_SITE_ID
+    SAFECHARGE_SERVER_TEST=_provided by safecharge_
+    SAFECHARGE_SERVER_LIVE=_provided by safecharge_
+    SAFECHARGE_SECRET_KEY=_provided by safecharge_
+    SAFECHARGE_MERCHANT_ID=_provided by safecharge_
+    SAFECHARGE_MERCHANT_SITE_ID=_provided by safecharge_
+    SAFECHARGE_MERCHANT_3D_SITE_ID=_provided by safecharge_
+    SAFECHARGE_SG_CLIENT_PASSWORD=_provided by safecharge_
+    SAFECHARGE_SG_3D_CLIENT_PASSWORD=_provided by safecharge_
+    SAFECHARGE_CPANEL_PASSWORD=_provided by safecharge_
 
 These will have been provided to you by Safecharge.
 

data/lib/safecharge/request.rb

@@ -74,7 +74,7 @@ module Safecharge
       end
       self.url = url
       self.full_url = url
-      core_params, items, extracted_items = self.extract_items(params)
+      core_params, items, extracted_items = self.extract_items(convert_symbols_to_strings(params))
       raise ValidationException, "Missing array of Items." if items == nil || items.empty?
       self.items = items
       self.params = DEFAULT_PARAMS.merge(core_params)
@@ -82,8 +82,8 @@ module Safecharge
       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")})
-      self.params.merge!({'checksum' => calculate_checksum})
+                          'time_stamp' => Time.now.utc.strftime("%Y-%m-%d.%H:%M:%S"),
+                          'checksum' => calculate_checksum})
       self.construct_url
     end
 
@@ -91,7 +91,7 @@ module Safecharge
 
     def extract_items(params)
       items = params.delete('items')
-      return params, nil, nil if items == nil
+      return params, nil, nil if items.nil?
       keyed_items = {}
       items.each_with_index do |item, i|
         item.keys.each do |key|
@@ -174,6 +174,22 @@ 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.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: safecharge
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Dave Sag
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-18 00:00:00.000000000 Z
+date: 2013-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -104,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.10
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: A Ruby Wrapper for the SafeCharge API