rsr_group 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f09fece5c75d3d9d1304a2d8fbc7d4c60eb2b0c
-  data.tar.gz: 9f0d50ae67fd3b89d4c3bd20293ab05a4d63e111
+  metadata.gz: e4e4f34827e9ede124f8e486883383b27e56db84
+  data.tar.gz: 1b4d50d861555d20ac59957d897d83a39e2011d8
 SHA512:
-  metadata.gz: 477a47be32795c951af6483f39a2c814ea35b8bfcf3736fdb7bd1338f1e96819aa4eb87c0739b30d60f24f1ebe6e288f8e95a19bb4de241b5c0d4d39a358fb09
-  data.tar.gz: 661cce484e55dd430d658952a8275408fa347ac25455e370c6e80f24e10815d8c7297cb0e77a08e2785d87961d65d7877df9876f10095614dd55aebc4ecf393d
+  metadata.gz: 16a6c131821a8f87184a5d3d0e6bbc04865e8ebb382cfdd6b37d8a614024d908d1c2eacbecaeb2a7ee4981eaba167fe3e770f3e31c5863cb69f8084c2bbf1bde
+  data.tar.gz: d43927890db8f102bd1ab35ff67db8e75c847d6cfa32cad3f524b81a12e569cedbf94158b70f34b9932d399bf214bfc04a72151e57f3dfcc4c3356a5b8cb61a7

data/lib/rsr_group.rb

@@ -8,7 +8,6 @@ require 'smarter_csv'
 
 require 'rsr_group/base'
 require 'rsr_group/constants'
-require 'rsr_group/chunker'
 require 'rsr_group/data_row'
 require 'rsr_group/department'
 require 'rsr_group/catalog'

data/lib/rsr_group/catalog.rb

@@ -20,7 +20,6 @@ module RsrGroup
     def all(chunk_size, &block)
       connect(@options) do |ftp|
         begin
-          chunker      = RsrGroup::Chunker.new(chunk_size)
           csv_tempfile = Tempfile.new
 
           if ftp.nlst.include?(KEYDEALER_DIR)
@@ -31,20 +30,8 @@ module RsrGroup
             ftp.getbinaryfile(INVENTORY_FILENAME, csv_tempfile.path)
           end
 
-          chunker.total_count = File.readlines(csv_tempfile).size
-
           CSV.readlines(csv_tempfile, col_sep: ';', quote_char: "\x00").to_enum.with_index(1).each do |row, current_line|
-            if chunker.is_full?
-              yield(chunker.chunk)
-
-              chunker.reset
-            elsif chunker.is_complete?
-              yield(chunker.chunk)
-
-              break
-            else
-              chunker.add(process_row(row))
-            end
+              process_row(row)
           end
         end
 

data/lib/rsr_group/inventory.rb

@@ -60,7 +60,9 @@ module RsrGroup
         end
 
         SmarterCSV.process(tempfile, DEFAULT_SMART_OPTS.merge(chunk_size: chunk_size)) do |chunk|
-          yield(chunk)
+          chunk.each do |item|
+            yield(item)
+          end
         end
 
         tempfile.unlink
@@ -120,9 +122,9 @@ module RsrGroup
         SmarterCSV.process(tempfile, DEFAULT_SMART_OPTS.merge(chunk_size: chunk_size)) do |chunk|
           chunk.each do |item|
             item = Hash[*item.select {|k,v| [:item_identifier, :quantity].include?(k)}.flatten]
-          end
 
-          yield(chunk)
+            yield(item)
+          end
         end
 
         tempfile.unlink

data/lib/rsr_group/version.rb

@@ -1,3 +1,3 @@
 module RsrGroup
-  VERSION = '2.3.0'.freeze
+  VERSION = '2.4.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rsr_group
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Dale Campbell
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-11 00:00:00.000000000 Z
+date: 2018-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: smarter_csv
@@ -102,7 +102,6 @@ files:
 - lib/rsr_group.rb
 - lib/rsr_group/base.rb
 - lib/rsr_group/catalog.rb
-- lib/rsr_group/chunker.rb
 - lib/rsr_group/constants.rb
 - lib/rsr_group/data_row.rb
 - lib/rsr_group/department.rb
@@ -135,7 +134,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: RSR Group Ruby library

data/lib/rsr_group/chunker.rb

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