sports_south 1.3.1 → 2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a6481c86cca1535a34412d14a8741f5d60a921d0
-  data.tar.gz: ed83dfd81a0648e0480ec19fdda1f3b2899aae31
+  metadata.gz: e83de8dbfabf6f57ae9602d11a61b4678f286011
+  data.tar.gz: d0dd3565443b6f251a5a93f1b87d35c20ccc48a2
 SHA512:
-  metadata.gz: 7c2da2c40f4f5074571225f424846805dae56614f6dea2165a2d5cbe9e4202e494e11cccd4dc00a843da534aa205cd06e8412a079119a43e146b6db4a704222a
-  data.tar.gz: 14ece0078b29da5ea1f64004645844958e873df6b3a47389967e2604f3546db8598322383846d989c1b898aa04dfbc35efd46a87131d3798bb1629ec33888849
+  metadata.gz: 305f47410723bed1e4a3c07a381a0fb9da61391860385fd81bcfff673e59e2a0b2c73ca88c1d1009ade12aaf9f88068679426ef411637d2ddde013bb455cfcec
+  data.tar.gz: 76c87dcba4dc4f82110abc575db18f1b5b1f88009a131cba597b353d805b78d90869e029bda640ab2a83df5ffd39019cda5dcf70ee73afc2e739339491b02655

data/lib/sports_south/base.rb

@@ -26,6 +26,11 @@ module SportsSouth
       end
     end
 
