workarea-blog 3.4.9 → 3.5.0

data/app/views/workarea/storefront/blog_metadata/_publisher.html.haml

@@ -1,7 +1,8 @@
+-# TODO v4 remove
 %div{ itemprop: 'publisher', itemscope: 'itemscope', itemtype: 'https://schema.org/Organization'}
   %meta{ itemprop: 'url', content: root_url }
   %meta{ itemprop: 'name', content: Workarea.config.site_name }
-  -# TODO: Add meta data for logo, this must include url, width, and height attributes 
+  -# TODO: Add meta data for logo, this must include url, width, and height attributes
   -# This will require a helper method for site logo with something similar to dragonfly analyzers for width & height
   -# example: https://webmasters.stackexchange.com/questions/95957/how-to-specify-publisher-in-schema-orgs-article-structured-data
-  
+

data/app/views/workarea/storefront/blogs/index.html.haml

@@ -8,16 +8,16 @@
   - unless @blog_index.meta_description.blank?
     %meta{ name: :description, content: @blog_index.meta_description }
 
-.blog-index.view{ itemscope: true, itemtype: 'http://schema.org/Blog' }
+.blog-index.view
 
   = render_content_blocks(@blog_index.content_blocks_for(:header_content))
 
-  %h1.blog-entry-summary__title{ itemprop: 'name' }= t('workarea.storefront.blogs.name')
+  %h1.blog-entry-summary__title= t('workarea.storefront.blogs.name')
 
   - @blog_index.each do |blog|
     %section
-      %h2.blog-index__title{ itemprop: 'name' }
-        = link_to blog.name, blog_path(blog), itemprop: 'url'
+      %h2.blog-index__title
+        = link_to blog.name, blog_path(blog)
 
       .pagination-results
         .blog-entry-summary__entry-group

data/app/views/workarea/storefront/blogs/show.html.haml

@@ -14,9 +14,9 @@
 - content_for :page_aside do
   = render 'workarea/storefront/blogs/blog_navigation', blog: @blog
 
-.blog-entry-summary.view{ itemscope: true, itemtype: 'http://schema.org/Blog', itemprop: '' }
+.blog-entry-summary.view
 
-  %h1.blog-entry-summary__title{ itemprop: 'name' }= @blog.name
+  %h1.blog-entry-summary__title= @blog.name
 
   - if @blog.content_blocks_for(:header_content).present?
     .blog-entry-summary__banner-content!= render_content_blocks(@blog.content_blocks_for(:header_content))

data/config/initializers/content_block_types.rb

@@ -1,4 +1,4 @@
-Workarea::Content.define_block_types do
+Workarea.define_content_block_types do
   block_type 'Blog Entry' do
     description 'Feature a blog entry as a content block'
     view_model 'Workarea::Storefront::ContentBlocks::BlogEntryContentBlockViewModel'

data/config/initializers/fields.rb

@@ -0,0 +1,9 @@
+Workarea::Configuration.define_fields do
+  fieldset 'Content', namespaced: false do
+    field 'Blog Entry Index Display',
+      id: :blog_entries_on_index,
+      type: :integer,
+      default: 4,
+      description: 'The number of blog entries to display on the blog index page for each blog.'
+  end
+end

data/config/initializers/rack_attack.rb

@@ -0,0 +1,11 @@
+class Rack::Attack
+  # Ban blog comment spammers for a day when more than 10 comments are
+  # posted in an hour.
+  blocklist('blog/comments') do |req|
+    key = [req.ip, req.cookies['user_id']].reject(&:blank?).join(':')
+
+    Rack::Attack::Allow2Ban.filter(key, maxretry: 10, findtime: 1.hour, bantime: 1.day) do
+      req.post? && req.path =~ %r{blog_entries/(.*)/comment}
+    end
+  end
+end

data/config/initializers/workarea.rb

@@ -1,7 +1,4 @@
 Workarea.configure do |config|
