duty_calculator 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e17b38949cd151f57b962118f76e516b0caaa5b
-  data.tar.gz: 0b6202df8eebd58bccf47481085e7d280f7b56c2
+  metadata.gz: 5ed8beb4c4232821afa3d6f8be62dd98ed3b179f
+  data.tar.gz: ec47b5f65e53b2be578322d7bf25d04737692c7f
 SHA512:
-  metadata.gz: de3cd369e239766070b6063cd4d8c1a449f224ec7d79d973156d1bd9c366e46d2e95648429b6a50c6ebc6ad9a58944d530e95fe1ea4542f339c6b5016790d53c
-  data.tar.gz: d13462fcd66f9895397c1061555768f4921ec940b9430661a9cbf667affc47ea1c1e76d9668b61d1a71259ca01839d204cbde81c0da4bd22830a904f1ef2bd3a
+  metadata.gz: 69ae696b897280cf5a2376a8a06fc87d7b784d87bd0acb3d59ec073af2ccd9668e134a38d1cce1d8e6edebda096ecc073a97be17375077e4fb40224ab3b67865
+  data.tar.gz: 88dbb06e724660c0ee0285cf651e13a3caf633f4f7fec2c18a8253918022a11c8a0df29d57e11e61d9d42ce2e849b318b5c50092593268f0351bcab96e63df39

data/lib/duty_calculator/calculation.rb

@@ -4,56 +4,38 @@ module DutyCalculator
   class Calculation
     class << self
       def validate_params(params)
-        required = %w{from to shipping_mode classify_by shipping
+        required = %w{from to shipping_mode shipping
                       insurance currency preferential_rates detailed_result incl_hs_codes cat
                       hs country_of_hs_code desc
                       sku value weight qty origin reference}
         msg = []
         required.each do |r|
-          msg << r unless params.has_key?(r)
+          # ensure keys are strings
+          msg << r unless params.inject({}){|memo,(k,v)| memo[k.to_s] = v; memo}.has_key?(r)
         end
-        raise ArgumentError, "Missing arguments from hash #{msg.to_s}" if msg.size
+        raise ArgumentError, "Missing arguments from hash #{msg.to_s}" if msg.size >= 1
         return params
       end
     end
 
-=begin
-# https://docs.google.com/a/walkerandcobrands.com/document/d/16e_lh7MIjLGYvS_qZL7pUzOvTVte-cqTnr4jGo_VtIM/pub
-# from={ISO  alpha-3 country code or alpha-2 country code} \
-# &to={ISO  alpha-3 country code or alpha-2 country code} \
-# &province={ISO alpha-2 province code of ‘importing to’ country (only required for Canada and Brazil)} \
-# &shipping_mode={shipping mode} \
-# &commercial_importer={importer status (only required for Russia)} \
-# &imported_wt={total weight of products imported during the month (only required for Russia)} \
-# &imported_value={total value of products imported during the month (only required for Russia)} \
-# &classify_by={items classification identifier} \
-# &cat[0]={item ID or category ID} \
-# &hs[0]={item HS code} \
-# &country_of_hs_code[0]={ISO  alpha-3 country code or alpha-2 country code} \
-# &desc[0]={product description} \
-# &sku[0]={item sku } \
-# &value[0]={value per one item} \
-# &weight[0]={weight of one item} \
-# &qty[0]={item quantity} \
-# &origin[0]={ISO alpha-3 country code or alpha-2 country code} \
-# &reference[0]={product reference}  \
-# &shipping={shipping cost} \
-# &insurance={cost of insurance} \
-# &currency={ISO currency code} \preferential
-# &output_currency={ISO currency code} \
-# &preferential_rates={1 to apply FTA and preferential rates, 0 to ignore FTA and preferential rates} \
-# &detailed_result={1 for detailed result, 0 for short result} \
-# &incl_hs_codes={include HS code for each item in response}
-#
-=end
     def self.get(params={})
-      uri = Addressable::URI.new
-      uri.query_values = validate_params(params)
-
+      qs = params.collect do |k,v|
+            if v.kind_of?(Array)
+              memo = ""
+              v.each_with_index do |value, index|
+                memo << "#{k}[#{index}]=#{value}"
+                memo << "&" if v.size > (index+1)
+              end
+              memo
+            else
+              "#{k}=#{v}"
+            end
+          end
       conn = DutyCalculator::Client.new
-      resp = conn.get "#{DutyCalculator::Client.api_base}/calculation?#{uri.query}"
-      resp.body
+      resp = conn.get "#{DutyCalculator::Client.api_base}/calculation?#{qs.join('&')}"
+      raise Exception, "Duty Calculator Error: #{DutyCalculator::ErrorMessages.for_code(resp.body["error"]["code"])}" if resp.body["error"]
+      raise Exception, "HTTP Status Code #{resp.status}" if resp.status.to_i != 200
+      return resp.body
     end
   end
 end
-

data/lib/duty_calculator/version.rb

@@ -1,3 +1,3 @@
 module DutyCalculator
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: duty_calculator
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Thomas Hanley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-06 00:00:00.000000000 Z
+date: 2015-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler