mge_wholesale 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 886679bf2b3c05ded7fc01419e2e8ac27bdf66ce7d7901e2a4e2b30873545854
-  data.tar.gz: f4f51d632d13087d1e9a37875f566a70be0004a766e0b630ee5f04483d528cb6
+  metadata.gz: f5b7852fe6985745da0f7bc4967e1fb8c64e336f226b9ac25ad2bacced35db70
+  data.tar.gz: 131296929cca3c7070a66909e110189f2efe5b4907599b6040cb1a79ac03f893
 SHA512:
-  metadata.gz: f0f804a38963dfdd52c082a862d013ea582af0686709de1c5962933b5a7a7935a6338133446881f11b04c850d91b1a0baf7550d30376ade28f50d80b3bb5e34c
-  data.tar.gz: 824e81b8deb279ebb36a99333aef106dd228da1e89d1ed4feaf37b6f7b671bb40868fc302f8180b72def4835edff9e8d09fe2cc87e37e796fe151644b12e4e92
+  metadata.gz: 56e138bae3c58c1f5a6952d79aa9e36dc9169297bc5727579ea3d1df1c81316abb251d4a8943203521d3141ee6bd5da0b3d1ff94c0e0934a6ef8898edabe6963
+  data.tar.gz: 48884f2aa13689fc317ed111f72ada10b4b3653555c690fbc4c48508407d48aea05c61a80997ea5a3574f11f683f23ec5c23c949a543912c2a8fcbc076ac2066

data/lib/mge_wholesale/order.rb

@@ -1,126 +1,101 @@
 module MgeWholesale
   # To submit an order:
   #
-  # * Instantiate a new Order, passing in `:username` and `:password`
-  # * Call {#add_header}
+  # * Instantiate a new Order, passing in `:username`
+  # * Call {#add_recipient}
   # * Call {#add_item} for each item on the order
-  # * Call {#submit!} to send the order
   #
   # See each method for a list of required options.
   class Order < Base
 
+    HEADERS = [
+      'Ordering Dealer Number',
+      'Ordering Dealer Name',
+      'Ship to Name',
+      'Ship To Address',
+      'Ship to City',
+      'Ship to State',
+      'Ship to Zip',
+      'Ship to email',
+      'Ship to phone',
+      'Ship to FFL',
+      'Item',
+      'Item Desc',
+      'Item UPC',
+      'Item Qty',
+      'Item Price',
+      'Special Instructions'
+    ]
+
     # @option options [String] :username *required*
-    # @option options [String] :password *required*
     def initialize(options = {})
-      requires!(options, :username, :password)
-      @options = options
-      @items = []
+      requires!(options, :username, :po_number)
+
+      @dealer_number = options[:username]
+      @po_number     = options[:po_number]
+      @items         = []
     end
 
-    # @param [Hash] header
-    #   * :customer [String] *required*
-    #   * :purchase_order [String] *required*
-    #   * :ffl [String] *required*
+    # @param header [Hash]
+    #   * :dealer_name [String] *required*
+    #   * :ffl [String]
     #   * :shipping [Hash] *required*
     #     * :name [String] *required*
-    #     * :address_1 [String] *required*
-    #     * :address_2 [String] optional
+    #     * :address [String] *required*
     #     * :city [String] *required*
     #     * :state [String] *required*
     #     * :zip [String] *required*
-    def add_header(header = {})
-      requires!(header, :customer, :purchase_order, :ffl, :shipping)
-      requires!(header[:shipping], :name, :address_1, :city, :state, :zip)
-      @header = header
-      # Ensure that address_2 is not an empty string
-      if @header[:shipping][:address_2] && @header[:shipping][:address_2].empty?
-        @header[:shipping][:address_2] = nil
-      end
+    #     * :email [String] *required*
+    #     * :phone [String] *required*
+    #   * :special_instructions [String] optional
+    def add_recipient(hash = {})
+      requires!(hash, :dealer_name, :shipping)
+      requires!(hash[:shipping], :name, :address, :city, :state, :zip, :email, :phone)
+      @headers = hash
     end
 
