rsr_group 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2d660007bcdfce8880a51ab15665a8d83b55fe4f
-  data.tar.gz: 15faf1b6e152b3a6acb91102905b44c056de3162
+SHA256:
+  metadata.gz: 5f1ccfd958f485916952de979f88c61690c73a6f534c10324801cdfb9aef34da
+  data.tar.gz: e596d74ed4aaed9db747f0d873844a0dae43c6e9f997def3dd536281745d2d94
 SHA512:
-  metadata.gz: 2a7cc57d289350b4bf86604c841b0b3f014f39616cf49ec9a5e6abbb52d85d8ff774f3d18e3422cb279d56672d9070aba00681eeb6d80f1ee918b7540a949d48
-  data.tar.gz: 98b7e8ac62f25143ab3c7969b0da796882fe6b55ff473d32a363e764833778ed47fb156e6e99d28e359b534d6f577f17765064d53027ddaeeae93ff1e41cbeff
+  metadata.gz: 4a8123d177997c6ee26d2a498fb1bf30a1d4f99b1123b893fdd00f3485801c9bb0f10aaf4a9a93127e7b636d3b3a755ec6e529f1bbb2758dbbe05230970d19f4
+  data.tar.gz: bf896bd6110264efcfaccb446a940bed7380ff1812db432525abd2fe82f30a6a4ea78834b5279aeafb7c958a53c6b5a59baf32ee0061445b6377eefbf189c029

data/.circleci/config.yml

@@ -0,0 +1,41 @@
+# Ruby CircleCI 2.0 configuration file
+#
+# Check https://circleci.com/docs/2.0/language-ruby/ for more details
+#
+version: 2
+jobs:
+  build:
+    docker:
+      # specify the version you desire here
+       - image: circleci/ruby:2.4.1-node-browsers
+
+    working_directory: ~/repo
+
+    steps:
+      - checkout
+
+      # Download and cache dependencies
+      - restore_cache:
+          keys:
+          - v1-dependencies-{{ checksum "rsr_group.gemspec" }}
+          # fallback to using the latest cache if no exact match is found
+          - v1-dependencies-
+
+      - run:
+          name: install dependencies
+          command: |
+            bundle install --jobs=4 --retry=3 --path vendor/bundle
+
+      - save_cache:
+          paths:
+            - ./vendor/bundle
+          key: v1-dependencies-{{ checksum "Gemfile.lock" }}
+
+      # run tests!
+      - run:
+          name: run tests
+          command: |
+            mkdir /tmp/test-results
+            TEST_FILES="$(circleci tests glob "spec/**/*_spec.rb" | circleci tests split --split-by=timings)"
+            
+            bundle exec rspec --format documentation $TEST_FILES

data/.ruby-version

@@ -1 +1 @@
-2.3.1
+2.3.6

data/lib/rsr_group/base.rb

@@ -1,6 +1,13 @@
 module RsrGroup
   class Base
 
+    KEYDEALER_DIR = 'keydealer'.freeze
+    DEFAULT_DIR   = 'ftpdownloads'.freeze
+    QTY_FILENAME  = 'IM-QTY-CSV.csv'.freeze
+    MAP_FILENAME  = 'retail-map.csv'.freeze
+    DEFAULT_CATALOG_FILENAME   = 'rsrinventory-new.txt'.freeze
+    KEYDEALER_CATALOG_FILENAME = 'rsrinventory-keydlr-new.txt'.freeze
+
     def self.connect(options = {})
       requires!(options, :username, :password)
 

data/lib/rsr_group/catalog.rb

@@ -1,14 +1,8 @@
 module RsrGroup
   class Catalog < Base
 
-    KEYDEALER_DIR      = 'keydealer'.freeze
-    INVENTORY_DIR      = 'ftpdownloads'.freeze
-    INVENTORY_FILENAME = 'rsrinventory-new.txt'.freeze
-    KEYDEALER_FILENAME = 'rsrinventory-keydlr-new.txt'.freeze
-
     def initialize(options = {})
       requires!(options, :username, :password)
-
       @options = options
     end
 
