lipseys 2.1.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fad5e2c7901bddbfb68ab13e7dbaf4014c3cd2bc
-  data.tar.gz: 3946ae62f8a6b1744b42d813c1aa3441d1ff115f
+  metadata.gz: 85dd68aea52b13495d0f693ace2247ba1f84d2fc
+  data.tar.gz: f38b94435002c2039c85302ef75702b8650c8501
 SHA512:
-  metadata.gz: fbdac012e2b20bbe02152297ab2772c13cf8cb4dfa820522f9254f67305846a0dac8ff0fb0b43de4a58ec8d7136f37a4e2775e078aa9d228ce7e0a1cc00b321e
-  data.tar.gz: fd4c34c3d53ed4327bb9edc816be1f70d1ba19d0f2460d37c7078bf4947d87a6146ce44aabaad9195ba0c2e98241d115223d7b4d8ca5d0a06d4a76ed919116c1
+  metadata.gz: 556c67b9070d7223f4796024fdcdfc47751fa9fb3ff67693337e699c04cb790a2d7d3fd9ed0c728e894868ca5578740d0b8db126624688f58a6aab5f5fda1f1a
+  data.tar.gz: a0142d7bcaaa1c8c9283631c50e685c9f18fa51ff40cf523a02e2045e0062e309842d7dc00c252ba2ca9134b4e705dbb930a20fb6eec3d511c8cee171ac78a7f

data/lib/lipseys.rb

@@ -13,8 +13,6 @@ require 'lipseys/invoice'
 require 'lipseys/order'
 require 'lipseys/user'
 require 'lipseys/image'
-
-require 'lipseys/chunker'
 require 'lipseys/parser'
 
 module Lipseys

data/lib/lipseys/base.rb

@@ -40,7 +40,7 @@ module Lipseys
 
     def not_authenticated?(xml_doc)
       msg = content_for(xml_doc, 'CatalogError')
-      msg =~ /Login failed/i
+      msg =~ /Login failed/i || msg =~ /Credentials Not Valid/i
     end
 
     def stream_to_tempfile(api_url, params)

data/lib/lipseys/catalog.rb

@@ -1,7 +1,9 @@
 module Lipseys
   class Catalog < Base
 
-    API_URL = 'https://www.lipseys.com/API/catalog.ashx'
+    CHUNK_SIZE = 500
+    API_URL    = 'https://www.lipseys.com/API/catalog.ashx'
+    ITEMTYPES  = %w(ACCESSORY FIREARM NFA OPTIC)
 
     def initialize(options = {})
       requires!(options, :username, :password)
@@ -9,34 +11,18 @@ module Lipseys
       @options = options
     end
 
-    def self.all(chunk_size = 15, options = {}, &block)
+    def self.all(options = {}, &block)
       requires!(options, :username, :password)
-      new(options).all(chunk_size, &block)
+      new(options).all &block
     end
 
-    def self.accessories(options = {})
-      new(options).accessories
-    end
-
-    def self.firearms(options = {})
-      new(options).firearms
-    end
-
-    def self.nfa(options = {})
-      new(options).nfa
-    end
-
-    def self.optics(options = {})
-      new(options).optics
-    end
-
-    def all(chunk_size, &block)
-      chunker   = Lipseys::Chunker.new(chunk_size)
-      tempfile  = stream_to_tempfile(API_URL, @options)
-      inventory = Array.new
+    def all(&block)
+      inventory_tempfile = stream_to_tempfile(Lipseys::Inventory::API_URL, @options)
+      catalog_tempfile   = stream_to_tempfile(API_URL, @options)
+      inventory          = Array.new
 
       # 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|
+      Lipseys::Parser.parse(inventory_tempfile, 'Item') do |node|
         inventory.push({
           item_identifier: content_for(node, 'ItemNo'),
           map_price: content_for(node, 'RetailMAP'),
@@ -45,67 +31,26 @@ module Lipseys
         })
       end
 
-      Lipseys::Parser.parse(tempfile, 'Item') do |node|
-        if chunker.is_full?
-          yield(chunker.chunk)
-
-          chunker.reset!
-        else
-          hash = map_hash(node)
-          availability = inventory.select { |i| i[:item_identifier] == hash[:item_identifier] }.first
-
-          if availability
-            hash[:price]     = availability[:price]
-            hash[:quantity]  = availability[:quantity]
-            hash[:map_price] = availability[:map_price]
+      Lipseys::Parser.parse(catalog_tempfile, 'Item') do |node|
+        hash = map_hash(node)
+        availability = inventory.select { |i| i[:item_identifier] == hash[:item_identifier] }.first
 
-            chunker.add(hash)
-          end
+        if availability
+          hash[:price]     = availability[:price]
+          hash[:quantity]  = availability[:quantity]
+          hash[:map_price] = availability[:map_price]
         end
-      end
 
-      # HACK-david
-      # since we can't get a count of the items without reading the file
-      # Let's just check to see if we have any left in the chunk
-      if chunker.chunk.count > 0
-        yield(chunker.chunk)
+        yield hash
       end
 
-      tempfile.unlink
-    end
-
-    def accessories
-      get_items('ACCESSORY')
-    end
-
-    def firearms
-      get_items('FIREARM')
-    end
-
-    def nfa
-      get_items('NFA')
-    end
-
-    def optics
-      get_items('OPTIC')
+      inventory_tempfile.unlink
+      catalog_tempfile.unlink
+      true
     end
 
     private
 