-    # @option item [String] :item_number *required*
-    # @option item [Integer] :quantity *required*
-    # @option item [String] :price *required* - Decimal formatted price, without currency sign
-    # @option item [String] :description optional
+    # @param item [Hash]
+    #   * :identifier [String] *required*
+    #   * :description [String] *required*
+    #   * :upc [String] *required*
+    #   * :qty [Integer] *required*
+    #   * :price [String] *required*
     def add_item(item = {})
-      requires!(item, :item_number, :quantity, :price)
+      requires!(item, :identifier, :description, :upc, :qty, :price,)
       @items << item
     end
 
     def filename
-      "#{@header[:purchase_order]}-order.txt"
+      return @filename if defined?(@filename)
+      timestamp = Time.now.strftime('%Y%m%d%T').gsub(':', '')
+      @filename = "MGE-#{@po_number.gsub('-', '')}-#{timestamp}.csv"
     end
 
-    def submit!
-      raise MgeWholesale::InvalidOrder.new("Must call #add_header before submitting") if @header.nil?
-      raise MgeWholesale::InvalidOrder.new("Must add items with #add_item before submitting") if @items.empty?
+    def to_csv
+      CSV.generate(headers: true) do |csv|
+        csv << HEADERS
 
-      @order_file = Tempfile.new(filename)
-      begin
-        CSV.open(@order_file.path, 'w+', col_sep: "\t") do |csv|
-          csv << header_names
-          csv << header_fields
-          csv << items_header
-          @items.each do |item|
-            csv << item_fields(item)
-          end
+        @items.each do |item|
+          csv << [
+            @dealer_number,
+            @headers[:dealer_name],
+            @headers[:shipping][:name],
+            @headers[:shipping][:address],
+            @headers[:shipping][:city],
+            @headers[:shipping][:state],
+            @headers[:shipping][:zip],
+            @headers[:shipping][:email],
+            @headers[:shipping][:phone],
+            @headers[:ffl],
+            item[:identifier],
+            item[:description],
+            item[:upc],
+            item[:qty],
+            item[:price],
+            @headers[:special_instructions]
+          ]
         end
-
-        upload!
-      ensure
-        # Close and delete (unlink) file.
-        @order_file.close
-        @order_file.unlink
-      end
-
-      # TODO: Find some way of returning a meaningful true/false. Currently, if there's a problem, an exception is raised.
-      true
-    end
-
-    private
-
-    def header_names
-      ['HL', 'Customer#', 'Ship to#', 'Ship to Name1', 'Address 1', 'Address 2', 'city', 'state', 'zip', 'cust po', 'ship method', 'notes', 'FFL#']
-    end
-
-    def header_fields
-      [
-        'H',
-        @header[:customer],
-        (@header[:shipping][:ship_to_number] || '0000'),
-        @header[:shipping][:name],
-        @header[:shipping][:address_1],
-        @header[:shipping][:address_2],
-        @header[:shipping][:city],
-        @header[:shipping][:state],
-        @header[:shipping][:zip],
-        @header[:purchase_order],
-        @header[:shipping_method],
-        @header[:notes],
-        @header[:ffl],
-        'END',
-      ]
-    end
-
-    def items_header
-      ['LL', 'Item', 'Description', 'Qty', 'Price']
-    end
-
-    def item_fields(item)
-      [
-        'L',
-        item[:item_number],
-        item[:description],
-        item[:quantity],
-        item[:price],
-      ]
-    end
-
-    def upload!
-      connect(@options) do |ftp|
-        ftp.chdir(MgeWholesale.config.full_submission_dir)
-        ftp.puttextfile(@order_file.path, filename)
-      end
+      end # CSV.generate
     end
 
   end

data/lib/mge_wholesale/version.rb

@@ -1,3 +1,3 @@
 module MgeWholesale
-  VERSION = '1.0.0'.freeze
+  VERSION = '1.0.1'.freeze
 end

data/lib/mge_wholesale.rb

@@ -1,5 +1,6 @@
 require 'mge_wholesale/version'
 
+require 'csv'
 require 'net/ftp'
 require 'tempfile'
 
@@ -8,17 +9,13 @@ require 'nokogiri'
 require 'active_support/all'
 
 require 'mge_wholesale/base'
