thredded 0.8.4 → 0.9.1

data/lib/generators/thredded/install/templates/initializer.rb

@@ -108,3 +108,31 @@ Thredded.layout = 'thredded/application'
 #     'hi'
 #   end
 # end
+
+# ==> Topic following
+#
+# By default, a user will be subscribed to a topic they've created. Uncomment this to not subscribe them:
+#
+# Thredded.auto_follow_when_creating_topic = false
+#
+# By default, a user will be subscribed to (follow) a topic they post in. Uncomment this to not subscribe them:
+#
+# Thredded.auto_follow_when_posting_in_topic = false
+#
+# By default, a user will be subscribed to the topic they get @-mentioned in.
+# Individual users can disable this in the Notification Settings.
+# To change the default for all users, simply change the default value of the `follow_topics_on_mention` column
+# of the `thredded_user_preferences` and `thredded_user_messageboard_preferences` tables.
+
+# ==> Notifiers
+#
+# Change how users can choose to be notified, by adding notifiers here, or removing the initializer altogether
+#
+# default:
+# Thredded.notifiers = [Thredded::EmailNotifier.new]
+#
+# none:
+# Thredded.notifiers = []
+#
+# add in (must install separate gem (under development) as well):
+# Thredded.notifiers = [Thredded::EmailNotifier.new, Thredded::PushoverNotifier.new(ENV['PUSHOVER_APP_ID'])]

data/lib/thredded.rb

@@ -19,6 +19,7 @@ require 'inline_svg'
 require 'thredded/html_pipeline/at_mention_filter'
 require 'thredded/html_pipeline/autolink_filter'
 require 'thredded/html_pipeline/kramdown_filter'
+require 'thredded/html_pipeline/wrap_iframes_filter'
 
 # Asset compilation
 require 'autoprefixer-rails'
@@ -32,6 +33,9 @@ require 'thredded/version'
 require 'thredded/engine'
 require 'thredded/errors'
 
+require 'thredded/view_hooks/config'
+require 'thredded/view_hooks/renderer'
+
 # Require Thredded::ContentFormatter explicitly so that it doesn't need to be required if used in the initializer.
 require 'thredded/content_formatter'
 
@@ -61,12 +65,23 @@ module Thredded
   # @return [Boolean] Whether posts that are pending moderation are visible to regular users.
   mattr_accessor :content_visible_while_pending_moderation
 
+  # @return [Array] The notifiers, by default just the EmailNotifier
+  mattr_accessor :notifiers
+
   # @return [Boolean] Whether users that are following a topic are listed on topic page.
   mattr_accessor :show_topic_followers
 
   # @return [Symbol] The name of the method used by Thredded to display users
   mattr_accessor :user_display_name_method
 
+  # @return [Boolean] Whether the user should get subscribed to a new topic they've created.
+  mattr_accessor :auto_follow_when_creating_topic
+  self.auto_follow_when_creating_topic = true
+
+  # @return [Boolean] Whether the user should get subscribed to a topic after posting in it.
+  mattr_accessor :auto_follow_when_posting_in_topic
+  self.auto_follow_when_posting_in_topic = true
+
   self.active_user_threshold = 5.minutes
   self.admin_column = :admin
   self.avatar_url = ->(user) { Gravatar.src(user.email, 128, 'mm') }
@@ -87,6 +102,15 @@ module Thredded
     instance
   end
 
+  def self.notifiers
+    @@notifiers ||= [Thredded::EmailNotifier.new] # rubocop:disable Style/ClassVars
+  end
+
+  def self.notifiers=(notifiers)
+    notifiers.each { |notifier| BaseNotifier.validate_notifier(notifier) }
+    @@notifiers = notifiers # rubocop:disable Style/ClassVars
+  end
+
   def self.user_display_name_method
     @@user_display_name_method || user_name_column
   end
@@ -103,14 +127,14 @@ module Thredded
 
   # @return [Class<Thredded::UserExtender>] the user class from the host application.
   def self.user_class
-    fail 'Please use a string instead of a class' if @@user_class.is_a?(Class)
-
-    if @@user_class.is_a?(String)
-      begin
-        Object.const_get(@@user_class)
-      rescue NameError
-        @@user_class.constantize
-      end
+    # This is nil before the initializer is installed.
+    return nil if @@user_class.nil?
+    fail 'Please use a String instead of a Class' if @@user_class.is_a?(Class)
+    fail "user_class must be a String, got #{@@user_class.inspect}" unless @@user_class.is_a?(String)
+    begin
+      Object.const_get(@@user_class)
+    rescue NameError
+      @@user_class.constantize
     end
   end
 