-    def get_items(item_type = nil)
-      @options[:itemtype] = item_type unless item_type.nil?
-
-      xml_doc = get_response_xml(API_URL, @options)
-
-      items = Array.new
-
-      xml_doc.css('LipseysCatalog/Item').each do |item|
-        items.push(map_hash(item))
-      end
-
-      items
-    end
-
     def map_hash(node)
       model      = content_for(node, 'Model')
       mfg_number = content_for(node, 'MFGModelNo')

data/lib/lipseys/inventory.rb

@@ -9,52 +9,23 @@ module Lipseys
       @options = options
     end
 
-    def self.all(chunk_size = 15, options = {}, &block)
-      new(options).all(chunk_size, &block)
+    def self.all(options = {}, &block)
+      new(options).all &block
     end
 
-    def self.get_quantity_file(options = {})
-      new(options).get_quantity_file
-    end
-
-    def self.quantity(chunk_size = 100, options = {}, &block)
-      new(options).all(chunk_size, &block)
-    end
-
-    def self.accessories(options = {})
-      new(options).accessories
-    end
-
-    def self.firearms(options = {})
-      new(options).firearms
-    end
-
-    def self.nfa(options = {})
-      new(options).nfa
+    def self.quantity(options = {}, &block)
+      new(options).all &block
     end
 
-    def self.optics(options = {})
-      new(options).optics
+    def self.get_quantity_file(options = {})
+      new(options).get_quantity_file
     end
 
-    def all(size, &block)
-      chunker  = Lipseys::Chunker.new(size)
+    def all(&block)
       tempfile = stream_to_tempfile(API_URL, @options)
 
       Lipseys::Parser.parse(tempfile, 'Item') do |node|
-        if chunker.is_full?
-          yield(chunker.chunk)
-          chunker.reset!
-        else
-          chunker.add(map_hash(node))
-        end
-      end
-
-      # HACK-david
-      # since we can't get a count of the items without reading the file
-      # Let's just check to see if we have any left in the chunk
-      if chunker.chunk.count > 0
-        yield(chunker.chunk)
+        yield map_hash(node)
       end
 
       tempfile.unlink
@@ -74,61 +45,8 @@ module Lipseys
       tempfile.path
     end
 
-    def quantity(size, &block)
-      chunker  = Lipseys::Chunker.new(size)
-      tempfile = stream_to_tempfile(API_URL, @options)
-
-      Lipseys::Parser.parse(tempfile, 'Item') do |node|
-        if chunker.is_full?
-          yield(chunker.chunk)
-          chunker.reset!
-        else
-          chunker.add({
-            item_identifier: content_for(node, 'ItemNo'),
-            quantity: content_for(node, 'QtyOnHand')
-          })
-        end
-      end
-
-      if chunker.chunk.count > 0
-        yield(chunker.chunk)
-      end
-
-      tempfile.unlink
-    end
-
-    def accessories
-      get_items('ACCESSORY')
-    end
-
-    def firearms
-      get_items('FIREARM')
-    end
-
-    def nfa
-      get_items('NFA')
-    end
-
-    def optics
-      get_items('OPTIC')
-    end
-
     private
 
-    def get_items(item_type = nil)
-      @options[:itemtype] = item_type unless item_type.nil?
-
-      xml_doc = get_response_xml(API_URL, @options)
-
-      items = Array.new
-
-      xml_doc.css('LipseysInventoryPricing/Item').each do |item|
-        items.push(map_hash(item))
-      end
-
-      items
-    end
-
     def map_hash(node)
       {
         item_identifier: content_for(node, 'ItemNo'),

data/lib/lipseys/version.rb

@@ -1,3 +1,3 @@
 module Lipseys
-  VERSION = "2.1.0".freeze
+  VERSION = '3.0.0'.freeze
 end

data/lipseys.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "nokogiri", "~> 1.6"
   spec.add_dependency "savon", "~> 2.11.1"
 
+  spec.add_development_dependency "activesupport", "~> 5"
   spec.add_development_dependency "bundler", "~> 1.12"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lipseys
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Dale Campbell
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-10 00:00:00.000000000 Z
+date: 2018-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.11.1
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -115,7 +129,6 @@ files:
 - lib/lipseys.rb
 - lib/lipseys/base.rb
 - lib/lipseys/catalog.rb
-- lib/lipseys/chunker.rb
 - lib/lipseys/image.rb
 - lib/lipseys/inventory.rb
 - lib/lipseys/invoice.rb
@@ -145,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Ruby library for Lipsey's API.

data/lib/lipseys/chunker.rb

@@ -1,34 +0,0 @@
-module Lipseys
-  class Chunker
-
-    attr_accessor :chunk, :total_count, :current_count, :size
-
-    def initialize(size, total_count = nil)
-      @size           = size
-      @chunk          = Array.new
-      @current_count  = 0
-      @total_count    = total_count
-    end
-
-    def add(row)
-      self.reset! if is_full?
-
-      @chunk.push(row)
-
-      @current_count += 1
-    end
-
-    def reset!
-      @chunk.clear
-    end
-
-    def is_full?
-      @chunk.count == @size
-    end
-
-    def is_complete?
-      @total_count == @current_count
-    end
-
-  end
-end