gun_accessory_supply 0.0.5 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: adf4003e7ce333052c677e91eb6e09a72c38e158b9331d684b08aaffd3d9a867
-  data.tar.gz: d1108146ba8e8a17e9a1afa4d9e6620f5bab0703b285e415d122a5cbff8eb060
+  metadata.gz: e62de40dc12dccc647ef63845db30843ffebcc34dc972b983902386d41f4f12a
+  data.tar.gz: 23f95cfda894bb0476cb8a96074e714ba973fa081cae653fce88c530acec842f
 SHA512:
-  metadata.gz: ab3795c87f78a0fdda4e9bde251e140078043b8bd49fb93eec5c3943a18524085baaa190b3dbdd63c65a28a05edeed7958f056e6bca3141f17e711a8da235f4d
-  data.tar.gz: 5ae910db9102ee76f8fec9978c8107e148a8a4e29d7367d67364bcf5def128a6372487ce7271bf8e1f68fa8110f9237062d0be0078cf22832b50428054c56959
+  metadata.gz: f1faa623eafd0163d25e2c40dde87cd29f40f4691a2bac13d151c4023dc51b8ebc2fb2dd9a6a434c217349124f9d4fc5823dfc7966d7cc8ccb5d6ae6dff5b70c
+  data.tar.gz: a3d45f7e90194b901f9a8d48fc51b7eb9d2a21bf6b87e7d987eef5f2f9baa6fa1600525ffde72fc906948094e37ad8eec66ac0c1a31baac51036ab039e4985db

data/gun_accessory_supply.gemspec

@@ -6,8 +6,8 @@ require 'gun_accessory_supply/version'
 Gem::Specification.new do |spec|
   spec.name          = "gun_accessory_supply"
   spec.version       = GunAccessorySupply::VERSION
-  spec.authors       = ["Tony Beninate"]
-  spec.email         = ["tonybeninate@icloud.com"]
+  spec.authors       = ["Tony Beninate", "Jeffrey Dill"]
+  spec.email         = ["tonybeninate@icloud.com", "jeffdill2@gmail.com"]
 
   spec.summary       = %q{Ruby library for Gun Accessory Supply}
   spec.description   = %q{}
@@ -23,6 +23,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "activesupport", ">= 5", "< 7"
   spec.add_runtime_dependency "net-sftp"
+  spec.add_runtime_dependency "cxml"
 
   spec.add_development_dependency "bundler", ">= 1.15"
   spec.add_development_dependency "rake", "~> 12.3.0"

data/lib/gun_accessory_supply/base.rb

@@ -37,9 +37,7 @@ module GunAccessorySupply
     # Instance methods become class methods through inheritance
     def connect(options)
       self.class.connect(options) do |sftp|
-        begin
-          yield(sftp)
-        end
+        yield(sftp)
       end
     end
 
@@ -53,27 +51,36 @@ module GunAccessorySupply
       end
     end
 
-    def get_file(filename, file_directory=nil)
+    def get_file(filename, file_directory = nil)
       connect(@options) do |sftp|
-        begin
-          tempfile = Tempfile.new
+        tempfile = Tempfile.new
 
-          sftp.download!(File.join(file_directory, filename), tempfile.path)
+        sftp.download!(File.join(file_directory, filename), tempfile.path)
 
-          return tempfile
-        end
+        return tempfile
       end
     end
 
-    def get_most_recent_file(file_prefix, file_directory=nil)
-      filenames = []
-
+    def get_full_filenames(filename_regexes = [], file_directory = nil)
       connect(@options) do |sftp|
-        sftp.dir.foreach(file_directory) { |entry| filenames << entry.name }
-        filename = filenames.select{ |n| n.include?(file_prefix) }.sort.last
+        filenames = sftp.dir.entries(file_directory).map(&:name)
+        full_regex = Regexp.union(*filename_regexes)
 
-        tempfile = self.get_file(filename, file_directory)
-        return tempfile
+        return filenames.select { |filename| filename =~ full_regex }
+      end
+    end
+
+    def get_most_recent_file(file_prefix, file_directory = nil)
+      connect(@options) do |sftp|
+        filename = sftp.
+          dir.
+          entries(file_directory).
+          map(&:name).
+          select { |filename| filename.include?(file_prefix) }.
+          sort.
+          last
+
+        return get_file(filename, file_directory)
       end
     end
 

data/lib/gun_accessory_supply/order.rb

@@ -73,28 +73,25 @@ module GunAccessorySupply
             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: 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: GunAccessorySupply.config.xml_domain) do
               xml.Identity GunAccessorySupply.config.xml_domain
               xml.SharedSecret GunAccessorySupply.config.xml_secret
-              xml.OrderID @po_number
             end
           end
         end
 
         xml.Request do
           xml.OrderRequest do
-            xml.OrderRequestHeader(orderDate: Time.now, type: 'new') do
+            xml.OrderRequestHeader(orderDate: Time.now, type: 'new', orderID: @po_number) do
               xml.ShipTo do
                 xml.Address(addressID: @ship_to_id) do
                   xml.Name @recipient[:dealer_name]

data/lib/gun_accessory_supply/po.rb

