rsr_group 1.8.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fad2958461833a387cb30e337cc04bbefb1a674a
-  data.tar.gz: b72595cc6a0dbc0016728fb3519d28e03ff01d94
+  metadata.gz: 27991f59b6bc1ffd9323f289032eb43c2cb02eff
+  data.tar.gz: b51ac996718c674f4a3e635780e35a7cea841793
 SHA512:
-  metadata.gz: 581611d9c64fec310a2d8b5e492fb44ac5507f5bc14ef758dc8352c8863066f2dab397fc5c5092f8da85fbac76d0a7e6ea18454c30e52dc0538deb3e6cdb3cc3
-  data.tar.gz: 590fb42cc224d76ca798064a050077c47eb23c691fb064eabfa50d76e4585925e3ae614146cea4027e1214197e7511487095382d1c8b551526e34d31c587f57c
+  metadata.gz: d9b6f14459886bbc9f3d94ff15d24e67c7c6627877b71298f75fc3dd2dbc6476d70f53df80a2c9c0259eff6ab2fe735bfafb5b6bdfbeaeed218af8eccf2a3615
+  data.tar.gz: 6be675b380406ffad1bd4029d7d20c582c10477b481157d8c9666eba28ae4a81109764b55e8c9c1536381ae1c18e7041993df47a64a6e31548ca05b10ba711cb

data/lib/rsr_group.rb

@@ -10,6 +10,7 @@ require 'rsr_group/constants'
 require 'rsr_group/chunker'
 require 'rsr_group/data_row'
 require 'rsr_group/department'
+require 'rsr_group/catalog'
 require 'rsr_group/inventory'
 require 'rsr_group/order'
 require 'rsr_group/order_detail'

data/lib/rsr_group/catalog.rb

@@ -0,0 +1,86 @@
+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
+
+    def self.all(chunk_size = 15, options = {}, &block)
+      requires!(options, :username, :password)
+      new(options).all(chunk_size, &block)
+    end
+
+    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)
+            ftp.chdir(KEYDEALER_DIR)
+            ftp.getbinaryfile(KEYDEALER_FILENAME, csv_tempfile.path)
+          else
+            ftp.chdir(INVENTORY_DIR)
+            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
+          end
+        end
+
+        csv_tempfile.unlink
+        ftp.close
+      end
+    end
+
+    private
+
+    def sanitize(data)
+      return data unless data.is_a?(String)
+      data.strip
+    end
+
+    def process_row(row)
+      {
+        upc:                sanitize(row[1]),
+        item_identifier:    sanitize(row[0]),
+        name:               sanitize(row[2]),
+        short_description:  sanitize(row[2]),
+        category:           row[3].nil? ? row[3] : RsrGroup::Department.new(row[3]).name,
+        brand:              sanitize(row[10]),
+        map_price:          sanitize(row[72]),
+        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]),
+          shipping_width:   sanitize(row[75]),
+          shipping_height:  sanitize(row[76])
+        }
+      }
+    end
+
+  end
+end

data/lib/rsr_group/data_row.rb

@@ -26,9 +26,9 @@ module RsrGroup
         @name = points[3]
         @zip  = points[4]
       when :order_detail # 20
-        get_errors(points[6]) if has_errors && points[6] != "00000"
-        @quantity = points[3].to_i
-        @stock_id = points[2]
+        get_errors(points[-1]) if has_errors && points[-1] != "00000"
+        @quantity   = points[3].to_i
+        @stock_id   = points[2]
         @shipping_carrier = points[4]
         @shipping_method  = SHIPPING_METHODS[points[5]]
       when :confirmation_header # 30

data/lib/rsr_group/inventory.rb

@@ -3,281 +3,24 @@ module RsrGroup
 
     KEYDEALER_DIR      = 'keydealer'.freeze
     INVENTORY_DIR      = 'ftpdownloads'.freeze
-    INVENTORY_FILENAME = 'rsrinventory-new.txt'.freeze
-    KEYDEALER_FILENAME = 'rsrinventory-keydlr-new.txt'.freeze
     QTY_FILENAME       = 'IM-QTY-CSV.csv'.freeze
     MAP_FILENAME       = 'retail-map.csv'.freeze
 
     def initialize(options = {})
       requires!(options, :username, :password)
-      @options = options
-    end
-
-    def self.all(options = {})
-      requires!(options, :username, :password)
-      new(options).all
-    end
-
-    def self.process_as_chunks(size = 15, options = {}, &block)
-      requires!(options, :username, :password)
-      new(options).process_as_chunks(size, &block)
-    end
 