+    def content_for(xml_doc, field)
+      node = xml_doc.css(field).first
+      node.nil? ? nil : node.content.strip
+    end
+
     # Returns a hash of common form params.
     def self.form_params(options = {})
       {
@@ -52,12 +57,6 @@ module SportsSouth
     end
     def get_http_and_request(*args); self.class.get_http_and_request(*args); end
 
-    def self.content_for(xml_doc, field)
-      node = xml_doc.css(field).first
-      node.nil? ? nil : node.content.strip
-    end
-    def content_for(*args); self.class.content_for(*args); end
-
     def self.not_authenticated?(xml_doc)
       msg = content_for(xml_doc, 'ERROR')
       (msg =~ /Authentication Failed/i) || (msg =~ /NOT AUTHENTICATED/i)

data/lib/sports_south/catalog.rb

@@ -0,0 +1,92 @@
+module SportsSouth
+  class Catalog < Base
+
+    API_URL = 'http://webservices.theshootingwarehouse.com/smart/inventory.asmx'
+
+    CATALOG_CODES = {
+      'S' => :special,
+      'C' => :closeout,
+      'F' => :flyer,
+      'B' => :buyers_special,
+      'N' => :net_price,
+    }
+
+    ITEM_TYPES = {
+      '1' => :handgun,
+      '2' => :long_gun,
+      '3' => :accessory,
+      '4' => :ammunition,
+      '5' => :optics,
+      '6' => :archery,
+      '7' => :reloading,
+      '8' => :suppressor,
+    }
+
+    def initialize(options = {})
+      requires!(options, :username, :password)
+
+      @options = options
+      @options[:customer_number] ||= options[:username]
+      @options[:source]          ||= 'ammor' 
+    end
+
+    def self.all(chunk_size = 15, options = {}, &block)
+      requires!(options, :username, :password)
+
+      options[:last_updated]  ||= '1/1/1990'
+      options[:last_item]     ||= '-1'
+
+      new(options).all(chunk_size, &block)
+    end
+
+    def all(chunk_size, &block)
+      chunker = SportsSouth::Chunker.new(chunk_size)
+      http, request = get_http_and_request(API_URL, '/DailyItemUpdate')
+
+      request.set_form_data(form_params(@options).merge({
+        LastUpdate: @options[:last_updated],
+        LastItem:   @options[:last_item].to_s
+      }))
+
+      response  = http.request(request)
+      xml_doc   = Nokogiri::XML(sanitize_response(response))
+
+      xml_doc.css('Table').map do |item|
+        if chunker.is_full?
+          yield(chunker.chunk)
+
+          chunker.reset!
+        else
+          chunker.add(self.map_hash(item))
+        end
+
+        if chunker.chunk.count > 0
+          yield(chunker.chunk)
+        end
+      end
+    end
+
+    protected
+
+    def map_hash(node)
+      {
+        upc:  content_for(node, 'ITUPC'),
+        item_identifier:  content_for(node, 'ITEMNO'),
+        quantity: content_for(node, 'QTYOH').to_i,
+        price: content_for(node, 'CPRC'),
+        short_description: content_for(node, 'SHDESC'),
+        long_description: content_for(node, 'IDESC'),
+        category: content_for(node, 'CATID'),
+        weight: content_for(node, 'WTPBX'),
+        map_price: content_for(node, 'MFPRC'),
+        brand: content_for(node, 'ITBRDNO'),
+        features: {
+          length: content_for(node, 'LENGTH'),
+          height: content_for(node, 'HEIGHT'),
+          width: content_for(node, 'WIDTH')
+        }
+      }
+    end
+
+  end
+end

data/lib/sports_south/chunker.rb

@@ -0,0 +1,34 @@
+module SportsSouth
+  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

data/lib/sports_south/inventory.rb

@@ -3,236 +3,77 @@ module SportsSouth
 
     API_URL = 'http://webservices.theshootingwarehouse.com/smart/inventory.asmx'
 
-    CATALOG_CODES = {
-      'S' => :special,
-      'C' => :closeout,
-      'F' => :flyer,
-      'B' => :buyers_special,
-      'N' => :net_price,
-    }
-
-    ITEM_TYPES = {
-      '1' => :handgun,
-      '2' => :long_gun,
-      '3' => :accessory,
-      '4' => :ammunition,
-      '5' => :optics,
-      '6' => :archery,
-      '7' => :reloading,
-      '8' => :suppressor,
-    }
-
-    def self.all(options = {})
-      requires!(options, :username, :password, :source, :customer_number)
-
-      options[:last_update] ||= '1/1/1990' # Return full catalog.
-      options[:last_item]   ||= '-1'       # Return all items.
-
-      http, request = get_http_and_request(API_URL, '/DailyItemUpdate')
-
-      request.set_form_data(form_params(options).merge({
-        LastUpdate: options[:last_update],
-        LastItem:   options[:last_item].to_s,
-      }))
-
-      xml_doc  = Nokogiri::XML(sanitize_response(http.request(request)))
-
-      raise SportsSouth::NotAuthenticated if not_authenticated?(xml_doc)
-
-      xml_doc.css('Table').map { |item| map_hash(item, mode: options[:mode]) }
-    end
-
-    def self.get_text(item_number, options = {})
-      requires!(options, :username, :password, :source, :customer_number)
-
-      http, request = get_http_and_request(API_URL, '/GetText')
-
-      request.set_form_data(form_params(options).merge({ ItemNumber: item_number }))
-
-      response = http.request(request)
-      xml_doc = Nokogiri::XML(sanitize_response(response))
-
-      raise SportsSouth::NotAuthenticated if not_authenticated?(xml_doc)
-
-      {
-        item_number:  item_number,
-        catalog_text: content_for(xml_doc, 'CATALOGTEXT')
-      }
-    end
+    def initialize(options = {})
+      requires!(options, :username, :password)
 
-    def self.inquiry(item_number, options = {})
-      requires!(options, :username, :password, :source, :customer_number)
-
-      http, request = get_http_and_request(API_URL, '/OnhandInquiry')
-
-      request.set_form_data(form_params(options).merge({ ItemNumber: item_number }))
-
-      response = http.request(request)
-      xml_doc  = Nokogiri::XML(sanitize_response(response))
-
-      raise SportsSouth::NotAuthenticated if not_authenticated?(xml_doc)
-
-      {
-        item_number:      content_for(xml_doc, 'I'),
-        quantity_on_hand: content_for(xml_doc, 'Q').to_i,
-        catalog_price:    content_for(xml_doc, 'P'),
-        customer_price:   content_for(xml_doc, 'C'),
-      }
+      @options = options
+      @options[:customer_number] ||= options[:username]
+      @options[:source]          ||= 'ammor'
     end
 
-    def self.list_new_text(options = {})
-      requires!(options, :username, :password, :source, :customer_number)
-      options[:since] ||= (Time.now - 86400).strftime('%m/%d/%Y')
-
-      http, request = get_http_and_request(API_URL, '/ListNewText')
-      request.set_form_data(form_params(options).merge({ DateFrom: options[:since] }))
+    def self.all(chunk_size = 15, options = {}, &block)
+      requires!(options, :username, :password)
 
-      xml_doc = Nokogiri::XML(sanitize_response(http.request(request)))
-
-      xml_doc.css('Table').map do |item|
-        {
-          item_number: content_for(item, 'ITEMNO'),
-          text: content_for(item, 'TEXT')
-        }
+      if options[:last_updated].present?
+        options[:last_updated].to_s("yyyy-MM-ddTHH:mm:sszzz")
+      else
+        options[:last_updated] = '2017-09-25T14:15:47-04:00'
       end
-    end
-
-    # This method accepts an Array of +item_numbers+.
-    def self.onhand_update_by_csv(item_numbers, options = {})
-      requires!(options, :username, :password, :source, :customer_number)
 
-      http, request = get_http_and_request(API_URL, '/OnhandUpdatebyCSV')
+      options[:last_item] ||= '-1'
 
-      request.set_form_data(form_params(options).merge({ CSVItems: item_numbers.join(',') }))
-
-      response = http.request(request)
-      xml_doc  = Nokogiri::XML(sanitize_response(response))
-
-      raise SportsSouth::NotAuthenticated if not_authenticated?(xml_doc)
-
-      xml_doc.css('Table').map do |item|
-        {
-          item_number: content_for(item, 'I'),
-          quantity: content_for(item, 'Q'),
-          price: content_for(item, 'P'),
-        }
-      end
+      new(options).all(chunk_size, &block)
     end
 
-    # Pass an optional `:since` option (YYYY-MM-DDTHH:mm:ss.mss-HH:00) to get items updated since that timestamp.
-    def self.incremental_onhand_update(options = {})
-      requires!(options, :username, :password, :source, :customer_number)
-
-      options[:since] ||= '-1'
+    def self.get(item_identifier, options = {})
+      requires!(options, :username, :password)
+      new(options).get(item_identifier)
+    end
 
+    def all(chunk_size, &block)
+      chunker = SportsSouth::Chunker.new(chunk_size)
       http, request = get_http_and_request(API_URL, '/IncrementalOnhandUpdate')
 
-      request.set_form_data(form_params(options).merge({ SinceDateTime: options[:since] }))
-
-      xml_doc = Nokogiri::XML(sanitize_response(http.request(request)))
+      request.set_form_data(form_params = form_params(@options).merge({
+        SinceDateTime: @options[:last_updated],
+        LastItem:      @options[:last_item].to_s
+      }))
 
-      raise SportsSouth::NotAuthenticated if not_authenticated?(xml_doc)
+      response  = http.request(request)
+      xml_doc   = Nokogiri::XML(sanitize_response(response))
 
       xml_doc.css('Onhand').map do |item|
-        {
-          item_number:      content_for(item, 'I'),
-          quantity:         content_for(item, 'Q'),
-          quantity_changed: content_for(item, 'D'),
-          catalog_price:    content_for(item, 'P'),
-          customer_price:   content_for(item, 'C'),
-        }
+        if chunker.is_full?
+          yield(chunker.chunk)
+
+          chunker.reset!
+        else
+          chunker.add(self.map_hash(item))
+        end
+
+        if chunker.chunk.count > 0
+          yield(chunker.chunk)
+        end
       end
     end
 
-    def self.onhand_update(options = {})
-      requires!(options, :username, :password, :source, :customer_number)
-
-      http, request = get_http_and_request(API_URL, '/OnhandUpdate')
+    def get(item_identifier)
+      http, request = get_http_and_request(API_URL, '/OnhandInquiry')
 
-      request.set_form_data(form_params(options))
+      request.set_form_data(form_params(@options).merge({ ItemNumber: item_identifier }))
 
       response = http.request(request)
       xml_doc  = Nokogiri::XML(sanitize_response(response))
-
-      raise SportsSouth::NotAuthenticated if not_authenticated?(xml_doc)
-
-      xml_doc.css('Table').map do |item|
-        {
-          item_number:    content_for(item, 'I'),
-          quantity:       content_for(item, 'Q').to_i,
-          catalog_price:  content_for(item, 'P'),
-          customer_price: content_for(item, 'C'),
-        }
-      end
     end
 
     protected
 
-    def self.map_hash(node, mode: nil)
-      if mode == :minimal
-        {
-          item_number:      content_for(node, 'ITEMNO'),
-          catalog_price:    content_for(node, 'PRC1'),
-          customer_price:   content_for(node, 'CPRC'),
-          quantity_on_hand: content_for(node, 'QTYOH'),
-        }
-      else
-        {
-          item_number:              content_for(node, 'ITEMNO'),
-          description:              content_for(node, 'IDESC'),
-          manufacturer_sequence:    content_for(node, 'IMFSEQ'),
-          manufacturer_number:      content_for(node, 'IMFGNO'),
-          catalog_sequence:         content_for(node, 'CSEQ'),
-          item_type:                ITEM_TYPES[content_for(node, 'ITYPE')],
-          short_description:        content_for(node, 'SHDESC'),
-          unit_of_measure:          content_for(node, 'UOM'),
-          catalog_price:            content_for(node, 'PRC1'),
-          customer_price:           content_for(node, 'CPRC'),
-          quantity_on_hand:         content_for(node, 'QTYOH'),
-          weight_per_box:           content_for(node, 'WTPBX'),
-          upc:                      content_for(node, 'ITUPC'),
-          manufacturer_item_number: content_for(node, 'MFGINO'),
-          scan_name_1:              content_for(node, 'SCNAM1'),
-          scan_name_2:              content_for(node, 'SCNAM2'),
-          catalog_code:             CATALOG_CODES[content_for(node, 'CATCD')],
-          mapp_price_code:          content_for(node, 'MFPRTYP'),
-          mapp_price:               content_for(node, 'MFPRC'),
-          category_id:              content_for(node, 'CATID'),
-          text_reference_number:    content_for(node, 'TXTREF'),
-          picture_reference_number: content_for(node, 'PICREF'),
-          brand_id:                 content_for(node, 'ITBRDNO'),
-          item_model_number:        content_for(node, 'IMODEL'),
-          item_purpose:             content_for(node, 'IPURPOSE'),
-          series_description:       content_for(node, 'SERIES'),
-          item_length:              content_for(node, 'LENGTH'),
-          item_height:              content_for(node, 'HEIGHT'),
-          item_width:               content_for(node, 'WIDTH'),
-          item_ships_hazmat_air:    content_for(node, 'HAZAIR'),
-          item_ships_hazmat_ground: content_for(node, 'HAZGRND'),
-          date_of_last_change:      content_for(node, 'CHGDTE'),
-          date_added:               content_for(node, 'CHGDTE'),
-          attribute_1:              content_for(node, 'ITATR1'),
-          attribute_2:              content_for(node, 'ITATR2'),
-          attribute_3:              content_for(node, 'ITATR3'),
-          attribute_4:              content_for(node, 'ITATR4'),
-          attribute_5:              content_for(node, 'ITATR5'),
-          attribute_6:              content_for(node, 'ITATR6'),
-          attribute_7:              content_for(node, 'ITATR7'),
-          attribute_8:              content_for(node, 'ITATR8'),
-          attribute_9:              content_for(node, 'ITATR9'),
-          attribute_10:             content_for(node, 'ITATR0'),
-          attribute_11:             content_for(node, 'ITATR11'),
-          attribute_12:             content_for(node, 'ITATR12'),
-          attribute_13:             content_for(node, 'ITATR13'),
-          attribute_14:             content_for(node, 'ITATR14'),
-          attribute_15:             content_for(node, 'ITATR15'),
-          attribute_16:             content_for(node, 'ITATR16'),
-          attribute_17:             content_for(node, 'ITATR17'),
-          attribute_18:             content_for(node, 'ITATR18'),
-          attribute_19:             content_for(node, 'ITATR19'),
-          attribute_20:             content_for(node, 'ITATR20')
-        }
-      end
+    def map_hash(node)
+      {
+        item_identifier: content_for(node, 'I'),
+        quantity: content_for(node, 'Q').to_i,
+        price: content_for(node, 'C')
+      }
     end
 
   end

data/lib/sports_south/order.rb

@@ -4,12 +4,11 @@ module SportsSouth
     API_URL = 'http://webservices.theshootingwarehouse.com/smart/orders.asmx'
 
     SHIP_VIA = {
-      ground: '',
-      next_day: 'N',
-      two_day: '2',
+      ground:    '',
+      next_day:  'N',
+      two_day:   '2',
       three_day: '3',
-      saturday: 'S',
-      premium_ground: 'G',
+      saturday:  'S',
     }
 
     # D=Placed, E=Error placing Order, R=Placed-Verifying, W=Open
@@ -43,8 +42,8 @@ module SportsSouth
 
       requires!(header[:shipping], :name, :address_one, :city, :state, :zip, :phone)
       header[:shipping][:attn] = '' unless header[:shipping].has_key?(:attn)
+      header[:shipping][:via] = SHIP_VIA[:ground] unless header[:shipping].has_key?(:ship_via)
       header[:shipping][:address_two] = '' unless header[:shipping].has_key?(:address_two)
-      header[:shipping][:via] = (header[:shipping].has_key?(:ship_via) ? SHIP_VIA[header[:shipping][:ship_via]] : SHIP_VIA[:ground])
 
       http, request = get_http_and_request(API_URL, '/AddHeader')
 

data/lib/sports_south/version.rb

@@ -1,3 +1,3 @@
 module SportsSouth
-  VERSION = '1.3.1'.freeze
+  VERSION = '2.0'
 end

data/lib/sports_south.rb

@@ -5,7 +5,9 @@ require 'net/http'
 require 'nokogiri'
 
 require 'sports_south/base'
+require 'sports_south/chunker'
 require 'sports_south/brand'
+require 'sports_south/catalog'
 require 'sports_south/category'
 require 'sports_south/ffl'
 require 'sports_south/image'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sports_south
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: '2.0'
 platform: ruby
 authors:
 - Dale Campbell
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-18 00:00:00.000000000 Z
+date: 2017-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -115,7 +115,9 @@ files:
 - lib/sports_south.rb
 - lib/sports_south/base.rb
 - lib/sports_south/brand.rb
+- lib/sports_south/catalog.rb
 - lib/sports_south/category.rb
+- lib/sports_south/chunker.rb
 - lib/sports_south/ffl.rb
 - lib/sports_south/image.rb
 - lib/sports_south/inventory.rb
@@ -145,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Sports South API Ruby library.