workarea-browse_option 2.1.9 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87bbf26ef0c7fbdadf9d42a44f802f99ec2f3259cca9aa460b4e37c4449d66f3
-  data.tar.gz: a4ec8bbeb5d54d0d6010cdfbf28007d962121352114c97e5a3b379a2c30ff389
+  metadata.gz: 7428080b0f34d199647907718ad7ba3651fa9f43366d52795206c7c1aefb1b66
+  data.tar.gz: '011391a4e92841bceabea8a0f16c95c9314ea98b0b033cad24288462cfac446d'
 SHA512:
-  metadata.gz: 9bc9b9dace0a54b6ca386d8b9a33f4280b7639e918babf319d50b81263c9f98635c177d67b4c2e375f57051e34843ffa123fee2aaa3ee52895575880df0da7b8
-  data.tar.gz: 38af4c0b77640f62e851d9e7cd1db3263d9c4973766f63ff39b14ed20db13353d806bddce3d99d06316ba7842b6e36d1aba5c9cf7e365e23bd58dca19d88696f
+  metadata.gz: 17363cfbeac3374455bedaff9378544a8e7b4c40076fb52766a5d27fa8076efe9cf0bc653098de5ff6941531ce90d422bcb4ec07a1d8f54e9baeacafce7c846e
+  data.tar.gz: adfa45e6e371f87dd413d4431247db699783391b0e7250a0cbdd9d72b69d1c8c3913500512e6f84ce94972b478abbe17d67c9e0a9ef15ae54310342811b2648d

data/CHANGELOG.md

@@ -1,19 +1,13 @@
-Workarea Browse Option 2.1.9 (2019-11-12)
+Workarea Browse Option 2.2.0 (2020-01-21)
 --------------------------------------------------------------------------------
 
-*   Restore Functionality for Explicit Options Passing
+*   Fix v3.5 update issue
 
-    Sometimes, an option named "option" will be passed into the product view
-    model that indicates what should be included in the cache key, and other
-    times it will be the actual name of the option, like "color". Ensure
-    that both variants are supported in the `CacheKey#option_parts` for
-    product view models.
     Tom Scott
 
+*   Allow passing `option` as the actual option name as well
 
-
-Workarea Browse Option 2.1.8 (2019-10-30)
---------------------------------------------------------------------------------
+    Tom Scott
 
 *   Update cache_key.decorator
 
@@ -34,6 +28,15 @@ Workarea Browse Option 2.1.8 (2019-10-30)
     This looks like it needs to be updated
     Jesse McPherson
 
+*   Update test to reflect text ouput for bulk editing products
+
+    Matt Duffy
+
+*   Update categorization decoration for workarea v3.5
+
+    BROWSEOPTION-2
+    Matt Duffy
+
 
 
 Workarea Browse Option 2.1.7 (2019-10-01)

data/Gemfile

@@ -6,4 +6,5 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 # development dependencies will be added by default to the :development group.
 gemspec
 
-gem 'workarea-api', '>= 4.x'
+gem 'workarea', github: 'workarea-commerce/workarea', branch: 'v3.5-stable'
+gem 'workarea-api', github: 'workarea-commerce/workarea-api'

data/Rakefile

@@ -40,10 +40,9 @@ task :release do
   Rake::Task['workarea:changelog'].execute
   system 'git add CHANGELOG.md'
   system 'git commit -m "Update CHANGELOG"'
-  system 'git push origin HEAD'
 
   system "git tag -a v#{Workarea::BrowseOption::VERSION} -m 'Tagging #{Workarea::BrowseOption::VERSION}'"
-  system 'git push --tags'
+  system 'git push origin HEAD --follow-tags'
 
   system 'gem build workarea-browse_option.gemspec'
   system "gem push workarea-browse_option-#{Workarea::BrowseOption::VERSION}.gem"

data/app/queries/workarea/categorization.decorator

@@ -4,8 +4,8 @@ module Workarea
 
     def manual_models
       return [] if @product.blank?
