bill_hicks 2.0.13 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b61aa4a036933ec43c3d65f986ea0fd556e47677
-  data.tar.gz: 4e80b27203c64a6dd0899b914c961c0b3a717671
+  metadata.gz: 7f7483ccbb583a16feb2a6d9cba92df5e3aefcf1
+  data.tar.gz: 5942dfb526c3a38343f585a767fac6e010235a40
 SHA512:
-  metadata.gz: 434f9e965ea80378a55c803d87c6a1039fe9d8bc071fe6d28ef779ac178a459c94825f513c7851a783e0aaadfd2f9588f0a43297227e0b36fa8a354526bbfd9d
-  data.tar.gz: 62b10312932d05dd8f0c2b44e8723c232ca0a03d29323c93c5ba4b75fd7d01277c690c72dbb633b2b6d648a55ff33b7be19bb7d7739b90b8803dcb7129315cf8
+  metadata.gz: 516d4f62202175330666d29fc18a55d56529814e0566d4332b09ed3a15d2dab53ce8968ff22c59d716f85c3435887c7cda1cdd9882038fd37bf4f66188b160d8
+  data.tar.gz: 68404e5d4eb90cdc3b403a332db49c72ac5e9333c31a6ce5f61d41b9fbacbcac0b3352f852bd5748b5310f99cdd33315ef7ea8d4f063f565d4bcde33416551ff

data/lib/bill_hicks.rb

@@ -6,6 +6,7 @@ require 'smarter_csv'
 require 'tempfile'
 
 require 'bill_hicks/base'
+require 'bill_hicks/ftp'
 require 'bill_hicks/catalog'
 require 'bill_hicks/category'
 require 'bill_hicks/inventory'

data/lib/bill_hicks/brand_converter.rb

@@ -100,8 +100,8 @@ module BillHicks
         { prefix: 'BEN',     company: 'Crosman' },
         { prefix: 'CROS',    company: 'Crosman' },
         { prefix: 'NT',      company: 'Non Typical  (Cuddeback)' },
-        { prefix: 'BERG',    company: 'Bergara' },
-        { prefix: 'BGA',     company: 'Bergara' },
+        { prefix: 'BERG',    company: 'CVA' },
+        { prefix: 'BGA',     company: 'CVA' },
         { prefix: 'CVA',     company: 'CVA' },
         { prefix: 'QUA',     company: 'CVA' },
         { prefix: 'CZ',      company: 'Cz Usa' },

data/lib/bill_hicks/ftp.rb

@@ -0,0 +1,23 @@
+module BillHicks
+  class FTP
+
+    attr_reader :connection
+
+    def initialize(credentials)
+      @connection ||= Net::FTP.new(BillHicks.config.ftp_host)
+      @connection.passive = true
+      self.login(credentials[:username], credentials[:password])
+    end
+
+    def login(username, password)
+      @connection.login(username, password)
+    rescue Net::FTPPermError
+      raise BillHicks::NotAuthenticated
+    end
+
+    def close
+      @connection.close
+    end
+
+  end
+end

data/lib/bill_hicks/response_file.rb

@@ -7,23 +7,20 @@ module BillHicks
     # @option options [String] :username *required*
     # @option options [String] :password *required*
     # @option options [String] :filename *required*
-    def initialize(options = {})
+    def initialize(ftp, options = {})
       requires!(options, :username, :password, :filename)
 
-      @credentials = options.select { |k, v| [:username, :password].include?(k) }
-      @filename    = options[:filename]
+      @credentials  = options.select { |k, v| [:username, :password].include?(k) }
+      @filename     = options[:filename]
+      @ftp          = ftp
     end
 
     # Return list of '855 Purchase Order Acknowledgement' files
     # @option options [String] :username *required*
     # @option options [String] :password *required*
-    def self.all(options = {})
-      requires!(options, :username, :password)
-
-      Base.connect(options) do |ftp|
-        ftp.chdir(BillHicks.config.full_response_dir)
-        ftp.nlst("*.txt")
-      end
+    def self.all(ftp)
+      ftp.chdir(BillHicks.config.full_response_dir)
+      ftp.nlst("*.txt")
     end
 
     # Is the file a '855 Purchase Order Acknowledgement'?
@@ -39,12 +36,11 @@ module BillHicks
     # Use '#gettextfile' to read file contents as a string
     def content
       return @content if @content
-      connect(@credentials) do |ftp|
-        ftp.chdir(BillHicks.config.full_response_dir)
-        @content = ftp.gettextfile(@filename, nil)
-        ftp.close
-        @content
-      end
+
+      @ftp.chdir(BillHicks.config.full_response_dir)
+      @content = @ftp.gettextfile(@filename, nil)
+
+      @content
     end
 
     # Convert to easily readable key-value pairs
@@ -74,5 +70,4 @@ module BillHicks
     end
 
   end
-
 end

data/lib/bill_hicks/version.rb

@@ -1,3 +1,3 @@
 module BillHicks
-  VERSION = '2.0.13'.freeze
+  VERSION = '2.1.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bill_hicks
 version: !ruby/object:Gem::Version
-  version: 2.0.13
+  version: 2.1.0
 platform: ruby
 authors:
 - Dale Campbell
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-09 00:00:00.000000000 Z
+date: 2018-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: smarter_csv
@@ -90,6 +90,7 @@ files:
 - lib/bill_hicks/brand_converter.rb
 - lib/bill_hicks/catalog.rb
 - lib/bill_hicks/category.rb
+- lib/bill_hicks/ftp.rb
 - lib/bill_hicks/inventory.rb
 - lib/bill_hicks/order.rb
 - lib/bill_hicks/response_file.rb
@@ -115,7 +116,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