thredded 0.10.1 → 0.11.0

data/lib/thredded/email_transformer/onebox.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+require 'thredded/email_transformer/base'
+module Thredded
+  module EmailTransformer
+    # Wraps oneboxes with tables, because only tables can have borders in most email clients.
+    class Onebox < Base
+      def call
+        doc.css('aside.onebox').each do |onebox|
+          table = Nokogiri::XML::Node.new('table', doc)
+          table['class'] = 'onebox-wrapper-table'
+          onebox.swap table
+          table
+            .add_child(Nokogiri::XML::Node.new('tr', doc))
+            .add_child(Nokogiri::XML::Node.new('td', doc))
+            .add_child(onebox)
+        end
+      end
+    end
+  end
+end

data/lib/thredded/formatting_demo_content.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+module Thredded
+  # Content for demo-ing formatting functionality
+  module FormattingDemoContent
+    class << self
+      attr_accessor :parts
+    end
+    self.parts = [
+      <<-'MARKDOWN',
+#### Oneboxes
+
+URLs of supported resources are replaced with boxes like these:
+
+**Twitter** `https://twitter.com/thredded/status/838824533477982209`:
+https://twitter.com/thredded/status/838824533477982209
+**StackExchange** `http://codegolf.stackexchange.com/questions/45701`:
+http://codegolf.stackexchange.com/questions/45701
+**Amazon** `https://www.amazon.co.uk/dp/0521797071`:
+https://www.amazon.co.uk/dp/0521797071
+**YouTube** `https://www.youtube.com/watch?v=1QP7elXwpLw`:
+https://www.youtube.com/watch?v=1QP7elXwpLw
+**Google Maps** `https://goo.gl/maps/R6nj3Qwf2LR2`:
+https://goo.gl/maps/R6nj3Qwf2LR2
+
+Many more resources are [supported](https://github.com/discourse/onebox/tree/master/lib/onebox/engine). Powered by the [onebox](https://github.com/discourse/onebox) library.
+      MARKDOWN
+    ]
+  end
+end

data/lib/thredded/html_pipeline/kramdown_filter.rb

@@ -19,7 +19,11 @@ module Thredded
 
       def initialize(text, context = nil, result = nil)
         super text, context, result
-        @text.delete! "\r"
+        if @text.frozen?
+          @text = @text.delete("\r")
+        else
+          @text.delete! "\r"
+        end
       end
 
       # Convert Markdown to HTML using the best available implementation

data/lib/thredded/html_pipeline/onebox_filter.rb

@@ -0,0 +1,136 @@
+# frozen_string_literal: true
+require 'onebox'
+
+module Thredded
+  module HtmlPipeline
+    class OneboxFilter < ::HTML::Pipeline::Filter
+      SANITIZE_CONFIG = Sanitize::Config.merge(
+        Sanitize::Config::ONEBOX,
+        attributes: {
+          'a' => Sanitize::Config::ONEBOX[:attributes]['a'] + %w(target),
+        },
+        add_attributes: {
+          'iframe' => {
+            'seamless' => 'seamless',
+            'sandbox' => 'allow-same-origin allow-scripts allow-forms allow-popups allow-popups-to-escape-sandbox',
+          }
+        },
+        transformers: (Sanitize::Config::ONEBOX[:transformers] || []) + [
+          lambda do |env|
+            next unless env[:node_name] == 'a'
+            a_tag = env[:node]
+            a_tag['href'] ||= '#'
+            if a_tag['href'] =~ %r{^(?:[a-z]+:)?//}
+              a_tag['target'] = '_blank'
+              a_tag['rel']    = 'nofollow noopener'
+            else
+              a_tag.remove_attribute('target')
+            end
+          end
+        ]
+      )
+
+      class << self
+        # In development and test, caching is usually disabled.
+        # Regardless, always store the onebox in a file cache to enable offline development,
+        # persistence between test runs, and to improve performance.
+        attr_accessor :onebox_views_cache
+        attr_accessor :onebox_data_cache
+      end
+
+      if Rails.env.development? || Rails.env.test?
+        self.onebox_views_cache = ActiveSupport::Cache::FileStore.new('tmp/cache/onebox-views')
+        self.onebox_data_cache = ActiveSupport::Cache::FileStore.new('tmp/cache/onebox-data')
+      end
+
+      def call
+        doc.css('a').each do |element|
+          url = element['href'].to_s
+          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
+          element.swap onebox_html
+        end
+        doc
+      end
+
+      private
+
+      def render_onebox_with_cache(url)
+        onebox_views_cache.fetch("onebox-views:#{url}#{':p' if context[:onebox_placeholders]}",
+                                 expires_in: context[:onebox_views_cache_expires_in] || 1.week) do
+          render_onebox(url)
+        end
+      end
+
+      def render_onebox(url)
+        preview = Onebox.preview(url, onebox_options(url))
+        if context[:onebox_placeholders]
+          %(<p><a href="#{ERB::Util.html_escape(url)}" target="_blank" rel="nofollow noopener">) \
+          "#{preview.placeholder_html}</a></p>"
+        else
+          preview.to_s.strip
+        end
+      end
+
+      def onebox_options(_url)
+        { cache: context[:onebox_data_cache] || self.class.onebox_data_cache || Rails.cache,
+          sanitize_config: SANITIZE_CONFIG }
+      end
+
+      def onebox_views_cache
+        context[:onebox_views_cache] || self.class.onebox_views_cache || Rails.cache
+      end
+
+      def on_its_own_line?(element)
+        siblings = element.parent.children
+        element_index = siblings.index(element)
+        all_blank_until_br?(siblings[0...element_index].reverse) &&
+          all_blank_until_br?(siblings[element_index + 1..-1])
+      end
+
+      def all_blank_until_br?(nodes)
+        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/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Thredded
-  VERSION = '0.10.1'
+  VERSION = '0.11.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thredded
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.11.0
 platform: ruby
 authors:
 - Joel Oliveira
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-12 00:00:00.000000000 Z
+date: 2017-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pundit
@@ -166,35 +166,27 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: html-pipeline
+  name: onebox
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+        version: '1.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: html-pipeline-vimeo
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.3
 - !ruby/object:Gem::Dependency
-  name: html-pipeline-youtube
+  name: html-pipeline
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -375,6 +367,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  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'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
@@ -571,6 +577,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.1
+- !ruby/object:Gem::Dependency
+  name: roadie-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'
 - !ruby/object:Gem::Dependency
   name: i18n-tasks
   requirement: !ruby/object:Gem::Requirement
@@ -667,6 +687,18 @@ extra_rdoc_files: []
 files:
 - MIT-LICENSE
 - README.md
+- app/assets/images/favicons/README.md
+- app/assets/images/favicons/amazon.png
+- app/assets/images/favicons/github.png
+- app/assets/images/favicons/google_branding/logo_calendar_128px.png
+- app/assets/images/favicons/google_branding/logo_docs_48px.png
+- app/assets/images/favicons/google_branding/logo_drive_48px.png
+- app/assets/images/favicons/google_branding/logo_forms_48px.png
+- app/assets/images/favicons/google_branding/logo_sheets_48px.png
+- app/assets/images/favicons/google_branding/logo_slides_48px.png
+- app/assets/images/favicons/stackexchange.png
+- app/assets/images/favicons/twitter.png
+- app/assets/images/favicons/wikipedia.png
 - app/assets/images/thredded/breadcrumb-chevron.svg
 - app/assets/images/thredded/follow.svg
 - app/assets/images/thredded/moderation.svg
@@ -696,6 +728,7 @@ files:
 - app/assets/stylesheets/thredded.scss
 - app/assets/stylesheets/thredded/_base.scss
 - app/assets/stylesheets/thredded/_dependencies.scss
+- app/assets/stylesheets/thredded/_email.scss
 - app/assets/stylesheets/thredded/_thredded.scss
 - app/assets/stylesheets/thredded/base/_alerts.scss
 - app/assets/stylesheets/thredded/base/_buttons.scss
@@ -717,6 +750,7 @@ files:
 - app/assets/stylesheets/thredded/components/_main-section.scss
 - app/assets/stylesheets/thredded/components/_mention-autocomplete.scss
 - app/assets/stylesheets/thredded/components/_messageboard.scss
+- app/assets/stylesheets/thredded/components/_onebox.scss
 - app/assets/stylesheets/thredded/components/_pagination.scss
 - app/assets/stylesheets/thredded/components/_post-form.scss
 - app/assets/stylesheets/thredded/components/_post.scss
@@ -736,10 +770,9 @@ files:
 - app/assets/stylesheets/thredded/utilities/_is-compact.scss
 - app/assets/stylesheets/thredded/utilities/_is-expanded.scss
 - app/commands/thredded/at_notification_extractor.rb
-- app/commands/thredded/autofollow_mentioned_users.rb
+- app/commands/thredded/autofollow_users.rb
 - app/commands/thredded/create_messageboard.rb
 - app/commands/thredded/mark_all_read.rb
-- app/commands/thredded/members_marked_notified.rb
 - app/commands/thredded/moderate_post.rb
 - app/commands/thredded/notify_following_users.rb
 - app/commands/thredded/notify_private_topic_users.rb
@@ -801,7 +834,6 @@ files:
 - app/models/thredded/null_user_topic_read_state.rb
 - app/models/thredded/post.rb
 - app/models/thredded/post_moderation_record.rb
-- app/models/thredded/post_notification.rb
 - app/models/thredded/private_post.rb
 - app/models/thredded/private_topic.rb
 - app/models/thredded/private_user.rb
@@ -949,11 +981,13 @@ files:
 - app/views/thredded/users/_post.html.erb
 - app/views/thredded/users/_posts.html.erb
 - bin/rails
+- bin/rubocop
 - config/i18n-tasks.yml
 - config/locales/en.yml
 - config/locales/es.yml
 - config/locales/pl.yml
 - config/locales/pt-BR.yml
+- config/locales/ru.yml
 - config/routes.rb
 - db/migrate/20160329231848_create_thredded.rb
 - db/seeds.rb
@@ -965,6 +999,7 @@ files:
 - db/upgrade_migrations/20161019150201_upgrade_v0_7_to_v0_8.rb
 - db/upgrade_migrations/20161113161801_upgrade_v0_8_to_v0_9.rb
 - db/upgrade_migrations/20170125033319_upgrade_v0_9_to_v0_10.rb
+- db/upgrade_migrations/20170312131417_upgrade_thredded_v0_10_to_v0_11.rb
 - lib/generators/thredded/install/USAGE
 - lib/generators/thredded/install/install_generator.rb
 - lib/generators/thredded/install/templates/initializer.rb
@@ -974,11 +1009,16 @@ files:
 - lib/thredded/content_formatter.rb
 - lib/thredded/database_seeder.rb
 - lib/thredded/db_tools.rb
+- lib/thredded/email_transformer.rb
+- lib/thredded/email_transformer/base.rb
+- lib/thredded/email_transformer/onebox.rb
 - lib/thredded/engine.rb
 - lib/thredded/errors.rb
+- lib/thredded/formatting_demo_content.rb
 - lib/thredded/html_pipeline/at_mention_filter.rb
 - 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/wrap_iframes_filter.rb
 - lib/thredded/version.rb
 - lib/thredded/view_hooks/config.rb

data/app/commands/thredded/autofollow_mentioned_users.rb

@@ -1,31 +0,0 @@
-# frozen_string_literal: true
-module Thredded
-  class AutofollowMentionedUsers
-    def initialize(post)
-      @post = post
-    end
-
-    def run
-      autofollowers.each do |user|
-        Thredded::UserTopicFollow.create_unless_exists(user.id, post.postable_id, :mentioned)
-      end
-    end
-
-    def autofollowers
-      autofollowers = Thredded::AtNotificationExtractor.new(post).run
-      autofollowers.delete(post.user)
-      exclude_those_opting_out_of_at_notifications autofollowers
-    end
-
-    private
-
-    attr_reader :post
-
-    def exclude_those_opting_out_of_at_notifications(members)
-      members.select do |member|
-        member.thredded_user_preference.follow_topics_on_mention? &&
-          member.thredded_user_messageboard_preferences.in(post.messageboard).follow_topics_on_mention?
-      end
-    end
-  end
-end

data/app/commands/thredded/members_marked_notified.rb

@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-module Thredded
-  class MembersMarkedNotified
-    def initialize(post, members)
-      @post = post
-      @members = members
-    end
-
-    def run
-      members.each do |member|
-        post.post_notifications.create(email: member.email)
-      end
-    end
-
-    private
-
-    attr_reader :post, :members
-  end
-end