sports_south 3.0.2 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7d132005031036050cb4e55d76aa4455d519fd69
-  data.tar.gz: 946d58824e49f0e1cce45a0dacc8353130bc91b4
+SHA256:
+  metadata.gz: b736895ad6b25eaba7670b07b9c656540af38f4f10f9dd1e33a98a4b6a0a53a4
+  data.tar.gz: fa5df6f96b4e6dcda10e5d15e14a2aaa14413d4987d951dad85a399e3e89bb98
 SHA512:
-  metadata.gz: b009cb4927ed59d0ca25afd0e5a74b7ae475f4438161b7d7ade10aec49a6fa583690cb80a4cda0031f60d29c6c16ab90c6b980bd828ce6dd9ccd31f214e1db54
-  data.tar.gz: e7878d0042ed306f8fdc67b10cbcb8c2b6d1c9dc47f6eeb5473d9534aceca9a55e3d2bb0902b241bf1dfe28bfb35c11e9de05303975dfd400baab0940061b8cc
+  metadata.gz: d1faa1e1fe88d5cd8a5570c09f358c025b9e9fc53bf77c94d19c22d2157dd63f0ef3d14398de0871fafd3a6de2f7bb07d2d41c616546fa285ecda70a60289add
+  data.tar.gz: d2bb33af61ab8f14ad44b4aa121105f45f5be2a4c84ac6a590c5073a6845a725c811440bbff33a3d8e2edbf92f462ee7c26393ffcb4b225649b6c49b1bef3b2f

data/.ruby-version

@@ -1 +1 @@
-2.3.1
+2.3.7

data/lib/sports_south.rb

@@ -1,8 +1,10 @@
 require 'sports_south/version'
 
+require 'cgi'
 require 'json'
 require 'net/http'
 require 'nokogiri'
+require 'tempfile'
 
 require 'sports_south/base'
 require 'sports_south/brand'

data/lib/sports_south/base.rb

@@ -1,5 +1,3 @@
-require 'cgi'
-
 module SportsSouth
   # Holds methods common to all classes.
   class Base
@@ -50,10 +48,12 @@ module SportsSouth
     #   http, request = get_http_and_request(<api_url>, <endpoint>)
     def self.get_http_and_request(api_url, endpoint)
       uri = URI([api_url, endpoint].join)
+
       http = Net::HTTP.new(uri.host, uri.port)
       http.read_timeout = TIMEOUT
+
       request = Net::HTTP::Post.new(uri.request_uri)
-      request['User-Agent'] = USER_AGENT
+      request['User-Agent']   = USER_AGENT
       request['Content-Type'] = CONTENT_TYPE
 
       return http, request
@@ -72,5 +72,34 @@ module SportsSouth
     end
     def sanitize_response(*args); self.class.sanitize_response(*args); end
 
+    def download_to_tempfile(http, request)
+      preformatted_tempfile = Tempfile.new(['preformatted-', '.txt'])
+
+      # Stream the response to disk.
+      # This file is not yet valid XML (the angle brackets are escaped).
+      http.request(request) do |response|
+        File.open(preformatted_tempfile, 'w') do |file|
+          response.read_body do |chunk|
+            file.write(chunk.force_encoding('UTF-8'))
+          end
+        end
+      end
+      preformatted_tempfile.close
+
+      # Now we need to read the file line-by-line and unescape the angle brackets.
+      # The new (properly formatted) XML will be in a secondary tempfile.
+      converted_tempfile = Tempfile.new(['formated-', '.xml'])
+
+      File.open(preformatted_tempfile, 'r') do |file|
+        file.each_line do |line|
+          converted_tempfile.puts CGI.unescapeHTML(line)
+        end
+      end
+
+      # Return the (still opened) tempfile
+      # Since it's sill open you may need to '#rewind' it first before usage
+      return converted_tempfile
+    end
+
   end
 end

data/lib/sports_south/catalog.rb

@@ -2,6 +2,7 @@ module SportsSouth
   class Catalog < Base
 
     API_URL = 'http://webservices.theshootingwarehouse.com/smart/inventory.asmx'
+    ITEM_NODE_NAME = 'Table'
 
     CATALOG_CODES = {
       'S' => :special,
@@ -62,13 +63,22 @@ module SportsSouth
         LastUpdate: @options[:last_updated],
         LastItem:   @options[:last_item].to_s
       }))
+      
+      tempfile = download_to_tempfile(http, request)
+      tempfile.rewind
 
-      response = http.request(request)
-      xml_doc  = Nokogiri::XML(sanitize_response(response))
+      Nokogiri::XML::Reader.from_io(tempfile).each do |reader|
+        next unless reader.node_type == Nokogiri::XML::Reader::TYPE_ELEMENT
+        next unless reader.name == ITEM_NODE_NAME
+
+        node = Nokogiri::XML.parse(reader.outer_xml)
 
-      xml_doc.css('Table').map do |item|
-        yield(map_hash(item, @options[:full_product]))
+        yield map_hash(node.css('Table'), @options[:full_product])
       end
+
+      tempfile.close
+      tempfile.unlink
+      true
     end
 
     def get_description(item_number)
@@ -101,27 +111,18 @@ module SportsSouth
         caliber = features[:gauge]
       end
 
-      if features[:action]
-        action = features[:action]
-      end
-
-      if full_product
-        long_description = self.get_description(content_for(node, 'ITEMNO'))
-      end
-
-      if features.respond_to?(:[]=)
-        features[:series] = series
-      end
+      action = features[:action] if features[:action]
+      features[:series] = series if features.respond_to?(:[]=)
 
       {
-        name:              "#{model} #{series} #{mfg_number}".gsub(/\s+/, ' ').rstrip,
+        name:              "#{model} #{series} #{mfg_number}".gsub(/\s+/, ' ').strip,
         model:             model,
         upc:               content_for(node, 'ITUPC').rjust(12, "0"),
         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:  long_description,
+        long_description:  (full_product ? get_description(content_for(node, 'ITEMNO')) : nil),
         category:          category[:description],
         product_type:      ITEM_TYPES[content_for(node, 'ITYPE')],
         mfg_number:        mfg_number,

data/lib/sports_south/version.rb

@@ -1,3 +1,3 @@
 module SportsSouth
-  VERSION = '3.0.2'.freeze
+  VERSION = '3.0.3'.freeze
 end

data/sports_south.gemspec

@@ -4,8 +4,6 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'sports_south/version'
 
 Gem::Specification.new do |spec|
-  spec.required_ruby_version = '~> 2.0'
-
   spec.name          = "sports_south"
   spec.version       = SportsSouth::VERSION
   spec.authors       = ["Dale Campbell"]
@@ -22,8 +20,8 @@ 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 "bundler", "~> 1.12"
   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: 3.0.2
+  version: 3.0.3
 platform: ruby
 authors:
 - Dale Campbell
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-17 00:00:00.000000000 Z
+date: 2018-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -25,33 +25,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '5'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '1.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '1.12'
 - !ruby/object:Gem::Dependency
   name: net-http-spy
   requirement: !ruby/object:Gem::Requirement
@@ -119,7 +119,6 @@ files:
 - ".rspec"
 - ".ruby-gemset"
 - ".ruby-version"
-- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -150,9 +149,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -160,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Sports South API Ruby library.

data/.travis.yml

@@ -1,4 +0,0 @@
-language: ruby
-rvm:
-  - 2.2.0
-before_install: gem install bundler -v 1.10.6