bill_hicks 2.1.4 → 5.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e66edb48bd0c80665df0a3fb107609d95f72149d
-  data.tar.gz: 541ee98fc5434bc63e93e38add4130bc95625587
+  metadata.gz: e15bab97eb4956e706f0b598e4f42608d0bfe21f
+  data.tar.gz: f7e7007fb2ada66e49902df044e77e3292261fc4
 SHA512:
-  metadata.gz: 9c4f416756138302838aa713dab89020a7aa028b1afd5b3079b4b36a1f8653fe8a6a1c6e37cc0ee0612d0f138ec8489d3b64bef201d51d33926e8e218dbf7d40
-  data.tar.gz: c8c00a73a230be7519f94fcdc904dbf8917e36675d282cd571889df2635601846fbe6788b3b702513a5b31894300a3fc818187d344eacf013bf10b4c96504d96
+  metadata.gz: 4c786bf3afd90aeeb879ed1ea2a99908020b8f82a0079e796fad111c884f32f46b0e698baa10c4f5576f9e2c76104efc68d18ba0bf1d12e16bcdee1ae92ce2b6
+  data.tar.gz: 2bcb02cb0addf1b8d9173ebedc575bdbd6ab828ff7dfec09f11b6f57738facd687bd892b5ce4ea351264477b70cb44637377db73d3f2b06e154daf63176d5f4d

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 "bill_hicks.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/README.md

@@ -18,95 +18,6 @@ Or install it yourself as:
 
     $ gem install bill_hicks
 
-## Usage
-
-**Note:** Nearly all methods require `:username` and `:password` keys in the options hash.
-
-```ruby
-options = {
-  username: 'dealer@example.com',
-  password: 'sekret-passwd'
-}
-```
-
-### BillHicks::Catalog
-
-To get all items in the catalog:
-
-```ruby
-catalog = BillHicks::Catalog.all(options)
-```
-
-See `BillHicks::Catalog` for the response structure.
-
-### BillHicks::Inventory
-
-To get your inventory details (availability, price, etc.):
-
-```ruby
-inventory = BillHicks::Inventory.all(options)
-```
-
-See `BillHicks::Inventory` for the response structure.
-
-### BillHicks::Category
-
-Returns an array of category codes and descriptions.
-
-```ruby
-categories = BillHicks::Category.all(options)
-
-# [
-#   {:code=>"H648", :description=>"AIRGUNS"},
-#   {:code=>"H610", :description=>"AMMUNITION"},
-#   ...,
-# ]
-```
-
-### BillHicks::Order
-
-To build and submit an order, the basic steps are: 1) instantiate an Order object, 2) add header
-information, 3) add item information (multiple items if needed), 4) submit the order.
-
-```ruby
-# Instantiate the Order instance, passing in your :username and :password
-order = BillHicks::Order.new(options)
-
-# Add header information:
-header_opts = {
-  customer: '...',  # customer number
-  purchase_order: '...',  # application specific purchase order
-  ffl: '...',  # your FFL number
-  shipping: {  # shipping information (all fields except :address_2 are required)
-    name: '...',
-    address_1: '...',
-    address_2: '...',
-    city: '...',
-    state: '...',
-    zip: '...',
-  },
-
-  # Optional fields:
-  shipping_method: '...',
-  notes: '...',
-}
-order.add_header(header_opts)
-
-# Add item information:
-item_opts = {
-  item_number: '...',  # Bill Hicks item number
-  description: '...',
-  quantity: 1,
-  price: '123.45',  # Decimal formatted price, without currency sign
-}
-order.add_item(item_opts)  # Multiple items may be added, just call #add_item for each one.
-
-# Submit the order (returns true on success, raises an exception on failgure):
-order.submit!
-```
-
-See `BillHicks::Order` for details on required options.
-
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/bill_hicks.gemspec

@@ -23,7 +23,8 @@ 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 "rake", ">= 12.3.3"
   spec.add_development_dependency "rspec", "~> 3.5"
 end

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,26 @@ 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
+
+    def get_file(filename)
+      connect(@options) do |ftp|
+        begin
+          tempfile = Tempfile.new
+
+          ftp.chdir(BillHicks.config.top_level_dir)
+          ftp.getbinaryfile(filename, tempfile.path)
+
+          tempfile
+        ensure
+          ftp.close
+        end
       end
     end
 

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,14 @@ module BillHicks
       @options = options
     end
 
