davidsons 1.0.4 → 3.0.0.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 914036ba6b5750a904124c069afd486e1ff4d38ff0a29328d93f012f8d3f0068
-  data.tar.gz: 5c57655ba02a193e651319d14cb4f0da7e3898dfff958c900218a3a400aea3f8
+  metadata.gz: b286e3483e84a4b0fd324fadb43e51d780a38127d34bb0bc75ff7cfb9f33d67d
+  data.tar.gz: 8abfaf696c4b51cea85a4683abfc29e941ab57d6a63467498bc59d269b553010
 SHA512:
-  metadata.gz: dbe533e923bc65689cd552207e4a1dcbd8e7217001d7bacddfbe5b619ca84639ef5b257d66aead601d1c04ae83b6084c14c91d0f5a15e40161c81c914c52e3aa
-  data.tar.gz: a67c8daafc227e823331cc91f2cb32c76226b63f8c5481b6101c98c56abc184fa5fe43764460c65baafa35fcf08fb880d60ef9b689a4dd4cbbe931bc8a326c22
+  metadata.gz: 5b2c54f5e13281b8ef373ff67ccda709c279ed583420845f1fa4f9477a5153fad8df0524a19181a5974315b3dd06db1a63c1a91c3996503abc974c09f7e2460a
+  data.tar.gz: 271fba58c6784f8b014aa9de3f5e7f58a78f0962aacc420326209cb7d31f70e6fb24da3b23d27502b841d3a8cf0c73c7e77775a4b03a571bb2771b738f73361e

data/.gitignore

@@ -1,3 +1,4 @@
+.DS_Store
 /.bundle/
 /.yardoc
 /Gemfile.lock

data/lib/davidsons/base.rb

@@ -47,17 +47,9 @@ module Davidsons
 
     def get_file(filename)
       connect(@options) do |ftp|
-        begin
-          tempfile = Tempfile.new
-
-          ftp.getbinaryfile(filename, tempfile.path)
-
-          tempfile.close
-
-          tempfile
-        ensure
-          ftp.close
-        end
+        tempfile = Tempfile.new
+        ftp.getbinaryfile(filename, tempfile.path)
+        tempfile
       end
     end
 

data/lib/davidsons/catalog.rb

@@ -1,13 +1,31 @@
 module Davidsons
   class Catalog < Base
 
-    CATALOG_FILENAME = "davidsons_inventory.csv".freeze
-    CHUNK_SIZE       = 100
+    WHOLE_CATALOG_FILENAME = 'davidsons_inventory.csv'.freeze
+    DEFAULT_SMART_OPTS = {
+      chunk_size: 500,
+      convert_values_to_numeric: false,
+      force_utf8: true,
+      key_mapping: {
+        "item_#":         :item_identifier,
+        item_description: :name,
+        upc_code:         :upc,
+        manufacturer:     :brand,
+        retail_price:     :msrp,
+        gun_type:         :category,
+      }
+    }
 
+    # @param [Hash] options
+    # @option options [Symbol] :username *required*
+    # @option options [Symbol] :password *required*
+    # @option options [Symbol] :pricing_tier *optional*
+    #   * Denotes which price to use
+    #   * Can be :regular or :minimum
     def initialize(options = {})
       requires!(options, :username, :password)
-
       @options = options
+      @options[:pricing_tier] ||= :regular
     end
 
     def self.all(options = {}, &block)
@@ -16,42 +34,48 @@ module Davidsons
     end
 
     def all(&block)
-      tempfile = get_file(CATALOG_FILENAME)
-
-      # TODO: account for Sale Price and MSP (minimum price)
+      tempfile = get_file(WHOLE_CATALOG_FILENAME)
 
-      SmarterCSV.process(tempfile.open, {
-        chunk_size: CHUNK_SIZE,
-        convert_values_to_numeric: false,
-        force_utf8: true,
-        key_mapping: {
-          "item_#":         :item_identifier,
-          item_description: :name,
-          upc_code:         :upc,
-          manufacturer:     :brand,
-          retail_price:     :msrp,
-          dealer_price:     :price,
-          gun_type:         :category,
-        }
-      }) do |chunk|
+      SmarterCSV.process(tempfile, DEFAULT_SMART_OPTS) do |chunk|
         chunk.each do |item|
