zanders 2.3.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1e40bf9409d6d02ef10b37ea4775601ceb7c2cd
-  data.tar.gz: f71f3e3d12781a6f2857a10527e9a2e318fc51e5
+  metadata.gz: 89bbfb0b8419f723b3961add32b0ab0dc1b6c70a
+  data.tar.gz: 0a8cbe3047e4e1331423f66d7b7b95513419c91e
 SHA512:
-  metadata.gz: 5d9e843dca9c57e9b6d750154f5d42d169c8518cefdc1a982f705948833dccb660cb4e92f64d09a15c9f67fe0ab1de22a70b4e91b05e54da0b16045cb99d4f5d
-  data.tar.gz: a81640e4b9b752fa676ede380d5b963ded5cee5393cf6b1ced0cb1c6f5b7b3f9fb5adb826387ef042e3606015af63d0c404ee78157bc83d33fb1360c5bfd5674
+  metadata.gz: 74ed395a7d1f728a9f4d0c2f65d8ecc4ce552b4f266e86fff6a15034945a2c4b81a822b81b6d4f3bbb2465005228d8fa00bbc56c581c2a1bdcd01836aba92c93
+  data.tar.gz: 66a084e8ef02b7acb4211a27c38baf098cdbd44cc3dcca31e765aa82f9dbf9966cd56807daf9ca279ea62c6a540f47d16a3219e87d8a3e8e671cd9111bf2c48e

data/lib/zanders/base.rb

@@ -49,8 +49,6 @@ module Zanders
           ftp.chdir(Zanders.config.ftp_directory)
           ftp.getbinaryfile(filename, tempfile.path)
 
-          tempfile.close
-
           tempfile
         ensure
           ftp.close

data/lib/zanders/catalog.rb

@@ -1,71 +1,55 @@
 module Zanders
   class Catalog < Base
 
-    CATALOG_FILENAME  = "zandersinv.xml"
+    CATALOG_FILENAME = 'zandersinv.xml'
+    ITEM_NODE_NAME   = 'ZandersDataOut'
 
     def initialize(options = {})
       requires!(options, :username, :password)
       @options = options
     end
 
-    def self.all(chunk_size = 15, options = {}, &block)
+    def self.all(options = {}, &block)
       requires!(options, :username, :password)
-      new(options).all(chunk_size, &block)
+      new(options).all &block
     end
 
-    def all(chunk_size, &block)
-      tempfile  = get_file(CATALOG_FILENAME)
-      xml_doc   = Nokogiri::XML(tempfile.open)
+    def all(&block)
+      tempfile = get_file(CATALOG_FILENAME)
 
-      xml_doc.xpath("//ZandersDataOut").each do |item|
-        map_hash(item)
+      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
+
+        yield map_hash(Nokogiri::XML::DocumentFragment.parse(node.inner_xml))
       end
 
+      tempfile.close
       tempfile.unlink
     end
 
     protected
 
     def map_hash(node)
-      features = self.map_features(node)
-
-      # product_type = case content_for(node, 'ITEMPRODUCTTYPE')
-      #   when 'PD', 'PR'
-      #     :ammunition
-      #   else
-      #     nil
-      #   end
+      features = 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'),
-        long_description:   long_description,
-        category:           content_for(node, 'ITEMCATEGORYNAME'),
-        # product_type:       product_type,
-        mfg_number:         content_for(node, 'ITEMMPN'),
-        weight:             content_for(node, 'ITEMWEIGHT'),
-        caliber:            features[:caliber],
-        map_price:          content_for(node, 'ITEMMAPPRICE'),
-        brand:              content_for(node, 'ITEMMANUFACTURER'),
-        features:           features
+        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'),
+        mfg_number:        content_for(node, 'ITEMMPN'),
+        weight:            content_for(node, 'ITEMWEIGHT'),
+        caliber:           features[:caliber],
+        map_price:         content_for(node, 'ITEMMAPPRICE'),
+        brand:             content_for(node, 'ITEMMANUFACTURER'),
+        features:          features
       }
     end
 
