lipseys 1.0.1 → 2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ff799fab921f70ff5c91ed11e5596c148076dcb
-  data.tar.gz: 7925f01de881e55a9fbd923e97506b7b664a48a8
+  metadata.gz: 3f9bd15130f7600c855bb9d9d333fd0ffa29976d
+  data.tar.gz: 32e12cf0871fd1d207224a1865e0c10d02df27db
 SHA512:
-  metadata.gz: a9aad7150067c3cae4d633bce3fa034101e9a416d67109ab90ae5a4f1b3ec3cae4e811858e9b939e630b9d93612bcc049d7a59cad4cebe3e48827e263e2e7831
-  data.tar.gz: 002b48c898a55357b3cd75a27a8c6bf2d483963d16dced28121389b5c097050f96dc5b2810a5e24b9ab909d1da2e69c4ef3762277bdba9d712ad13f4e6d0383e
+  metadata.gz: 1a8b7fa728e9d0089c4f9754a60a3fa757a1c6f5bb0182c83452a6adee3601a3c2f507c6a53575d6c8b2258180172433121c1f447c9b83b2f370ca2382ab03ef
+  data.tar.gz: 4f945e0f1070a9e92626e0d04bf0009874ffcc0a3abb4bd1af036e87d473acb48ca64222c831b1511f12cde7d91811d0a3411b38ef20136007c1718aa1796ac8

data/lib/lipseys/catalog.rb

@@ -1,78 +1,17 @@
 module Lipseys
-  # Each method will return an array of catalog items with the following fields:
-  #
-  #   {
-  #     item_number: content_for(item, 'ItemNo'),
-  #     description_1: content_for(item, 'Desc1'),
-  #     description_2: content_for(item, 'Desc2'),
-  #     upc: content_for(item, 'UPC'),
-  #     manufacturer_model_number: content_for(item, 'MFGModelNo'),
-  #     msrp: content_for(item, 'MSRP'),
-  #     model: content_for(item, 'Model'),
-  #     caliber: content_for(item, 'Caliber'),
-  #     manufacturer: content_for(item, 'MFG'),
-  #     type: content_for(item, 'Type'),
-  #     action: content_for(item, 'Action'),
-  #     barrel: content_for(item, 'Barrel'),
-  #     capacity: content_for(item, 'Capacity'),
-  #     finish: content_for(item, 'Finish'),
-  #     length: content_for(item, 'Length'),
-  #     receiver: content_for(item, 'Receiver'),
-  #     safety: content_for(item, 'Safety'),
-  #     sights: content_for(item, 'Sights'),
-  #     stock_frame_grips: content_for(item, 'StockFrameGrips'),
-  #     magazine: content_for(item, 'Magazine'),
-  #     weight: content_for(item, 'Weight'),
-  #     image: "http://www.lipseys.net/images/#{content_for(item, 'Image')}",
-  #     chamber: content_for(item, 'Chamber'),
-  #     drilled_tapped: (content_for(item, 'DrilledTapped') == 'Y'),
-  #     rate_of_twist: content_for(item, 'RateOfTwist'),
-  #     item_type: content_for(item, 'ItemType'),
-  #     feature_1: content_for(item, 'Feature1'),
-  #     feature_2: content_for(item, 'Feature2'),
-  #     feature_3: content_for(item, 'Feature3'),
-  #     shipping_weight: content_for(item, 'ShippingWeight'),
-  #     bound_book: {
-  #       model: content_for(item, 'BoundBookModel'),
-  #       type: content_for(item, 'BoundBookType'),
-  #       manufacturer: content_for(item, 'BoundBookMFG'),
-  #     },
-  #     nfa: {
-  #       thread_pattern: content_for(item, 'NFAThreadPattern'),
-  #       attach_method: content_for(item, 'NFAAttachMethod'),
-  #       baffle: content_for(item, 'NFABaffle'),
-  #       can_disassemble: (content_for(item, 'NFACanDisassemble') == 'Y'),
-  #       construction: content_for(item, 'NFAConstruction'),
-  #       db_reduction: content_for(item, 'NFAdbReduction'),
-  #       diameter: content_for(item, 'NFADiameter'),
-  #       form_3_caliber: content_for(item, 'NFAForm3Caliber'),
-  #     },
-  #     optic: {
-  #       magnification: content_for(item, 'Magnification'),
-  #       maintube: content_for(item, 'Maintube'),
-  #       objective: content_for(item, 'Objective'),
-  #       adjustable_objective: (content_for(item, 'AdjustableObjective') == 'Y'),
-  #       optic_adjustments: content_for(item, 'OpticAdjustments'),
-  #       reticle: content_for(item, 'Reticle'),
-  #       illuminated_reticle: (content_for(item, 'IlluminatedReticle') == 'Y'),
-  #     }
-  #   }
   class Catalog < Base
 
     API_URL = 'https://www.lipseys.com/API/catalog.ashx'
 
     def initialize(options = {})