-          item.except!(:retail_price, :capacity, :sale_price, :sale_ends)
-
           item[:msrp].tr!('$', '')
-          item[:price].tr!('$', '')
           item[:upc].tr!('#', '')
 
+          item[:price]      = lowest_price(item)
           item[:mfg_number] = item[:item_identifier]
-          item[:quantity] = item[:quantity].to_i
-          item[:features] = map_features(item)
+          item[:quantity]   = item[:quantity].to_i
+          item[:features]   = map_features(item)
+
+          item.delete(:sale_ends)
+          item.delete(:sale_price)
 
           yield(item)
         end
       end
+
+      tempfile.unlink
     end
 
     protected
 
+    def lowest_price(item)
+      case @options[:pricing_tier]
+      when :minimum
+        relevant_price = item.delete(:msp).tr('$', '')
+        item.delete(:dealer_price)
+      else
+        relevant_price = item.delete(:dealer_price).tr('$', '')
+        item.delete(:msp)
+      end
+
+      if item[:sale_price]
+        sale_price = item.delete(:sale_price).tr('$', '')
+        return sale_price if sale_price.to_f < relevant_price.to_f
+      end
+
+      relevant_price
+    end
+
     def map_features(item)
       {
         finish:         item.delete(:finish),
@@ -60,6 +84,7 @@ module Davidsons
         model_series:   item.delete(:model_series),
         sights:         item.delete(:sights),
         stock:          item.delete(:stock),
+        capacity:       item.delete(:capacity),
       }
     end
 

data/lib/davidsons/inventory.rb

@@ -1,89 +1,124 @@
 module Davidsons
   class Inventory < Base
 
-    INVENTORY_FILENAME = "davidsons_quantity.csv"
-    CHUNK_SIZE         = 100
-
+    WHOLE_CATALOG_FILENAME = 'davidsons_inventory.csv'.freeze
+    DEFAULT_WHOLE_CATALOG_SMART_OPTS = {
+      chunk_size: 500,
+      convert_values_to_numeric: false,
+      force_utf8: true,
+      remove_unmapped_keys: true,
+      key_mapping: {
+        "item_#":     :item_identifier,
+        upc_code:     :upc,
+        msp:          :msp,
+        dealer_price: :dealer_price,
+        sale_price:   :sale_price,
+        quantity:     :quantity,
+      }
+    }
+
+    QUANTITY_FILENAME = 'davidsons_quantity.csv'.freeze
+    DEFAULT_QUANTITY_SMART_OPTS = {
+      chunk_size: 2000,
+      convert_values_to_numeric: false,
+      force_utf8: true,
+      key_mapping: {
+        item_number: :item_identifier,
+        upc_code:    :upc
+      }
+    }
+
+    # @param [Hash] options
+    # @option options [Symbol] :username *required*
+    # @option options [Symbol] :password *required*
+    # @option options [Symbol] :pricing_tier *optional*
+    #   * Denotes which price to use
+    #   * Can be :regular or :minimum
     def initialize(options = {})
       requires!(options, :username, :password)
-
       @options = options
+      @options[:pricing_tier] ||= :regular
     end
 
+    # Iterates over all items in the 'davidsons_inventory.csv' file yielding the item_identifier, quantity, and price.
+    # We have to use this file since the 'davidsons_quantity.csv' file does not included prices.
+    # The price can vary based on the +pricing_tier+
+    #
+    # @param [Hash] options
+    # @option options [Symbol] :username *required*
+    # @option options [Symbol] :password *required*
+    # @option options [Symbol] :pricing_tier *optional*
+    #   * Denotes which price to use
+    #   * Can be :regular or :minimum
     def self.all(options = {}, &block)
       requires!(options, :username, :password)
