zanders 3.0.0 → 5.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 89bbfb0b8419f723b3961add32b0ab0dc1b6c70a
-  data.tar.gz: 0a8cbe3047e4e1331423f66d7b7b95513419c91e
+SHA256:
+  metadata.gz: 667c712dfc6b1d986624a4595a42cae4719dbcfa72049d3f8c5e8d9938f6171e
+  data.tar.gz: bbf53fd0f93133f7f3baed35440340cbcb87e8e5cee1f45b945ab277e0d29d3c
 SHA512:
-  metadata.gz: 74ed395a7d1f728a9f4d0c2f65d8ecc4ce552b4f266e86fff6a15034945a2c4b81a822b81b6d4f3bbb2465005228d8fa00bbc56c581c2a1bdcd01836aba92c93
-  data.tar.gz: 66a084e8ef02b7acb4211a27c38baf098cdbd44cc3dcca31e765aa82f9dbf9966cd56807daf9ca279ea62c6a540f47d16a3219e87d8a3e8e671cd9111bf2c48e
+  metadata.gz: 9769a9dcae8c327efa69cc6b7ccc518362323bd7e5cf8fd0f358a4ee32aaf79f40c4ecc2626dba29d21d378d7466fadcdff8e422e5f5167e491f925f7f478dce
+  data.tar.gz: 8b8eeca66eb86873a07ed24bbb00605f4111870c70e6c735f3b1c6c4551352bdd5b5d18671c76da86dabba79e1891e1e3f0cc5dab3a77b81fa123dcdb54baa3a

data/.ruby-version

@@ -1 +1 @@
-2.3.1
+2.3.6

data/lib/zanders/catalog.rb

@@ -1,31 +1,38 @@
 module Zanders
   class Catalog < Base
 
-    CATALOG_FILENAME = 'zandersinv.xml'
-    ITEM_NODE_NAME   = 'ZandersDataOut'
+    CATALOG_FILENAME = 'zandersinv.xml'.freeze
+    ITEM_NODE_NAME   = 'ZandersDataOut'.freeze
 
     def initialize(options = {})
       requires!(options, :username, :password)
       @options = options
     end
 
-    def self.all(options = {}, &block)
+    def self.all(options = {})
       requires!(options, :username, :password)
-      new(options).all &block
+      new(options).all
     end
 
-    def all(&block)
+    def all
+      items    = []
       tempfile = get_file(CATALOG_FILENAME)
 
-      Nokogiri::XML::Reader.from_io(tempfile).each do |node|
-        next unless node.node_type == Nokogiri::XML::Reader::TYPE_ELEMENT
-        next unless node.name == ITEM_NODE_NAME
+      Nokogiri::XML::Reader.from_io(tempfile, nil, Zanders.config.file_encoding).each do |reader|
+        next unless reader.node_type == Nokogiri::XML::Reader::TYPE_ELEMENT
+        next unless reader.name == ITEM_NODE_NAME
 
-        yield map_hash(Nokogiri::XML::DocumentFragment.parse(node.inner_xml))
+        node = Nokogiri::XML.parse(reader.outer_xml)
+
+        _map_hash = map_hash(node.css(ITEM_NODE_NAME))
+
+        items << _map_hash unless _map_hash.nil?
       end
 
       tempfile.close
       tempfile.unlink
+
+      items
     end
 
     protected

data/lib/zanders/inventory.rb

@@ -8,9 +8,9 @@ module Zanders
       @options = options
     end
 
-    def self.all(options = {}, &block)
+    def self.all(options = {})
       requires!(options, :username, :password)
-      new(options).all &block
+      new(options).all
     end
 
     def self.get_quantity_file(options = {})
@@ -18,20 +18,25 @@ module Zanders
       new(options).get_quantity_file
     end
 
-    def self.quantity(options = {}, &block)
+    def self.quantity(options = {})
       requires!(options, :username, :password)
-      new(options).all &block
+      new(options).all
     end
 
-    def all(&block)
+    def all
+      items    = []
       tempfile = get_file(INVENTORY_FILENAME)
 
       Nokogiri::XML(tempfile).xpath('//ZandersDataOut').each do |item|
-        yield map_hash(item)
+        _map_hash = map_hash(item)
+
+        items << _map_hash unless _map_hash.nil?
       end
 
       tempfile.close
       tempfile.unlink
+
+      items
     end
 
     def get_quantity_file

data/lib/zanders/order.rb