-require 'mge_wholesale/ftp'
 require 'mge_wholesale/catalog'
 require 'mge_wholesale/category'
 require 'mge_wholesale/inventory'
-#require 'mge_wholesale/order'
-#require 'mge_wholesale/response_file'
+require 'mge_wholesale/order'
 require 'mge_wholesale/user'
-#require 'mge_wholesale/brand_converter'
 
 module MgeWholesale
-  #TODO: handle orders
   class InvalidOrder < StandardError; end
   class NotAuthenticated < StandardError; end
 
@@ -37,24 +34,12 @@ module MgeWholesale
   class Configuration
     attr_accessor :debug_mode
     attr_accessor :ftp_host
-    attr_accessor :response_dir
-    attr_accessor :submission_dir
     attr_accessor :top_level_dir
 
     def initialize
-      @debug_mode     ||= false
-      @ftp_host       ||= "ftp.mgegroup.com"
-      @top_level_dir  ||= "ffldealer"
-      @submission_dir ||= ""
-      @response_dir   ||= ""
-    end
-
-    def full_submission_dir
-      File.join(@top_level_dir, @submission_dir)
-    end
-
-    def full_response_dir
-      File.join(@top_level_dir, @response_dir)
+      @debug_mode    ||= false
+      @ftp_host      ||= "ftp.mgegroup.com"
+      @top_level_dir ||= "ffldealer"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mge_wholesale
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Ken Ebling
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-21 00:00:00.000000000 Z
+date: 2018-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -103,10 +103,8 @@ files:
 - lib/mge_wholesale/base.rb
 - lib/mge_wholesale/catalog.rb
 - lib/mge_wholesale/category.rb
-- lib/mge_wholesale/ftp.rb
 - lib/mge_wholesale/inventory.rb
 - lib/mge_wholesale/order.rb
-- lib/mge_wholesale/response_file.rb
 - lib/mge_wholesale/user.rb
 - lib/mge_wholesale/version.rb
 - mge_wholesale.gemspec

data/lib/mge_wholesale/ftp.rb

@@ -1,23 +0,0 @@
-module MgeWholesale
-  class FTP
-
-    attr_reader :connection
-
-    def initialize(credentials)
-      @connection ||= Net::FTP.new(MgeWholesale.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 MgeWholesale::NotAuthenticated
-    end
-
-    def close
-      @connection.close
-    end
-
-  end
-end

data/lib/mge_wholesale/response_file.rb

@@ -1,71 +0,0 @@
-module MgeWholesale
-  class ResponseFile < Base
-
-    attr_reader :credentials
-    attr_reader :filename
-
-    # @option options [String] :username *required*
-    # @option options [String] :password *required*
-    # @option options [String] :filename *required*
-    def initialize(ftp, options = {})
-      requires!(options, :username, :password, :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(ftp)
-      ftp.nlst("*.txt")
-    end
-
-    # Is the file a '855 Purchase Order Acknowledgement'?
-    def ack?
-      filename.downcase.start_with?("ack")
-    end
-
-    # Is the file a '856 Advance Shipping Notice'?
-    def asn?
-      filename.downcase.start_with?("asn")
-    end
-
-    # Use '#gettextfile' to read file contents as a string
-    def content
-      return @content if @content
-
-      @content = @ftp.gettextfile(@filename, nil)
-
-      @content
-    end
-
-    # Convert to easily readable key-value pairs
-    def to_json
-      if corrupt_asn?
-        CSV.parse(content.gsub("Price|", ""), headers: true, col_sep: "|").
-          map { |x| x.to_h }.
-          group_by { |x| x["PO Number"] }
-      else
-        CSV.parse(content, headers: true, col_sep: "|").
-          map { |x| x.to_h }.
-          group_by { |x| x["PO Number"] }
-      end
-    end
-
-    private
-
-    def corrupt_asn?
-      return false if ack?
-      lines = content.lines.map(&:chomp)
-      if lines[0].split("|").length != lines[1].split("|").length
-        puts "Notice: ASN file is malformed! (#{filename})"
-        true
-      else
-        false
-      end
-    end
-
-  end
-end