@@ -20,23 +14,29 @@ module RsrGroup
     def all(&block)
       connect(@options) do |ftp|
         begin
-          csv_tempfile = Tempfile.new
+          tempfile = Tempfile.new
 
           if ftp.nlst.include?(KEYDEALER_DIR)
             ftp.chdir(KEYDEALER_DIR)
-            ftp.getbinaryfile(KEYDEALER_FILENAME, csv_tempfile.path)
+            ftp.getbinaryfile(KEYDEALER_CATALOG_FILENAME, tempfile.path)
           else
-            ftp.chdir(INVENTORY_DIR)
-            ftp.getbinaryfile(INVENTORY_FILENAME, csv_tempfile.path)
+            ftp.chdir(DEFAULT_DIR)
+            ftp.getbinaryfile(DEFAULT_CATALOG_FILENAME, tempfile.path)
           end
+          ftp.close
+
+          CSV.foreach(tempfile, { col_sep: ';', quote_char: "\x00" }).each do |row|
+            item = process_row(row)
 
-          CSV.foreach(csv_tempfile, { col_sep: ';', quote_char: "\x00" }).each do |row|
-            yield(process_row(row))
+            if !row[12].nil? && row[12].to_sym.eql?(:Allocated)
+              item[:quantity] = 0
+            end
+
+            yield(item)
           end
         end
 
-        csv_tempfile.unlink
-        ftp.close
+        tempfile.unlink
       end
     end
 
@@ -48,19 +48,22 @@ module RsrGroup
     end
 
     def process_row(row)
