zanders 2.2.7 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 52badb9c2d6d13273145657ecc927f678209e5ae
-  data.tar.gz: ca5f963d2b3f3d33eb214233098c0b5b977bada6
+  metadata.gz: f1e40bf9409d6d02ef10b37ea4775601ceb7c2cd
+  data.tar.gz: f71f3e3d12781a6f2857a10527e9a2e318fc51e5
 SHA512:
-  metadata.gz: d026e542453a3c286c2f26b19f3edd09fce597ca579c9f7b3339ad76dec0e918bcef3bdcaf2409654099fb69eb91ffe51c7b2ae15484dc917cdc70531f785f02
-  data.tar.gz: 61f7555598fad289f2a80e5961734fdfcbfe57cd412116fd7c1cb6f8da3b8c70a6a829b60c7dbc330e68eb90f9c774bc790ecdacc0c6f4735e9a4c9a1aac393e
+  metadata.gz: 5d9e843dca9c57e9b6d750154f5d42d169c8518cefdc1a982f705948833dccb660cb4e92f64d09a15c9f67fe0ab1de22a70b4e91b05e54da0b16045cb99d4f5d
+  data.tar.gz: a81640e4b9b752fa676ede380d5b963ded5cee5393cf6b1ced0cb1c6f5b7b3f9fb5adb826387ef042e3606015af63d0c404ee78157bc83d33fb1360c5bfd5674

data/lib/zanders/catalog.rb

@@ -6,10 +6,6 @@ module Zanders
     def initialize(options = {})
       requires!(options, :username, :password)
       @options = options
-
-      if options[:full_product].present?
-        self.load_descriptions
-      end
     end
 
     def self.all(chunk_size = 15, options = {}, &block)
@@ -18,22 +14,11 @@ module Zanders
     end
 
     def all(chunk_size, &block)
-      chunker   = Zanders::Chunker.new(chunk_size)
       tempfile  = get_file(CATALOG_FILENAME)
       xml_doc   = Nokogiri::XML(tempfile.open)
 
       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
-
-      if chunker.chunk.count > 0
-        yield(chunker.chunk)
+        map_hash(item)
       end
 
       tempfile.unlink
@@ -41,13 +26,9 @@ module Zanders
 
     protected
 
-    def map_hash(node, full_product = false)
+    def map_hash(node)
       features = self.map_features(node)
 
-      if full_product
-        long_description = self.get_description(content_for(node, 'ITEMNO'))
-      end
-
       # product_type = case content_for(node, 'ITEMPRODUCTTYPE')
       #   when 'PD', 'PR'
       #     :ammunition

data/lib/zanders/inventory.rb

@@ -30,22 +30,11 @@ module Zanders
     end
 
     def all(chunk_size, &block)
-      chunker   = Zanders::Chunker.new(chunk_size)
       tempfile  = get_file(INVENTORY_FILENAME)
       xml_doc   = Nokogiri::XML(tempfile.open)
 
       xml_doc.xpath('//ZandersDataOut').each do |item|
-        if chunker.is_full?
-          yield(chunker.chunk)
-
-          chunker.reset!
-        else
-          chunker.add(map_hash(item))
-        end
-      end
-
-      if chunker.chunk.count > 0
-        yield(chunker.chunk)
+        map_hash(item)
       end
 
       tempfile.unlink

data/lib/zanders/version.rb

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

data/lib/zanders.rb

@@ -5,7 +5,6 @@ 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.2.7
+  version: 2.3.0
 platform: ruby
 authors:
 - David Knight
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-27 00:00:00.000000000 Z
+date: 2018-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -131,7 +131,6 @@ 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
@@ -159,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Ruby library for Zanders

data/lib/zanders/chunker.rb

@@ -1,34 +0,0 @@
-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