rsr_group 2.0.4 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe5517c688477cb0af67c4b4710f8764ece96feb
-  data.tar.gz: b5fa94f53bf559d2854889233621a0899a48844a
+  metadata.gz: ade549f57a9f051ee13fc17901098c134fdc9e91
+  data.tar.gz: 20a5d061bb389fe4ff6eea46e953d62530d8975a
 SHA512:
-  metadata.gz: 93c82484ea8805744e148640da0bf9c5e27f884dcfa7670688ef52f4a2f2419b2e91e9fc7b293c75606575e97656e60ec160d540f85844f7a21e861111bfa61c
-  data.tar.gz: c40e6c4b4652d40340b163d5995da8df7c02bef0051f5aabbf9097e97c88a078ffb170552420b1d10249ac3188d143e146c08b46f5044f121132064a9aaa36b5
+  metadata.gz: f0e492ba80329ac4cac1ad22dbf77935d69711a0af09f5b27d878036bb5b8253e8253281858d3c1e865546292f147f9897586ea1ebbfcf88a13250efa7327024
+  data.tar.gz: 1a504cd1c3c4aaccffc0efba67e407e8d4113d7cc0d0c808bccbe0978dbbd31350ee1327e1a5c24f3c53e38ba59365a9e392447b2fd9fc60d5dbba55c44f494e

data/lib/rsr_group.rb

@@ -3,6 +3,7 @@ require 'rsr_group/version'
 require 'csv'
 require 'date'
 require 'net/ftp'
+require 'tempfile'
 require 'smarter_csv'
 
 require 'rsr_group/base'

data/lib/rsr_group/inventory.rb

@@ -1,10 +1,28 @@
 module RsrGroup
   class Inventory < Base
 
-    KEYDEALER_DIR      = 'keydealer'.freeze
-    INVENTORY_DIR      = 'ftpdownloads'.freeze
-    QTY_FILENAME       = 'IM-QTY-CSV.csv'.freeze
-    MAP_FILENAME       = 'retail-map.csv'.freeze
+    KEYDEALER_DIR = 'keydealer'.freeze
+    INVENTORY_DIR = 'ftpdownloads'.freeze
+    QTY_FILENAME  = 'IM-QTY-CSV.csv'.freeze
+    MAP_FILENAME  = 'retail-map.csv'.freeze
+    INVENTORY_FILENAME = 'rsrinventory-new.txt'.freeze
+    KEYDEALER_FILENAME = 'rsrinventory-keydlr-new.txt'.freeze
+
+    DEFAULT_SMART_OPTS = {
+      chunk_size: 100,
+      convert_values_to_numeric: false,
+      col_sep: ";",
+      quote_char: "|",
+      headers_in_file: false,
+      user_provided_headers: [
+        :stock_number, :upc, :short_description, :department_number, :manufacturer_id, :retail_price,
+        :price, :weight, :quantity, :model, :manufacturer, :mfg_number, :allocated_closeout_deleted, :long_description,
+        :image_name, 51.times.map { |i| "state_#{i}".to_sym }, :ships_ground_only, :signature_required, :blocked_from_drop_ship,
+        :date_entered, :map_price, :image_disclaimer, :length, :width, :height, :null
+      ].flatten,
+      remove_unmapped_keys: true,
+      verbose: true
+    }
 
     def initialize(options = {})
       requires!(options, :username, :password)
@@ -12,47 +30,31 @@ module RsrGroup
       @options = options
     end
 
-    def self.all(chunk_size = 15, options = {}, &block)
+    def self.all(chunk_size, options = {}, &block)
       requires!(options, :username, :password)
       new(options).all(chunk_size, &block)
     end
 
     def all(chunk_size, &block)
       connect(@options) do |ftp|
-        chunker       = RsrGroup::Chunker.new(chunk_size)
-        csv_tempfile  = Tempfile.new
+        tempfile = Tempfile.new
 
         # Is this a key dealer?
         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)
         else
           ftp.chdir(INVENTORY_DIR)
+          # Pull from the FTP and save as a temp file
+          ftp.getbinaryfile(INVENTORY_FILENAME, tempfile.path)
         end
 
-        # Pull from the FTP and save as a temp file
-        ftp.getbinaryfile(QTY_FILENAME, csv_tempfile.path)
-
-        # total_count is hte number of lines in the file
-        chunker.total_count = File.readlines(csv_tempfile).size
-
-        CSV.readlines(csv_tempfile).each do |row|
-          if chunker.is_full?
-            yield(chunker.chunk)
-
-            chunker.reset
-          elsif chunker.is_complete?
-            yield(chunker.chunk)
-
-            break
-          else
-            chunker.add({
-              item_identifier:  row[0].rstrip,
-              quantity:         row[1].to_i
-            })
-          end
+        SmarterCSV.process(tempfile, DEFAULT_SMART_OPTS.merge(chunk_size: chunk_size)) do |chunk|
+          yield(chunk)
         end
 
-        csv_tempfile.unlink
+        tempfile.unlink
         ftp.close
       end
     end

data/lib/rsr_group/version.rb

@@ -1,3 +1,3 @@
 module RsrGroup
-  VERSION = '2.0.4'.freeze
+  VERSION = '2.1.0'.freeze
 end

data/rsr_group.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'rsr_group/version'
 
 Gem::Specification.new do |spec|
-  spec.required_ruby_version = '~> 2.0'
+  spec.required_ruby_version = '>= 2.0'
 
   spec.name          = "rsr_group"
   spec.version       = RsrGroup::VERSION
@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency  "smarter_csv", "~> 1.1.4"
+  spec.add_runtime_dependency "smarter_csv", "~> 1.1.4"
 
   spec.add_development_dependency "bundler", "~> 1.12"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rsr_group
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.1.0
 platform: ruby
 authors:
 - Dale Campbell
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-06 00:00:00.000000000 Z
+date: 2017-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: smarter_csv
@@ -125,7 +125,7 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement