gun_accessory_supply 0.0.1 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 713a82aca54c3918e02de8c1653811b9ad48312bcc8b85ecf541df271e56d9e3
-  data.tar.gz: 403f668797fb4bf16a6a96c11d6b64b102e55316ed03f47db0895882b5cc07e5
+  metadata.gz: 2cb360468009585d6c544174df5a98e085a8ff8504acd2af87d97d3f91d5e111
+  data.tar.gz: 8ffea43be565f45d76e1dd08b13ddc17fdf7555b01d84abc9bd4e32bd70ddb03
 SHA512:
-  metadata.gz: 538ded1697f684265fe166db18599972a4ccc0c3d8b5fb09938e05e851bd2cfc7d53954e555763ba9c1543fd3bc1ff5d4a88e3f3339f12e71233e9f72e6fe233
-  data.tar.gz: 06573264b87a5ab1cfa66acbed323b3d2e8a9028352c693e760a2e06e6f4dce2960aeacb9a34627098514fcb658cd52d22fea1934b4ef67eeda5e88b10683a57
+  metadata.gz: 714b1a759af4f27ed31aeb28caaee92abbac0e7f75cfe11b1563fe3df7ff9f68878516e8bec584940d8661e9abbec0869891ff7ec474bd9e320b7e97efeb6385
+  data.tar.gz: de7c514d94c2f18b1611db4a45af9da44b6169bdd662aeebedd42ab21783f6a084366333c4afbbf937f4a019accde79efb9a3e6135e269365fb9b0042bcad114

data/lib/gun_accessory_supply/base.rb

@@ -3,8 +3,13 @@ module GunAccessorySupply
 
     def self.connect(options = {})
       requires!(options, :username, :password)
-      
-      Net::SFTP.start(GunAccessorySupply.config.ftp_host, options[:username], password: options[:password], port: GunAccessorySupply.config.ftp_port) do |sftp|
+
+      Net::SFTP.start(
+        GunAccessorySupply.config.proxy_host || GunAccessorySupply.config.sftp_host,
+        options[:username],
+        password: options[:password],
+        port: GunAccessorySupply.config.proxy_port || GunAccessorySupply.config.sftp_port
+      ) do |sftp|
         yield(sftp)
       end
     end
@@ -47,12 +52,12 @@ module GunAccessorySupply
         node.content.try(:strip)
       end
     end
-    
+
     def get_file(filename, file_directory=nil)
       connect(@options) do |sftp|
         begin
           tempfile = Tempfile.new
-          
+
           sftp.download!(File.join(file_directory, filename), tempfile.path)
 
           return tempfile
@@ -67,7 +72,7 @@ module GunAccessorySupply
         sftp.dir.foreach(file_directory) { |entry| filenames << entry.name }
         filename = filenames.select{ |n| n.include?(file_prefix) }.sort.last
 
-        tempfile = self.get_file(filename, file_directory) 
+        tempfile = self.get_file(filename, file_directory)
         return tempfile
       end
     end

data/lib/gun_accessory_supply/catalog.rb

@@ -1,6 +1,6 @@
 module GunAccessorySupply
   class Catalog < Base
-    
+
     def initialize(options = {})
       requires!(options, :username, :password)
       @options = options
@@ -12,12 +12,12 @@ module GunAccessorySupply
     end
 
     def all
-      tempfile = get_most_recent_file(GunAccessorySupply.config.catalog_filename_prefix, GunAccessorySupply.config.top_level_dir)
+      tempfile = get_most_recent_file(GunAccessorySupply.config.inventory_filename_prefix, 'out')
       items = []
 
       File.open(tempfile).each_with_index do |row, i|
         row = parse_row(row)
-        
+
         if i==0
           @headers = row
           next
@@ -30,7 +30,7 @@ module GunAccessorySupply
           upc:             row[@headers.index('UPC')].try(:strip),
           name:            row[@headers.index('Item Description')].try(:strip),
           quantity:        row[@headers.index("Available Qty")].to_i,
-          price:           row[@headers.index('MSRP')].try(:strip),
+          price:           row[@headers.index('Dealer Cost')].try(:strip),
           msrp:            row[@headers.index('MSRP')].try(:strip),
           map_price:       row[@headers.index('MAP Price')].try(:strip),
           brand:           row[@headers.index('Manufacturer')].try(:strip),

data/lib/gun_accessory_supply/inventory.rb

@@ -1,6 +1,6 @@
 module GunAccessorySupply
   class Inventory < Base
-    
+
     def initialize(options = {})
       requires!(options, :username, :password)
       @options = options
@@ -17,12 +17,12 @@ module GunAccessorySupply
     end
 
     def all
-      tempfile = get_most_recent_file(GunAccessorySupply.config.catalog_filename_prefix, GunAccessorySupply.config.top_level_dir)
+      tempfile = get_most_recent_file(GunAccessorySupply.config.inventory_filename_prefix, 'out')
       items = []
 
       File.open(tempfile).each_with_index do |row, i|
         row = parse_row(row)
-        
+
         if i==0
           @headers = row
           next