+      category_name = row[3].nil? ? nil : RsrGroup::Department.new(row[3]).name
+
       {
-        upc:               sanitize(row[1]),
-        item_identifier:   sanitize(row[0]),
-        name:              sanitize(row[2]),
-        model:             sanitize(row[9]),
+        upc:             sanitize(row[1]),
+        item_identifier: sanitize(row[0]),
+        name:            sanitize(row[2]),
+        model:           sanitize(row[9]),
+        category:        category_name,
+        brand:           sanitize(row[10]),
+        msrp:            sanitize(row[5]),
+        price:           sanitize(row[6]),
+        map_price:       sanitize(row[70]),
+        quantity:        (Integer(sanitize(row[8])) rescue 0),
+        mfg_number:      sanitize(row[11]),
+        weight:          sanitize(row[7]),
         short_description: sanitize(row[2]),
-        category:          row[3].nil? ? nil : RsrGroup::Department.new(row[3]).name,
-        brand:             sanitize(row[10]),
-        map_price:         sanitize(row[70]),
-        price:             sanitize(row[6]),
-        quantity:          (Integer(sanitize(row[8])) rescue 0),
-        mfg_number:        sanitize(row[11]),
-        weight:            sanitize(row[7]),
         long_description:  sanitize(row[13]),
         features: {
           shipping_length: sanitize(row[74]),

data/lib/rsr_group/inventory.rb

@@ -1,39 +1,40 @@
 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
-    INVENTORY_FILENAME = 'rsrinventory-new.txt'.freeze
-    KEYDEALER_FILENAME = 'rsrinventory-keydlr-new.txt'.freeze
-
-    DEFAULT_SMART_OPTS = {
+    # This corresponds with the 'rsrinventory-new.txt' and 'rsrinventory-keydlr-new.txt' files 
+    # and the +DEFAULT_CATALOG_FILENAME+ and +KEYDEALER_CATALOG_FILENAME+ constants
+    DEFAULT_CATALOG_SMART_OPTS = {
       chunk_size: 500,
       convert_values_to_numeric: false,
-      col_sep: ";",
-      quote_char: "|",
+      col_sep: ';',
+      quote_char: '|',
       headers_in_file: false,
       user_provided_headers: [
         :item_identifier, :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
+        :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,
     }
 
+    # This corresponds with the 'IM-QTY-CSV.csv' file and the +QTY_FILENAME+ constant
+    DEFAULT_QUANTITY_SMART_OPTS = {
+      chunk_size: 2000,
+      convert_values_to_numeric: false,
+      col_sep: ',',
+      headers_in_file: false,
+      user_provided_headers: [
+        :item_identifier,
+        :quantity,
+      ]
+    }
+
     def initialize(options = {})
       requires!(options, :username, :password)
-
       @options = options
     end
 
-    def self.get_quantity_file(options = {})
-      requires!(options, :username, :password)
-      new(options).get_quantity_file
-    end
-
     def self.quantity(options = {}, &block)
       requires!(options, :username, :password)
       new(options).quantity &block
@@ -51,59 +52,32 @@ module RsrGroup
         # 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)
+          # Pull from the FTP and save to a tempfile
+          ftp.getbinaryfile(KEYDEALER_CATALOG_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.chdir(DEFAULT_DIR)
+          # Pull from the FTP and save to a tempfile
+          ftp.getbinaryfile(DEFAULT_CATALOG_FILENAME, tempfile.path)
         end
+        ftp.close
 
-        SmarterCSV.process(tempfile, DEFAULT_SMART_OPTS) do |chunk|
+        SmarterCSV.process(tempfile, DEFAULT_CATALOG_SMART_OPTS) do |chunk|
           chunk.each do |item|
+            if !item[:allocated_closeout_deleted].nil? && item[:allocated_closeout_deleted].to_sym.eql?(:Allocated)
+              item[:quantity] = 0
+            else
+              item[:quantity] = item[:quantity].to_i
+            end
+
             yield(item)
           end
         end
 
         tempfile.unlink
-        ftp.close
-      end
-    end
-
-    def get_quantity_file
-      connect(@options) do |ftp|
-        quantity_tempfile = Tempfile.new
-        tempfile          = Tempfile.new(['quantity-', '.csv'])
-
-        # 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(QTY_FILENAME, quantity_tempfile.path)
-        else
-          ftp.chdir(INVENTORY_DIR)
-          # Pull from the FTP and save as a temp file
-          ftp.getbinaryfile(QTY_FILENAME, quantity_tempfile.path)
-        end
-
-        ftp.close
-
-        SmarterCSV.process(quantity_tempfile.open, {
-          chunk_size: 100,
-          force_utf8: true,
-          convert_values_to_numeric: false,
-          user_provided_headers: [:item_identifier, :quantity]
-        }) do |chunk|
-          chunk.each do |item|
-            tempfile.puts("#{item[:item_identifier]},#{item[:quantity].to_i}")
-          end
-        end
-
-        quantity_tempfile.unlink
-        tempfile.path
       end
     end
 
+    # Parse through the 'IM-QTY-CSV.csv' file
     def quantity(&block)
       connect(@options) do |ftp|
         tempfile = Tempfile.new
@@ -114,23 +88,15 @@ module RsrGroup
           # Pull from the FTP and save as a temp file
           ftp.getbinaryfile(QTY_FILENAME, tempfile.path)
         else
-          ftp.chdir(INVENTORY_DIR)
+          ftp.chdir(DEFAULT_DIR)
           # Pull from the FTP and save as a temp file
           ftp.getbinaryfile(QTY_FILENAME, tempfile.path)
         end
         ftp.close
 
-        smart_opts = { 
-          col_sep: ",",
-          headers_in_file: false,
-          user_provided_headers: [
-            :item_identifier,
-            :quantity
-          ]
-        }
-
-        SmarterCSV.process(tempfile, smart_opts) do |chunk|
+        SmarterCSV.process(tempfile, DEFAULT_QUANTITY_SMART_OPTS) do |chunk|
           chunk.each do |item|
+            item[:quantity] = item[:quantity].to_i
             yield(item)
           end
         end

data/lib/rsr_group/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rsr_group
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - Dale Campbell
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-17 00:00:00.000000000 Z
+date: 2018-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: smarter_csv
@@ -101,11 +101,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".gitignore"
 - ".rspec"
 - ".ruby-gemset"
 - ".ruby-version"
-- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -148,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: RSR Group Ruby library

data/.travis.yml

@@ -1,5 +0,0 @@
-sudo: false
-language: ruby
-rvm:
-  - 2.3.1
-before_install: gem install bundler -v 1.13.1