-    def self.map_prices(options = {})
-      requires!(options, :username, :password)
-      new(options).map_prices
-    end
-
-    def self.map_prices_as_chunks(size = 15, options = {}, &block)
-      requires!(options, :username, :password)
-      new(options).map_prices_as_chunks(size, &block)
-    end
-
-    def self.quantities(options = {})
-      requires!(options, :username, :password)
-      new(options).quantities
+      @options = options
     end
 
-    def self.quantities_as_chunks(size = 15, options = {}, &block)
+    def self.all(chunk_size = 15, options = {}, &block)
       requires!(options, :username, :password)
-      new(options).quantities_as_chunks(size, &block)
-    end
-
-    def all
-      items = []
-
-      connect(@options) do |ftp|
-        if ftp.nlst.include?(KEYDEALER_DIR)
-          ftp.chdir(KEYDEALER_DIR)
-          lines = ftp.gettextfile(KEYDEALER_FILENAME, nil)
-        else
-          ftp.chdir(INVENTORY_DIR)
-          lines = ftp.gettextfile(INVENTORY_FILENAME, nil)
-        end
-
-        # Use a zero-byte char as `quote_char` since the data has no quote character.
-        CSV.parse(lines, col_sep: ';', quote_char: "\x00") do |row|
-          items << {
-            stock_number: sanitize(row[0]),
-            upc: sanitize(row[1]),
-            description: sanitize(row[2]),
-            department: row[3].nil? ? row[3] : RsrGroup::Department.new(row[3]),
-            manufacturer_id: sanitize(row[4]),
-            retail_price: sanitize(row[5]),
-            regular_price: sanitize(row[6]),
-            weight: sanitize(row[7]),
-            quantity: (Integer(sanitize(row[8])) rescue 0),
-            model: sanitize(row[9]),
-            manufacturer_name: sanitize(row[10]),
-            manufacturer_part_number: sanitize(row[11]),
-            allocated_closeout_deleted: sanitize(row[12]),
-            description_full: sanitize(row[13]),
-            image_name: sanitize(row[14]),
-            restricted_states: {
-              AK: row[15] == 'Y',
-              AL: row[16] == 'Y',
-              AR: row[17] == 'Y',
-              AZ: row[18] == 'Y',
-              CA: row[19] == 'Y',
-              CO: row[20] == 'Y',
-              CT: row[21] == 'Y',
-              DC: row[22] == 'Y',
-              DE: row[23] == 'Y',
-              FL: row[24] == 'Y',
-              GA: row[25] == 'Y',
-              HI: row[26] == 'Y',
-              IA: row[27] == 'Y',
-              ID: row[28] == 'Y',
-              IL: row[29] == 'Y',
-              IN: row[30] == 'Y',
-              KS: row[31] == 'Y',
-              KY: row[32] == 'Y',
-              LA: row[33] == 'Y',
-              MA: row[36] == 'Y',
-              MD: row[37] == 'Y',
-              ME: row[38] == 'Y',
-              MI: row[39] == 'Y',
-              MN: row[40] == 'Y',
-              MO: row[41] == 'Y',
-              MS: row[42] == 'Y',
-              MT: row[43] == 'Y',
-              NC: row[44] == 'Y',
-              ND: row[45] == 'Y',
-              NE: row[46] == 'Y',
-              NH: row[47] == 'Y',
-              NJ: row[48] == 'Y',
-              NM: row[49] == 'Y',
-              NV: row[50] == 'Y',
-              NY: row[51] == 'Y',
-              OH: row[52] == 'Y',
-              OK: row[53] == 'Y',
-              OR: row[54] == 'Y',
-              PA: row[55] == 'Y',
-              RI: row[56] == 'Y',
-              SC: row[57] == 'Y',
-              SD: row[58] == 'Y',
-              TN: row[59] == 'Y',
-              TX: row[60] == 'Y',
-              UT: row[61] == 'Y',
-              VA: row[62] == 'Y',
-              VT: row[63] == 'Y',
-              WA: row[64] == 'Y',
-              WI: row[65] == 'Y',
-              WV: row[66] == 'Y',
-              WY: row[67] == 'Y',
-            },
-            ground_shipping_only: row[68] == 'Y',
-            adult_signature_required: row[69] == 'Y',
-            blocked_from_drop_ship: row[70] == 'Y',
-            date_entered: row[71].nil? ? row[71] : Date.strptime(row[71], '%Y%m%d'),
-            retail_map: sanitize(row[72]),
-            image_disclaimer: row[73] == 'Y',
-            shipping_length: sanitize(row[74]),
-            shipping_width: sanitize(row[75]),
-            shipping_height: sanitize(row[76]),
-          }
-        end
-
-        ftp.close
-      end
-
-      items
-    end
-
-    def process_as_chunks(size, &block)
-      connect(@options) do |ftp|
-        chunker       = RsrGroup::Chunker.new(size)
-        temp_csv_file = 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, temp_csv_file.path)
-        else
-          ftp.chdir(INVENTORY_DIR)
-
-          # Pull from the FTP and save as a temp file
-          ftp.getbinaryfile(INVENTORY_FILENAME, temp_csv_file.path)
-        end
-
-        # total_count is the number of lines in the file
-        chunker.total_count = File.readlines(temp_csv_file).size
-
-        CSV.readlines(temp_csv_file, 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
-        end
-
-        temp_csv_file.unlink
-        ftp.close
-      end
-    end
-
-    def map_prices
-      rows = []
-
-      connect(@options) do |ftp|
-        if ftp.nlst.include?(KEYDEALER_DIR)
-          ftp.chdir(KEYDEALER_DIR)
-        else
-          ftp.chdir(INVENTORY_DIR)
-        end
-
-        ftp.gettextfile(MAP_FILENAME, nil) do |line|
-          points = line.split(',').map(&:rstrip)
-          rows << {
-            stock_number: points[0],
-            map_price:    points[1],
-          }
-        end
-
-        ftp.close
-      end
-
-      rows
-    end
-
-    def map_prices_as_chunks(size, &block)
-      connect(@options) do |ftp|
-        chunker       = RsrGroup::Chunker.new(size)
-        temp_csv_file = Tempfile.new
-
-        # Is this a key dealer?
-        if ftp.nlst.include?(KEYDEALER_DIR)
-          ftp.chdir(KEYDEALER_DIR)
-        else
-          ftp.chdir(INVENTORY_DIR)
-        end
-
-        # Pull from the FTP and save as a temp file
-        ftp.getbinaryfile(MAP_FILENAME, temp_csv_file.path)
-
-        # total_count is hte number of lines in the file
-        chunker.total_count = File.readlines(temp_csv_file).size
-
-        CSV.readlines(temp_csv_file).each do |row|
-          if chunker.is_full?
-            yield(chunker.chunk)
-
-            chunker.reset
-          elsif chunker.is_complete?
-            yield(chunker.chunk)
-
-            break
-          else
-            chunker.add({
-              stock_number: row[0].strip,
-              map_price:    row[1]
-            })
-          end
-        end
-
-        temp_csv_file.unlink
-        ftp.close
-      end
-    end
-
-    def quantities
-      rows = []
-
-      connect(@options) do |ftp|
-        if ftp.nlst.include?(KEYDEALER_DIR)
-          ftp.chdir(KEYDEALER_DIR)
-        else
-          ftp.chdir(INVENTORY_DIR)
-        end
-
-        csv = ftp.gettextfile(QTY_FILENAME, nil)
-
-        CSV.parse(csv) do |row|
-          rows << { 
-            stock_number: row[0].rstrip,
-            quantity: row[1].to_i,
-          }
-        end
-
-        ftp.close
-      end
-
-      rows
+      new(options).all(chunk_size, &block)
     end
 
-    def quantities_as_chunks(size, &block)
+    def all(chunk_size, &block)
       connect(@options) do |ftp|
-        chunker       = RsrGroup::Chunker.new(size)
-        temp_csv_file = Tempfile.new
+        chunker       = RsrGroup::Chunker.new(chunk_size)
+        csv_tempfile  = Tempfile.new
 
         # Is this a key dealer?
         if ftp.nlst.include?(KEYDEALER_DIR)
@@ -287,12 +30,12 @@ module RsrGroup
         end
 
         # Pull from the FTP and save as a temp file
-        ftp.getbinaryfile(QTY_FILENAME, temp_csv_file.path)
+        ftp.getbinaryfile(QTY_FILENAME, csv_tempfile.path)
 
         # total_count is hte number of lines in the file
-        chunker.total_count = File.readlines(temp_csv_file).size
+        chunker.total_count = File.readlines(csv_tempfile).size
 
-        CSV.readlines(temp_csv_file).each do |row|
+        CSV.readlines(csv_tempfile).each do |row|
           if chunker.is_full?
             yield(chunker.chunk)
 
@@ -303,106 +46,16 @@ module RsrGroup
             break
           else
             chunker.add({
-              stock_number: row[0].rstrip,
-              quantity: row[1].to_i
+              item_identifier:  row[0].rstrip,
+              quantity:         row[1].to_i
             })
           end
         end
 
-        temp_csv_file.unlink
+        csv_tempfile.unlink
         ftp.close
       end
     end
 
-
-    private
-
-    def sanitize(data)
-      return data unless data.is_a?(String)
-      data.strip
-    end
-
-    def process_row(row)
-      {
-        stock_number: sanitize(row[0]),
-        upc: sanitize(row[1]),
-        description: sanitize(row[2]),
-        department: row[3].nil? ? row[3] : RsrGroup::Department.new(row[3]),
-        manufacturer_id: sanitize(row[4]),
-        retail_price: sanitize(row[5]),
-        regular_price: sanitize(row[6]),
-        weight: sanitize(row[7]),
-        quantity: (Integer(sanitize(row[8])) rescue 0),
-        model: sanitize(row[9]),
-        manufacturer_name: sanitize(row[10]),
-        manufacturer_part_number: sanitize(row[11]),
-        allocated_closeout_deleted: sanitize(row[12]),
-        description_full: sanitize(row[13]),
-        image_name: sanitize(row[14]),
-        restricted_states: {
-          AK: row[15] == 'Y',
-          AL: row[16] == 'Y',
-          AR: row[17] == 'Y',
-          AZ: row[18] == 'Y',
-          CA: row[19] == 'Y',
-          CO: row[20] == 'Y',
-          CT: row[21] == 'Y',
-          DC: row[22] == 'Y',
-          DE: row[23] == 'Y',
-          FL: row[24] == 'Y',
-          GA: row[25] == 'Y',
-          HI: row[26] == 'Y',
-          IA: row[27] == 'Y',
-          ID: row[28] == 'Y',
-          IL: row[29] == 'Y',
-          IN: row[30] == 'Y',
-          KS: row[31] == 'Y',
-          KY: row[32] == 'Y',
-          LA: row[33] == 'Y',
-          MA: row[36] == 'Y',
-          MD: row[37] == 'Y',
-          ME: row[38] == 'Y',
-          MI: row[39] == 'Y',
-          MN: row[40] == 'Y',
-          MO: row[41] == 'Y',
-          MS: row[42] == 'Y',
-          MT: row[43] == 'Y',
-          NC: row[44] == 'Y',
-          ND: row[45] == 'Y',
-          NE: row[46] == 'Y',
-          NH: row[47] == 'Y',
-          NJ: row[48] == 'Y',
-          NM: row[49] == 'Y',
-          NV: row[50] == 'Y',
-          NY: row[51] == 'Y',
-          OH: row[52] == 'Y',
-          OK: row[53] == 'Y',
-          OR: row[54] == 'Y',
-          PA: row[55] == 'Y',
-          RI: row[56] == 'Y',
-          SC: row[57] == 'Y',
-          SD: row[58] == 'Y',
-          TN: row[59] == 'Y',
-          TX: row[60] == 'Y',
-          UT: row[61] == 'Y',
-          VA: row[62] == 'Y',
-          VT: row[63] == 'Y',
-          WA: row[64] == 'Y',
-          WI: row[65] == 'Y',
-          WV: row[66] == 'Y',
-          WY: row[67] == 'Y',
-        },
-        ground_shipping_only: row[68] == 'Y',
-        adult_signature_required: row[69] == 'Y',
-        blocked_from_drop_ship: row[70] == 'Y',
-        date_entered: row[71].nil? ? row[71] : Date.strptime(row[71], '%Y%m%d'),
-        retail_map: sanitize(row[72]),
-        image_disclaimer: row[73] == 'Y',
-        shipping_length: sanitize(row[74]),
-        shipping_width: sanitize(row[75]),
-        shipping_height: sanitize(row[76]),
-      }
-    end
-
   end
 end

data/lib/rsr_group/order.rb

@@ -7,17 +7,6 @@ module RsrGroup
   # * Call {#submit!} to send the order
   class Order < Base
 
-    class ResponseStruct < Struct.new(:success, :message, :data)
-
-      # Simple response object to pass along success/falure/messages of any process
-      # Usage:
-      #   response = ResponseStruct.new(true)
-      #   response = ResponseStruct.new(false, "You did the wrong thing")
-      #   response = ResponseStruct.new(true, nil, { result: 200 })
-
-      alias success? success
-    end
-
     # @param [Hash] options
     # @option options [String]  :merchant_number *required*
     # @option options [Integer] :sequence_number *required*
@@ -98,16 +87,12 @@ module RsrGroup
         io = StringIO.new(to_txt)
         begin
           ftp.storlines("STOR " + filename, io)
-          success = ftp.nlst.include?(filename)
-          @response = ResponseStruct.new(success, nil, modified: ftp.mtime(filename), size: ftp.size(filename))
         ensure
           io.close
         end
         ftp.close
       end
-      @response || ResponseStruct.new(false)
-    rescue Net::FTPPermError => e
-      return ResponseStruct.new(false, e.message.chomp)
+      true
     end
 
     private

data/lib/rsr_group/version.rb

@@ -1,3 +1,3 @@
 module RsrGroup
-  VERSION = '1.8.0'.freeze
+  VERSION = '2.0.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rsr_group
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Dale Campbell
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-23 00:00:00.000000000 Z
+date: 2017-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: smarter_csv
@@ -101,6 +101,7 @@ files:
 - config.rb.example
 - 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
@@ -134,7 +135,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