rsr_group 2.4.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4e4f34827e9ede124f8e486883383b27e56db84
-  data.tar.gz: 1b4d50d861555d20ac59957d897d83a39e2011d8
+  metadata.gz: 2d660007bcdfce8880a51ab15665a8d83b55fe4f
+  data.tar.gz: 15faf1b6e152b3a6acb91102905b44c056de3162
 SHA512:
-  metadata.gz: 16a6c131821a8f87184a5d3d0e6bbc04865e8ebb382cfdd6b37d8a614024d908d1c2eacbecaeb2a7ee4981eaba167fe3e770f3e31c5863cb69f8084c2bbf1bde
-  data.tar.gz: d43927890db8f102bd1ab35ff67db8e75c847d6cfa32cad3f524b81a12e569cedbf94158b70f34b9932d399bf214bfc04a72151e57f3dfcc4c3356a5b8cb61a7
+  metadata.gz: 2a7cc57d289350b4bf86604c841b0b3f014f39616cf49ec9a5e6abbb52d85d8ff774f3d18e3422cb279d56672d9070aba00681eeb6d80f1ee918b7540a949d48
+  data.tar.gz: 98b7e8ac62f25143ab3c7969b0da796882fe6b55ff473d32a363e764833778ed47fb156e6e99d28e359b534d6f577f17765064d53027ddaeeae93ff1e41cbeff

data/lib/rsr_group/catalog.rb

@@ -12,12 +12,12 @@ module RsrGroup
       @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)
+    def all(&block)
       connect(@options) do |ftp|
         begin
           csv_tempfile = Tempfile.new
@@ -30,8 +30,8 @@ module RsrGroup
             ftp.getbinaryfile(INVENTORY_FILENAME, csv_tempfile.path)
           end
 
-          CSV.readlines(csv_tempfile, col_sep: ';', quote_char: "\x00").to_enum.with_index(1).each do |row, current_line|
-              process_row(row)
+          CSV.foreach(csv_tempfile, { col_sep: ';', quote_char: "\x00" }).each do |row|
+            yield(process_row(row))
           end
         end
 
@@ -54,7 +54,7 @@ module RsrGroup
         name:              sanitize(row[2]),
         model:             sanitize(row[9]),
         short_description: sanitize(row[2]),
-        category:          row[3].nil? ? row[3] : RsrGroup::Department.new(row[3]).name,
+        category:          row[3].nil? ? nil : RsrGroup::Department.new(row[3]).name,
         brand:             sanitize(row[10]),
         map_price:         sanitize(row[70]),
         price:             sanitize(row[6]),

data/lib/rsr_group/inventory.rb

@@ -9,7 +9,7 @@ module RsrGroup
     KEYDEALER_FILENAME = 'rsrinventory-keydlr-new.txt'.freeze
 
     DEFAULT_SMART_OPTS = {
-      chunk_size: 100,
+      chunk_size: 500,
       convert_values_to_numeric: false,
       col_sep: ";",
       quote_char: "|",
@@ -34,17 +34,17 @@ module RsrGroup
       new(options).get_quantity_file
     end
 
-    def self.quantity(chunk_size, options = {}, &block)
+    def self.quantity(options = {}, &block)
       requires!(options, :username, :password)
-      new(options).quantity(chunk_size, &block)
+      new(options).quantity &block
     end
 
-    def self.all(chunk_size, 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)
+    def all(&block)
       connect(@options) do |ftp|
         tempfile = Tempfile.new
 
@@ -59,7 +59,7 @@ module RsrGroup
           ftp.getbinaryfile(INVENTORY_FILENAME, tempfile.path)
         end
 
-        SmarterCSV.process(tempfile, DEFAULT_SMART_OPTS.merge(chunk_size: chunk_size)) do |chunk|
+        SmarterCSV.process(tempfile, DEFAULT_SMART_OPTS) do |chunk|
           chunk.each do |item|
             yield(item)
           end
@@ -73,7 +73,7 @@ module RsrGroup
     def get_quantity_file
       connect(@options) do |ftp|
         quantity_tempfile = Tempfile.new
-        tempfile          = Tempfile.new
+        tempfile          = Tempfile.new(['quantity-', '.csv'])
 
         # Is this a key dealer?
         if ftp.nlst.include?(KEYDEALER_DIR)
@@ -86,6 +86,8 @@ module RsrGroup
           ftp.getbinaryfile(QTY_FILENAME, quantity_tempfile.path)
         end
 
+        ftp.close
+
         SmarterCSV.process(quantity_tempfile.open, {
           chunk_size: 100,
           force_utf8: true,
@@ -93,18 +95,16 @@ module RsrGroup
           user_provided_headers: [:item_identifier, :quantity]
         }) do |chunk|
           chunk.each do |item|
-            tempfile.puts("#{item[:item_identifier]}, #{item[:quantity]}")
+            tempfile.puts("#{item[:item_identifier]},#{item[:quantity].to_i}")
           end
         end
 
         quantity_tempfile.unlink
-        ftp.close
-
         tempfile.path
       end
     end
 
-    def quantity(chunk_size, &block)
+    def quantity(&block)
       connect(@options) do |ftp|
         tempfile = Tempfile.new
 
@@ -112,23 +112,30 @@ module RsrGroup
         if ftp.nlst.include?(KEYDEALER_DIR)
           ftp.chdir(KEYDEALER_DIR)
           # Pull from the FTP and save as a temp file
-          ftp.getbinaryfile(KEYDEALER_FILENAME, tempfile.path)
+          ftp.getbinaryfile(QTY_FILENAME, tempfile.path)
         else
           ftp.chdir(INVENTORY_DIR)
           # Pull from the FTP and save as a temp file
-          ftp.getbinaryfile(INVENTORY_FILENAME, tempfile.path)
+          ftp.getbinaryfile(QTY_FILENAME, tempfile.path)
         end
+        ftp.close
 
-        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]
+        smart_opts = { 
+          col_sep: ",",
+          headers_in_file: false,
+          user_provided_headers: [
+            :item_identifier,
+            :quantity
+          ]
+        }
 
+        SmarterCSV.process(tempfile, smart_opts) do |chunk|
+          chunk.each do |item|
             yield(item)
           end
         end
 
         tempfile.unlink
-        ftp.close
       end
     end
 

data/lib/rsr_group/version.rb

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

data/rsr_group.gemspec

@@ -27,6 +27,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "smarter_csv", "~> 1.1.4"
 
   spec.add_development_dependency "bundler", "~> 1.12"
+  spec.add_development_dependency "memory_profiler", "~> 0.9"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "webmock", "~> 1.20"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rsr_group
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Dale Campbell
 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: smarter_csv
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.12'
+- !ruby/object:Gem::Dependency
+  name: memory_profiler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -134,7 +148,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: RSR Group Ruby library