-      requires!(options, :email, :password)
-      @email = options[:email]
-      @password = options[:password]
-    end
+      requires!(options, :email, :pass)
 
-    def self.all(options = {})
-      new(options).all
+      @options = options
     end
 
-    def self.all_as_chunks(size, options = {}, &block)
-      new(options).all_as_chunks(size, &block)
+    def self.all(chunk_size = 15, options = {}, &block)
+      requires!(options, :email, :pass)
+      new(options).all(chunk_size, &block)
     end
 
     def self.accessories(options = {})
@@ -91,28 +30,37 @@ module Lipseys
       new(options).optics
     end
 
-    def all
-      tempfile = stream_to_tempfile(API_URL, default_params)
-
-      items = Array.new
+    def all(chunk_size, &block)
+      chunker   = Lipseys::Chunker.new(chunk_size)
+      tempfile  = stream_to_tempfile(API_URL, @options)
+      inventory = Array.new
 
-      Lipseys::Parser.parse(tempfile, 'Item') do |node|
-        items.push(map_hash(node))
+      # Let's get the inventory and toss 'er into an array
+      Lipseys::Parser.parse(stream_to_tempfile(Lipseys::Inventory::API_URL, @options), 'Item') do |node|
+        inventory.push({
+          item_identifier: content_for(node, 'ItemNo'),
+          map_price: content_for(node, 'RetailMAP'),
+          quantity: content_for(node, 'QtyOnHand'),
+          price: content_for(node, 'Price')
+        })
       end
 
-      items
-    end
-
-    def all_as_chunks(size, &block)
-      chunker  = Lipseys::Chunker.new(size)
-      tempfile = stream_to_tempfile(API_URL, default_params)
-
       Lipseys::Parser.parse(tempfile, 'Item') do |node|
         if chunker.is_full?
           yield(chunker.chunk)
-          chunker.reset
+
+          chunker.reset!
         else
-          chunker.add(map_hash(node))
+          hash = map_hash(node)
+          availability = inventory.select { |i| i[:item_identifier] == hash[:item_identifier] }.first
+
+          if availability.present?
+            hash[:price]      = availability[:price]
+            hash[:quantity]   = availability[:quantity]
+            hash[:map_price]  = availability[:map_price]
+
+            chunker.add(hash)
+          end
         end
       end
 
@@ -144,17 +92,10 @@ module Lipseys
 
     private
 
-    def default_params
-      { 
-        email: @email,
-        pass:  @password
-      }
-    end
-
     def get_items(item_type = nil)
-      default_params[:itemtype] = item_type unless item_type.nil?
+      @options[:itemtype] = item_type unless item_type.nil?
 
-      xml_doc = get_response_xml(API_URL, default_params)
+      xml_doc = get_response_xml(API_URL, @options)
 
       items = Array.new
 
