orion_wholesale 1.0.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f912eba82356f534ac1e312792ac9e0b97f861f3703ef51c6ed6627259977c8
-  data.tar.gz: b227ce9f341ea67e794419c5fabfe3e447b76c582968a71cd241bc3195784805
+  metadata.gz: d86d91420ad8fbb4b61a9b8b282376f8fea820df10c17459dec9ac3a16e854cd
+  data.tar.gz: 2918d80f92b3a665b6c51a619893f775a16daa8e7de3348f1cdd93008518321a
 SHA512:
-  metadata.gz: 8294e49274594cfc604879212042c2451cd5160562800c30eb3ffb1b05aa08369e04a1a31851266f4c7eb7db8d7cf4348c35bf6e258c00eeff3d5a148600856c
-  data.tar.gz: 9df02007435a308a6649755711d4e75492e370068e189b02bd657b7ffae472ec21cfc77305ca4b25ea6c97de0dc0fe6e5a2625cdbeff0554fbffce38c79c2a7d
+  metadata.gz: 98fddca67ae56c44fff9810061b6a4aab42883088b64efbea3abe25d7d633cd1cdcbbd70434121abdbc0e6efdb45e890181517f6913541d450b8ce42df4f3de8
+  data.tar.gz: a8c494e532cffd8d28ac80be8d6349695bff436c4d1aecc22935be44b0506476b2f8bc5b2e0ddd7a7959dc39c11e69c3439def04d27c86ca51e80dfa2771adc5

data/.gitignore