-      new(options).quantity(&block)
-    end
-
-    def self.get_quantity_file(options = {})
-      requires!(options, :username, :password)
-      new(options).get_quantity_file
+      new(options).all(&block)
     end
 
+    # Iterates over all items in the 'davidsons_quantity.csv' file yielding the item_identifier, upc, quantity and locations.
+    #
+    # @param [Hash] options
+    # @option options [Symbol] :username *required*
+    # @option options [Symbol] :password *required*
     def self.quantity(options = {}, &block)
       requires!(options, :username, :password)
       new(options).quantity(&block)
     end
 
-    def quantity(&block)
-      tempfile = get_file(INVENTORY_FILENAME)
-
-      SmarterCSV.process(tempfile.open, {
-        chunk_size: CHUNK_SIZE,
-        convert_values_to_numeric: false,
-        force_utf8: true,
-        key_mapping: { item_number: :item_identifier }
-      }) do |chunk|
-        chunk.each do |item|
-          item.except!(:upc_code)
+    def all
+      tempfile = get_file(WHOLE_CATALOG_FILENAME)
 
-          item[:quantity]   = item[:quantity_nc].to_i + item[:quantity_az].to_i
-          item[:locations]  = map_location_quantities(item)
+      SmarterCSV.process(tempfile, DEFAULT_WHOLE_CATALOG_SMART_OPTS) do |chunk|
+        chunk.each do |item|
+          item[:upc].tr!('#', '')
 
-          item.except!(:quantity_nc, :quantity_az)
+          item[:price]    = lowest_price(item)
+          item[:quantity] = item[:quantity].to_i
 
           yield(item)
         end
       end
     end
 
-    def get_quantity_file
-      inventory_tempfile  = get_file(INVENTORY_FILENAME)
-      tempfile            = Tempfile.new
-
-      SmarterCSV.process(inventory_tempfile.open, {
-        chunk_size: CHUNK_SIZE,
-        convert_values_to_numeric: false,
-        force_utf8: true,
-        key_mapping: {
-          item_number:  :item_identifier
-        }
-      }) do |chunk|
-        chunk.each do |item|
-          item.except!(:upc_code)
-
-          item[:quantity] = item[:quantity_nc].to_i + item[:quantity_az].to_i
+    def quantity(&block)
+      tempfile = get_file(QUANTITY_FILENAME)
 
-          item.except!(:quantity_nc, :quantity_az)
+      SmarterCSV.process(tempfile, DEFAULT_QUANTITY_SMART_OPTS) do |chunk|
+        chunk.each do |item|
+          item[:quantity]  = item[:quantity_nc].to_i + item[:quantity_az].to_i
+          item[:locations] = map_location_quantities(item)
 
-          tempfile.puts("#{item[:item_number]},#{item[:quantity]}")
+          yield(item)
         end
       end
-
-      inventory_tempfile.unlink
-      tempfile.close
-
-      tempfile.path
     end
 
-    protected
+    private
 
     def map_location_quantities(item)
       {
-        nc: item[:quantity_nc],
-        az: item[:quantity_az]
+        nc: item.delete(:quantity_nc),
+        az: item.delete(:quantity_az),
       }
     end
 
+    def lowest_price(item)
+      case @options[:pricing_tier]
+      when :minimum
+        relevant_price = item.delete(:msp).tr('$', '')
+        item.delete(:dealer_price)
+      else
+        relevant_price = item.delete(:dealer_price).tr('$', '')
+        item.delete(:msp)
+      end
+
+      if item[:sale_price]
+        sale_price = item.delete(:sale_price).tr('$', '')
+        return sale_price if sale_price.to_f < relevant_price.to_f
+      end
+
+      relevant_price
+    end
+
   end
 end

data/lib/davidsons/version.rb

@@ -1,3 +1,3 @@
 module Davidsons
-  VERSION = '1.0.4'.freeze
+  VERSION = '3.0.0.pre2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: davidsons
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 3.0.0.pre2
 platform: ruby
 authors:
 - David Knight
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-30 00:00:00.000000000 Z
+date: 2018-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: savon
@@ -136,9 +136,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.7