sports_south 2.1.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5bd1dcc61d7b0adc054a1a3ca07d60a47ce481a3
-  data.tar.gz: 8159615459f73a383dcea375e20df35101a3b24a
+  metadata.gz: bd770d8c140f2571c87ce1f3fae13571c1259e63
+  data.tar.gz: cc5837ea9f109de82636f7b056a186d851df0139
 SHA512:
-  metadata.gz: dad76b47b93d600e3ea6e10fbdf5fe4333ffdcd79b390236bb8b16826f4ee7552c6142847c66906107d4a21324821017ae75f5b57901d93d6e0dd66827fc52a2
-  data.tar.gz: 03fcdb8fac8bf943a580d28d183c7d6c865c70fc505785ab2d46857e950a90f0bf7c7968a3fa785f71f96843612ad5c7116211eda57d2c75a62d64ddd3f10812
+  metadata.gz: 0551d34300ec47e40f9acb8c51c8580943f517036b5bbb00cf4f3af12c737caf6cfb44ce634055367e2de312803af288a06468713b6526be5abd8d6e6bceeb73
+  data.tar.gz: cb2d3a70347fdca2a5d2a7c0e25d196f062ade020d4ec9092b3736e8948997e6cb00b64bc90a03a7e01d8048ca6ec7946c274aa475307b389a8ad792c8e4f3e3

data/lib/sports_south.rb

@@ -5,7 +5,6 @@ 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'

data/lib/sports_south/base.rb

@@ -5,7 +5,7 @@ module SportsSouth
   class Base
 
     TIMEOUT = 960 # seconds
-    USER_AGENT = "sports_south rubygems.org/gems/sports_south v(#{SportsSouth::VERSION})"
+    USER_AGENT = "sports_south rubygems.org/gems/sports_south v(#{SportsSouth::VERSION})".freeze
     CONTENT_TYPE = 'application/x-www-form-urlencoded'.freeze
 
     protected

data/lib/sports_south/catalog.rb

@@ -35,7 +35,7 @@ module SportsSouth
       @brands     = SportsSouth::Brand.all(options)
     end
 
-    def self.all(chunk_size = 15, options = {}, &block)
+    def self.all(options = {}, &block)
       requires!(options, :username, :password)
 
       if options[:last_updated]
@@ -46,7 +46,7 @@ module SportsSouth
 
       options[:last_item] ||= '-1'
 
-      new(options).all(chunk_size, &block)
+      new(options).all &block
     end
 
     def self.get_description(item_number, options = {})
@@ -55,8 +55,7 @@ module SportsSouth
       new(options, :username, :password)
     end
 
-    def all(chunk_size, &block)
-      chunker = SportsSouth::Chunker.new(chunk_size)
+    def all(&block)
       http, request = get_http_and_request(API_URL, '/DailyItemUpdate')
 
       request.set_form_data(form_params(@options).merge({
@@ -68,17 +67,7 @@ module SportsSouth
       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(map_hash(item, !@options[:full_product].nil?))
-        end
-      end
-
-      if chunker.chunk.count > 0
-        yield(chunker.chunk)
+        yield(map_hash(item, !@options[:full_product].nil?))
       end
     end
 

data/lib/sports_south/inventory.rb

@@ -12,13 +12,13 @@ module SportsSouth
     def self.get_quantity_file(options = {})
       requires!(options, :username, :password)
 
-      options[:last_updated]  = '1990-09-25T14:15:47-04:00'
-      options[:last_item]     = '-1'
+      options[:last_updated] = '1990-09-25T14:15:47-04:00'
+      options[:last_item]    = '-1'
 
       new(options).get_quantity_file
     end
 
-    def self.all(chunk_size = 15, options = {}, &block)
+    def self.all(options = {}, &block)
       requires!(options, :username, :password)
 
       if options[:last_updated].present?
@@ -29,7 +29,7 @@ module SportsSouth
 
       options[:last_item] ||= '-1'
 
-      new(options).all(chunk_size, &block)
+      new(options).all(&block)
     end
 
     def self.get(item_identifier, options = {})
@@ -37,8 +37,7 @@ module SportsSouth
       new(options).get(item_identifier)
     end
 
-    def all(chunk_size, &block)
-      chunker = SportsSouth::Chunker.new(chunk_size)
+    def all(&block)
       http, request = get_http_and_request(API_URL, '/IncrementalOnhandUpdate')
 
       request.set_form_data(form_params = form_params(@options).merge({
@@ -46,21 +45,11 @@ module SportsSouth
         LastItem:      @options[:last_item].to_s
       }))
 
-      response  = http.request(request)
-      xml_doc   = Nokogiri::XML(sanitize_response(response))
+      response = http.request(request)
+      xml_doc  = Nokogiri::XML(sanitize_response(response))
 
       xml_doc.css('Onhand').map do |item|
-        if chunker.is_full?
-          yield(chunker.chunk)
-
-          chunker.reset!
-        else
-          chunker.add(self.map_hash(item))
-        end
-      end
-
-      if chunker.chunk.count > 0
-        yield(chunker.chunk)
+        yield(self.map_hash(item))
       end
     end
 
@@ -73,19 +62,18 @@ module SportsSouth
         LastItem:      @options[:last_item].to_s
       }))
 
