thredded 0.14.4 → 0.15.1

data/lib/thredded/email_transformer.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'thredded/email_transformer/onebox'
+require 'thredded/email_transformer/spoiler'
 
 module Thredded
   # This transformer should applied to emails so that they render correctly in the email clients.
@@ -11,8 +12,10 @@ module Thredded
   #     Rails.application.config.roadie.before_transformation = Thredded::EmailTransformer
   #
   module EmailTransformer
-    mattr_accessor :transformers
-    self.transformers = [Onebox]
+    class << self
+      attr_accessor :transformers
+    end
+    @transformers = [Onebox, Spoiler]
 
     # @param doc [Nokogiri::HTML::Document]
     def self.call(doc)

data/lib/thredded/email_transformer/spoiler.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require 'thredded/email_transformer/base'
+module Thredded
+  module EmailTransformer
+    # Changes the spoiler tags to work in emails.
+    class Spoiler < Base
+      def call
+        doc.css('.thredded--post--content--spoiler--summary').each do |node|
+          node.content = I18n.t('thredded.posts.spoiler_summary_for_email')
+        end
+        doc.css('.thredded--post--content--spoiler--contents img').each do |img|
+          text = "#{img['src']} #{" (#{img['alt']})" if img['alt'].present?}"
+          img.swap(
+            if img.parent.name == 'a' && img.parent.children.size == 1
+              doc.document.create_text_node(text)
+            else
+              doc.document.create_element('a', text, href: img['src'], target: '_blank')
+            end
+          )
+        end
+      end
+    end
+  end
+end

data/lib/thredded/formatting_demo_content.rb

@@ -8,6 +8,18 @@ module Thredded
     end
     self.parts = [
       <<-'MARKDOWN',
+#### Spoilers
+
+Use `<spoiler></spoiler>` tags to create spoiler boxes like this one:
+
+<spoiler>
+Harry Potter books are better than the movies.
+
+![nyancat](https://storage.googleapis.com/glebm-stuff/nyancat.gif)
+
+https://www.youtube.com/watch?v=5lBBUPVuusM
+</spoiler>
+
 #### Oneboxes
 
 URLs of supported resources are replaced with boxes like these:

data/lib/thredded/html_pipeline/onebox_filter.rb

@@ -5,6 +5,8 @@ require 'onebox'
 module Thredded
   module HtmlPipeline
     class OneboxFilter < ::HTML::Pipeline::Filter
+      include ::Thredded::HtmlPipeline::Utils
+
       SANITIZE_CONFIG = Sanitize::Config.merge(
         Sanitize::Config::ONEBOX,
         attributes: {
@@ -51,7 +53,7 @@ module Thredded
           next unless url.present? && url == element.content && on_its_own_line?(element)
           onebox_html = render_onebox_with_cache(url)
           next if onebox_html.empty?
-          fixup_paragraph! element
+          extract_block_from_paragraph! element
           element.swap onebox_html
         end
         doc
@@ -101,43 +103,6 @@ module Thredded
         nodes.take_while { |node| !node_name?(node, 'br') }
           .all? { |node| node.text? && node.blank? }
       end
-
-      def fixup_paragraph!(element)
-        # Can't have a div inside a paragraph, so split the paragraph
-        p = element.parent
-        return unless node_name?(p, 'p')
-        children_after = p.children[p.children.index(element) + 1..-1]
-        remove_leading_blanks! children_after
-        # Move the onebox out of and after the paragraph
-        p.add_next_sibling element
-        # Move all the elements after the onebox to a new paragraph
-        unless children_after.empty?
-          new_p = Nokogiri::XML::Node.new 'p', doc
-          element.add_next_sibling new_p
-          children_after.each { |child| new_p.add_child child }
-        end
-        # The original paragraph might have been split just after a <br> or whitespace, remove them if so:
-        remove_leading_blanks! p.children.reverse
-        p.remove if p.children.empty?
-      end
-
-      # @param children [Nokogiri::XML::NodeSet]
-      def remove_leading_blanks!(children)
-        to_remove = children.take_while do |c|
-          if node_name?(c, 'br') || c.text? && c.content.blank?
-            c.remove
-            true
-          else
-            c.content = c.content.lstrip
-            false
-          end
-        end
-        to_remove.each { |c| children.delete(c) }
-      end
-
-      def node_name?(node, node_name)
-        node && node.node_name && node.node_name.casecmp(node_name).zero?
-      end
     end
   end
 end

data/lib/thredded/html_pipeline/spoiler_tag_filter.rb

@@ -0,0 +1,128 @@
+# frozen_string_literal: true
+
+module Thredded
+  module HtmlPipeline
+    module SpoilerTagFilter
+      PLACEHOLDER_START_CLASS = 'thredded-spoiler-placeholder-start-24uob7bajv5'
+      PLACEHOLDER_END_CLASS = 'thredded-spoiler-placeholder-end-24uob7bajv5'
+      PLACEHOLDER_START_BLOCK = "<p class='#{PLACEHOLDER_START_CLASS}' title='%s'></p>"
+      PLACEHOLDER_END_BLOCK = "<p class='#{PLACEHOLDER_END_CLASS}' title='%s'></p>"
+      PLACEHOLDER_START_SPAN = "<i class='#{PLACEHOLDER_START_CLASS}' title='%s'></i>"
+      PLACEHOLDER_END_SPAN = "<i class='#{PLACEHOLDER_END_CLASS}' title='%s'></i>"
+
+      class << self
+        # @return [[[String, String]]] Pairs of opening and closing spoiler tags.
+        attr_reader :spoiler_tags
+
+        # @api private
+        attr_reader :spoiler_tags_replacements
+
+        # @api private
+        attr_reader :spoiler_tags_inverse_replacements
+
+        # @param [[[String, String]]] spoiler_tags
+        def spoiler_tags=(spoiler_tags)
+          @spoiler_tags = spoiler_tags.freeze
+          @spoiler_tags_replacements = spoiler_tags.flat_map.with_index do |(open, close), i|
+            [[/((?:\A|\r?\n|>)[ ]*)#{Regexp.escape(open)}(?=[ \t]*\r?(?:\n|\z))/, "\\1#{PLACEHOLDER_START_BLOCK % i}"],
+             [/((?:\A|\r?\n|>)[ ]*)#{Regexp.escape(close)}(?=[ \t]*\r?(?:\n|\z))/, "\\1#{PLACEHOLDER_END_BLOCK % i}"],
+             [open, PLACEHOLDER_START_SPAN % i],
+             [close, PLACEHOLDER_END_SPAN % i]]
+          end
+          @spoiler_tags_inverse_replacements = spoiler_tags.flat_map.with_index do |(open, close), i|
+            [[PLACEHOLDER_START_BLOCK % i, open],
+             [PLACEHOLDER_END_BLOCK % i, close],
+             [PLACEHOLDER_START_SPAN % i, open],
+             [PLACEHOLDER_END_SPAN % i, close]]
+          end
+        end
+      end
+
+      self.spoiler_tags = [
+        %w[<spoiler> </spoiler>],
+      ].freeze
+
+      class BeforeMarkup < ::HTML::Pipeline::Filter
+        def call
+          @html = +html # Unfreeze
+          SpoilerTagFilter.spoiler_tags_replacements.each do |(pattern, replacement)|
+            html.gsub! pattern, replacement
+          end
+          html
+        end
+      end
+
+      class AfterMarkup < ::HTML::Pipeline::Filter
+        include ::Thredded::HtmlPipeline::Utils
+
+        SPOILER_START = [PLACEHOLDER_START_BLOCK, PLACEHOLDER_START_SPAN].freeze
+        SPOILER_END = [PLACEHOLDER_END_BLOCK, PLACEHOLDER_END_SPAN].freeze
+
+        def call
+          doc.css(".#{PLACEHOLDER_START_CLASS}").each do |placeholder_start|
+            process(placeholder_start)
+          end
+          doc.search('.//text()').each do |node|
+            content = +node.content # Unfreeze
+            SpoilerTagFilter.spoiler_tags_inverse_replacements.each do |(pattern, replacement)|
+              content.gsub! pattern, replacement
+            end
+            node.content = content
+          end
+          doc
+        end
+
+        protected
+
+        # @param [Nokogiri::XML::Document] document
+        # @param [Array<Nokogiri::XML::Node>] children
+        def build_spoiler_tag(document, children)
+          document.create_element(
+            'div',
+            class: 'thredded--post--content--spoiler',
+            tabindex: 0,
+            role: 'figure',
+            'aria-expanded' => 'false',
+          ) << document.create_element(
+            'div',
+            I18n.t('thredded.posts.spoiler_summary'),
+            class: 'thredded--post--content--spoiler--summary',
+            'aria-hidden' => 'false',
+          ) << document.create_element(
+            'div',
+            class: 'thredded--post--content--spoiler--contents',
+            'aria-hidden' => 'true',
+          ) { |contents_tag| children.each { |child| contents_tag.add_child child } }
+        end
+
+        private
+
+        def process(placeholder_start)
+          placeholder_end, children = find_placeholder_end(placeholder_start)
+          placeholder_start.remove
+          return if !placeholder_end || children.empty?
+          spoiler_tag = placeholder_end.replace(build_spoiler_tag(doc.document, children))
+          extract_block_from_paragraph! spoiler_tag
+          spoiler_tag
+        end
+
+        def find_placeholder_end(sibling)
+          children = []
+          placeholder_end = nil
+          loop do
+            sibling = sibling.next_sibling
+            break if sibling.nil?
+            if sibling[:class] == PLACEHOLDER_START_CLASS
+              sibling = process(sibling) || sibling
+            elsif sibling[:class] == PLACEHOLDER_END_CLASS
+              placeholder_end = sibling
+              break
+            end
+            children << sibling
+          end
+          [placeholder_end, children]
+        end
+      end
+    end
+  end
+end

data/lib/thredded/html_pipeline/utils.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+module Thredded
+  module HtmlPipeline
+    module Utils
+      private
+
+      # If the given block element is contained in a paragraph, splits the paragraph and removes unnecessary whitespace.
+      # @param [Nokogiri::HTML::Node] element the block element that may be inside a paragraph.
+      def extract_block_from_paragraph!(element)
+        p = element.parent
+        return unless node_name?(p, 'p')
+        children_after = p.children[p.children.index(element) + 1..-1]
+        remove_leading_blanks! children_after
+        # Move the element out of and after the paragraph
+        p.add_next_sibling element
+        # Move all the elements after the onebox to a new paragraph
+        unless children_after.empty?
+          new_p = Nokogiri::XML::Node.new 'p', doc
+          element.add_next_sibling new_p
+          children_after.each { |child| new_p.add_child child }
+        end
+        # The original paragraph might have been split just after a <br> or whitespace, remove them if so:
+        remove_leading_blanks! p.children.reverse
+        p.remove if p.children.empty?
+      end
+
+      # @param children [Nokogiri::XML::NodeSet]
+      def remove_leading_blanks!(children)
+        to_remove = children.take_while do |c|
+          if node_name?(c, 'br') || c.text? && c.content.blank?
+            c.remove
+            true
+          else
+            c.content = c.content.lstrip
+            false
+          end
+        end
+        to_remove.each { |c| children.delete(c) }
+      end
+
+      def node_name?(node, node_name)
+        node && node.node_name && node.node_name.casecmp(node_name).zero?
+      end
+    end
+  end
+end

data/lib/thredded/rails_lt_5_2_arel_case_node.rb

@@ -0,0 +1,119 @@
+# frozen_string_literal: true
+
+module Arel
+  module Nodes
+    class Case < Arel::Nodes::Node
+      include Arel::OrderPredications
+      include Arel::Predications
+      include Arel::AliasPredication
+
+      attr_accessor :case, :conditions, :default
+
+      def initialize(expression = nil, default = nil)
+        @case = expression
+        @conditions = []
+        @default = default
+      end
+
+      def when(condition, expression = nil)
+        @conditions << When.new(Nodes.build_quoted(condition), expression)
+        self
+      end
+
+      def then(expression)
+        @conditions.last.right = Nodes.build_quoted(expression)
+        self
+      end
+
+      def else(expression)
+        @default = Else.new Nodes.build_quoted(expression)
+        self
+      end
+
+      def initialize_copy(other)
+        super
+        @case = @case.clone if @case
+        @conditions = @conditions.map(&:clone)
+        @default = @default.clone if @default
+      end
+
+      def hash
+        [@case, @conditions, @default].hash
+      end
+
+      def eql?(other)
+        self.class == other.class &&
+          self.case == other.case &&
+          conditions == other.conditions &&
+          default == other.default
+      end
+
+      alias == eql?
+    end
+
+    class When < Binary
+    end
+
+    class Else < Unary
+    end
+  end
+end
+
+module Arel
+  module Visitors
+    class DepthFirst < Arel::Visitors::Visitor
+      alias visit_Arel_Nodes_Else unary
+
+      def visit_Arel_Nodes_Case(o) # rubocop:disable Style/MethodName
+        visit o.case
+        visit o.conditions
+        visit o.default
+      end
+
+      alias visit_Arel_Nodes_When binary
+    end
+  end
+end
+
+module Arel
+  module Predications
+    def when(right)
+      Nodes::Case.new(self).when quoted_node(right)
+    end
+  end
+end
+
+module Arel
+  module Visitors
+    class ToSql < Arel::Visitors::Reduce
+      def visit_Arel_Nodes_Case(o, collector) # rubocop:disable Style/MethodName
+        collector << 'CASE '
+        if o.case
+          visit o.case, collector
+          collector << ' '
+        end
+        o.conditions.each do |condition|
+          visit condition, collector
+          collector << ' '
+        end
+        if o.default
+          visit o.default, collector
+          collector << ' '
+        end
+        collector << 'END'
+      end
+
+      def visit_Arel_Nodes_When(o, collector) # rubocop:disable Style/MethodName
+        collector << 'WHEN '
+        visit o.left, collector
+        collector << ' THEN '
+        visit o.right, collector
+      end
+
+      def visit_Arel_Nodes_Else(o, collector) # rubocop:disable Style/MethodName
+        collector << 'ELSE '
+        visit o.expr, collector
+      end
+    end
+  end
+end

data/lib/thredded/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Thredded
-  VERSION = '0.14.4'
+  VERSION = '0.15.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thredded
 version: !ruby/object:Gem::Version
-  version: 0.14.4
+  version: 0.15.1
 platform: ruby
 authors:
 - Joel Oliveira
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-29 00:00:00.000000000 Z
+date: 2018-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pundit
@@ -157,14 +157,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.17.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.17.0
 - !ruby/object:Gem::Dependency
   name: onebox
   requirement: !ruby/object:Gem::Requirement
@@ -174,7 +174,7 @@ dependencies:
         version: '1.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.13
+        version: 1.8.48
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -184,7 +184,7 @@ dependencies:
         version: '1.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.13
+        version: 1.8.48
 - !ruby/object:Gem::Dependency
   name: html-pipeline
   requirement: !ruby/object:Gem::Requirement
@@ -633,20 +633,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: coffee-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: |-
   The best Rails 4.2+ forums engine ever. Its goal is to be as simple and feature rich as possible.
   Thredded works with SQLite, MySQL (v5.6.4+), and PostgreSQL. See the demo at https://thredded.org/.
@@ -686,6 +672,7 @@ files:
 - app/assets/javascripts/thredded/components/post_form.es6
 - app/assets/javascripts/thredded/components/preview_area.es6
 - app/assets/javascripts/thredded/components/quote_post.es6
+- app/assets/javascripts/thredded/components/spoilers.es6
 - app/assets/javascripts/thredded/components/time_stamps.es6
 - app/assets/javascripts/thredded/components/topic_form.es6
 - app/assets/javascripts/thredded/components/topics.es6
@@ -738,6 +725,7 @@ files:
 - app/assets/stylesheets/thredded/components/_post.scss
 - app/assets/stylesheets/thredded/components/_preferences.scss
 - app/assets/stylesheets/thredded/components/_preview_area.scss
+- app/assets/stylesheets/thredded/components/_spoiler.scss
 - app/assets/stylesheets/thredded/components/_topic-delete.scss
 - app/assets/stylesheets/thredded/components/_topic-header.scss
 - app/assets/stylesheets/thredded/components/_topics.scss
@@ -900,6 +888,7 @@ files:
 - app/views/thredded/posts/edit.html.erb
 - app/views/thredded/posts/new.html.erb
 - app/views/thredded/posts_common/_actions.html.erb
+- app/views/thredded/posts_common/_before_first_unread_post.html.erb
 - app/views/thredded/posts_common/_content.html.erb
 - app/views/thredded/posts_common/_form.html.erb
 - app/views/thredded/posts_common/_header.html.erb
@@ -943,6 +932,7 @@ files:
 - app/views/thredded/shared/_breadcrumbs.html.erb
 - app/views/thredded/shared/_content_moderation_blocked_state.html.erb
 - app/views/thredded/shared/_currently_online.html.erb
+- app/views/thredded/shared/_field_errors.html.erb
 - app/views/thredded/shared/_flash_messages.html.erb
 - app/views/thredded/shared/_header.html.erb
 - app/views/thredded/shared/_nav.html.erb
@@ -995,12 +985,14 @@ files:
 - db/upgrade_migrations/20170125033319_upgrade_v0_9_to_v0_10.rb
 - db/upgrade_migrations/20170312131417_upgrade_thredded_v0_10_to_v0_11.rb
 - db/upgrade_migrations/20170420163138_upgrade_thredded_v0_11_to_v0_12.rb
-- db/upgrade_migrations/20170811090735_upgrade_thredded_v0_13_to_v_014.rb
+- db/upgrade_migrations/20170811090735_upgrade_thredded_v0_13_to_v0_14.rb
+- db/upgrade_migrations/20180110200009_upgrade_thredded_v0_14_to_v0_15.rb
 - lib/generators/thredded/install/USAGE
 - lib/generators/thredded/install/install_generator.rb
 - lib/generators/thredded/install/templates/initializer.rb
 - lib/tasks/thredded_tasks.rake
 - lib/thredded.rb
+- lib/thredded/arel_compat.rb
 - lib/thredded/base_migration.rb
 - lib/thredded/base_notifier.rb
 - lib/thredded/collection_to_strings_with_cache_renderer.rb
@@ -1010,6 +1002,7 @@ files:
 - lib/thredded/email_transformer.rb
 - lib/thredded/email_transformer/base.rb
 - lib/thredded/email_transformer/onebox.rb
+- lib/thredded/email_transformer/spoiler.rb
 - lib/thredded/engine.rb
 - lib/thredded/errors.rb
 - lib/thredded/formatting_demo_content.rb
@@ -1017,7 +1010,10 @@ files:
 - lib/thredded/html_pipeline/autolink_filter.rb
 - lib/thredded/html_pipeline/kramdown_filter.rb
 - lib/thredded/html_pipeline/onebox_filter.rb
+- lib/thredded/html_pipeline/spoiler_tag_filter.rb
+- lib/thredded/html_pipeline/utils.rb
 - lib/thredded/html_pipeline/wrap_iframes_filter.rb
+- lib/thredded/rails_lt_5_2_arel_case_node.rb
 - lib/thredded/version.rb
 - lib/thredded/view_hooks/config.rb
 - lib/thredded/view_hooks/renderer.rb