data/lib/thredded/content_formatter.rb

@@ -25,11 +25,12 @@ module Thredded
         'a'      => %w(href rel),
         'iframe' => %w(src width height frameborder allowfullscreen sandbox seamless),
         'span'   => %w(class),
+        'div'    => %w(class)
       },
       add_attributes: {
         'iframe' => {
           'seamless' => 'seamless',
-          'sandbox'  => 'allow-same-origin allow-scripts allow-forms',
+          'sandbox'  => 'allow-same-origin allow-scripts allow-forms allow-popups allow-popups-to-escape-sandbox',
         }
       },
       protocols: {
@@ -63,7 +64,7 @@ module Thredded
       Thredded::HtmlPipeline::AutolinkFilter,
       HTML::Pipeline::EmojiFilter,
       Thredded::HtmlPipeline::AtMentionFilter,
-      HTML::Pipeline::SanitizationFilter,
+      Thredded::HtmlPipeline::WrapIframesFilter,
     ]
 
     # Filters that sanitize the resulting HTML.

data/lib/thredded/database_seeder.rb

@@ -231,12 +231,14 @@ module Thredded
       MODEL_CLASS = PrivateTopic
 
       def create(count: 1)
-        FactoryGirl.create_list(
-          :private_topic, count,
-          user: seeder.users[1..-1].sample,
-          last_user: seeder.users.sample,
-          users: [seeder.first_user]
-        )
+        Array.new(count) do
+          FactoryGirl.create(
+            :private_topic,
+            user: seeder.users[1..-1].sample,
+            last_user: seeder.users.sample,
+            users: [seeder.first_user, *seeder.users.sample(1 + rand(3))]
+          )
+        end
       end
     end
 
@@ -274,8 +276,9 @@ module Thredded
       def create(count: (1..1))
         log "Creating #{count} additional posts in each private topic..."
         seeder.private_topics.flat_map do |topic|
-          (count.min + rand(count.max + 1)).times do
-            FactoryGirl.create(:private_post, postable: topic, user: seeder.users.sample)
+          (count.min + rand(count.max + 1)).times do |i|
+            author = i.zero? ? topic.user : topic.users.sample
+            FactoryGirl.create(:private_post, postable: topic, user: author)
           end
         end
       end

data/lib/thredded/db_tools.rb

@@ -0,0 +1,82 @@
+# frozen_string_literal: true
+module Thredded
+  module DbTools
+    class << self
+      MIGRATION_SPEC_SOURCE_VERSION = 'v0.8'
+
+      def dump_file
+        File.expand_path("../../../spec/migration/#{MIGRATION_SPEC_SOURCE_VERSION}.#{adapter}.dump", __FILE__)
+      end
+
+      def dump(to = dump_file)
+        case adapter
+        when /sqlite/i
+          system "sqlite3 #{Rails.root.join(database)} .dump > #{to}"
+        when /postgres/i
+          cmd = "pg_dump --host #{host} --username #{username} --verbose --clean --no-owner --no-acl --format=c " \
+            "#{database} > #{to}"
+          system cmd
+        when /mysql/i
+          system("mysqldump --user #{username} -p#{password} #{database} > #{to}")
+        end
+      end
+
+      def restore(from = dump_file)
+        case adapter
+        when /postgres/i
+          cmd = [
+            "pg_restore --verbose --host #{host}",
+            "--username #{username}",
+            ' --clean --no-owner --no-acl ',
+            " --dbname #{database} #{from}",
+            " > #{Rails.root.join('log/restore.log')}"
+          ].join(' ')
+          system cmd
+        when /mysql/i, /sqlite/i
+          connection = ActiveRecord::Base.connection
+          statements = File.read(from).split(/;$/)
+          statements.pop
+          silence_active_record do
+            ActiveRecord::Base.transaction do
+              statements.each do |statement|
+                connection.execute(statement) unless statement =~ /(BEGIN TRANSACTION|COMMIT)/
+              end
+            end
+          end
+        end
+      end
+
+      def silence_active_record
+        was = ActiveRecord::Base.logger.level
+        ActiveRecord::Base.logger.level = Logger::WARN
+        yield
+      ensure
+        ActiveRecord::Base.logger.level = was
+      end
+
+      def config
+        @config ||= Rails.configuration.database_configuration[Rails.env]
+      end
+
+      def adapter
+        config['adapter']
+      end
+
+      def database
+        config['database']
+      end
+
+      def username
+        config['username']
+      end
+
+      def password
+        config['password']
+      end
+
+      def host
+        config['host']
+      end
+    end
+  end
+end