@@ -48,9 +48,19 @@ module Zanders
 
       items.each do |item|
         order_items.push(item: [
-          { key: 'itemNumber', value: item[:item_number], attributes!: { key: {'xsi:type' => 'xsd:string'}, value: {'xsi:type' => 'xsd:string'} }},
-          { key: 'quantity', value: item[:quantity] , attributes!: { key: {'xsi:type' => 'xsd:string'}, value: {'xsi:type' => 'xsd:string'} }},
-          { key: 'allowBackOrder', value: false, attributes!: { key: { 'xsi:type' => 'xsd:string' }, value: {'xsi:type' => 'xsd:boolean'} }}
+          {
+            key: 'itemNumber',
+            value: item[:item_number],
+            attributes!: { key: { 'xsi:type' => 'xsd:string' }, value: { 'xsi:type' => 'xsd:string' } }
+          }, {
+            key: 'quantity',
+            value: item[:quantity],
+            attributes!: { key: { 'xsi:type' => 'xsd:string' }, value: { 'xsi:type' => 'xsd:string' } }
+          }, {
+            key: 'allowBackOrder',
+            value: false,
+            attributes!: { key: { 'xsi:type' => 'xsd:string' }, value: { 'xsi:type' => 'xsd:boolean' } }
+          }
         ])
       end
 
@@ -74,12 +84,12 @@ module Zanders
         end
       else
         shipping_information.push(*[
-          { key: 'shipToName',      value: address[:name]     },
-          { key: 'shipToAddress1',  value: address[:address1] },
-          { key: 'shipToAddress2',  value: address[:address2] },
-          { key: 'shipToCity',      value: address[:city]     },
-          { key: 'shipToState',     value: address[:state]    },
-          { key: 'shipToZip',       value: address[:zip]      }
+          { key: 'shipToName',     value: address[:name]     },
+          { key: 'shipToAddress1', value: address[:address1] },
+          { key: 'shipToAddress2', value: address[:address2] },
+          { key: 'shipToCity',     value: address[:city]     },
+          { key: 'shipToState',    value: address[:state]    },
+          { key: 'shipToZip',      value: address[:zip]      }
         ])
       end
 
@@ -107,18 +117,33 @@ module Zanders
         key: 'items',
         value: order_items,
         attributes!: {
-          key: {"xsi:type" => "xsd:string"},
-          value: {"enc:itemType" => "ns2:Map[#{order_items.count}]", "enc:arraySize" => order_items.count.to_s, "xsi:type" => "enc:Array"}
+          key: {
+            "xsi:type" => "xsd:string"
+          },
+          value: {
+            "enc:itemType"  => "ns2:Map[#{order_items.count}]",
+            "enc:arraySize" => order_items.count.to_s,
+            "xsi:type"      => "enc:Array"
+          }
         }
       })
 
-      response = soap_client(ORDER_API_URL).call(:create_order, message: order)
-      response = response.body[:create_order_response][:return][:item]
+      soap_response = soap_client(ORDER_API_URL).call(:create_order, message: order)
+      hash = soap_response.body[:create_order_response][:return][:item]
 
-      if response.first[:value] == "0"
-        { success: true, order_number: response.last[:value] }
+      if hash.first[:value] == "0"
+        {
+          success:       true,
+          order_number:  hash.find { |h| h[:key] == 'orderNumber' }&.dig(:value),
+          removed_items: hash.find { |h| h[:key] == 'removedItems' }&.dig(:value, :item),
+          raw_xml:       soap_response.to_xml
+        }
       else
-        { success: false, error_code: response.first[:value], error_message: response.last[:value] }
+        {
+          success:       false,
+          error_code:    hash.first[:value],
+          error_message: hash.last[:value]
+        }
       end
     end
 
@@ -176,15 +201,15 @@ module Zanders
     end
 
     def get_shipments(order_number)
