sports_south 3.0.4 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b8ffcf4d3fbb056d53b5cdb05ea2dd3174ca8fd306b0721f0c067a523b86339b
-  data.tar.gz: 814ed8f3c6649ee0fb52bdc024ee934d919976613270d71f91167adc8634e74d
+  metadata.gz: 14f58435980d9c679d29c36d8539f634fc438d05797ed712993c89dd51ec1ce8
+  data.tar.gz: ef5c4b09f54268ac9de6b5c427d4cbfba6b4af90c92fc3ac0625f423674f9305
 SHA512:
-  metadata.gz: 881d8cbd200ae7b66ca98f04b39c6bfbf1efe86a416b8d509711e7b029e74c954441bb1b8f2411fdeef7b4e1e8a28b278e35808913e7f1458e07af20d5a97ac8
-  data.tar.gz: af555a914628c4b1217a506ff1b345e6a2b6f4f07e10cf27c5438ce4be0584f8b056c885d0fa443b672b329ac65a4bf8ad37865355aa5f3a7a7c3f7e0c7db117
+  metadata.gz: 49e51b8c47c04e4a98f95f5d488ab3a9282d2d7e4db96c521a5c366cbedc2c3da23b2e2dbf66356680976d5710c30540d318025f8faede2d98a20835621cfa7a
+  data.tar.gz: 46e39889b90fa2bf4b6e3f986c5e3f4fcd89356fe242282b84ab728ea2430d14a463b1fd0b0b474caf6f5370147d13173ca8f99a7710981684589278e1730493

data/.circleci/config.yml

@@ -0,0 +1,41 @@
+# Ruby CircleCI 2.0 configuration file
+#
+# Check https://circleci.com/docs/2.0/language-ruby/ for more details
+#
+version: 2
+jobs:
+  build:
+    docker:
+      # specify the version you desire here
+       - image: circleci/ruby:2.4.1-node-browsers
+
+    working_directory: ~/repo
+
+    steps:
+      - checkout
+
+      # Download and cache dependencies
+      - restore_cache:
+          keys:
+          - v1-dependencies-{{ checksum "sports_south.gemspec" }}
+          # fallback to using the latest cache if no exact match is found
+          - v1-dependencies-
+
+      - run:
+          name: install dependencies
+          command: |
+            bundle install --jobs=4 --retry=3 --path vendor/bundle
+
+      - save_cache:
+          paths:
+            - ./vendor/bundle
+          key: v1-dependencies-{{ checksum "Gemfile.lock" }}
+
+      # run tests!
+      - run:
+          name: run tests
+          command: |
+            mkdir /tmp/test-results
+            TEST_FILES="$(circleci tests glob "spec/**/*_spec.rb" | circleci tests split --split-by=timings)"
+            
+            bundle exec rspec --format documentation $TEST_FILES

data/lib/sports_south/catalog.rb

@@ -36,7 +36,7 @@ module SportsSouth
       @brands     = SportsSouth::Brand.all(options)
     end
 
-    def self.all(options = {}, &block)
+    def self.all(options = {})
       requires!(options, :username, :password)
 
       if options[:last_updated]
@@ -47,24 +47,20 @@ module SportsSouth
 
       options[:last_item] ||= '-1'
 
-      new(options).all &block
+      new(options).all
     end
 
-    def self.get_description(item_number, options = {})
-      requires!(options, :username, :password)
-
-      new(options, :username, :password)
-    end
-
-    def all(&block)
+    def all
       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
       }))
-      
+
+      items    = []
       tempfile = download_to_tempfile(http, request)
+
       tempfile.rewind
 
       Nokogiri::XML::Reader.from_io(tempfile).each do |reader|
@@ -73,12 +69,21 @@ module SportsSouth
 
         node = Nokogiri::XML.parse(reader.outer_xml)
 
-        yield map_hash(node.css(ITEM_NODE_NAME), @options[:full_product])
+        _map_hash = map_hash(node.css(ITEM_NODE_NAME), @options[:full_product])
+
+        items << _map_hash unless _map_hash.nil?
       end
 
       tempfile.close
       tempfile.unlink