@@ -167,59 +108,30 @@ module Lipseys
 
     def map_hash(node)
       {
-        item_number: content_for(node, 'ItemNo'),
-        description_1: content_for(node, 'Desc1'),
-        description_2: content_for(node, 'Desc2'),
+        name: content_for(node, 'Model'),
         upc: content_for(node, 'UPC'),
-        manufacturer_model_number: content_for(node, 'MFGModelNo'),
-        msrp: content_for(node, 'MSRP'),
-        model: content_for(node, 'Model'),
-        caliber: content_for(node, 'Caliber'),
-        manufacturer: content_for(node, 'MFG'),
-        type: content_for(node, 'Type'),
-        action: content_for(node, 'Action'),
-        barrel: content_for(node, 'Barrel'),
-        capacity: content_for(node, 'Capacity'),
-        finish: content_for(node, 'Finish'),
-        length: content_for(node, 'Length'),
-        receiver: content_for(node, 'Receiver'),
-        safety: content_for(node, 'Safety'),
-        sights: content_for(node, 'Sights'),
-        stock_frame_grips: content_for(node, 'StockFrameGrips'),
-        magazine: content_for(node, 'Magazine'),
+        short_description: content_for(node, 'Desc1'),
+        long_description: "#{content_for(node, 'Desc1')} #{content_for(node, 'Desc2')}",
+        category: content_for(node, 'Type'),
+        price: nil,
         weight: content_for(node, 'Weight'),
-        image: "http://www.lipseys.net/images/#{content_for(node, 'Image')}",
-        chamber: content_for(node, 'Chamber'),
-        drilled_tapped: (content_for(node, 'DrilledTapped') == 'Y'),
-        rate_of_twist: content_for(node, 'RateOfTwist'),
-        item_type: content_for(node, 'ItemType'),
-        feature_1: content_for(node, 'Feature1'),
-        feature_2: content_for(node, 'Feature2'),
-        feature_3: content_for(node, 'Feature3'),
-        shipping_weight: content_for(node, 'ShippingWeight'),
-        bound_book: {
-          model: content_for(node, 'BoundBookModel'),
-          type: content_for(node, 'BoundBookType'),
-          manufacturer: content_for(node, 'BoundBookMFG'),
-        },
-        nfa: {
-          thread_pattern: content_for(node, 'NFAThreadPattern'),
-          attach_method: content_for(node, 'NFAAttachMethod'),
-          baffle: content_for(node, 'NFABaffle'),
-          can_disassemble: (content_for(node, 'NFACanDisassemble') == 'Y'),
-          construction: content_for(node, 'NFAConstruction'),
-          db_reduction: content_for(node, 'NFAdbReduction'),
-          diameter: content_for(node, 'NFADiameter'),
-          form_3_caliber: content_for(node, 'NFAForm3Caliber'),
-        },
-        optic: {
-          magnification: content_for(node, 'Magnification'),
-          maintube: content_for(node, 'Maintube'),
-          objective: content_for(node, 'Objective'),
-          adjustable_objective: (content_for(node, 'AdjustableObjective') == 'Y'),
-          optic_adjustments: content_for(node, 'OpticAdjustments'),
-          reticle: content_for(node, 'Reticle'),
-          illuminated_reticle: (content_for(node, 'IlluminatedReticle') == 'Y'),
+        marp: nil,
+        msrp: content_for(node, 'MSRP'),
+        item_identifier: content_for(node, 'ItemNo'),
+        brand: content_for(node, 'MFG'),
+        features: {
+          model: content_for(node, 'Model'),
+          caliber: content_for(node, 'Caliber'),
+          action: content_for(node, 'Action'),
+          barrel: content_for(node, 'Barrel'),
+          capacity: content_for(node, 'Capacity'),
+          finish: content_for(node, 'Finish'),
+          length: content_for(node, 'Length'),
+          receiver: content_for(node, 'Receiver'),
+          safety: content_for(node, 'Safety'),
+          sights: content_for(node, 'Sights'),
+          magazine: content_for(node, 'Magazine'),
+          chamber: content_for(node, 'Chamber')
         }
       }
     end

data/lib/lipseys/chunker.rb

@@ -11,14 +11,14 @@ module Lipseys
     end
 
     def add(row)
-      reset if is_full?
+      self.reset! if is_full?
 
       @chunk.push(row)
 
       @current_count += 1
     end
 
-    def reset
+    def reset!
       @chunk.clear
     end
 

data/lib/lipseys/inventory.rb

@@ -1,32 +1,16 @@
 module Lipseys
-  # Each method will return an array of inventory items with the following fields:
-  #
-  #   {
-  #     item_number: content_for(item, 'ItemNo'),
-  #     upc: content_for(item, 'UPC'),
-  #     manufacturer_model_number: content_for(item, 'MFGModelNo'),
-  #     quantity_on_hand: content_for(item, 'QtyOnHand'),
-  #     allocation: (content_for(item, 'Allocation') == 'Y'),
-  #     price: content_for(item, 'Price'),
-  #     on_sale: (content_for(item, 'OnSale') == 'Y'),
-  #     retail_map: content_for(item, 'RetailMAP')
-  #   }
   class Inventory < Base
 
     API_URL = 'https://www.lipseys.com/API/pricequantitycatalog.ashx'
 
     def initialize(options = {})
-      requires!(options, :email, :password)
-      @email = options[:email]
-      @password = options[:password]
-    end
+      requires!(options, :email, :pass)
 
-    def self.all(options = {})
-      new(options).all
+      @options = options
     end
 
-    def self.all_as_chunks(size, options = {}, &block)
-      new(options).all_as_chunks(size, &block)
+    def self.all(chunk_size = 15, options = {}, &block)
+      new(options).all(chunk_size, &block)
     end
 
     def self.accessories(options = {})
@@ -45,26 +29,14 @@ module Lipseys
       new(options).optics
     end
 
-    def all
-      tempfile = stream_to_tempfile(API_URL, default_params)
-
-      items = Array.new
-
-      Lipseys::Parser.parse(tempfile, 'Item') do |node|
-        items.push(map_hash(node))
-      end
-
-      items
-    end
-
-    def all_as_chunks(size, &block)
+    def all(size, &block)
       chunker  = Lipseys::Chunker.new(size)
-      tempfile = stream_to_tempfile(API_URL, default_params)
+      tempfile = stream_to_tempfile(API_URL, @options)
 
       Lipseys::Parser.parse(tempfile, 'Item') do |node|
         if chunker.is_full?
           yield(chunker.chunk)
-          chunker.reset
+          chunker.reset!
         else
           chunker.add(map_hash(node))
         end
@@ -98,17 +70,10 @@ module Lipseys
 
     private
 
-    def default_params
-      { 
-        email: @email,
-        pass:  @password
-      }
-    end
-
     def get_items(item_type = nil)
-      default_params[:itemtype] = item_type unless item_type.nil?
+      @options[:itemtype] = item_type unless item_type.nil?
 
-      xml_doc = get_response_xml(API_URL, default_params)
+      xml_doc = get_response_xml(API_URL, @options)
 
       items = Array.new
 
@@ -121,14 +86,9 @@ module Lipseys
 
     def map_hash(node)
       {
-        item_number: content_for(node, 'ItemNo'),
-        upc: content_for(node, 'UPC'),
-        manufacturer_model_number: content_for(node, 'MFGModelNo'),
-        quantity_on_hand: content_for(node, 'QtyOnHand'),
-        allocation: (content_for(node, 'Allocation') == 'Y'),
-        price: content_for(node, 'Price'),
-        on_sale: (content_for(node, 'OnSale') == 'Y'),
-        retail_map: content_for(node, 'RetailMAP')
+        item_identifier: content_for(node, 'ItemNo'),
+        quantity: content_for(node, 'QtyOnHand'),
+        price: content_for(node, 'Price')
       }
     end
 

data/lib/lipseys/version.rb

@@ -1,3 +1,3 @@
 module Lipseys
-  VERSION = "1.0.1"
+  VERSION = "2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lipseys
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: '2.0'
 platform: ruby
 authors:
 - Dale Campbell
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-06 00:00:00.000000000 Z
+date: 2017-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -130,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.7
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Ruby library for Lipsey's API.