-      @manual_models ||= Catalog::Category.by_product(
-        [@product.id, *BrowseOptionIds.all_for(@product)]
+      @manual_models ||= FeaturedCategorization.new(
+        @product.id, *BrowseOptionIds.all_for(@product)
       ).to_a
     end
   end

data/app/view_models/workarea/storefront/product_view_model/cache_key.decorator

@@ -4,8 +4,7 @@ module Workarea
 
     def option_parts
       option = @product.browse_option
-      value = @options['option'].presence || @options[option].presence
-
+      value = @options[option].presence || @options['option'].presence
       return super unless option.present? && value.present?
 
       super.unshift(value.optionize)

data/lib/workarea/browse_option/version.rb

@@ -1,5 +1,5 @@
 module Workarea
   module BrowseOption
-    VERSION = '2.1.9'.freeze
+    VERSION = '2.2.0'.freeze
   end
 end

data/test/dummy/config/initializers/session_store.rb

@@ -1,3 +1,3 @@
 # Be sure to restart your server when you modify this file.
 
-Rails.application.config.session_store :cookie_store, key: '_dummy_session'
+Rails.application.config.session_store :cookie_store, key: '_dummy_session', expire_after: 30.minutes

data/test/queries/workarea/browse_option_categorization_test.rb

@@ -7,14 +7,31 @@ module Workarea
         browse_option: 'color',
         variants: [{ sku: 'SKU', details: { 'color' => 'red' } }]
       )
+
       category_one = create_category(product_ids: [product.id])
       category_two = create_category(
         product_ids: [BrowseOptionIds.build(product.id, 'red')]
       )
+      category_three = create_category
 
       categorization = Categorization.new(product)
       assert(categorization.manual.include?(category_one.id))
       assert(categorization.manual.include?(category_two.id))
+      refute(categorization.manual.include?(category_three.id))
+
+      release = create_release(publish_at: 1.day.from_now)
+
+      release.as_current do
+        category_one.update!(product_ids: [])
+        category_three.update!(
+          product_ids: [BrowseOptionIds.build(product.id, 'red')]
+        )
+
+        categorization = Categorization.new(product)
+        refute(categorization.manual.include?(category_one.id))
+        assert(categorization.manual.include?(category_two.id))
+        assert(categorization.manual.include?(category_three.id))
+      end
     end
   end
 end

data/test/system/workarea/admin/bulk_action_product_edit_browse_option_test.rb

@@ -21,7 +21,7 @@ module Workarea
         select 'Color', from: 'bulk_action[settings][browse_option]'
 
         click_button t('workarea.admin.bulk_action_product_edits.edit.review_changes')
-        assert(page.has_content?('Browse Option: Color'))
+        assert(page.has_content?('Browse Option Color'))
         click_button t('workarea.admin.bulk_action_product_edits.review.save_and_finish')
         assert(page.has_content?('Your product edits are being processed'))
 

data/test/view_models/workarea/storefront/browse_option_product_view_model_test.rb

@@ -31,14 +31,19 @@ module Workarea
       end
 
       def test_cache_key
-        cached_product = Catalog::Product.new(create_product.as_document)
-        cached_product.browse_option = 'color'
+        cached_product = create_product(browse_option: 'color')
 
         view_model = ProductViewModel.new(cached_product, color: 'red')
         assert_match(/red/, view_model.cache_key)
 
         view_model = ProductViewModel.new(cached_product, option: 'red')
         assert_match(/red/, view_model.cache_key)
+
+        view_model = ProductViewModel.new(cached_product, color: 'red', option: '')
+        assert_match(/red/, view_model.cache_key)
+
+        view_model = ProductViewModel.new(cached_product, color: '', option: 'red')
+        assert_match(/red/, view_model.cache_key)
       end
 
       def test_primary_image

data/workarea-browse_option.gemspec

@@ -17,5 +17,5 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 2.3.0'
 
-  s.add_dependency 'workarea', '~> 3.x', '>= 3.3.x'
+  s.add_dependency 'workarea', '~> 3.x', '>= 3.5.x'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: workarea-browse_option
 version: !ruby/object:Gem::Version
-  version: 2.1.9
+  version: 2.2.0
 platform: ruby
 authors:
 - Matt Duffy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-12 00:00:00.000000000 Z
+date: 2020-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: workarea
@@ -19,7 +19,7 @@ dependencies:
         version: 3.x
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.3.x
+        version: 3.5.x
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: 3.x
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.3.x
+        version: 3.5.x
 description: Adds browsing products by an option (e.g. color) to the Workarea Commerce
   Platform
 email:
@@ -181,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Adds browsing products by an option to the Workarea Commerce Platform