workarea-browse_option 2.1.6 → 2.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36962f203f973f8b170772166b3d044e8208430a9d1e64bc188251dcd54e6a14
-  data.tar.gz: 71bdd4b75a37c88c7ce5ab2ff212edce7a2890d4b70a22122755153326676146
+  metadata.gz: 28d5f9b37ef5d675069c9052300b43f5039b1a6526f280c3d2cd734333f6e0eb
+  data.tar.gz: 395a0ad0c22c651884cd232f2b4a18fe231ffa56d465ccb6d872016bdd76421f
 SHA512:
-  metadata.gz: 9f2655f7fd7dbde853e5cccecb59f4d1ac724a5cbad3d8162769c7a9aaa240bd1bf1b208cd136690aadadb9e467935194b54226040cfcab119fb6af88a4a1025
-  data.tar.gz: 15c6587978dd8b514ac0dc869892363d64c3fc9a18ba74b74ba870292643949475400e358cc1e76322c05d49d21ffe1d81de397755a92066b261b85dceb4150f
+  metadata.gz: 5c496a31cddfe5cfe9c71280cba7f8b541b88ce870001aa535eb541886a1ba28d79821deff3d5e9f28938eb7adf8e29fa032f79651db320b43bf852496f6f5ff
+  data.tar.gz: fcfd1a6212b08ef0b59c19fb3cb0efc4a86fdee3435d6dc2cb3961cc325a645e368b04c306403ea3fa37da8d4dd579f98054aee9b5f69c4c0470e8713ce4a3bd

data/.eslintrc.json

@@ -0,0 +1,35 @@
+{
+    "extends": "eslint:recommended",
+    "rules": {
+      "semi": ["error", "always"],
+      "eqeqeq": ["error", "always"]
+    },
+    "globals": {
+      "window": true,
+      "document": true,
+      "WORKAREA": true,
+      "$": true,
+      "jQuery": true,
+      "_": true,
+      "feature": true,
+      "JST": true,
+      "Turbolinks": true,
+      "I18n": true,
+      "Chart": true,
+      "Dropzone": true,
+      "strftime": true,
+      "Waypoint": true,
+      "wysihtml": true,
+      "LocalTime": true,
+      "describe": true,
+      "after": true,
+      "afterEach": true,
+      "before": true,
+      "beforeEach": true,
+      "it": true,
+      "expect": true,
+      "sinon": true,
+      "fixture": true,
+      "chai": true
+    }
+}

data/.github/workflows/ci.yml

@@ -0,0 +1,57 @@
+name: CI
+on: [push]
+
+jobs:
+  static_analysis:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v1
+    - uses: workarea-commerce/ci/bundler-audit@v1
+    - uses: workarea-commerce/ci/rubocop@v1
+    - uses: workarea-commerce/ci/eslint@v1
+      with:
+        args: '**/*.js'
+
+  admin_tests:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v1
+    - uses: actions/setup-ruby@v1
+      with:
+        ruby-version: 2.6.x
+    - uses: workarea-commerce/ci/test@v1
+      with:
+        command: bin/rails app:workarea:test:admin
+
+  core_tests:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v1
+    - uses: actions/setup-ruby@v1
+      with:
+        ruby-version: 2.6.x
+    - uses: workarea-commerce/ci/test@v1
+      with:
+        command: bin/rails app:workarea:test:core
+
+  storefront_tests:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v1
+    - uses: actions/setup-ruby@v1
+      with:
+        ruby-version: 2.6.x
+    - uses: workarea-commerce/ci/test@v1
+      with:
+        command: bin/rails app:workarea:test:storefront
+
+  plugins_tests:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v1
+    - uses: actions/setup-ruby@v1
+      with:
+        ruby-version: 2.6.x
+    - uses: workarea-commerce/ci/test@v1
+      with:
+        command: bin/rails app:workarea:test:plugins

data/.gitignore

@@ -12,3 +12,4 @@ node_modules
 test/reports
 package.json
 yarn.lock
+.rubocop-http*

