bill_hicks 2.2.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a9bf35ce7df7b67c93b47936309a3641eb7f455
-  data.tar.gz: b12c4e7d2b36d8b4c128a884031ea40361b3bcfe
+  metadata.gz: 200b1a8ece7bd7d86e47c15449d5d28cd9b576f2
+  data.tar.gz: 14f161f5c9b43a98481af55bb7fe2512de58b96d
 SHA512:
-  metadata.gz: f8834a97ba02ed8cf1e2f5d290523719ffa2816b62f6fc68482cfc739b277869af7580c37538fdc1e66fa09b9083aa3613c684f86925c79fb47543bf0d1f68be
-  data.tar.gz: 2e2428f0371992e6972603955ff1d5be212aeb90abed38580c3e74a51a08d4bc03a832b48714b501a5d352b4fe7c58ea857ae72b096bfbfd1f37fcaa0d483248
+  metadata.gz: 43614bde0369cbe747eeac017e4466ff49c73b51dc3447408b832845eb0ba6501622ce5037bb0a63541c24002547924b5089caccdc7d86f6ea4625ab0094e3c5
+  data.tar.gz: 0f81c641898416ba0f01d0e00420c9ec18f921e1b85d14b917766bf9e563710598bddce3a45d2e7a4671813b18f1a3253276a5b9f3f65d0b85be1a0bb034f0c2

data/bill_hicks.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency  "smarter_csv", "~> 1.1.4"
 
+  spec.add_development_dependency "activesupport", "~> 5"
   spec.add_development_dependency "bundler", "~> 1.12"
   spec.add_development_dependency "rake", "~> 11.3"
   spec.add_development_dependency "rspec", "~> 3.5"

data/lib/bill_hicks/base.rb

@@ -5,9 +5,13 @@ module BillHicks
       requires!(options, :username, :password)
 
       Net::FTP.open(BillHicks.config.ftp_host, options[:username], options[:password]) do |ftp|
-        ftp.debug_mode = BillHicks.config.debug_mode
-        ftp.passive = true
-        yield ftp
+        begin
+          ftp.debug_mode = BillHicks.config.debug_mode
+          ftp.passive = true
+          yield ftp
+        ensure
+          ftp.close
+        end
       end
     rescue Net::FTPPermError
       raise BillHicks::NotAuthenticated
@@ -36,7 +40,11 @@ module BillHicks
     # Instance methods become class methods through inheritance
     def connect(options)
       self.class.connect(options) do |ftp|
-        yield ftp
+        begin
+          yield ftp
+        ensure
+          ftp.close
+        end
       end
     end
 
@@ -48,8 +56,6 @@ module BillHicks
           ftp.chdir(BillHicks.config.top_level_dir)
           ftp.getbinaryfile(filename, tempfile.path)
 
-          tempfile.close
-
           tempfile
         ensure
           ftp.close

data/lib/bill_hicks/brand_converter.rb

@@ -134,6 +134,7 @@ 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

@@ -14,7 +14,8 @@ module BillHicks
   #   }
   class Catalog < Base
 
-    CATALOG_FILENAME = 'billhickscatalog.csv'
+    CHUNK_SIZE = 500
+    CATALOG_FILENAME = 'billhickscatalog.csv'.freeze
     PERMITTED_FEATURES = [
       'weight',
       'caliber',
@@ -46,12 +47,12 @@ module BillHicks
       @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|
         tempfile = Tempfile.new
 
@@ -59,7 +60,7 @@ module BillHicks
         ftp.getbinaryfile(CATALOG_FILENAME, tempfile.path)
 
         SmarterCSV.process(tempfile, {
-          chunk_size: chunk_size,
+          chunk_size: CHUNK_SIZE,
           force_utf8: true,
           convert_values_to_numeric: false,
           key_mapping: {
@@ -75,35 +76,21 @@ module BillHicks
             item.except!(:category_code)
 
             item[:item_identifier] = item[:name]
-            item[:brand] = BillHicks::BrandConverter.convert(item[:name])
-            item[:mfg_number] = item[:name].split.last
+            item[:brand]           = BillHicks::BrandConverter.convert(item[:name])
+            item[:mfg_number]      = item[:name].split.last
 
             if item[:long_description].present?
-              features = self.parse_features(item[:long_description])
+              features = parse_features(item[:long_description])
 
-              if features[:action].present?
-                item[:action] = features[:action]
-
-                features.delete(:action)
-              end
-
-              if features[:caliber].present?
-                item[:caliber] = features[:caliber]
-
-                features.delete(:caliber)
-              end
-
-              if features[:weight].present?
-                item[:weight] = features[:weight]
-
-                features.delete(:weight)
-              end
+              item[:action]  = features.delete(:action)  if features[:action].present?
+              item[:caliber] = features.delete(:caliber) if features[:caliber].present?
+              item[:weight]  = features.delete(:weight)  if features[:weight].present?
 
               item[:features] = features
             end
-          end
 
-          yield(chunk)
+            yield item
+          end
         end
 
         tempfile.unlink

data/lib/bill_hicks/inventory.rb

@@ -8,6 +8,7 @@ module BillHicks
   #   }
   class Inventory < Base
 
+    CHUNK_SIZE = 2000
     INVENTORY_FILENAME = 'billhicksinventory.csv'
 
     def initialize(options = {})
@@ -20,21 +21,21 @@ module BillHicks
       new(options).get_quantity_file
     end
 
-    def self.quantity(chunk_size = 15, options = {}, &block)
+    def self.quantity(options = {}, &block)
       requires!(options, :username, :password)
-      new(options).all(chunk_size, &block)
+      new(options).all &block
     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)
       quantity_tempfile = get_file(INVENTORY_FILENAME)
 
-      SmarterCSV.process(quantity_tempfile.open, {
-        chunk_size: chunk_size,
+      SmarterCSV.process(quantity_tempfile, {
+        chunk_size: CHUNK_SIZE,
         force_utf8: true,
         convert_values_to_numeric: false,
         key_mapping: {
@@ -43,21 +44,21 @@ module BillHicks
         }
       }) do |chunk|
         chunk.each do |item|
-          item.except!(:product)
+          yield item
         end
-
-        yield(chunk)
       end
 
+      quantity_tempfile.close
       quantity_tempfile.unlink
+      true
     end
 
     def get_quantity_file
       quantity_tempfile = get_file(INVENTORY_FILENAME)
       tempfile          = Tempfile.new
 
-      SmarterCSV.process(quantity_tempfile.open, {
-        chunk_size: 100,
+      SmarterCSV.process(quantity_tempfile, {
+        chunk_size: CHUNK_SIZE,
         force_utf8: true,
         convert_values_to_numeric: false,
         key_mapping: {
@@ -70,9 +71,9 @@ module BillHicks
         end
       end
 
+      quantity_tempfile.close
       quantity_tempfile.unlink
       tempfile.close
-
       tempfile.path
     end
 

data/lib/bill_hicks/version.rb

@@ -1,3 +1,3 @@
 module BillHicks
-  VERSION = '2.2.0'.freeze
+  VERSION = '3.0.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bill_hicks
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Dale Campbell
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-10 00:00:00.000000000 Z
+date: 2018-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: smarter_csv
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.4
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -116,7 +130,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: Ruby library for Bill Hicks ERP system