@@ -0,0 +1,39 @@
+module GunAccessorySupply
+  class PO < Base
+
+    def initialize(options = {})
+      requires!(options, :username, :password)
+
+      @options = options
+    end
+
+    def self.file_names(options = {}, po_numbers = [])
+      requires!(options, :username, :password)
+
+      new(options).file_names(po_numbers)
+    end
+
+    def self.file_data(options = {}, filename)
+      requires!(options, :username, :password)
+
+      new(options).download(filename)
+    end
+
+    def file_names(po_numbers = [])
+      filename_regexes = if po_numbers.empty?
+        [/#{GunAccessorySupply.config.po_filename_prefix}.*.xml/]
+      else
+        po_numbers.map do |po_number|
+          /#{GunAccessorySupply.config.po_filename_prefix}.*#{po_number}.xml/
+        end
+      end
+
+      get_full_filenames(filename_regexes, 'out')
+    end
+
+    def file_data(filename)
+      CXML::Parser.new.parse(get_file(filename, 'out').read)
+    end
+
+  end
+end

data/lib/gun_accessory_supply/tracking.rb

@@ -1,39 +1,38 @@
 module GunAccessorySupply
   class Tracking < Base
 
-    BASE_TRACKING_FILE_DIRECTORY = "%s-TRACK".freeze
-    BASE_TRACKING_FILE_NAME = "%s_PackageTracking.csv".freeze
-    CARRIER = 'UPS'.freeze
-
     def initialize(options = {})
-      requires!(options, :username, :password, :dealer_number)
+      requires!(options, :username, :password)
 
       @options = options
-      @dealer_number = options[:dealer_number]
     end
 
-    def self.fetch_data(options = {})
-      requires!(options, :username, :password, :dealer_number)
+    def self.file_names(options = {}, po_numbers = [])
+      requires!(options, :username, :password)
 
-      new(options).fetch_data
+      new(options).file_names(po_numbers)
     end
 
-    def fetch_data
-      tracking_file_name = BASE_TRACKING_FILE_NAME % @dealer_number
-      tracking_file_directory = BASE_TRACKING_FILE_DIRECTORY % @dealer_number
-      tracking_file = get_file(tracking_file_name, tracking_file_directory)
-
-      tracking_details = CSV.foreach(tracking_file, { headers: :first_row }).map do |row|
-        {
-          po_number: row['USR_VEND_ORD_NO'],
-          carrier: CARRIER,
-          tracking_numbers: [row['TRK_NO_1'], row['TRK_NO_2'], row['TRK_NO_3'], row['TRK_NO_4'], row['TRK_NO_5']].reject(&:blank?),
-        }
+    def self.file_data(options = {}, filename)
+      requires!(options, :username, :password)
+
+      new(options).download(filename)
+    end
+
+    def file_names(po_numbers = [])
+      filename_regexes = if po_numbers.empty?
+        [/#{GunAccessorySupply.config.tracking_filename_prefix}.*.xml/]
+      else
+        po_numbers.map do |po_number|
+          /#{GunAccessorySupply.config.tracking_filename_prefix}.*#{po_number}.xml/
+        end
       end
 
-      tracking_file.unlink
+      get_full_filenames(filename_regexes, 'out')
+    end
 
-      tracking_details
+    def file_data(filename)
+      CXML::Parser.new.parse(get_file(filename, 'out').read)
     end
 
   end

data/lib/gun_accessory_supply/version.rb

@@ -1,3 +1,3 @@
 module GunAccessorySupply
-  VERSION = '0.0.5'.freeze
+  VERSION = '1.0.0'.freeze
 end

data/lib/gun_accessory_supply.rb

@@ -1,12 +1,15 @@
-require 'gun_accessory_supply/version'
+require 'active_support/all'
 require 'csv'
+require 'cxml'
 require 'net/sftp'
 require 'tempfile'
-require 'active_support/all'
+
+require 'gun_accessory_supply/version'
 require 'gun_accessory_supply/base'
 require 'gun_accessory_supply/catalog'
 require 'gun_accessory_supply/category'
 require 'gun_accessory_supply/inventory'
+require 'gun_accessory_supply/po'
 require 'gun_accessory_supply/order'
 require 'gun_accessory_supply/tracking'
 require 'gun_accessory_supply/user'
@@ -33,6 +36,8 @@ module GunAccessorySupply
       sftp_host
       sftp_port
       inventory_filename_prefix
+      po_filename_prefix
+      tracking_filename_prefix
       xml_domain
       xml_secret
       proxy_host

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: gun_accessory_supply
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 1.0.0
 platform: ruby
 authors:
 - Tony Beninate
+- Jeffrey Dill
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-08-25 00:00:00.000000000 Z
+date: 2022-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -44,6 +45,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: cxml
+  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
@@ -89,6 +104,7 @@ dependencies:
 description: ''
 email:
 - tonybeninate@icloud.com
+- jeffdill2@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -108,6 +124,7 @@ files:
 - lib/gun_accessory_supply/category.rb
 - lib/gun_accessory_supply/inventory.rb
 - lib/gun_accessory_supply/order.rb
+- lib/gun_accessory_supply/po.rb
 - lib/gun_accessory_supply/tracking.rb
 - lib/gun_accessory_supply/user.rb
 - lib/gun_accessory_supply/version.rb