workarea-blog 3.4.8 → 3.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e87f8cf05f4855dc05e2a61e1df898971902d7408e691db8c5d70a25e4194fc
-  data.tar.gz: 5fa1624cd20946a0a29c968d6861a457dead106368c55cc438dafba48629a961
+  metadata.gz: 05dd002e82b59940b44ec0428f8b851bf67df28ba9e927cedafd4c567e509386
+  data.tar.gz: d65ee90babfb6388d41c1b4ad3e43ad6474ac51a58f23ed3e0a634eee6c3a336
 SHA512:
-  metadata.gz: 7bfd69d488b23f9616d981b78c100513c49110cedfd6232924d44295c4b4f4e88d01924a7409f607f30f3bab8105c3e1ba8e2686db556b8c1350c252ac9a45f3
-  data.tar.gz: b7125a6748b4ed90bf72f32150e0b64fe298b37d692e961a93594a103a49dd060a6e2d339ce5d83a2eec0e77b0694ab7f8b760701a356008fd2221a19c7918d5
+  metadata.gz: bc739ac4a5aec8e70a6326d0ac43a6d1a45b80cae2ff827d39f5e4fcd5a4c3ced652c0faca28616ea02d9b49c65ccd330ab880fa3d5892afd179d038c98ef564
+  data.tar.gz: dcaec863fb1f1d7da54a4ee2ea96664fce82f355fa6782b8084887f03b2b06b85525198afc3715a310ecca2f405a248f07c892e91ea9af988abd432d38e093ef

data/.github/workflows/ci.yml

@@ -0,0 +1,54 @@
+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
+
+  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/.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,22 @@
+Workarea Blog 3.4.9 (2019-10-16)
+--------------------------------------------------------------------------------
+
+*   Fix Content Search Text for Blog Entries
+
+    Since workarea-commerce/workarea-content-search#1 seems to be on the
+    back burner for now, and regardless of this blogs will have to handle
+    their search summary text on their own anyway. Update
+    `Search::Storefront::Content` to use the blog entry summary if it
+    exists, falling back to whatever the content-search gem uses to generate
+    its text. At the moment, this involves extracting text from content
+    blocks that have more than 5 words in them, but this may change in the
+    next major.
+
+    (#6)
+    Tom Scott
+
+
+
 Workarea Blog 3.4.8 (2019-10-01)
 --------------------------------------------------------------------------------
 

data/Gemfile

@@ -5,3 +5,4 @@ gemspec
 
 gem 'listen'
 gem 'workarea'
+gem 'workarea-content_search'

data/app/models/workarea/search/storefront/content.decorator

@@ -0,0 +1,12 @@
+module Workarea
+  if Plugin.installed?(:content_search)
+    decorate Search::Storefront::Content, with: :blog do
+      # Always use the summary
+      def text
+        return super unless model.contentable.try(:summary).present?
+
+        model.contentable.summary
+      end
+    end
+  end
+end

data/lib/workarea/blog/version.rb

@@ -1,5 +1,5 @@
 module Workarea
   module Blog
-    VERSION = '3.4.8'.freeze
+    VERSION = '3.4.9'.freeze
   end
 end

data/test/models/workarea/search/storefront/blog_content_test.rb

@@ -0,0 +1,37 @@
+require 'test_helper'
+
+module Workarea
+  if Plugin.installed?(:content_search)
+    module Search
+      class Storefront
+        class BlogContentTest < Workarea::TestCase
+          include TestCase::SearchIndexing
+
+          setup :setup_models
+
+          def setup_models
+            @entry = create_blog_entry(blog: create_blog)
+            @content = Workarea::Content.for(@entry)
+            @content.blocks.create!(
+              type: :html,
+              data: { 'html' => '<p>lorem ipsum dolor sit amet</p</p>' }
+            )
+          end
+
+          def test_use_summary_for_text_when_available
+            @entry.update!(summary: 'foo bar baz')
+            indexed = Content.new(@content)
+
+            assert_equal('foo bar baz', indexed.text)
+          end
+
+          def test_fall_back_to_default_block_text_extraction
+            indexed = Content.new(@content)
+
+            assert_equal('lorem ipsum dolor sit amet', indexed.text)
+          end
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: workarea-blog
 version: !ruby/object:Gem::Version
-  version: 3.4.8
+  version: 3.4.9
 platform: ruby
 authors:
 - bcrouse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-01 00:00:00.000000000 Z
+date: 2019-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: workarea
@@ -43,9 +43,12 @@ files:
 - ".github/ISSUE_TEMPLATE/bug_report.md"
 - ".github/ISSUE_TEMPLATE/documentation-request.md"
 - ".github/ISSUE_TEMPLATE/feature_request.md"
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - ".scss-lint.yml"
+- ".stylelintrc.json"
 - ".tailor"
 - ".yardopts"
 - CHANGELOG.md
@@ -80,6 +83,7 @@ files:
 - app/models/workarea/content/fields/blog_id.rb
 - app/models/workarea/search/admin/content_blog.rb
 - app/models/workarea/search/admin/content_blog_entry.rb
+- app/models/workarea/search/storefront/content.decorator
 - app/queries/workarea/metadata/content_blog.rb
 - app/queries/workarea/metadata/content_blog_entry.rb
 - app/queries/workarea/search/admin_blog_entries.rb
@@ -231,6 +235,7 @@ files:
 - test/lib/workarea/blog/import/wordpress/page_test.rb
 - test/models/workarea/content/blog_comment_test.rb
 - test/models/workarea/content/blog_entry_test.rb
+- test/models/workarea/search/storefront/blog_content_test.rb
 - test/queries/workarea/metadata/content_blog_entry_test.rb
 - test/queries/workarea/metadata/content_blog_test.rb
 - test/support/workarea/blog/stub_wordpress_assets.rb