-      order = build_order_data.merge({ ordernumber: order_number })
+      order = build_order_data.merge({ ordernumber: { "@xsi:type" => "xsd:string", :content! => 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 = { shipments: [] }
+
         info[:number_of_shipments] = response.find { |i| i[:key] == "numberOfShipments" }[:value].to_i
-        info[:shipments] = Array.new
 
         if info[:number_of_shipments] > 0
           tracking_numbers = response.find { |i| i[:key] == "trackingNumbers" }[:value]
@@ -231,7 +256,7 @@ module Zanders
     #
     # Returns Hash of username, password, and cast assignments
     def build_order_data
-      hash = {
+      {
         :attributes! => {
           order: { "xsi:type" => "ns2:Map" }
         },
@@ -239,8 +264,6 @@ module Zanders
         password: @password,
         testing:  @testing
       }
-
-      hash
     end
 
     # Private: Formats the name and phone number into a

data/lib/zanders/soap_client.rb

@@ -1,6 +1,14 @@
 module Zanders
   class SoapClient < Base
 
+    NAMESPACES = {
+      "xmlns:env" => "http://www.w3.org/2003/05/soap-envelope",
+      "xmlns:xsd" => "http://www.w3.org/2001/XMLSchema",
+      "xmlns:xsl" => "http://www.w3.org/2001/XMLSchema-Instance",
+      "xmlns:ns2" => "http://xml.apache.org/xml-soap",
+      "xmlns:enc" => "http://www.w3.org/2003/05/soap-encoding"
+    }
+
     ##
     # == Item Service
     #
@@ -12,17 +20,9 @@ module Zanders
     protected
 
     def soap_client(api_url)
-      namespaces = {
-        "xmlns:env" => "http://www.w3.org/2003/05/soap-envelope",
-        "xmlns:xsd" => "http://www.w3.org/2001/XMLSchema",
-        "xmlns:xsl" => "http://www.w3.org/2001/XMLSchema-Instance",
-        "xmlns:ns2" => "http://xml.apache.org/xml-soap",
-        "xmlns:enc" => "http://www.w3.org/2003/05/soap-encoding"
-      }
-
       @soap_client ||= Savon.client do
         wsdl(api_url)
-        namespaces(namespaces)
+        namespaces(NAMESPACES)
         namespace_identifier(:ns1)
         strip_namespaces true
         ssl_verify_mode :none

data/lib/zanders/version.rb

@@ -1,3 +1,3 @@
 module Zanders
-  VERSION = '3.0.0'.freeze
+  VERSION = '5.0.1'.freeze
 end

data/lib/zanders.rb

@@ -35,6 +35,7 @@ module Zanders
 
   class Configuration
     attr_accessor :debug_mode
+    attr_accessor :file_encoding
     attr_accessor :ftp_host
     attr_accessor :ftp_directory
 
@@ -42,8 +43,9 @@ module Zanders
 
     def initialize
       @debug_mode    ||= false
-      @ftp_host      ||= "ftp2.gzanders.com"
-      @ftp_directory ||= "Inventory/AmmoReady"
+      @file_encoding ||= 'Windows-1252'
+      @ftp_host      ||= 'ftp2.gzanders.com'
+      @ftp_directory ||= 'Inventory/AmmoReady'
     end
   end
 end

data/zanders.gemspec

@@ -6,8 +6,8 @@ require 'zanders/version'
 Gem::Specification.new do |spec|
   spec.name          = "zanders"
   spec.version       = Zanders::VERSION
-  spec.authors       = ["David Knight"]
-  spec.email         = ["viacoffee@gmail.com"]
+  spec.authors       = ["David Knight", "Jeffrey Dill"]
+  spec.email         = ["jeffdill2@gmail.com"]
 
   spec.summary       = %q{Ruby library for Zanders}
   spec.description   = %q{}
@@ -21,14 +21,17 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "nokogiri", "~> 1.6"
+  spec.required_ruby_version = '~> 2.3'
+
+  spec.add_dependency "nokogiri", "~> 1.11.0"
   spec.add_dependency "savon", "~> 2.11.1"
+  spec.add_dependency "wasabi", "~> 3.5.0"
 
   spec.add_runtime_dependency "smarter_csv", "~> 1.1.4"
 
   spec.add_development_dependency "activesupport", "~> 5"
-  spec.add_development_dependency "bundler", "~> 1.14"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler", ">= 2.2.10"
+  spec.add_development_dependency "rake", ">= 12.3.3"
   spec.add_development_dependency "rspec", "~> 3.3"
   spec.add_development_dependency "webmock", "~> 3.4"
 end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: zanders
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 5.0.1
 platform: ruby
 authors:
 - David Knight
-autorequire: 
+- Jeffrey Dill
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2018-07-17 00:00:00.000000000 Z
+date: 2021-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -16,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: 1.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: 1.11.0
 - !ruby/object:Gem::Dependency
   name: savon
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +39,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.11.1
+- !ruby/object:Gem::Dependency
+  name: wasabi
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.5.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.5.0
 - !ruby/object:Gem::Dependency
   name: smarter_csv
   requirement: !ruby/object:Gem::Requirement
@@ -70,30 +85,30 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: 2.2.10
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: 2.2.10
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -124,7 +139,7 @@ dependencies:
         version: '3.4'
 description: ''
 email:
-- viacoffee@gmail.com
+- jeffdill2@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -156,24 +171,23 @@ homepage: ''
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.12
-signing_key: 
+rubygems_version: 3.0.8
+signing_key:
 specification_version: 4
 summary: Ruby library for Zanders
 test_files: []