-      true
+
+      assign_brand_names(items)
+    end
+
+    def self.get_description(item_number, options = {})
+      requires!(options, :username, :password)
+
+      new(options, :username, :password)
     end
 
     def get_description(item_number)
@@ -98,7 +103,6 @@ module SportsSouth
 
     def map_hash(node, full_product = false)
       category = @categories.find { |category| category[:category_id] == content_for(node, 'CATID') }
-      brand    = @brands.find { |brand| brand[:brand_id] == content_for(node, 'ITBRDNO') }
       features = self.map_features(category.except(:category_id, :department_id, :department_description, :description), node)
 
       model      = content_for(node, 'IMODEL')
@@ -130,7 +134,7 @@ module SportsSouth
         caliber:           caliber,
         action:            action,
         map_price:         content_for(node, 'MFPRC'),
-        brand:             brand.present? ? brand[:name] : nil,
+        brand:             content_for(node, 'ITBRDNO').presence,
         features:          features,
         unit_of_measure:   UNITS_OF_MEASURE.fetch(content_for(node, 'UOM'), nil)
       }
@@ -138,15 +142,15 @@ module SportsSouth
 
     def map_features(attributes, node)
       features = {
-        attributes[:attribute_1] => content_for(node, 'ITATR1'),
-        attributes[:attribute_2] => content_for(node, 'ITATR2'),
-        attributes[:attribute_3] => content_for(node, 'ITATR3'),
-        attributes[:attribute_4] => content_for(node, 'ITATR4'),
-        attributes[:attribute_5] => content_for(node, 'ITATR5'),
-        attributes[:attribute_6] => content_for(node, 'ITATR6'),
-        attributes[:attribute_7] => content_for(node, 'ITATR7'),
-        attributes[:attribute_8] => content_for(node, 'ITATR8'),
-        attributes[:attribute_9] => content_for(node, 'ITATR9'),
+        attributes[:attribute_1]  => content_for(node, 'ITATR1'),
+        attributes[:attribute_2]  => content_for(node, 'ITATR2'),
+        attributes[:attribute_3]  => content_for(node, 'ITATR3'),
+        attributes[:attribute_4]  => content_for(node, 'ITATR4'),
+        attributes[:attribute_5]  => content_for(node, 'ITATR5'),
+        attributes[:attribute_6]  => content_for(node, 'ITATR6'),
+        attributes[:attribute_7]  => content_for(node, 'ITATR7'),
+        attributes[:attribute_8]  => content_for(node, 'ITATR8'),
+        attributes[:attribute_9]  => content_for(node, 'ITATR9'),
         attributes[:attribute_10] => content_for(node, 'ITATR10'),
         attributes[:attribute_11] => content_for(node, 'ITATR11'),
         attributes[:attribute_12] => content_for(node, 'ITATR12'),
@@ -165,5 +169,22 @@ module SportsSouth
       features.symbolize_keys!
     end
 
+    def assign_brand_names(items)
+      brand_ids = items.collect { |item| item[:brand] }.uniq.compact
+
+      brand_ids.each do |brand_id|
+        brand_name = @brands.find { |brand| brand[:brand_id] == brand_id }.try(:[], :name)
+
+        next if brand_name.nil?
+
+        items.map! do |item|
+          item[:brand] = brand_name if item[:brand] == brand_id
+          item
+        end
+      end
+
+      items
+    end
+
   end
 end

data/lib/sports_south/version.rb

@@ -1,3 +1,3 @@
 module SportsSouth
-  VERSION = '3.0.4'.freeze
+  VERSION = '4.0.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sports_south
 version: !ruby/object:Gem::Version
-  version: 3.0.4
+  version: 4.0.0
 platform: ruby
 authors:
 - Dale Campbell
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-23 00:00:00.000000000 Z
+date: 2019-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -115,6 +115,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".gitignore"
 - ".rspec"
 - ".ruby-gemset"