-    def self.all(chunk_size = 15, options = {}, &block)
+    def self.all(options = {})
       requires!(options, :username, :password)
-      new(options).all(chunk_size, &block)
+      new(options).all
     end
 
-    def all(chunk_size, &block)
+    def all
+      items = []
+
       connect(@options) do |ftp|
         tempfile = Tempfile.new
 
@@ -59,7 +62,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,39 +78,27 @@ 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])
-
-              if features[:action].present?
-                item[:action] = features[:action]
-
-                features.delete(:action)
-              end
-
-              if features[:caliber].present?
-                item[:caliber] = features[:caliber]
-
-                features.delete(:caliber)
-              end
+              features = parse_features(item[:long_description])
 
-              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)
+            items << item
+          end
         end
 
         tempfile.unlink
       end
+
+      items
     end
 
     protected

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 = {})
@@ -15,44 +16,67 @@ module BillHicks
       @options = options
     end
 
-    def self.quantity(chunk_size = 15, options = {}, &block)
+    def self.get_quantity_file(options = {})
       requires!(options, :username, :password)
-      new(options).all(chunk_size, &block)
+      new(options).get_quantity_file
     end
 
-    def self.all(chunk_size = 15, options = {}, &block)
+    def self.quantity(options = {})
       requires!(options, :username, :password)
-      new(options).all(chunk_size, &block)
+      new(options).all
     end
 
-    def all(chunk_size, &block)
-      connect(@options) do |ftp|
-        begin
-          tempfile = Tempfile.new
-
-          ftp.chdir(BillHicks.config.top_level_dir)
-          ftp.getbinaryfile(INVENTORY_FILENAME, tempfile.path)
-
-          SmarterCSV.process(tempfile, {
-            chunk_size: chunk_size,
-            force_utf8: true,
-            convert_values_to_numeric: false,
-            key_mapping: {
-              product: :item_identifier,
-              qty_avail: :quantity,
-            }
-          }) do |chunk|
-            chunk.each do |item|
-              item.except!(:product)
-            end
-
-            yield(chunk)
-          end
-        ensure
-          tempfile.unlink
-          ftp.close
+    def self.all(options = {})
+      requires!(options, :username, :password)
+      new(options).all
+    end
+
+    def all
+      items             = []
+      quantity_tempfile = get_file(INVENTORY_FILENAME)
+
+      SmarterCSV.process(quantity_tempfile, {
+        chunk_size: CHUNK_SIZE,
+        force_utf8: true,
+        convert_values_to_numeric: false,
+        key_mapping: {
+          product: :item_identifier,
+          qty_avail: :quantity,
+        }
+      }) do |chunk|
+        chunk.each do |item|
+          items << item
+        end
+      end
+
+      quantity_tempfile.close
+      quantity_tempfile.unlink
+
+      items
+    end
+
+    def get_quantity_file
+      quantity_tempfile = get_file(INVENTORY_FILENAME)
+      tempfile          = Tempfile.new
+
+      SmarterCSV.process(quantity_tempfile, {
+        chunk_size: CHUNK_SIZE,
+        force_utf8: true,
+        convert_values_to_numeric: false,
+        key_mapping: {
+          product: :item_identifier,
+          qty_avail: :quantity,
+        }
+      }) do |chunk|
+        chunk.each do |item|
+          tempfile.puts("#{item[:item_identifier]},#{item[:quantity]}")
         end
       end
+
+      quantity_tempfile.close
+      quantity_tempfile.unlink
+      tempfile.close
+      tempfile.path
     end
 
     alias quantity all

data/lib/bill_hicks/version.rb

@@ -1,3 +1,3 @@
 module BillHicks
-  VERSION = '2.1.4'.freeze
+  VERSION = '5.0.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bill_hicks
 version: !ruby/object:Gem::Version
-  version: 2.1.4
+  version: 5.0.1
 platform: ruby
 authors:
 - Dale Campbell
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-10 00:00:00.000000000 Z
+date: 2020-06-25 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
@@ -42,16 +56,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '11.3'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '11.3'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -73,11 +87,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".gitignore"
 - ".rspec"
 - ".ruby-gemset"
 - ".ruby-version"
-- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -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.14.1
 signing_key: 
 specification_version: 4
 summary: Ruby library for Bill Hicks ERP system

data/.travis.yml

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