data/lib/thredded/html_pipeline/wrap_iframes_filter.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+module Thredded
+  module HtmlPipeline
+    # Wraps iframes with a <div class="thredded--embed-16-by-9"/>
+    class WrapIframesFilter < ::HTML::Pipeline::Filter
+      def call
+        doc.css('iframe').wrap('<div class="thredded--embed-16-by-9"/>')
+        doc
+      end
+    end
+  end
+end

data/lib/thredded/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thredded
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.9.1
 platform: ruby
 authors:
 - Joel Oliveira
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-19 00:00:00.000000000 Z
+date: 2016-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pundit
@@ -451,14 +451,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.42.0
+        version: 0.45.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.42.0
+        version: 0.45.0
 - !ruby/object:Gem::Dependency
   name: rails-i18n
   requirement: !ruby/object:Gem::Requirement
@@ -713,14 +713,19 @@ files:
 - app/models/concerns/thredded/content_moderation_state.rb
 - app/models/concerns/thredded/friendly_id_reserved_words_and_pagination.rb
 - app/models/concerns/thredded/moderation_state.rb
+- app/models/concerns/thredded/notifier_preference.rb
 - app/models/concerns/thredded/post_common.rb
+- app/models/concerns/thredded/search_parser.rb
 - app/models/concerns/thredded/topic_common.rb
+- app/models/concerns/thredded/topics_search.rb
 - app/models/concerns/thredded/user_topic_read_state_common.rb
 - app/models/thredded/category.rb
 - app/models/thredded/messageboard.rb
 - app/models/thredded/messageboard_group.rb
+- app/models/thredded/messageboard_notifications_for_followed_topics.rb
 - app/models/thredded/messageboard_user.rb
-- app/models/thredded/null_preference.rb
+- app/models/thredded/notifications_for_followed_topics.rb
+- app/models/thredded/notifications_for_private_topics.rb
 - app/models/thredded/null_user.rb
 - app/models/thredded/null_user_topic_read_state.rb
 - app/models/thredded/post.rb
@@ -747,6 +752,8 @@ files:
 - app/models/thredded/user_private_topic_read_state.rb
 - app/models/thredded/user_topic_follow.rb
 - app/models/thredded/user_topic_read_state.rb
+- app/notifiers/thredded/base_notifier.rb
+- app/notifiers/thredded/email_notifier.rb
 - app/policies/thredded/messageboard_group_policy.rb
 - app/policies/thredded/messageboard_policy.rb
 - app/policies/thredded/post_policy.rb
@@ -821,8 +828,10 @@ files:
 - app/views/thredded/private_topics/_no_private_topics.html.erb
 - app/views/thredded/private_topics/_private_topic.html.erb
 - app/views/thredded/private_topics/edit.html.erb
+- app/views/thredded/private_topics/header/_participant.html.erb
 - app/views/thredded/private_topics/index.html.erb
 - app/views/thredded/private_topics/new.html.erb
+- app/views/thredded/private_topics/private_topic/_participant.html.erb
 - app/views/thredded/private_topics/show.html.erb
 - app/views/thredded/search/_form.html.erb
 - app/views/thredded/shared/_breadcrumbs.html.erb
@@ -865,6 +874,7 @@ files:
 - db/upgrade_migrations/20160611094616_upgrade_v0_5_to_v0_6.rb
 - db/upgrade_migrations/20160723012349_upgrade_v0_6_to_v0_7.rb
 - db/upgrade_migrations/20161019150201_upgrade_v0_7_to_v0_8.rb
+- db/upgrade_migrations/20161113161801_upgrade_v0_8_to_v0_9.rb
 - lib/generators/thredded/install/USAGE
 - lib/generators/thredded/install/install_generator.rb
 - lib/generators/thredded/install/templates/initializer.rb
@@ -872,13 +882,13 @@ files:
 - lib/thredded.rb
 - lib/thredded/content_formatter.rb
 - lib/thredded/database_seeder.rb
+- lib/thredded/db_tools.rb
 - lib/thredded/engine.rb
 - lib/thredded/errors.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/search_parser.rb
-- lib/thredded/topics_search.rb
+- lib/thredded/html_pipeline/wrap_iframes_filter.rb
 - lib/thredded/version.rb
 - lib/thredded/view_hooks/config.rb
 - lib/thredded/view_hooks/renderer.rb
@@ -903,7 +913,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: The best Rails forums engine ever.

data/app/models/thredded/null_preference.rb

@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-module Thredded
-  class NullPreference
-    def follow_topics_on_mention
-      true
-    end
-
-    def notify_on_message
-      true
-    end
-
-    def followed_topic_emails
-      true
-    end
-  end
-end