-      response  = http.request(request)
-      xml_doc   = Nokogiri::XML(sanitize_response(response))
+      response = http.request(request)
+      xml_doc  = Nokogiri::XML(sanitize_response(response))
 
       xml_doc.css('Onhand').map do |item|
         tempfile.puts("#{content_for(item, 'I')},#{content_for(item, 'Q')}")
       end
 
       tempfile.close
-
       tempfile.path
     end
 
-    def self.quantity(chunk_size = 100, options = {}, &block)
+    def self.quantity(options = {}, &block)
       requires!(options, :username, :password)
 
       if options[:last_updated].present?
@@ -96,37 +84,7 @@ module SportsSouth
 
       options[:last_item] ||= '-1'
 
-      new(options).all(chunk_size, &block)
-    end
-
-    def quantity(chunk_size, &block)
-      chunker = SportsSouth::Chunker.new(chunk_size)
-      http, request = get_http_and_request(API_URL, '/IncrementalOnhandUpdate')
-
-      request.set_form_data(form_params = form_params(@options).merge({
-        SinceDateTime: @options[:last_updated],
-        LastItem:      @options[:last_item].to_s
-      }))
-
-      response  = http.request(request)
-      xml_doc   = Nokogiri::XML(sanitize_response(response))
-
-      xml_doc.css('Onhand').map do |item|
-        if chunker.is_full?
-          yield(chunker.chunk)
-
-          chunker.reset!
-        else
-          chunker.add({
-            item_identifier: content_for(node, 'I'),
-            quantity: content_for(node, 'Q').to_i
-          })
-        end
-      end
-
-      if chunker.chunk.count > 0
-        yield(chunker.chunk)
-      end
+      new(options).all(&block)
     end
 
     def get(item_identifier)

data/lib/sports_south/invoice.rb

@@ -35,17 +35,18 @@ module SportsSouth
       @response_body = body
 
       @tracking = {
-        invoice_number: content_for(xml_doc, 'INVNO'),
+        invoice_number:  content_for(xml_doc, 'INVNO'),
         customer_number: content_for(xml_doc, 'CUSNO'),
-        po_number: content_for(xml_doc, 'PONBR'),
-        ship_date: content_for(xml_doc, 'SHPDTE'),
+        po_number:       content_for(xml_doc, 'PONBR'),
+        ship_date:       content_for(xml_doc, 'SHPDTE'),
         tracking_number: content_for(xml_doc, 'TRACKNO'),
-        package_weight: content_for(xml_doc, 'PKGWT'),
-        cod_amount: content_for(xml_doc, 'CODAMT'),
-        hazmat: content_for(xml_doc, 'HAZMAT'),
-        ship_amount: content_for(xml_doc, 'SHPAMT'),
-        ship_service: content_for(xml_doc, 'SERVICE'),
+        package_weight:  content_for(xml_doc, 'PKGWT'),
+        cod_amount:      content_for(xml_doc, 'CODAMT'),
+        hazmat:          content_for(xml_doc, 'HAZMAT'),
+        ship_amount:     content_for(xml_doc, 'SHPAMT'),
+        ship_service:    content_for(xml_doc, 'SERVICE'),
       }
     end
+
   end
 end

data/lib/sports_south/order.rb

@@ -4,11 +4,12 @@ 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',
+      saturday: 'S',
+      premium_ground: 'G',
     }
 
     # D=Placed, E=Error placing Order, R=Placed-Verifying, W=Open
@@ -42,8 +43,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/rotator.rb

@@ -3,7 +3,6 @@ module SportsSouth
 
     API_URL = 'http://tsw-api.com/images/rotator/check.php'
 
-
     def self.check(api_user_id, api_key, *items)
       new(api_user_id, api_key).check(items)
     end

data/lib/sports_south/version.rb

@@ -1,3 +1,3 @@
 module SportsSouth
-  VERSION = '2.1.0'.freeze
+  VERSION = '3.0.1'.freeze
 end

data/sports_south.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "nokogiri", "~> 1.6"
 
   spec.add_development_dependency "bundler", "~> 1.12"
+  spec.add_development_dependency "activesupport", "~> 5"
   spec.add_development_dependency "net-http-spy", "~> 0.2"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.3"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sports_south
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 3.0.1
 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: '1.12'
+- !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: net-http-spy
   requirement: !ruby/object:Gem::Requirement
@@ -117,7 +131,6 @@ files:
 - 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
@@ -147,7 +160,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: Sports South API Ruby library.

data/lib/sports_south/chunker.rb

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