bill_hicks 1.3.10 → 2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 497eff185ebe572e87bc0470a5d454a53eace4d6
-  data.tar.gz: 2591aaef3445b2742231a4ea1a16b29f90c5f39a
+  metadata.gz: 0c8dd7c7f41c6d1042d4be6fe55b875065f55829
+  data.tar.gz: 57959c6ad5fff327913a59bc7da9b5a2d6f0771d
 SHA512:
-  metadata.gz: 33b6959cfb6f06f96329ed846a792f7f80ad4c45488e7823031cfde294dda7634409abd65c38ecbb163e37f0b06d18901ee49a721cff3d2d776e4e9ca2aa8b23
-  data.tar.gz: 0160b807ae28d98986946df2866544e452e1e9f20e46b9cfa1f4939a17e26d1949acdd2ef40f40340e29ae480dfd7e2bffa5d0d594209450478f0f546c54e487
+  metadata.gz: 5970c5b09ac70ef3d94974311c5ca1fe8155de8b0098d945dd7a517a0969d494bc3db916f59c83637fca760bf73d0cd1dc020b34554491c9c28c887016b5a6f2
+  data.tar.gz: a63f6dbd35d7cb0497c6fbc1ec00b359ce003fafbd2af813242980f0bafadbba74c5f3192e8692e0ed0f914811a958125e89f1cf6c0eb30daa563e0e849692fa

data/lib/bill_hicks/base.rb

@@ -5,12 +5,8 @@ module BillHicks
       requires!(options, :username, :password)
 
       Net::FTP.open(BillHicks.config.ftp_host, options[:username], options[:password]) do |ftp|
-        begin
-          ftp.passive = true
-          yield ftp
-        ensure
-          ftp.close
-        end
+        ftp.passive = true
+        yield ftp
       end
     rescue Net::FTPPermError
       raise BillHicks::NotAuthenticated
@@ -39,11 +35,7 @@ module BillHicks
     # Instance methods become class methods through inheritance
     def connect(options)
       self.class.connect(options) do |ftp|
-        begin
-          yield ftp
-        ensure
-          ftp.close
-        end
+        yield ftp
       end
     end
 

data/lib/bill_hicks/brand_converter.rb

@@ -134,7 +134,6 @@ module BillHicks
         { prefix: 'FED',     company: 'Federal' },
         { prefix: 'IND',     company: 'Federal' },
         { prefix: 'FIO',     company: 'Fiocchi' },
-        { prefix: 'FO',      company: 'Freedom Ordnance' },
         { prefix: 'WILL',    company: 'Williams Gun Sight Company' },
         { prefix: 'FC',      company: 'Flippin Critters' },
         { prefix: 'FLITZ',   company: 'Flitz' },

data/lib/bill_hicks/catalog.rb

@@ -25,70 +25,86 @@ module BillHicks
       @options = options
     end
 
-    def self.all(options = {})
+    def self.all(chunk_size = 15, options = {}, &block)
       requires!(options, :username, :password)
-      new(options).all
+      new(options).all(chunk_size, &block)
     end
 
-    def self.process_as_chunks(size = 15, options = {}, &block)
-      requires!(options, :username, :password)
-      new(options).process_as_chunks(size, &block)
-    end
-
-    # Returns an array of hashes with the catalog item details.
-    def all
-      catalog = []
-
+    def all(chunk_size, &block)
       connect(@options) do |ftp|
+        csv_tempfile = Tempfile.new
+
         ftp.chdir(BillHicks.config.top_level_dir)
+        ftp.getbinaryfile(CATALOG_FILENAME, csv_tempfile.path)
+
+        SmarterCSV.process(csv_tempfile, {
+          :chunk_size => chunk_size,
+          :force_utf8 => true,
+          :convert_values_to_numeric => false,
+          :key_mapping => {
+            :universal_product_code => :upc,
+            :product_name           => :name,
+            :product_weight         => :weight,
+            :product_price          => :price,
+            :category_description   => :category
+          }
+        }) do |chunk|
+          chunk.each do |item|
+            item.except!(:category_code)
+
+            item[:item_identifier] = item[:upc]
+            item[:brand] = BillHicks::BrandConverter.convert(item[:name])
 
-        lines = ftp.gettextfile(CATALOG_FILENAME, nil)
+            if item[:long_description].present?
+              features = self.parse_features(item[:long_description])
 
-        CSV.parse(lines, headers: :first_row) do |row|
-          row_hash = {}
+              if features[:action].present?
+                item[:action] = features[:action]
 
-          # Turn the row into a hash with header names as symbolized keys.
-          row.each { |r| row_hash[r.first.to_sym] = r.last }
+                features.delete(:action)
+              elsif features[:caliber].present?
+                item[:caliber] = features[:caliber]
 
-          # Alias the ':universal_product_code' as ':upc'.
-          row_hash[:upc] = row_hash[:universal_product_code]
+                features.delete(:caliber)
+              elsif features[:weight].present?
+                item[:weight] = features[:weight]
 
-          row_hash[:brand_name] = BillHicks::BrandConverter.convert(row_hash[:product_name])
+                features.delete(:weight)
+              end
 