@@ -31,7 +31,7 @@ module GunAccessorySupply
         item = {
           item_identifier: row[@headers.index('Item ID')].try(:strip),
           quantity:        row[@headers.index('Available Qty')].to_i,
-          price:           row[@headers.index('MSRP')].try(:strip),
+          price:           row[@headers.index('Dealer Cost')].try(:strip),
         }
 
         items << item
@@ -44,12 +44,12 @@ module GunAccessorySupply
     end
 
     def quantity
-      tempfile = get_most_recent_file(GunAccessorySupply.config.catalog_filename_prefix, GunAccessorySupply.config.top_level_dir)
+      tempfile = get_most_recent_file(GunAccessorySupply.config.inventory_filename_prefix, 'out')
       items = []
 
       File.open(tempfile).each_with_index do |row, i|
         row = parse_row(row)
-        
+
         if i==0
           @headers = row
           next

data/lib/gun_accessory_supply/order.rb

@@ -32,7 +32,7 @@ module GunAccessorySupply
     #   * :special_instructions [String] optional
     def add_recipient(hash = {})
       requires!(hash, :dealer_name, :shipping)
-      requires!(hash[:shipping], :name, :address, :city, :state, :zip, :email, :phone)
+      requires!(hash[:shipping], :name, :address, :city, :state, :zip, :email)
 
       @recipient = hash
     end
@@ -45,13 +45,16 @@ module GunAccessorySupply
     #   * :price [String]
     def add_item(item = {})
       requires!(item, :identifier, :upc, :qty)
+
       @items << item
     end
 
     def filename
-      return @filename if defined?(@filename)
-      timestamp = Time.now.strftime('%Y%m%d%T').gsub(':', '')
-      @filename = "GUN-ACCESSORY-SUPPLY-#{@po_number}-#{timestamp}.xml"
+      @filename ||= begin
+        timestamp = Time.now.strftime('%Y%m%d%T').gsub(':', '')
+
+        "GUN-ACCESSORY-SUPPLY-#{@po_number}-#{timestamp}.xml"
+      end
     end
 
     def submit!
@@ -60,7 +63,6 @@ module GunAccessorySupply
 
     def to_xml
       output = ""
-
       xml = Builder::XmlMarkup.new(target: output, indent: 2)
 
       xml.instruct!(:xml)
@@ -68,23 +70,23 @@ module GunAccessorySupply
       xml.cXML(timestamp: Time.now) do
         xml.Header do
           xml.From do
-            xml.Credential(domain: @xml_domain) do
-              xml.Identity @xml_domain
-              xml.SharedSecret @xml_secret
+            xml.Credential(domain: GunAccessorySupply.config.xml_domain) do
+              xml.Identity GunAccessorySupply.config.xml_domain
+              xml.SharedSecret GunAccessorySupply.config.xml_secret
               xml.OrderID @po_number
             end
           end
           xml.To do
-            xml.Credential(domain: @xml_domain) do
-              xml.Identity @xml_domain
-              xml.SharedSecret @xml_secret
+            xml.Credential(domain: GunAccessorySupply.config.xml_domain) do
+              xml.Identity GunAccessorySupply.config.xml_domain
+              xml.SharedSecret GunAccessorySupply.config.xml_secret
               xml.OrderID @po_number
             end
           end
           xml.Sender do
-            xml.Credential(domain: @xml_domain) do
-              xml.Identity @xml_domain
-              xml.SharedSecret @xml_secret
+            xml.Credential(domain: GunAccessorySupply.config.xml_domain) do
+              xml.Identity GunAccessorySupply.config.xml_domain
+              xml.SharedSecret GunAccessorySupply.config.xml_secret
               xml.OrderID @po_number
             end
           end

data/lib/gun_accessory_supply/version.rb

@@ -1,3 +1,3 @@
 module GunAccessorySupply
-  VERSION = '0.0.1'.freeze
+  VERSION = '0.0.4'.freeze
 end

data/lib/gun_accessory_supply.rb

@@ -1,11 +1,8 @@
 require 'gun_accessory_supply/version'
-
 require 'csv'
 require 'net/sftp'
 require 'tempfile'
-
 require 'active_support/all'
-
 require 'gun_accessory_supply/base'
 require 'gun_accessory_supply/catalog'
 require 'gun_accessory_supply/category'
@@ -32,19 +29,19 @@ module GunAccessorySupply
   end
 
   class Configuration
-    attr_accessor :debug_mode
-    attr_accessor :ftp_host
-    attr_accessor :ftp_port
-    attr_accessor :top_level_dir
-    attr_accessor :catalog_filename_prefix
-    attr_accessor :xml_domain
-    attr_accessor :xml_secret
+    attr_accessor *%i(
+      sftp_host
+      sftp_port
+      inventory_filename_prefix
+      xml_domain
+      xml_secret
+      proxy_host
+      proxy_port
+    )
 
     def initialize
-      @debug_mode    ||= false
-      @ftp_host      ||= "50.233.131.250"
-      @ftp_port      ||= "2222"
-      @top_level_dir ||= "/out"
+      @sftp_host ||= "50.233.131.250"
+      @sftp_port ||= "2222"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gun_accessory_supply
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.4
 platform: ruby
 authors:
 - Tony Beninate
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-06-14 00:00:00.000000000 Z
+date: 2022-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport