workarea-content_search 1.0.9 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e12fe17ff40450cc7b218bdaf03cf6faedaa6ed82cf59e5cdc68d3f7b25642b9
-  data.tar.gz: 331dda0af1ff1de4967dd5e26dd9d9d3388aff0b08e1214a0a85cf58261ef1b2
+  metadata.gz: b9cb1b584de2dcbd3657b3baa6edbef7cb44e1d063d4219c8b13b842b3b654dd
+  data.tar.gz: d69ecbd89640eb29c0ce3f9ac9e96b58bdddf16a55b8d65aade7b9d90d3df3cb
 SHA512:
-  metadata.gz: 3d0615611de822f8f215de471ee5f95334b2b69269ae035045f66e9dcc2197becb1a805872427b9433c415e76876a56d49a384f7486c793f5f396b20dcfeef48
-  data.tar.gz: ce175aba27e1eedde6f9accd3dcfbf10220f2ff1e570ab2abefd79ce0807e7114029986381749865e9aaad94caeb630215c729d1e38c18972c50f342a147f46d
+  metadata.gz: 546668ec22ab7a4d54aedb9bc085f32eab4ec8bcb022d44abf266e812a8dcffdb4c5fff2e4217ad9926bb935083b7c19a1261ddd35dd3964bbf7bc002c676171
+  data.tar.gz: c4c58ed398937e63bdfb43a133a2c1301e1ffe06909697cc7057387756aed146863378ce10013611ae04701182083ce1c675d405c8beef56653001470d2a0efe

data/CHANGELOG.md

@@ -1,3 +1,42 @@
+Workarea Content Search 1.1.0 (2019-11-26)
+--------------------------------------------------------------------------------
+
+*   Add Autocomplete to Content Search
+
+    Using the shiny new **workarea-search-autocomplete** plugin, Content
+    Search can now provide autocomplete results for the given search term.
+    Content results are injected right below the common search terms, and
+    augments the existing autocomplete with results from pages, blog posts,
+    and other `Contentable` items.
+
+    CONTSEARCH-3
+    Tom Scott
+
+*   Enable changelog task in release task
+
+    Curt Howard
+
+*   Update checking for SearchSuggestion content to ensure decoration loading
+
+    CONTSEARCH-2
+    Matt Duffy
+
+*   Updates for v3.5
+
+    Ben Crouse
+
+
+
+Workarea Content Search 1.0.9 (2019-10-30)
+--------------------------------------------------------------------------------
+
+*   Update checking for SearchSuggestion content to ensure decoration loading
+
+    CONTSEARCH-2
+    Matt Duffy
+
+
+
 Workarea Content Search 1.0.8 (2019-07-09)
 --------------------------------------------------------------------------------
 

data/Gemfile

@@ -7,3 +7,4 @@ gemspec
 # gem 'byebug', group: [:development, :test]
 
 gem 'workarea', github: 'workarea-commerce/workarea'
+gem 'workarea-search_autocomplete', github: 'workarea-commerce/workarea-search-autocomplete', branch: :master

data/Rakefile

@@ -16,10 +16,10 @@ desc "Release version #{Workarea::ContentSearch::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::ContentSearch::VERSION} -m 'Tagging #{Workarea::ContentSearch::VERSION}'"
   system 'git push --tags'

data/app/assets/stylesheets/workarea/storefront/content_search/components/_search_autocomplete.scss

@@ -0,0 +1,11 @@
+/**
+ * Extensions to the search autocomplete plugin to support content
+ * results.
+ */
+
+.search-autocomplete__content {
+    @extend %list-reset;
+    text-align: left;
+}
+    .search-autocomplete__content-item {}
+        .search-autocomplete__content-link {}

data/app/view_models/workarea/storefront/search_autocomplete_view_model.decorator

@@ -0,0 +1,17 @@
+module Workarea
+  if Plugin.installed?(:search_autocomplete)
+    decorate Storefront::SearchAutocompleteViewModel, with: :content_search do
+      def content_results
+        @content_results ||= begin
+          return [] if searches.blank?
+
+          results = Storefront::ContentSearchViewModel.wrap(response, options)
+
+          results.content.take(
+            Workarea.config.storefront_search_autocomplete_max_content
+          )
+        end
+      end
+    end
+  end
+end

data/app/views/workarea/storefront/searches/_autocomplete_content.html.haml

@@ -0,0 +1,7 @@
+- if @autocomplete.content_results.any?
+  %ul.search-autocomplete__content
+    %span.search-autocomplete__heading
+      = t('workarea.storefront.search_autocomplete.content_heading', term: @autocomplete.searches.first)
+    - @autocomplete.content_results.each do |result|
+      %li.search-autocomplete__content-item
+        = link_to result.name, send("#{result.resource_name}_path", result), class: 'search-autocomplete__content-link'

data/config/initializers/appends.rb

@@ -2,3 +2,15 @@ Workarea.append_partials(
   'storefront.above_search_results',
   'workarea/storefront/searches/search_type_toggle'
 )
+
+if Workarea::Plugin.installed?(:search_autocomplete)
+  Workarea.append_stylesheets(
+    'storefront.components',
+    'workarea/storefront/content_search/components/search_autocomplete'
+  )
+
+  Workarea.append_partials(
+    'storefront.search_autocomplete_under_searches',
+    'workarea/storefront/searches/autocomplete_content'
+  )
+end

data/config/initializers/configuration.rb

@@ -16,4 +16,8 @@ Workarea.configure do |config|
     Workarea::Search::Customization
     Workarea::Navigation::Menu
   )
+
+  if Workarea::Plugin.installed?(:search_autocomplete)
+    config.storefront_search_autocomplete_max_content = 5
+  end
 end

data/config/locales/en.yml

@@ -5,3 +5,5 @@ en:
         product_result: product result
         content_result: content result
         content: Content
+      search_autocomplete:
+        content_heading: "Content Results: %{term}"

data/lib/workarea/content_search/version.rb

@@ -1,5 +1,5 @@
 module Workarea
   module ContentSearch
-    VERSION = '1.0.9'.freeze
+    VERSION = '1.1.0'.freeze
   end
 end

data/test/system/workarea/storefront/content_search_autocomplete_system_test.rb

@@ -0,0 +1,35 @@
+require 'test_helper'
+
+module Workarea
+  if Plugin.installed?(:search_autocomplete)
+    module Storefront
+      class ContentSearchAutocompleteSystemTest < Workarea::SystemTest
+        def test_content_appears_in_autocomplete
+          create_page(name: 'Content Test One')
+          create_page(name: 'Content Test Two')
+          create_page(name: 'Content Test Three')
+          create_product(name: 'Test One')
+          create_product(name: 'Test Two')
+          create_search_by_week(query_string: 'test one', searches: 5, total_results: 5)
+          create_search_by_week(query_string: 'test two', searches: 10, total_results: 5)
+
+          visit storefront.root_path
+
+          fill_in :q, with: 'te'
+
+          within '#search_autocomplete' do
+            assert_text(
+              t(
+                'workarea.storefront.search_autocomplete.content_heading',
+                term: 'test two'
+              )
+            )
+            assert_text('Content Test One')
+            assert_text('Content Test Two')
+            assert_text('Content Test Three')
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,37 @@
+require 'test_helper'
+
+module Workarea
+  if Plugin.installed?(:search_autocomplete)
+    module Storefront
+      class SearchAutocompleteViewModelTest < Workarea::TestCase
+        include TestCase::SearchIndexing
+
+        def test_content
+          query = QueryString.new('te').pretty
+          search = Storefront::SearchAutocompleteViewModel.wrap(query)
+
+          Sidekiq::Callbacks.enable do
+            create_page(name: 'Content Test One')
+            create_page(name: 'Content Test Two')
+            create_page(name: 'Content Test Three')
+            create_product(name: 'Test One')
+            create_product(name: 'Test Two')
+            create_search_by_week(
+              query_string: 'test one',
+              searches: 5,
+              total_results: 5
+            )
+            create_search_by_week(
+              query_string: 'test two',
+              searches: 10,
+              total_results: 5
+            )
+          end
+
+          refute_empty(search.content_results)
+          assert_equal(3, search.content_results.count)
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: workarea-content_search
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.1.0
 platform: ruby
 authors:
 - Matt Duffy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-30 00:00:00.000000000 Z
+date: 2019-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: workarea
@@ -47,6 +47,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- app/assets/stylesheets/workarea/storefront/content_search/components/_search_autocomplete.scss
 - app/controllers/workarea/.keep
 - app/controllers/workarea/storefront/searches_controller.decorator
 - app/models/workarea/search/storefront.decorator
@@ -58,6 +59,8 @@ files:
 - app/queries/workarea/search/storefront_search/template_with_content.rb
 - app/view_models/workarea/storefront/content_search_results.rb
 - app/view_models/workarea/storefront/content_search_view_model.rb
+- app/view_models/workarea/storefront/search_autocomplete_view_model.decorator
+- app/views/workarea/storefront/searches/_autocomplete_content.html.haml
 - app/views/workarea/storefront/searches/_search_type_toggle.html.haml
 - app/views/workarea/storefront/searches/content.html.haml
 - app/workers/workarea/bulk_index_content.rb
@@ -123,8 +126,10 @@ files:
 - test/dummy/public/favicon.ico
 - test/models/workarea/search/storefront/content_test.rb
 - test/queries/workarea/search/content_search_test.rb
+- test/system/workarea/storefront/content_search_autocomplete_system_test.rb
 - test/system/workarea/storefront/content_search_system_test.rb
 - test/test_helper.rb
+- test/view_models/workarea/storefront/content_search_autocomplete_view_model_test.rb
 - test/view_models/workarea/storefront/content_search_results_test.rb
 - test/view_models/workarea/storefront/content_search_view_model_test.rb
 - test/workers/workarea/bulk_index_content_test.rb