@@ -65,3 +65,5 @@ yarn-debug.log*
 # Ignore uploaded files in development
 /storage/*
 !/storage/.keep
+
+/pkg/

data/Gemfile

@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in orion.gemspec
+# Specify your gem's dependencies in orion_wholesale.gemspec
 gemspec

data/Gemfile.lock

@@ -1,25 +1,26 @@
 PATH
   remote: .
   specs:
-    orion_wholesale (1.0.0)
+    orion_wholesale (1.2.0)
       activesupport (>= 5, < 7)
+      net-sftp
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.4.3)
+    activesupport (5.2.4.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    concurrent-ruby (1.1.6)
+    concurrent-ruby (1.1.7)
     diff-lcs (1.3)
     i18n (1.8.5)
       concurrent-ruby (~> 1.0)
-    minitest (5.14.1)
-    net-sftp (2.1.2)
-      net-ssh (>= 2.6.5)
-    net-ssh (5.2.0)
+    minitest (5.14.2)
+    net-sftp (3.0.0)
+      net-ssh (>= 5.0.0, < 7.0.0)
+    net-ssh (6.1.0)
     rake (12.3.3)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
@@ -43,7 +44,6 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (>= 1.15)
-  net-sftp
   orion_wholesale!
   rake (~> 12.3.0)
   rspec (~> 3.7)

data/lib/orion_wholesale.rb

@@ -36,12 +36,14 @@ module OrionWholesale
     attr_accessor :ftp_host
     attr_accessor :ftp_port
     attr_accessor :top_level_dir
+    attr_accessor :catalog_filename_prefix
 
     def initialize
-      @debug_mode    ||= false
-      @ftp_host      ||= "74.143.53.110"
-      @ftp_port      ||= "10022"
-      @top_level_dir ||= "ffldealer"
+      @debug_mode              ||= false
+      @ftp_host                ||= "74.143.53.110"
+      @ftp_port                ||= "10022"
+      @top_level_dir           ||= "/ammoready"
+      @catalog_filename_prefix ||= 'orion_inv_arweb'
     end
   end
 end

data/lib/orion_wholesale/catalog.rb

@@ -1,8 +1,5 @@
 module OrionWholesale
   class Catalog < Base
-  
-    CATALOG_DIR             = '/ammoready'
-    CATALOG_FILENAME_PREFIX = 'orion_inv_arweb'
     
     def initialize(options = {})
       requires!(options, :username, :password)
@@ -15,7 +12,7 @@ module OrionWholesale
     end
 
     def all
-      tempfile = get_most_recent_file(CATALOG_FILENAME_PREFIX, CATALOG_DIR)
+      tempfile = get_most_recent_file(OrionWholesale.config.catalog_filename_prefix, OrionWholesale.config.top_level_dir)
       items = []
 
       File.open(tempfile).each_with_index do |row, i|
@@ -26,31 +23,32 @@ module OrionWholesale
           next
         end
 
-        if row[@headers.index('Category1')].strip == 'Guns'
+        if row[@headers.index('Category1')].try(:strip) == 'Guns'
           # Guns
-          case row[@headers.index('Category2')].strip
+          case row[@headers.index('Category2')].try(:strip)
           when 'Long Guns'
-            @category    = row[@headers.index('Category3')].strip
-            @subcategory = row[@headers.index("Category4\n")].strip
+            @category    = row[@headers.index('Category3')].try(:strip)
+            @subcategory = row[@headers.index("Category4")].try(:strip)
           when 'Handguns'
-            @category    = row[@headers.index('Category2')].strip
-            @subcategory = row[@headers.index("Category3")].strip
+            @category    = row[@headers.index('Category2')].try(:strip)
+            @subcategory = row[@headers.index("Category3")].try(:strip)
           end
         else
           # Everything else
-          @category    = row[@headers.index('Category1')].strip
-          @subcategory = row[@headers.index('Category2')].strip
+          @category    = row[@headers.index('Category1')].try(:strip)
+          @subcategory = row[@headers.index('Category2')].try(:strip)
         end
 
         item = {
-          mfg_number:   row[@headers.index('Item ID')].strip,
-          upc:          row[@headers.index('Bar Code')].strip,
-          name:         row[@headers.index('Description')].strip,
-          quantity:     row[@headers.index('Qty available')].to_i,
-          price:        row[@headers.index('Price')].strip,
-          brand:        row[@headers.index('Brand')].strip,
-          category:     @category,
-          subcategory:  @subcategory,
+          mfg_number:      row[@headers.index('Item ID')].try(:strip),
+          upc:             row[@headers.index('Bar Code')].try(:strip),
+          name:            row[@headers.index('Description')].try(:strip),
+          quantity:        row[@headers.index('Qty available')].to_i,
+          price:           row[@headers.index('Price')].try(:strip),
+          brand:           row[@headers.index('Brand')].try(:strip),
+          item_identifier: row[@headers.index("ImageFileName\n")].try(:strip),
+          category:        @category,
+          subcategory:     @subcategory,
         }
 
         items << item

data/lib/orion_wholesale/inventory.rb

@@ -1,9 +1,6 @@
 module OrionWholesale
   class Inventory < Base
     
-    CATALOG_DIR             = '/ammoready'.freeze
-    CATALOG_FILENAME_PREFIX = 'orion_inv_web'.freeze
-
     def initialize(options = {})
       requires!(options, :username, :password)
       @options = options
@@ -20,7 +17,7 @@ module OrionWholesale
     end
 
     def all
-      tempfile = get_most_recent_file(CATALOG_FILENAME_PREFIX, CATALOG_DIR)
+      tempfile = get_most_recent_file(OrionWholesale.config.catalog_filename_prefix, OrionWholesale.config.top_level_dir)
       items = []
 
       File.open(tempfile).each_with_index do |row, i|
@@ -47,7 +44,7 @@ module OrionWholesale
     end
 
     def quantity
-      tempfile = get_most_recent_file(CATALOG_FILENAME_PREFIX, CATALOG_DIR)
+      tempfile = get_most_recent_file(OrionWholesale.config.catalog_filename_prefix, OrionWholesale.config.top_level_dir)
       items = []
 
       File.open(tempfile).each_with_index do |row, i|

data/lib/orion_wholesale/user.rb

@@ -1,14 +1,24 @@
 module OrionWholesale
   class User < Base
 
+    USER_DIR             = '/ammoready'
+    USER_FILENAME_PREFIX = 'orion_ardy_cust_tab'
+
     def initialize(options = {})
-      requires!(options, :username, :password)
+      requires!(options, :username, :password, :account_id)
       @options = options
     end
 
     def authenticated?
-      connect(@options) { |ftp| ftp.pwd }
-      true
+      tempfile = get_most_recent_file(USER_FILENAME_PREFIX, USER_DIR)
+
+      File.open(tempfile).each_with_index do |row, i|
+        row = row.split("\t")
+
+        return true if row[0].strip.downcase == @options[:account_id].strip.downcase
+      end
+
+      false
     rescue OrionWholesale::NotAuthenticated
       false
     end

data/lib/orion_wholesale/version.rb

@@ -1,3 +1,3 @@
 module OrionWholesale
-  VERSION = '1.0.0'.freeze
+  VERSION = '1.2.0'.freeze
 end

data/orion_wholesale.gemspec

@@ -22,9 +22,9 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "activesupport", ">= 5", "< 7"
+  spec.add_runtime_dependency "net-sftp"
 
   spec.add_development_dependency "bundler", ">= 1.15"
   spec.add_development_dependency "rake", "~> 12.3.0"
   spec.add_development_dependency "rspec", "~> 3.7"
-  spec.add_development_dependency "net-sftp"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orion_wholesale
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Tony Beninate
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-29 00:00:00.000000000 Z
+date: 2020-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -30,6 +30,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '7'
+- !ruby/object:Gem::Dependency
+  name: net-sftp
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -72,20 +86,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.7'
-- !ruby/object:Gem::Dependency
-  name: net-sftp
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: ''
 email:
 - tonybeninate@icloud.com