-          catalog << row_hash
+              item[:features] = features
+            end
+          end
+
+          yield(chunk)
         end
       end
-
-      catalog
     end
 
-    # Streams csv and chunks it
-    #
-    # @size integer The number of items in each chunk
-    def process_as_chunks(size, &block)
-      connect(@options) do |ftp|
-        tempfile = Tempfile.new
+    protected
 
-        ftp.chdir(BillHicks.config.top_level_dir)
-        ftp.getbinaryfile(CATALOG_FILENAME, tempfile.path)
+    def parse_features(text)
+      features = Hash.new
+      text = text.split("-")
+      permitted_features = ['weight', 'caliber', 'action', 'mount', 'finish', 'length', 'diameter', 'rail', 'trigger', 'barrel length', 'silencer mount', 'barrel', 'stock', 'internal bore', 'thread pitch', 'dimensions', 'bulb type', 'bezel diameter', 'output max', 'battery type', 'mount type', 'waterproof rating', 'operating temperature']
 
-        smart_options = {
-          chunk_size: size,
-          key_mapping: { universal_product_code: :upc },
-          force_utf8: true,
-          convert_values_to_numeric: false
-        }
+      text.each do |feature|
+        if feature.include?(':') && feature.length <= 45
+          key, value = feature.split(':')
 
-        SmarterCSV.process(File.open(tempfile, "r:iso-8859-1"), smart_options) do |chunk|
-          chunk.each do |item|
-            item[:brand_name] = BillHicks::BrandConverter.convert(item[:product_name])
+          if key.nil? || value.nil?
+            next
           end
 
-          yield(chunk)
-        end
+          key, value = key.strip.downcase, value.strip
 
-        tempfile.unlink
+          if permitted_features.include?(key)
+            features[key.gsub(" ", "_")] = value
+          end
+        end
       end
+
+      features
     end
 
   end

data/lib/bill_hicks/inventory.rb

@@ -15,62 +15,43 @@ module BillHicks
       @options = options
     end
 
-    def self.all(options = {})
+    def self.all(chunk_size = 15, options = {}, &block)
       requires!(options, :username, :password)
-      new(options).all
+      new(options).all(chunk_size, &block)
     end
 
-    def self.process_as_chunks(size = 15, options = {}, &block)
+    def self.quantities(chunk_size = 15, options = {}, &block)
       requires!(options, :username, :password)
-      new(options).process_as_chunks(size, &block)
+      new(options).quantities(chunk_size, &block)
     end
 
-    # Returns an array of hashes with the inventory item details.
-    def all
-      inventory = []
-
-      connect(@options) do |ftp|
-        ftp.chdir(BillHicks.config.top_level_dir)
-
-        lines = ftp.gettextfile(INVENTORY_FILENAME, nil)
-
-        CSV.parse(lines, headers: :first_row) do |row|
-          inventory << {
-            brand_name: BillHicks::BrandConverter.convert(row.fetch('Product')),
-            product: row.fetch('Product'),
-            upc: row.fetch('UPC'),
-            quantity: (Integer(row.fetch('Qty Avail')) rescue 0)
-          }
-        end
-      end
-
-      inventory
-    end
-
-    # Streams csv and chunks it
-    #
-    # @size integer The number of items in each chunk
-    def process_as_chunks(size, &block)
+    def all(chunk_size, &block)
       connect(@options) do |ftp|
-        tempfile = Tempfile.new
-
-        ftp.chdir(BillHicks.config.top_level_dir)
-        ftp.getbinaryfile(INVENTORY_FILENAME, tempfile.path)
-
-        smart_options = {
-          chunk_size: size,
-          key_mapping: { qty_avail: :quantity },
-          force_utf8: true,
-          convert_values_to_numeric: false
-        }
-
-        SmarterCSV.process(tempfile, smart_options) do |chunk|
-          yield(chunk)
+        begin
+          csv_tempfile = Tempfile.new
+
+          ftp.chdir(BillHicks.config.top_level_dir)
+          ftp.getbinaryfile(INVENTORY_FILENAME, csv_tempfile.path)
+
+          SmarterCSV.process(csv_tempfile, {
+            :chunk_size => chunk_size,
+            :force_utf8 => true,
+            :convert_values_to_numeric => false,
+            :key_mapping => {
+              :qty_avail  => :quantity,
+              :upc        => :item_identifier
+            }
+          }) do |chunk|
+            chunk.each do |item|
+              item.except!(:product)
+            end
+
+            yield(chunk)
+          end
+        ensure
+          ftp.close
         end
-
-        tempfile.unlink
       end
     end
-
   end
 end

data/lib/bill_hicks/version.rb

@@ -1,3 +1,3 @@
 module BillHicks
-  VERSION = '1.3.10'.freeze
+  VERSION = '2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bill_hicks
 version: !ruby/object:Gem::Version
-  version: 1.3.10
+  version: '2.0'
 platform: ruby
 authors:
 - Dale Campbell
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-03 00:00:00.000000000 Z
+date: 2017-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: smarter_csv
@@ -115,7 +115,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: Ruby library for Bill Hicks ERP system