-    def get_description(item_number)
-      description = @descriptions.find { |x| x[0] == item_number }
-
-      if description
-        description = description.last
-        description.slice!("FEATURES")
-      end
-
-      description
-    end
-
     def map_features(node)
       features = Hash.new
 
@@ -79,16 +63,5 @@ module Zanders
       features.symbolize_keys!
     end
 
-    def load_descriptions
-      connect(@options) do |ftp|
-        csv_tempfile = Tempfile.new
-
-        ftp.chdir(Zanders.config.ftp_directory)
-        ftp.getbinaryfile('detaildesctext.csv', csv_tempfile.path)
-
-        @descriptions = CSV.read(csv_tempfile, { :col_sep => '~', :quote_char => "\x00" })
-      end
-    end
-
   end
 end

data/lib/zanders/inventory.rb

@@ -5,13 +5,12 @@ module Zanders
 
     def initialize(options = {})
       requires!(options, :username, :password)
-
       @options = options
     end
 
-    def self.all(chunk_size = 100, options = {}, &block)
+    def self.all(options = {}, &block)
       requires!(options, :username, :password)
-      new(options).all(chunk_size, &block)
+      new(options).all &block
     end
 
     def self.get_quantity_file(options = {})
@@ -19,39 +18,33 @@ module Zanders
       new(options).get_quantity_file
     end
 
-    def self.quantity(chunk_size = 100, options = {}, &block)
-      requires!(options, :username, :password)
-      new(options).all(chunk_size, &block)
-    end
-
-    def self.get_file(options = {})
+    def self.quantity(options = {}, &block)
       requires!(options, :username, :password)
-      new(options).get_file
+      new(options).all &block
     end
 
-    def all(chunk_size, &block)
-      tempfile  = get_file(INVENTORY_FILENAME)
-      xml_doc   = Nokogiri::XML(tempfile.open)
+    def all(&block)
+      tempfile = get_file(INVENTORY_FILENAME)
 
-      xml_doc.xpath('//ZandersDataOut').each do |item|
-        map_hash(item)
+      Nokogiri::XML(tempfile).xpath('//ZandersDataOut').each do |item|
+        yield map_hash(item)
       end
 
+      tempfile.close
       tempfile.unlink
     end
 
     def get_quantity_file
-      inventory_tempfile  = get_file(INVENTORY_FILENAME)
-      tempfile            = Tempfile.new
-      xml_doc             = Nokogiri::XML(inventory_tempfile.open)
+      inventory_tempfile = get_file(INVENTORY_FILENAME)
+      tempfile           = Tempfile.new
 
-      xml_doc.xpath('//ZandersDataOut').each do |item|
+      Nokogiri::XML(inventory_tempfile).xpath('//ZandersDataOut').each do |item|
         tempfile.puts("#{content_for(item, 'ITEMNO')},#{content_for(item, 'AVAILABLE')}")
       end
 
+      inventory_tempfile.close
       inventory_tempfile.unlink
       tempfile.close
-
       tempfile.path
     end
 
@@ -59,9 +52,9 @@ module Zanders
 
     def map_hash(node)
       {
-        item_identifier:  content_for(node, 'ITEMNO'),
-        quantity:         content_for(node, 'AVAILABLE'),
-        price:            content_for(node, 'ITEMPRICE')
+        item_identifier: content_for(node, 'ITEMNO'),
+        quantity:        content_for(node, 'AVAILABLE'),
+        price:           content_for(node, 'ITEMPRICE')
       }
     end
 

data/lib/zanders/version.rb

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

data/zanders.gemspec

@@ -26,6 +26,7 @@ Gem::Specification.new do |spec|
 
   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 "rspec", "~> 3.3"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zanders
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 3.0.0
 platform: ruby
 authors:
 - David Knight
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-10 00:00:00.000000000 Z
+date: 2018-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.4
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -158,7 +172,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