-  # Number of articles to be displayed per blog on blog index page
-  config.blog_entries_on_index ||= 4
-
   config.content_areas.merge!(
     'blog_entry' => %w[blog_content blog_header],
     'blog' => %w[header_content],

data/config/locales/en.yml

@@ -44,6 +44,8 @@ en:
           new_comment: New Comment
           comment_body: Comment Body
           create_comment: Create Comment
+          approve: Approve
+          deny: Deny
       content_blog_entries:
         fields:
           author: Author

data/lib/workarea/blog/import/wordpress/content_cleaner.rb

@@ -31,7 +31,7 @@ module Workarea
 
           def find_asset(uri)
             name = uri.path.rpartition('.').first.split('/').join('-')
-            Content::Asset.find_by(name: name) rescue Content::Asset.placeholder
+            Content::Asset.find_by(name: name) rescue Content::Asset.image_placeholder
           end
 
           def make_internal_links_relative

data/lib/workarea/blog/version.rb

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

data/package.json

@@ -0,0 +1,9 @@
+{
+  "devDependencies": {
+    "eslint": "~5.16.0",
+    "eslint-config-recommended": "~4.0.0",
+    "stylelint": "~10.1.0",
+    "stylelint-config-recommended-scss": "~3.3.0",
+    "stylelint-scss": "~3.9.2"
+  }
+}

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/factories/wordpress_import.rb

@@ -1,16 +1,14 @@
 module Workarea
-  module Blog
-    module Factoris
-      module WordpressImport
-        Factories.add(self)
+  module Factories
+    module WordpressImport
+      Factories.add(self)
 
-        def wordpress_xml_path
-          "#{Workarea::Blog.root}/test/fixtures/test_wordpress.xml"
-        end
+      def wordpress_xml_path
+        "#{Workarea::Blog.root}/test/fixtures/test_wordpress.xml"
+      end
 
-        def wordpress_xml
-          File.open(wordpress_xml_path)
-        end
+      def wordpress_xml
+        File.open(wordpress_xml_path)
       end
     end
   end

data/test/integration/workarea/blog/rack_attack_integration_test.rb

@@ -0,0 +1,50 @@
+require 'test_helper'
+
+module Workarea
+  class Blog::RackAttackIntegrationTest < Workarea::IntegrationTest
+    class AddEnvMiddleware
+      def initialize(app)
+        @app = app
+      end
+
+      def call(env)
+        env.merge!(Rails.application.env_config)
+        @app.call(env)
+      end
+    end
+
+    def test_prevent_comment_spam
+      ip = '192.168.1.1'
+      user = create_user
+      blog_entry = create_blog_entry(blog: create_blog)
+      key = [ip, user.id.to_s].reject(&:blank?).join(':')
+      env = { 'HTTP_COOKIE' => "user_id=#{user.id}", 'REMOTE_ADDR' => ip }
+
+      post "/blog_entries/#{blog_entry.slug}/comment", env: env
+
+      assert_response(:success)
+
+      Rack::Attack::Allow2Ban.stubs(:banned?).returns(false)
+      Rack::Attack::Allow2Ban.stubs(:banned?).with(key).returns(true)
+
+      post "/blog_entries/#{blog_entry.slug}/comment", env: env
+
+      assert_equal('blog/comments', request.env['rack.attack.matched'])
+      assert_equal(:blocklist, request.env['rack.attack.match_type'])
+      assert_response(:forbidden)
+    end
+
+    private
+
+    def app
+      @app ||= begin
+        Rack::Builder.new do
+          use AddEnvMiddleware
+          use Rack::Attack
+          use ActionDispatch::Cookies
+          run -> (*) { [ 200, {}, [] ] }
+        end
+      end
+    end
+  end
+end

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

@@ -43,6 +43,46 @@ module Workarea
         assert(page.has_content?('blog comment'))
       end
 
+      def test_moderating_comments_from_index
+        pending = t('workarea.admin.content_blogs_comments.summary.pending')
+        blog_entry = blog.entries.first
+        bad_comment = create_blog_comment(
+          entry: blog_entry,
+          user_id: Workarea::User.first.id,
+          user_info: 'UC',
+          body: 'oh noes i said the bad word',
+          pending: true
+        )
+        good_comment = create_blog_comment(
+          entry: blog_entry,
+          user_id: Workarea::User.first.id,
+          user_info: 'UC',
+          body: 'test test test',
+          pending: true
+        )
+
+        visit admin.content_blog_user_comments_path
+
+        assert_text(good_comment.body)
+        assert_text(bad_comment.body)
+        assert_text(pending, count: 2)
+
+        within '.comments__comment:first-child' do
+          click_link t('workarea.admin.content_blogs_comments.index.approve')
+        end
+
+        assert_text(pending, count: 1)
+
+        within '.comments__comment:first-child' do
+          click_link t('workarea.admin.content_blogs_comments.index.deny')
+        end
+
+        refute_text(pending)
+
+        assert(good_comment.reload.approved)
+        refute(bad_comment.reload.approved)
+      end
+
       def test_deleting_a_comment
         blog_entry = blog.entries.first
         blog_entry.comments.create!(
@@ -56,7 +96,7 @@ module Workarea
         visit admin.content_blog_user_comments_path
 
         within '.comments__comment', match: :first do
-          click_button('Delete')
+          click_link t('workarea.admin.actions.delete')
         end
 
         assert(page.has_content?(t('workarea.admin.content_blogs_comments.flash_messages.destroyed')))

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

@@ -133,15 +133,16 @@ module Workarea
           unpublished = view_model.entries.select { |entry| entry.name == 'Unpublished' }
 
           assert_equal(3, view_model.entries.count)
-          assert unpublished.empty?
+          assert(unpublished.empty?)
+          assert(release.publish!)
 
-          release.as_current do
-            view_model = Workarea::Storefront::BlogViewModel.new(@blog.reload)
-            newly_published = view_model.entries.select { |entry| entry.name == 'Unpublished' }
-
-            assert_equal(4, view_model.entries.count)
-            refute newly_published.empty?
+          view_model = Workarea::Storefront::BlogViewModel.new(@blog.reload)
+          newly_published = view_model.entries.select do |entry|
+            entry.name == 'Unpublished'
           end
+
+          assert_equal(4, view_model.entries.count)
+          refute(newly_published.empty?)
         end
 
         def test_total

data/workarea-blog.gemspec

@@ -8,12 +8,12 @@ Gem::Specification.new do |s|
   s.authors     = ['bcrouse']
   s.email       = ['bcrouse@workarea.com']
   s.homepage    = 'https://github.com/workarea-commerce/workarea-blog'
-  s.summary     = 'Blog plugin for Workarea.'
-  s.description = 'This plugin adds blogs capability to Workarea.'
+  s.summary     = 'Blog plugin for the Workarea Commerce Platform'
+  s.description = 'This plugin adds blogs functionality to the Workarea Commerce Platform.'
 
   s.files = `git ls-files`.split("\n")
 
   s.license = 'Business Software License'
 
-  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-blog
 version: !ruby/object:Gem::Version
-  version: 3.4.9
+  version: 3.5.0
 platform: ruby
 authors:
 - bcrouse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-16 00:00:00.000000000 Z
+date: 2019-11-26 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,8 +29,8 @@ dependencies:
         version: 3.x
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.3.x
-description: This plugin adds blogs capability to Workarea.
+        version: 3.5.x
+description: This plugin adds blogs functionality to the Workarea Commerce Platform.
 email:
 - bcrouse@workarea.com
 executables: []
@@ -39,7 +39,7 @@ extra_rdoc_files: []
 files:
 - ".editorconfig"
 - ".eslintignore"
-- ".eslintrc"
+- ".eslintrc.json"
 - ".github/ISSUE_TEMPLATE/bug_report.md"
 - ".github/ISSUE_TEMPLATE/documentation-request.md"
 - ".github/ISSUE_TEMPLATE/feature_request.md"
@@ -47,9 +47,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".scss-lint.yml"
 - ".stylelintrc.json"
-- ".tailor"
 - ".yardopts"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
@@ -72,10 +70,12 @@ files:
 - app/controllers/workarea/admin/content_blog_entries_controller.rb
 - app/controllers/workarea/admin/content_blogs_controller.rb
 - app/controllers/workarea/admin/create_content_blog_entries_controller.rb
+- app/controllers/workarea/storefront/application_controller.decorator
 - app/controllers/workarea/storefront/blog_comments_controller.rb
 - app/controllers/workarea/storefront/blog_entries_controller.rb
 - app/controllers/workarea/storefront/blogs_controller.rb
 - app/helpers/workarea/admin/blogs_helper.rb
+- app/helpers/workarea/storefront/blogs_helper.rb
 - app/models/workarea/content/blog.rb
 - app/models/workarea/content/blog_comment.rb
 - app/models/workarea/content/blog_entry.rb
@@ -153,7 +153,9 @@ files:
 - bin/rails
 - config/initializers/appends.rb
 - config/initializers/content_block_types.rb
+- config/initializers/fields.rb
 - config/initializers/jump_to_navigation.rb
+- config/initializers/rack_attack.rb
 - config/initializers/seeds.rb
 - config/initializers/workarea.rb
 - config/locales/en.yml
@@ -174,6 +176,7 @@ files:
 - lib/workarea/blog/import/wordpress/page.rb
 - lib/workarea/blog/import/wordpress/page_parser.rb
 - lib/workarea/blog/version.rb
+- package.json
 - test/dummy/Rakefile
 - test/dummy/app/assets/config/manifest.js
 - test/dummy/app/assets/images/.keep
@@ -225,6 +228,7 @@ files:
 - test/fixtures/test_wordpress.xml
 - test/integration/workarea/blog/admin_integration_test.rb
 - test/integration/workarea/blog/create_blog_entries_integration_test.rb
+- test/integration/workarea/blog/rack_attack_integration_test.rb
 - test/integration/workarea/blog/storefront_integration_test.rb
 - test/integration/workarea/blog/wordpress_import_integration_test.rb
 - test/lib/workarea/blog/import/wordpress/attachment_test.rb
@@ -253,6 +257,7 @@ files:
 - test/view_models/workarea/storefront/blog_view_model_test.rb
 - test/workers/workarea/generate_content_blog_metadata_test.rb
 - workarea-blog.gemspec
+- yarn.lock
 homepage: https://github.com/workarea-commerce/workarea-blog
 licenses:
 - Business Software License
@@ -275,5 +280,5 @@ requirements: []
 rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
-summary: Blog plugin for Workarea.
+summary: Blog plugin for the Workarea Commerce Platform
 test_files: []

data/.scss-lint.yml

@@ -1,188 +0,0 @@
-# Extension of the default configuration:
-# https://github.com/causes/scss-lint/blob/master/config/default.yml
-
-linters:
-  Comment:
-    enabled: false
-
-  DeclarationOrder:
-    enabled: true
-
-  ElsePlacement:
-    enabled: true
-    style: new_line
-
-  EmptyRule:
-    enabled: false
-
-  HexLength:
-    enabled: true
-    style: long
-
-  Indentation:
-    enabled: true
-    allow_non_nested_indentation: true
-    character: space
-    width: 4
-
-  LeadingZero:
-    enabled: true
-    style: include_zero
-
-  MergeableSelector:
-    enabled: true
-    force_nesting: false
-
-  PropertySortOrder:
-    enabled: true
-    ignore_unspecified: false
-    separate_groups: false
-    order:
-      - display
-      -
-      - position
-      - top
-      - right
-      - bottom
-      - left
-      - z-index
-      -
-      - margin
-      - margin-top
-      - margin-right
-      - margin-bottom
-      - margin-left
-      -
-      - margin-collapse
-      - margin-top-collapse
-      - margin-right-collapse
-      - margin-bottom-collapse
-      - margin-left-collapse
-      -
-      - padding
-      - padding-top
-      - padding-right
-      - padding-bottom
-      - padding-left
-      -
-      - width
-      - height
-      - max-width
-      - max-height
-      - min-width
-      - min-height
-      -
-      - float
-      - clear
-      -
-      - color
-      -
-      - font
-      - font-size
-      - font-style
-      - font-family
-      - font-weight
-      - font-variant
-      - font-smoothing
-      -
-      - line-height
-      - letter-spacing
-      - word-spacing
-      -
-      - text-align
-      - text-indent
-      - text-shadow
-      - text-overflow
-      - text-rendering
-      - text-transform
-      - text-decoration
-      - text-size-adjust
-      -
-      - word-break
-      - word-wrap
-      -
-      - white-space
-      -
-      - background
-      - background-size
-      - background-color
-      - background-image
-      - background-repeat
-      - background-position
-      - background-attachment
-      -
-      - border
-      - border-top
-      - border-right
-      - border-bottom
-      - border-left
-      -
-      - border-image
-      - border-spacing
-      - border-collapse
-      -
-      - border-color
-      - border-top-color
-      - border-right-color
-      - border-bottom-color
-      - border-left-color
-      -
-      - border-style
-      - border-top-style
-      - border-right-style
-      - border-bottom-style
-      - border-left-style
-      -
-      - border-width
-      - border-top-width
-      - border-right-width
-      - border-bottom-width
-      - border-left-width
-      -
-      - border-radius
-      - border-top-right-radius
-      - border-bottom-right-radius
-      - border-bottom-left-radius
-      - border-top-left-radius
-      - border-radius-topright
-      - border-radius-bottomright
-      - border-radius-bottomleft
-      - border-radius-topleft
-      -
-      - box-shadow
-
-  SelectorFormat:
-    enabled: true
-    convention: hyphenated_BEM
-
-  SingleLinePerSelector:
-    enabled: false
-
-  SpaceAfterPropertyColon:
-    enabled: true
-    style: at_least_one_space
-
-  SpaceBeforeBrace:
-    enabled: true
-    style: space
-    allow_single_line_padding: true
-
-  VariableForProperty:
-    enabled: true
-    properties:
-      - color
-      - font-family
-      - background-color
-
-  # These default settings may be problematic to implementors. They are not
-  # ommitted so that they may be adjusted as needed during an implementation.
-  #
-  # For documentation:
-  # https://github.com/causes/scss-lint/blob/master/lib/scss_lint/linter/README.md
-
-  DuplicateProperty:
-    enabled: true
-
-  PropertySpelling:
-    enabled: true
-    extra_properties: [] # Add experimental CSS to this array, if needed