zanders 2.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87b6fba3d86fa736bca99aa0c64cddc262c1b8c0
-  data.tar.gz: 108b978150d49336b6c697e8b108270a2c4db8a9
+  metadata.gz: 4e06bfb17dc0814d2d1ff1fcae78f30cde28071d
+  data.tar.gz: 066e53e422081dc2d25ed0fa8f0eb7721b6eb0b4
 SHA512:
-  metadata.gz: 963c1d800361f0e04a18b22535ab3d153772813224772e2b5af3ab7a19f60602b69280fccac2f24ba5a3802ddd10217a623fba0e458fe2594266738f85b85043
-  data.tar.gz: 65f26302cd660430a46064e4b1ecf7d3f16f8bca393ea3f66761bf6373c725ba64595b9740730fc6b133d26ea6e8b089c18ee1e5cc042471be813f337d759317
+  metadata.gz: d5b3277a7cec7dc88e8558b8746c2f3969c89aa21532fdbd6ded1c9c7a08ba54c4cb9268d7338f956a5182a4687b1a905400f53f70d9b7b0a168457eab03e1e1
+  data.tar.gz: fbe982215e5832915e4d914a10968905b40576972dcccf2ff972e584c675d9ae63a42b8e7f4d1c0579638e8d0c94f8285bc30edcde6b03aa1d32192ecd1a569c

data/lib/zanders/base.rb

@@ -40,5 +40,19 @@ module Zanders
       end
     end
 
+    def content_for(xml_doc, field)
+      node = xml_doc.css(field).first
+
+      if node.nil?
+        nil
+      else
+        if node.css("DATA").present?
+          node.css("DATA").text.strip
+        else
+          node.content.strip
+        end
+      end
+    end
+
   end
 end

data/lib/zanders/catalog.rb

@@ -1,11 +1,10 @@
 module Zanders
   class Catalog < Base
 
-    CATALOG_FILENAME  = "zandersinv.csv"
+    CATALOG_FILENAME  = "zandersinv.xml"
 
     def initialize(options = {})
       requires!(options, :username, :password)
-
       @options = options
     end
 
@@ -14,7 +13,9 @@ module Zanders
       new(options).all(chunk_size, &block)
     end
 
-    def all(chunk_size, &block)
+   def all(chunk_size, &block)
+      chunker = Zanders::Chunker.new(chunk_size)
+
       connect(@options) do |ftp|
         begin
           csv_tempfile = Tempfile.new
@@ -22,27 +23,20 @@ module Zanders
           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)
+          xml_doc = Nokogiri::XML(csv_tempfile)
+
+          xml_doc.xpath("//ZandersDataOut").each do |item|
+            if chunker.is_full?
+              yield(chunker.chunk)
+
+              chunker.reset!
+            else
+              chunker.add(map_hash(item, @options[:full_product].present?))
             end
+          end
 
-            yield(chunk)
+          if chunker.chunk.count > 0
+            yield(chunker.chunk)
           end
 
           csv_tempfile.unlink
@@ -52,5 +46,40 @@ module Zanders
       end
     end
 
+    protected
+
+    def map_hash(node, full_product = false)
+      features = self.map_features(node)
+
+      {
+        name:               content_for(node, 'ITEMDESCRIPTION'),
+        upc:                content_for(node, 'ITEMUPC'),
+        item_identifier:    content_for(node, 'ITEMNO'),
+        quantity:           content_for(node, 'ITEMQTYAVAIL'),
+        price:              content_for(node, 'ITEMPRICE'),
+        short_description:  content_for(node, 'ITEMDESCRIPTION'),
+        category:           content_for(node, 'ITEMCATEGORYNAME'),
+        product_type:       content_for(node, 'ITEMPRODUCTTYPE'),
+        mfg_number:         content_for(node, 'ITEMMPN'),
+        weight:             content_for(node, 'ITEMWEIGHT'),
+        map_price:          content_for(node, 'ITEMMAPPRICE'),
+        brand:              content_for(node, 'ITEMMANUFACTURER'),
+        features:           features
+      }
+    end
+
+    def map_features(node)
+      features = Hash.new
+
+      node.css("ATTRIBUTE").each do |feature|
+        features[feature.css("TITLE").text.strip] = feature.css("DATA").text.strip
+      end
+
+      features.delete_if { |k, v| v.to_s.blank? }
+      features.transform_keys! { |k| k.gsub(/\s+/, '_').downcase }
+      features.transform_keys! { |k| k.gsub(/[^0-9A-Za-z \_]/, '') }
+      features.symbolize_keys!
+    end
+
   end
 end

data/lib/zanders/chunker.rb

@@ -0,0 +1,34 @@
+module Zanders
+  class Chunker
+
+    attr_accessor :chunk, :total_count, :current_count, :size
+
+    def initialize(size, total_count = nil)
+      @size           = size
+      @chunk          = Array.new
+      @current_count  = 0
+      @total_count    = total_count
+    end
+
+    def add(row)
+      self.reset! if is_full?
+
+      @chunk.push(row)
+
+      @current_count += 1
+    end
+
+    def reset!
+      @chunk.clear
+    end
+
+    def is_full?
+      @chunk.count == @size
+    end
+
+    def is_complete?
+      @total_count == @current_count
+    end
+
+  end
+end

data/lib/zanders/version.rb

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

data/lib/zanders.rb

@@ -5,6 +5,7 @@ require 'savon'
 
 require 'zanders/base'
 require 'zanders/soap_client'
+require 'zanders/chunker'
 
 require 'zanders/user'
 require 'zanders/address'

metadata

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