zanders 2.2.2 → 2.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80f6a8f8fb898fc00a32f8f9354926a70370b7c4
-  data.tar.gz: 2dcbbb94dcfada4dbe64ea11b70f28e2fc99a095
+  metadata.gz: 80f8c8ee990117f5b3b57d719141d7f1bec3629c
+  data.tar.gz: 0a5792092be3a480b68dc9207aee4cfe69317d89
 SHA512:
-  metadata.gz: f84c6b4e296388b675e367b0b9bf9220ea3b90748bf032a7e45b10ba1cc928e290f7c04999a7dacdf43f571a0ecfdf5004c78434f7c37d4bd204f234ddeed128
-  data.tar.gz: 38b98f28016dc8b67423bb2610ba80e1c21c08893ad288925319ea35145501acfd0d987653e28cfcc0f9050398309bd8acb29a1cfdbe9acd72a36f0cc77f18b3
+  metadata.gz: 3d43a623d556236199e112a77155fd64ffdc79a6c4f902ac37ae7152639dea696ce1a3c9f58efbb7cd2e80c2a7c445e970bd643912838a47fc3a5a8ea5c223e7
+  data.tar.gz: c640700f2e662e6583447389a78227fd62a249dabd96656e8b2a64bef668218d29e4a9d522779937a1b20aef01b46c4f6f6bb3b3a639a4fe98768682d6940d5d

data/.gitignore

@@ -10,3 +10,5 @@
 
 # rspec failure tracking
 .rspec_status
+script/*
+

data/lib/zanders/item.rb

@@ -77,7 +77,7 @@ module Zanders
         quantity = Hash.new
 
         # We only need the quantity out of the data received
-        quantity[:quantity] = response.find { |i| i[:key] == "numberAvailable" }[:value]
+        quantity[:quantity] = response.find { |i| i[:key] == "numberAvailable" }[:value].to_i
         quantity[:success]  = true
 
         quantity

data/lib/zanders/order.rb

@@ -189,70 +189,34 @@ module Zanders
         if info[:number_of_shipments] > 0
           tracking_numbers = response.find { |i| i[:key] == "trackingNumbers" }[:value]
 
-          tracking_numbers[:item].each do |part|
-            part    = part[:item]
+          if info[:number_of_shipments] == 1
+            shipment_list = [tracking_numbers[:item]]
+          elsif info[:number_of_shipments] > 1
+            shipment_list = tracking_numbers[:item]
+          end
+
+          shipment_list.each do |part|
+            part = part[:item]
             shipment = Hash.new
 
-            part.each do |info|
-              case info[:key]
+            part.each do |datum|
+              case datum[:key]
               when 'shipCompany'
-                shipment[:company] = info[:value]
+                shipment[:company] = datum[:value]
               when 'shipVia'
-                shipment[:via] = info[:value]
+                shipment[:via] = datum[:value]
               when 'trackingNumber'
-                shipment[:tracking_number] = info[:value]
-              when 'weight'
-                shipment[:weight] = info[:value]
+                shipment[:tracking_number] = datum[:value]
               when 'url'
-                shipment[:url] = info[:value]
+                shipment[:url] = datum[:value]
               end
             end
 
-            info[:shipments].push shipment
-          end
-
-          info[:success] = true
-
-          info
-        else
-          { success: false, error_code: response.first[:value], error_message: "No present tracking information" }
-        end
-      else
-        { success: false, error_code: response.first[:value] }
-      end
-    end
-
-    def get_tracking_info(order_number)
-      order = build_order_data.merge({ ordernumber: order_number })
-
-      response = soap_client(ORDER_API_URL).call(:get_tracking_info, message: order)
-      response = response.body[:get_tracking_info_response][:return][:item]
-
-      if response.first[:value] == "0"
-        info = Hash.new
-        info[:number_of_shipments] = response.find { |i| i[:key] == "numberOfShipments" }[:value].to_i
-
-        if info[:number_of_shipments] > 0
-          tracking_numbers = response.find { |i| i[:key] == "trackingNumbers" }[:value]
-
-          tracking_numbers[:item][:item].each do |part|
-            case part[:key]
-            when 'shipCompany'
-              info[:company] = part[:value]
-            when 'shipVia'
-              info[:via] = part[:value]
-            when 'trackingNumber'
-              info[:tracking_number] = part[:value]
-            when 'weight'
-              info[:weight] = part[:value]
-            when 'url'
-              info[:url] = part[:value]
-            end
+            info[:shipments] << shipment
           end
 
           info[:success] = true
-
-          info
+          return info
         else
           { success: false, error_code: response.first[:value], error_message: "No present tracking information" }
         end

data/lib/zanders/version.rb

@@ -1,3 +1,3 @@
 module Zanders
-  VERSION = "2.2.2".freeze
+  VERSION = "2.2.3".freeze
 end

data/zanders.gemspec

@@ -28,5 +28,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.14"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "rspec", "~> 3.3"
+  spec.add_development_dependency "webmock", "~> 3.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zanders
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.2.3
 platform: ruby
 authors:
 - David Knight
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-23 00:00:00.000000000 Z
+date: 2018-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -86,14 +86,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.3'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
 description: ''
 email:
 - viacoffee@gmail.com
@@ -144,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Ruby library for Zanders