zanders 1.4.10 → 2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b04b4f35c32e7fefb2e813e7143e33d6749ee98
-  data.tar.gz: 37ff995660b5e1e98dc5213914ffe2c8f4b4d8e1
+  metadata.gz: 87b6fba3d86fa736bca99aa0c64cddc262c1b8c0
+  data.tar.gz: 108b978150d49336b6c697e8b108270a2c4db8a9
 SHA512:
-  metadata.gz: 04a63e413014b45a44cbcce9cd1743a8ce88ab2d114f2ec3eb4d779bf0a0db1a79de33922c4fbf901e3801d1c2be537cf5c7f962191f93776c3148cfc106f153
-  data.tar.gz: fd135cd8fe139ab047431196dc157a675c8a854437726c55a27b8bc3afc89c7fff6404f07d437ec873b37872db95652e7d95729dae2969f650807ea292b6c888
+  metadata.gz: 963c1d800361f0e04a18b22535ab3d153772813224772e2b5af3ab7a19f60602b69280fccac2f24ba5a3802ddd10217a623fba0e458fe2594266738f85b85043
+  data.tar.gz: 65f26302cd660430a46064e4b1ecf7d3f16f8bca393ea3f66761bf6373c725ba64595b9740730fc6b133d26ea6e8b089c18ee1e5cc042471be813f337d759317

data/lib/zanders.rb

@@ -11,6 +11,7 @@ require 'zanders/address'
 require 'zanders/order'
 require 'zanders/item'
 require 'zanders/inventory'
+require 'zanders/catalog'
 
 module Zanders
 

data/lib/zanders/address.rb

@@ -36,7 +36,7 @@ module Zanders
       response = response.body[:use_ship_to_response][:return][:item]
 
       # Successful call return_code is 0
-      if response.first[:value] == "0" || response.first[:value] == "15"
+      if response.first[:value] == "0"
         ship_to_number = Hash.new
 
         # Let's dig to get to data we actually need. Yay, digging...

data/lib/zanders/catalog.rb

@@ -0,0 +1,56 @@
+module Zanders
+  class Catalog < Base
+
+    CATALOG_FILENAME  = "zandersinv.csv"
+
+    def initialize(options = {})
+      requires!(options, :username, :password)
+
+      @options = options
+    end
+
+    def self.all(chunk_size = 15, options = {}, &block)
+      requires!(options, :username, :password)
+      new(options).all(chunk_size, &block)
+    end
+
+    def all(chunk_size, &block)
+      connect(@options) do |ftp|
+        begin
+          csv_tempfile = Tempfile.new
+
+          ftp.chdir(Zanders.config.ftp_directory)
+          ftp.getbinaryfile(CATALOG_FILENAME, csv_tempfile.path)
+
+          SmarterCSV.process(csv_tempfile, {
+            :chunk_size => chunk_size,
+            :convert_values_to_numeric => false,
+            :key_mapping => {
+              :available    => :quantity,
+              :desc1        => :short_description,
+              :itemnumber   => :item_identifier,
+              :manufacturer => :brand,
+              :mfgpnumber   => :mfg_number,
+              :mapprice     => :map_price,
+              :price1       => :price
+            }
+          }) do |chunk|
+            chunk.each do |item|
+              item[:name] = item[:short_description]
+              item[:long_description] = "#{item[:short_description]} #{item[:desc2]}"
+
+              item.except!(:desc2, :qty1, :qty2, :qty3, :price2, :price3)
+            end
+
+            yield(chunk)
+          end
+
+          csv_tempfile.unlink
+        ensure
+          ftp.close
+        end
+      end
+    end
+
+  end
+end

data/lib/zanders/inventory.rb

@@ -1,8 +1,7 @@
 module Zanders
   class Inventory < Base
 
-    INVENTORY_FILENAME  = "zandersinv.csv"
-    QUANTITY_FILENAME   = "liveinv.csv"
+    INVENTORY_FILENAME  = "liveinv.csv"
 
     def initialize(options = {})
       requires!(options, :username, :password)
@@ -15,31 +14,7 @@ module Zanders
       new(options).all(chunk_size, &block)
     end
 
-    def self.quantities(chunk_size = 15, options = {}, &block)
-      requires!(options, :username, :password)
-      new(options).quantities(chunk_size, &block)
-    end
-
     def all(chunk_size, &block)
-      connect(@options) do |ftp|
-        begin
-          csv_tempfile = Tempfile.new
-
-          ftp.chdir(Zanders.config.ftp_directory)
-          ftp.getbinaryfile(INVENTORY_FILENAME, csv_tempfile.path)
-
-          SmarterCSV.process(csv_tempfile, { :chunk_size => chunk_size, :convert_values_to_numeric => false }) do |chunk|
-            yield(chunk)
-          end
-
-          csv_tempfile.unlink
-        ensure
-          ftp.close
-        end
-      end
-    end
-
-    def quantities(chunk_size, &block)
       connect(@options) do |ftp|
         begin
           csv_tempfile = Tempfile.new
@@ -47,7 +22,19 @@ module Zanders
           ftp.chdir(Zanders.config.ftp_directory)
           ftp.getbinaryfile(QUANTITY_FILENAME, csv_tempfile.path)
 
-          SmarterCSV.process(csv_tempfile, { :chunk_size => chunk_size, :convert_values_to_numeric => false }) do |chunk|
+          SmarterCSV.process(csv_tempfile, {
+            :chunk_size => chunk_size,
+            :convert_values_to_numeric => false,
+            :key_mapping => {
+              :available  => :quantity,
+              :itemnumber => :item_identifier,
+              :price1     => :price
+            }
+          }) do |chunk|
+            chunk.each do |item|
+              item.except!(:qty1, :qty2, :qty3, :price2, :price3)
+            end
+
             yield(chunk)
           end
 

data/lib/zanders/order.rb

@@ -53,11 +53,9 @@ module Zanders
         ])
       end
 
-      shipping_code = (@options[:account] == :default ? 'UM' : 'UG')
-
       shipping_information.push(*[
         { key: 'shipDate', value: Time.now.strftime("%Y-%m-%d") },
-        { key: 'shipViaCode', value: shipping_code },
+        { key: 'shipViaCode', value: 'UG' },
         { key: 'purchaseOrderNumber', value: purchase_order_number }
       ])
 
@@ -69,7 +67,7 @@ module Zanders
         if ship_to_number[:success]
           shipping_information.push({key: 'shipToNo', value: ship_to_number[:ship_to_number] })
         else
-          return { success: false, error_code: ship_to_number[:error_code], error_message: ship_to_number[:error_message] }
+          return { success: false, error_code: ship_to_number[:error_code], error_message: response.last[:value] }
         end
       else
         shipping_information.push(*[

data/lib/zanders/version.rb

@@ -1,3 +1,3 @@
 module Zanders
-  VERSION = "1.4.10"
+  VERSION = "2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zanders
 version: !ruby/object:Gem::Version
-  version: 1.4.10
+  version: '2.0'
 platform: ruby
 authors:
 - David Knight
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-19 00:00:00.000000000 Z
+date: 2017-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -115,6 +115,7 @@ files:
 - lib/zanders.rb
 - lib/zanders/address.rb
 - lib/zanders/base.rb
+- lib/zanders/catalog.rb
 - lib/zanders/inventory.rb
 - lib/zanders/item.rb
 - lib/zanders/order.rb