data/.rubocop.yml

@@ -0,0 +1,3 @@
+inherit_from:
+  - https://raw.githubusercontent.com/workarea-commerce/workarea/master/.rubocop.yml
+

data/.stylelintrc.json

@@ -0,0 +1,8 @@
+{
+  "extends": "stylelint-config-recommended-scss",
+  "rules": {
+    "block-no-empty": null,
+    "no-descending-specificity": null,
+    "property-no-unknown": [true, { "ignoreProperties": ["mso-hide"] }]
+  }
+}

data/CHANGELOG.md

@@ -1,3 +1,21 @@
+Workarea Browse Option 2.1.7 (2019-10-01)
+--------------------------------------------------------------------------------
+
+*   try to fix build
+
+    Tom Scott
+
+*   Fix Deleted Featured Products
+
+    Prevent an error in admin when browsing a category with a featured
+    product that has since been deleted. Ensure that no `nil` records are
+    returned by the `#featured_products` method in the view model(s).
+
+    Fixes #1
+    Tom Scott
+
+
+
 Workarea Browse Option 2.1.6 (2019-08-21)
 --------------------------------------------------------------------------------
 

data/Gemfile

@@ -1,12 +1,9 @@
 source 'https://rubygems.org'
-git_source(:github) { |repo| "git@github.com:#{repo}.git" }
+git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
 # Declare your gem's dependencies in browse_option.gemspec.
 # Bundler will treat runtime dependencies like base dependencies, and
 # development dependencies will be added by default to the :development group.
 gemspec
 
-gem 'bundler-audit'
-gem 'listen'
-
 gem 'workarea-api', '>= 4.x'

data/Rakefile

@@ -37,10 +37,10 @@ desc "Release version #{Workarea::BrowseOption::VERSION} of the gem"
 task :release do
   host = "https://#{ENV['BUNDLE_GEMS__WEBLINC__COM']}@gems.weblinc.com"
 
-  #Rake::Task['workarea:changelog'].execute
-  #system 'git add CHANGELOG.md'
-  #system 'git commit -m "Update CHANGELOG"'
-  #system 'git push origin HEAD'
+  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'

data/app/view_models/workarea/admin/featured_browse_option_products_view_model.rb

@@ -16,6 +16,8 @@ module Workarea
                 tmp.browse_option => option&.optionize
               )
             end
+
+            results.compact
           end
       end
     end

data/lib/workarea/browse_option/version.rb

@@ -1,5 +1,5 @@
 module Workarea
   module BrowseOption
-    VERSION = '2.1.6'.freeze
+    VERSION = '2.1.7'.freeze
   end
 end

data/test/integration/workarea/admin/browse_option_featured_products_integration_test.rb

@@ -40,6 +40,22 @@ module Workarea
 
         assert_equal([], category.reload.product_ids)
       end
+
+      def test_delete_featured_products
+        product = create_product
+        category = create_category(product_ids: [product.id])
+
+        get admin.catalog_category_path(category)
+
+        assert(response.success?)
+
+        assert(product.destroy!)
+
+        # ActionView::Template::Error: undefined method `primary_image' for nil:NilClass
+        get admin.catalog_category_path(category)
+
+        assert(response.success?)
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: workarea-browse_option
 version: !ruby/object:Gem::Version
-  version: 2.1.6
+  version: 2.1.7
 platform: ruby
 authors:
 - Matt Duffy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-21 00:00:00.000000000 Z
+date: 2019-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: workarea
@@ -39,10 +39,14 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".editorconfig"
+- ".eslintrc.json"
 - ".github/ISSUE_TEMPLATE/bug_report.md"
 - ".github/ISSUE_TEMPLATE/documentation-request.md"
 - ".github/ISSUE_TEMPLATE/feature_request.md"
+- ".github/workflows/ci.yml"
 - ".gitignore"
+- ".rubocop.yml"
+- ".stylelintrc.json"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - CONTRIBUTING.md
@@ -177,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Adds browsing products by an option to the Workarea Commerce Platform