RubyGems - thredded - Versions diffs - 0.0.10 → 0.0.12 - Mend

thredded 0.0.10 → 0.0.12

Files changed (47) hide show

checksums.yaml +4 -4
data/README.mkdn +25 -0
data/app/controllers/thredded/application_controller.rb +31 -13
data/app/controllers/thredded/posts_controller.rb +9 -7
data/app/controllers/thredded/topics_controller.rb +14 -33
data/app/decorators/thredded/post_decorator.rb +10 -1
data/app/decorators/thredded/topic_decorator.rb +2 -2
data/app/decorators/thredded/user_topic_decorator.rb +2 -3
data/app/helpers/thredded/application_helper.rb +0 -5
data/app/models/thredded/ability.rb +10 -2
data/app/models/thredded/attachment.rb +1 -1
data/app/models/thredded/messageboard.rb +1 -0
data/app/models/thredded/post.rb +63 -13
data/app/models/thredded/topic.rb +10 -8
data/app/uploaders/thredded/attachment_uploader.rb +1 -1
data/app/uploaders/thredded/image_uploader.rb +1 -2
data/app/views/thredded/messageboards/index.html.erb +3 -0
data/app/views/thredded/post_mailer/at_notification.html.erb +1 -1
data/app/views/thredded/posts/_post.html.erb +15 -15
data/app/views/thredded/posts/edit.html.erb +3 -0
data/app/views/thredded/posts/index.html.erb +3 -0
data/app/views/thredded/preferences/edit.html.erb +3 -0
data/app/views/thredded/private_topics/index.html.erb +3 -0
data/app/views/thredded/private_topics/new.html.erb +3 -0
data/app/views/thredded/setups/new.html.erb +2 -1
data/app/views/thredded/topic_mailer/message_notification.html.erb +1 -1
data/app/views/thredded/topics/_topic_form.html.erb +1 -1
data/app/views/thredded/topics/by_category.html.erb +3 -0
data/app/views/thredded/topics/edit.html.erb +3 -0
data/app/views/thredded/topics/index.html.erb +3 -0
data/app/views/thredded/topics/new.html.erb +3 -0
data/app/views/thredded/topics/search.html.erb +3 -0
data/lib/html/pipeline/at_mention_filter.rb +19 -0
data/lib/{thredded/filter/attachment.rb → html/pipeline/attached_image_filter.rb} +18 -10
data/lib/html/pipeline/bbcode_filter.rb +19 -0
data/lib/thredded.rb +15 -7
data/lib/thredded/errors.rb +22 -0
data/lib/thredded/topic_user_permissions.rb +6 -2
data/lib/thredded/version.rb +1 -1
metadata +54 -17
data/lib/thredded/filter.rb +0 -4
data/lib/thredded/filter/at_notification.rb +0 -11
data/lib/thredded/filter/base.rb +0 -13
data/lib/thredded/filter/bbcode.rb +0 -75
data/lib/thredded/filter/emoji.rb +0 -11
data/lib/thredded/filter/markdown.rb +0 -25
data/lib/thredded/filter/syntax.rb +0 -28

checksums.yaml CHANGED

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63f6eebe937c5b969d191a5650bb160b07b5976a
-  data.tar.gz: 73b1e243259935e0f8e80a653ffe4c922e581e28
+  metadata.gz: df7af89356e2a063cd53eb323694e5e5ddce74a4
+  data.tar.gz: fffc4fd4e91f2828b3d45dd7761bf01861dc8802
 SHA512:
-  metadata.gz: f38401e4c39f48e55dd2def77978ab913d662a13012de3e013fd0f67d4fd62bf7df03bc259cb5e933442ca6234aed36537e2a45ddfa04e3a03b97dc4d2793825
-  data.tar.gz: 718c48c5501ecb3712ae25c7113bdcf457de3eb6cc1a72fce282a825c9dd5644a548ecd5d1da3667cec8b41c5cb1219a2b1aa791cf83566c960a758620517198
+  metadata.gz: 77112aabf3ce777664be0d5c19cad1449d7d6cc67f67c04ac82b23b3c2a134b176a30c5a0a59f6eade60ab860004f4a9f17c183810f3a615247b33f9d716e32f
+  data.tar.gz: 49465daf00d25b2bd94dfe37d0b322049f4d8b32864f3674dfb92b9207a6b24d28cbe1ae2e2e650e7f59b83e13f2226e85d30f2bf3410da8285f2c098914694e

data/README.mkdn CHANGED

@@ -16,6 +16,10 @@ Thredded.email_incoming_host = 'incoming.example.com'
 Thredded.email_from = 'no-reply@example.com'
 Thredded.email_outgoing_prefix = '[Thredded] '
 Thredded.user_path = ->(user){ "/path/to/where/you/show/#{user}" }
+Thredded.file_storage = :file # or :fog
+Thredded.asset_root = 'http://assets.website.com/assets' # where important things, like emojis, might live
+Thredded.layout = 'thredded' # looks for `app/views/layouts/thredded.html.erb`
+Thredded.avatar_default = 'mm' # or other gravatar defaults or URL to an image
 ```
 Copy the migrations over to your parent application and migrate:
@@ -44,4 +48,25 @@ class User < ActiveRecord::Base
 end
 ```
+2. Ensure you have a view layout that thredded will wrap around its views.
+A couple of notes with regards to your layout.
+* When using route helpers -- eg: `new_session_path`, et al -- make sure to prepend main_app to the helper: `main_app.new_session_path` as rails engines like thredded will not know about those routes' existence unless explicitly told so.
+* As noted above, by default thredded will look for a layout file in your application called `thredded.html.erb`. If you would like to use something else, like your main application layout, you may change it to that in your initializer.
+* The chosen layout has two content_tags available to yield - `:thredded_page_title` and `:thredded_page_id`. The views within thredded pass those up through to your layout if you would like to use them.  Example layout:
+```html
+<html>
+  <head>
+  <title>My Application | <%= yield :thredded_page_title %></title>
+  </head>
+  <body id="<%= yield :thredded_page_id %>">
+    <%= yield %>
+  </body>
+</html>
+```
+* * *
 For more information see [the full-fledged rails app](https://github.com/jayroh/thredded_app)

data/app/controllers/thredded/application_controller.rb CHANGED

@@ -1,24 +1,48 @@
 module Thredded
   class ApplicationController < ::ApplicationController
     helper Thredded::Engine.helpers
-    helper_method :messageboard, :topic, :preferences
+    helper_method :messageboard, :preferences
+    layout Thredded.layout
+    rescue_from CanCan::AccessDenied,
+      Thredded::Errors::MessageboardNotFound,
+      Thredded::Errors::MessageboardReadDenied,
+      Thredded::Errors::TopicCreateDenied do |exception|
-    rescue_from CanCan::AccessDenied do |exception|
       redirect_to thredded.root_path, alert: exception.message
     end
-    rescue_from Thredded::Errors::MessageboardNotFound do |exception|
-      redirect_to thredded.root_path, alert: exception.message
+    rescue_from Thredded::Errors::EmptySearchResults,
+      Thredded::Errors::TopicNotFound do |exception|
+      redirect_to messageboard_topics_path(messageboard),
+        alert: exception.message
     end
     private
-    def update_user_activity
-      if messageboard && current_user
-        messageboard.update_activity_for!(current_user)
+    def authorize_reading(obj)
+      if cannot? :read, obj
+        class_name = obj.class.to_s
+        error = class_name
+          .gsub(/Thredded::/, 'Thredded::Errors::') + 'ReadDenied'
+        raise error.constantize
+      end
+    end
+    def authorize_creating(obj)
+      if cannot? :create, obj
+        class_name = obj.class.to_s
+        error = class_name
+          .gsub(/Thredded::/, 'Thredded::Errors::') + 'CreateDenied'
+        raise error.constantize
       end
     end
+    def update_user_activity
+      messageboard.update_activity_for!(current_user)
+    end
     def current_ability
       @current_ability ||= Ability.new(current_user)
     end
@@ -32,11 +56,5 @@ module Thredded
         @preferences ||= UserPreference.where(user_id: current_user.id).first
       end
     end
-    def topic
-      if messageboard
-        @topic ||= messageboard.topics.find(params[:topic_id])
-      end
-    end
   end
 end

data/app/controllers/thredded/posts_controller.rb CHANGED

@@ -4,14 +4,15 @@ module Thredded
     helper_method :messageboard, :topic, :user_topic
     before_filter :update_user_activity
-    rescue_from Thredded::Errors::TopicNotFound do |exception|
-      redirect_to messageboard_topics_path(messageboard), alert: exception.message
-    end
     def index
       authorize! :read, topic
-      @posts = topic.posts.page(current_page)
+      @posts = Post
+        .where(topic_id: topic.id)
+        .includes(:user, :messageboard, :topic, :attachments)
+        .order('id ASC')
+        .page(current_page)
       @post  = messageboard.posts.build(topic: topic)
       update_read_status!
@@ -23,11 +24,12 @@ module Thredded
     end
     def edit
-      authorize! :manage, post
+      authorize! :edit, post
     end
     def update
-      post.update_attributes(post_params)
+      post.update_attributes(post_params.except(:user, :ip))
       redirect_to messageboard_topic_posts_url(messageboard, topic)
     end

data/app/controllers/thredded/topics_controller.rb CHANGED

@@ -1,36 +1,23 @@
 module Thredded
   class TopicsController < Thredded::ApplicationController
-    helper_method :current_page
+    helper_method :current_page, :topic
     before_filter :update_user_activity
     def index
-      if cannot? :read, messageboard
-        error = 'You are not authorized access to this messageboard.'
-        redirect_to default_home, flash: { error: error }
-      end
+      authorize_reading messageboard
       @topics = topics
     end
     def search
-      @topics = search_results
-      if @topics.empty?
-        error = 'No topics found for this search.'
-        redirect_to messageboard_topics_path(messageboard),
-          flash: { error: error }
-      end
+      @topics = Topic.search(params[:q], messageboard)
     end
     def new
       @topic = messageboard.topics.build
       @topic.posts.build
-      unless can? :create, @topic
-        error = 'Sorry, you are not authorized to post on this messageboard.'
-        redirect_to messageboard_topics_url(messageboard),
-          flash: { error: error }
-      end
+      authorize_creating @topic
     end
     def by_category
@@ -55,9 +42,16 @@ module Thredded
     private
     def topic
-      if messageboard
-        @topic ||= messageboard.topics.friendly.find(params[:id])
-      end
+      @topic ||= messageboard.topics.find_by_slug(params[:id])
+    end
+    def topics
+      Topic
+        .public
+        .for_messageboard(messageboard)
+        .includes(:user_topic_reads, :categories, :messageboard, :last_user, :user)
+        .order_by_stuck_and_updated_time
+        .on_page(current_page)
     end
     def topic_params
@@ -88,10 +82,6 @@ module Thredded
         })
     end
-    def search_results
-      Topic.full_text_search(params[:q], messageboard)
-    end
     def topics_by_category(category_id)
       topics = Category.find(category_id)
         .topics
@@ -102,15 +92,6 @@ module Thredded
         .on_page(current_page)
     end
-    def topics
-      Topic
-        .public
-        .for_messageboard(messageboard)
-        .includes(:user_topic_reads)
-        .order_by_stuck_and_updated_time
-        .on_page(current_page)
-    end
     def current_page
       params[:page] || 1
     end

data/app/decorators/thredded/post_decorator.rb CHANGED

@@ -15,6 +15,15 @@ module Thredded
       end
     end
+    def user_link
+      if post.user
+        user_path = Thredded.user_path(post.user)
+        "<a href='#{user_path}'>#{post.user}</a>".html_safe
+      else
+        '<a href="#">?</a>'.html_safe
+      end
+    end
     def original
       post
     end
@@ -36,7 +45,7 @@ module Thredded
     end
     def gravatar_url
-      super.gsub /http:/, ''
+      super.gsub(/http:/, '')
     end
     private

data/app/decorators/thredded/topic_decorator.rb CHANGED

@@ -24,12 +24,12 @@ module Thredded
     end
     def last_user_link
-      if last_user && last_user.valid?
+      if last_user && last_user.to_s != 'Anonymous User'
         last_user_path = Thredded.user_path(last_user)
         "<a href='#{last_user_path}'>#{last_user}</a>".html_safe
       else
-        'Anonymous'
+        last_user.to_s
       end
     end

data/app/decorators/thredded/user_topic_decorator.rb CHANGED

@@ -55,7 +55,7 @@ module Thredded
     end
     def user_link
-      if topic.user && topic.user.valid?
+      if topic.user && topic.user.to_s != 'Anonymous User'
         user_path = Thredded.user_path(topic.user)
         "<a href='#{user_path}'>#{topic.user}</a>".html_safe
       else
@@ -63,7 +63,6 @@ module Thredded
       end
     end
     def decorated_topic
       @decorated_topic ||= TopicDecorator.new(topic)
     end
@@ -73,7 +72,7 @@ module Thredded
     attr_reader :topic, :user
     def read_status
-      if user.valid?
+      if user.id > 0
         @read_status ||= topic.user_topic_reads.select do |reads|
           reads.user_id == user.id
         end

data/app/helpers/thredded/application_helper.rb CHANGED

@@ -1,9 +1,4 @@
 module Thredded
   module ApplicationHelper
-    def method_missing(method, *args, &block)
-      main_app.send(method, *args, &block)
-    rescue NoMethodError
-      super
-    end
   end
 end

data/app/models/thredded/ability.rb CHANGED

@@ -12,8 +12,16 @@ module Thredded
         Thredded::MessageboardUserPermissions.new(messageboard, user).readable?
       end
-      can :manage, Thredded::Topic do |topic|
-        Thredded::TopicUserPermissions.new(topic, user, user_details).manageable?
+      can :admin, Thredded::Topic do |topic|
+        Thredded::TopicUserPermissions.new(topic, user, user_details).adminable?
+      end
+      can :edit, Thredded::Topic do |topic|
+        Thredded::TopicUserPermissions.new(topic, user, user_details).editable?
+      end
+      can :update, Thredded::Topic do |topic|
+        Thredded::TopicUserPermissions.new(topic, user, user_details).editable?
       end
       can :read, Thredded::Topic do |topic|

data/app/models/thredded/attachment.rb CHANGED

@@ -1,6 +1,6 @@
 module Thredded
   class Attachment < ActiveRecord::Base
-    belongs_to :post
+    belongs_to :post, touch: true
     validates_presence_of :attachment
     mount_uploader :attachment, Thredded::AttachmentUploader
     before_save :update_attachment_attributes

data/app/models/thredded/messageboard.rb CHANGED

@@ -53,6 +53,7 @@ module Thredded
     def active_users
       Role
         .joins(:user)
+        .includes(:user)
         .where(messageboard_id: self.id)
         .where('last_seen > ?', 5.minutes.ago)
         .order(:last_seen)

data/app/models/thredded/post.rb CHANGED

@@ -4,14 +4,8 @@ require 'gravtastic'
 module Thredded
   class Post  < ActiveRecord::Base
     include Gravtastic
-    include Thredded::Filter::Base
-    include Thredded::Filter::Bbcode
-    include Thredded::Filter::Markdown
-    include Thredded::Filter::Attachment
-    include Thredded::Filter::Emoji
-    include Thredded::Filter::AtNotification
-    gravtastic :user_email
+    gravtastic :user_email, default: Thredded.avatar_default
     paginates_per 50
     belongs_to :messageboard, counter_cache: true
@@ -28,10 +22,6 @@ module Thredded
     after_save :notify_at_users
     after_create :modify_parent_posts_counts
-    def self.default_scope
-      order('id ASC')
-    end
     def created_date
       created_at.strftime("%b %d, %Y %I:%M:%S %Z") if created_at
     end
@@ -41,15 +31,75 @@ module Thredded
     end
     def gravatar_url
-      super.gsub /http:/, ''
+      super.gsub(/http:/, '')
     end
     def self.filters
       ['bbcode', 'markdown']
     end
+    def filtered_content
+      pipeline = HTML::Pipeline.new [
+        HTML::Pipeline::AttachedImageFilter,
+        html_filter_for_pipeline,
+        HTML::Pipeline::SanitizationFilter,
+        HTML::Pipeline::AtMentionFilter,
+        HTML::Pipeline::EmojiFilter,
+        HTML::Pipeline::AutolinkFilter,
+      ], context_options
+      result = pipeline.call(content)
+      result[:output].to_s
+    end
     private
+    def context_options
+      {
+        asset_root: Thredded.asset_root,
+        post: self,
+        whitelist: sanitize_whitelist
+      }
+    end
+    def sanitize_whitelist
+      HTML::Pipeline::SanitizationFilter::WHITELIST.deep_merge({
+        attributes: {
+          'code' => ['class'],
+          'img' => ['src', 'class', 'width', 'height'],
+          'blockquote' => ['class'],
+        },
+        transformers: [
+          lambda do |env|
+            node      = env[:node]
+            node_name = env[:node_name]
+            return if env[:is_whitelisted] || !node.element?
+            return if node_name != 'iframe'
+            return if (node['src'] =~ /\A(https?:)?\/\/(?:www\.)?youtube(?:-nocookie)?\.com\//).nil?
+            Sanitize.clean_node!(node, {
+              elements: %w[iframe],
+              attributes: {
+                'iframe' => %w[allowfullscreen frameborder height src width]
+              }
+            })
+            { node_whitelist: [node]}
+          end
+        ]
+      })
+    end
+    def html_filter_for_pipeline
+      if filter == 'bbcode'
+        HTML::Pipeline::BbcodeFilter
+      else
+        HTML::Pipeline::MarkdownFilter
+      end
+    end
     def modify_parent_posts_counts
       Thredded::UserDetail.increment_counter(:posts_count, user_id)
       topic.last_user = user

data/app/models/thredded/topic.rb CHANGED

@@ -62,15 +62,17 @@ module Thredded
       order('sticky DESC, updated_at DESC')
     end
-    def self.full_text_search(query, messageboard)
-      if query.empty?
-        []
-      else
-        sql_builder = Thredded::SearchSqlBuilder.new(query, messageboard)
-        sql = sql_builder.build
-        sql_params = [sql].concat(sql_builder.binds)
-        find_by_sql sql_params
+    def self.search(query, messageboard)
+      sql_builder = Thredded::SearchSqlBuilder.new(query, messageboard)
+      sql = sql_builder.build
+      sql_params = [sql].concat(sql_builder.binds)
+      results = find_by_sql(sql_params)
+      if results.empty?
+        raise Thredded::Errors::EmptySearchResults, query
       end
+      results
     end
     def self.decorate

data/app/uploaders/thredded/attachment_uploader.rb CHANGED

@@ -3,7 +3,7 @@ require 'carrierwave/processing/mini_magick'
 module Thredded
   class AttachmentUploader < CarrierWave::Uploader::Base
     include CarrierWave::MiniMagick
-    storage :file
+    storage Thredded.file_storage
     def store_dir
       "uploads/#{mounted_as}/#{model.id}"

data/app/uploaders/thredded/image_uploader.rb CHANGED

@@ -3,8 +3,7 @@ require 'carrierwave/processing/mini_magick'
 module Thredded
   class ImageUploader < CarrierWave::Uploader::Base
     include CarrierWave::MiniMagick
-    storage :file
+    storage Thredded.file_storage
     def store_dir
       "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"

data/app/views/thredded/messageboards/index.html.erb CHANGED

@@ -1,3 +1,6 @@
+<% content_for :thredded_page_title, 'Messageboards' %>
+<% content_for :thredded_page_id, 'thredded_messageboards_index' %>
 <header>
   <nav>
     <ul class="breadcrumbs">

data/app/views/thredded/post_mailer/at_notification.html.erb CHANGED

@@ -1,6 +1,6 @@
 <p><span style="font-size:11px; color: gray;">- write above this line to post a reply -</span></p>
-<%= @post.filtered_content %>
+<%== @post.filtered_content %>
 <hr />

data/app/views/thredded/posts/_post.html.erb CHANGED

@@ -1,7 +1,7 @@
-<% post = Thredded::PostDecorator.new(post) %>
+<% cache [current_user, 'post', post] do %>
+  <% post = Thredded::PostDecorator.new(post) %>
-<%= content_tag_for(:article, post) do %>
-  <% cache post do %>
+  <%= content_tag_for(:article, post) do %>
     <header>
       <%= image_tag post.gravatar_url, class: 'avatar' %>
       <cite>
@@ -11,19 +11,19 @@
     </header>
     <div class="content">
-      <p><%= post.filtered_content %></p>
+      <%== post.filtered_content %>
       <ul class="attachments"><%= render post.attachments %></ul>
     </div>
-  <% end %>
-  <footer>
-    <% if can? :edit, post.original %>
-      <%= link_to 'edit post', edit_messageboard_topic_post_path(
-          messageboard,
-          topic,
-          post
-        ),
-        class: 'edit' %>
-    <% end %>
-  </footer>
+    <footer>
+      <% if can? :edit, post.original %>
+        <%= link_to 'edit post', edit_messageboard_topic_post_path(
+            messageboard,
+            topic,
+            post
+          ),
+          class: 'edit' %>
+      <% end %>
+    </footer>
+  <% end %>
 <% end %>

data/app/views/thredded/posts/edit.html.erb CHANGED

@@ -1,3 +1,6 @@
+<% content_for :thredded_page_title, 'Edit Post' %>
+<% content_for :thredded_page_id, 'thredded_edit_post' %>
 <header>
   <nav>
     <ul class="breadcrumbs">

data/app/views/thredded/posts/index.html.erb CHANGED

@@ -1,3 +1,6 @@
+<% content_for :thredded_page_title, topic.title %>
+<% content_for :thredded_page_id, 'thredded_posts' %>
 <% content_for :breadcrumbs do %>
   <ul class="breadcrumbs">
     <li><%= link_to 'Forums', thredded.root_path %></li>

data/app/views/thredded/preferences/edit.html.erb CHANGED

@@ -1,3 +1,6 @@
+<% content_for :thredded_page_title, 'Messageboard Preferences' %>
+<% content_for :thredded_page_id, 'thredded_preferences' %>
 <fieldset>
   <legend>Update Preferences For <%= messageboard.name %></legend>

data/app/views/thredded/private_topics/index.html.erb CHANGED

@@ -1,3 +1,6 @@
+<% content_for :thredded_page_title, 'Private Topics' %>
+<% content_for :thredded_page_id, 'thredded_private_topics_index' %>
 <% content_for :breadcrumbs do %>
   <ul class="breadcrumbs">
     <li><%= link_to 'Forums', thredded.root_path %></li>

data/app/views/thredded/private_topics/new.html.erb CHANGED

@@ -1,3 +1,6 @@
+<% content_for :thredded_page_title, 'Create a New Private Topic' %>
+<% content_for :thredded_page_id, 'thredded_new_private_topic' %>
 <header>
   <nav>
     <ul class="breadcrumbs">

data/app/views/thredded/setups/new.html.erb CHANGED

@@ -1,4 +1,5 @@
-<% content_for :page_title do %>Thredded Setup<% end %>
+<% content_for :thredded_page_title, 'Set Up Thredded' %>
+<% content_for :thredded_page_id, 'thredded_new_setup' %>
 <h1>Setup</h1>

data/app/views/thredded/topic_mailer/message_notification.html.erb CHANGED

@@ -1,6 +1,6 @@
 <p><span style="font-size:11px; color: gray;">- write above this line to post a reply -</span></p>
-<%= @topic.posts.first.filtered_content %>
+<%== @topic.posts.first.filtered_content %>
 <hr />

data/app/views/thredded/topics/_topic_form.html.erb CHANGED

@@ -6,7 +6,7 @@
   </li>
 <% end %>
-<% if can? :manage, form.object %>
+<% if can? :admin, form.object %>
   <li class="locked">
     <%= form.label :locked do %>
       Locked <%= form.check_box :locked %>

data/app/views/thredded/topics/by_category.html.erb CHANGED

@@ -1,3 +1,6 @@
+<% content_for :thredded_page_title, 'Topic Categories' %>
+<% content_for :thredded_page_id, 'thredded_topic_categories' %>
 <% content_for :breadcrumbs do %>
   <ul class="breadcrumbs">
     <li><%= link_to 'Forums', thredded.root_path %></li>

data/app/views/thredded/topics/edit.html.erb CHANGED

@@ -1,3 +1,6 @@
+<% content_for :thredded_page_title, "Edit \"#{topic.title}\"" %>
+<% content_for :thredded_page_id, 'thredded_edit_topic' %>
 <header>
   <nav>
     <ul class="breadcrumbs">

data/app/views/thredded/topics/index.html.erb CHANGED

@@ -1,3 +1,6 @@
+<% content_for :thredded_page_title, 'Topics' %>
+<% content_for :thredded_page_id, 'thredded_topics_index' %>
 <% content_for :breadcrumbs do %>
   <ul class="breadcrumbs">
     <li><%= link_to 'Forums', thredded.root_path %></li>

data/app/views/thredded/topics/new.html.erb CHANGED

@@ -1,3 +1,6 @@
+<% content_for :thredded_page_title, 'Create a New Topic' %>
+<% content_for :thredded_page_id, 'thredded_new_topic' %>
 <header>
   <nav>
     <ul class="breadcrumbs">

data/app/views/thredded/topics/search.html.erb CHANGED

@@ -1,3 +1,6 @@
+<% content_for :thredded_page_title, 'Search Results' %>
+<% content_for :thredded_page_id, 'thredded_topic_search_results' %>
 <% content_for :breadcrumbs do %>
   <ul class="breadcrumbs">
     <li><%= link_to 'Forums', thredded.root_path %></li>

data/lib/html/pipeline/at_mention_filter.rb ADDED

@@ -0,0 +1,19 @@
+require 'thredded/at_users'
+module HTML
+  class Pipeline
+    class AtMentionFilter < Filter
+      def initialize(text, context = nil, result = nil)
+        super text, context, result
+        @text = text.to_s.gsub "\r", ''
+        @post = context[:post]
+      end
+      def call
+        html = Thredded::AtUsers.render(@text, @post.messageboard)
+        html.rstrip!
+        html
+      end
+    end
+  end
+end

data/lib/{thredded/filter/attachment.rb → html/pipeline/attached_image_filter.rb} RENAMED

@@ -1,9 +1,16 @@
-module Thredded
-  module Filter
-    module Attachment
-      def filtered_content
-        content = super
-        matches = content.scan(/(?<full>\[t:(?<tag>\w+)=?(?<img_nmb>\d+)? ?(?<attribs>[^\]]+)?\])/)
+module HTML
+  class Pipeline
+    class AttachedImageFilter < Filter
+      def initialize(text, context = nil, result = nil)
+        super text, context, result
+        @text = text.gsub "\r", ''
+        @post = context[:post]
+      end
+      def call
+        html = @text
+        matches = @text.scan(/(?<full>\[t:(?<tag>\w+)=?(?<img_nmb>\d+)? ?(?<attribs>[^\]]+)?\])/)
         matches.each do |match|
           str_buff = ''
@@ -12,7 +19,7 @@ module Thredded
           img_number = match[2] ? match[2].to_i - 1 : 0 # default to first attachment
           attribs = match[3]
-          if(tag != 'img' || !self.attachments[img_number])
+          if(tag != 'img' || !@post.attachments[img_number])
             next
           end
@@ -20,7 +27,7 @@ module Thredded
           str_buff += '<img '
           # get attachment object at spot img_number - 1
-          attachment = self.attachments[img_number]
+          attachment = @post.attachments[img_number]
           str_buff += 'src="' + attachment.attachment.to_s + '" '
           # do attribute stuff, left right first
@@ -41,11 +48,12 @@ module Thredded
           str_buff += '/>'
           # replace in post content
-          content = content.sub(full, str_buff)
+          html = html.sub(full, str_buff)
         end
-        content.html_safe
+        html
       end
     end
   end
 end

data/lib/html/pipeline/bbcode_filter.rb ADDED

@@ -0,0 +1,19 @@
+require 'bbcoder'
+module HTML
+  class Pipeline
+    class BbcodeFilter < TextFilter
+      def initialize(text, context = {}, result = nil)
+        super text, context, result
+        @context = context
+        @text = @text.gsub "\r", ''
+      end
+      def call
+        html = BBCoder.new(@text).to_html.gsub(/\n|\r\n/, '<br />')
+        html.rstrip!
+        "<p>#{html}</p>"
+      end
+    end
+  end
+end

data/lib/thredded.rb CHANGED

@@ -7,24 +7,32 @@ require 'friendly_id'
 require 'nested_form'
 require 'thredded/email_processor'
 require 'thredded/errors'
-require 'thredded/filter/base'
 require 'thredded/at_notifier'
-require 'thredded/filter/at_notification'
-require 'thredded/filter/attachment'
-require 'thredded/filter/bbcode'
-require 'thredded/filter/emoji'
-require 'thredded/filter/markdown'
+require 'html/pipeline'
+require 'html/pipeline/bbcode_filter'
+require 'html/pipeline/attached_image_filter'
+require 'html/pipeline/at_mention_filter'
 require 'thredded/messageboard_user_permissions'
 require 'thredded/post_user_permissions'
 require 'thredded/private_topic_user_permissions'
 require 'thredded/topic_user_permissions'
+require 'thredded/search_sql_builder'
 module Thredded
   mattr_accessor :user_class,
     :email_incoming_host,
     :email_from,
     :email_outgoing_prefix,
-    :user_path
+    :user_path,
+    :file_storage,
+    :asset_root,
+    :layout,
+    :avatar_default
+  self.file_storage = :file # or :fog
+  self.asset_root = '' # or fully qualified URI to assets
+  self.layout = 'thredded'
+  self.avatar_default = 'mm'
   def self.user_class
     if @@user_class.is_a?(Class)

data/lib/thredded/errors.rb CHANGED

@@ -14,5 +14,27 @@ module Thredded
         'This messageboard does not exist.'
       end
     end
+    class MessageboardReadDenied < Thredded::Error
+      def message
+        'You are not authorized access to this messageboard.'
+      end
+    end
+    class TopicCreateDenied < Thredded::Error
+      def message
+        'You are not authorized to post in this messageboard.'
+      end
+    end
+    class EmptySearchResults < Thredded::Error
+      def initialize(query)
+        @query = query
+      end
+      def message
+        "There are no results for your search - '#{@query}'"
+      end
+    end
   end
 end

data/lib/thredded/topic_user_permissions.rb CHANGED

@@ -13,8 +13,12 @@ module Thredded
       member? || messageboard_restrictions_allow?
     end
-    def manageable?
-      superadmin? || started_by_user? || administrates_messageboard?
+    def adminable?
+      superadmin? || administrates_messageboard?
+    end
+    def editable?
+      superadmin? || administrates_messageboard? || started_by_user?
     end
     def readable?

data/lib/thredded/version.rb CHANGED

@@ -1,3 +1,3 @@
 module Thredded
-  VERSION = '0.0.10'
+  VERSION = '0.0.12'
 end

metadata CHANGED

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: thredded
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.12
 platform: ruby
 authors:
 - Joel Oliveira
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-11-09 00:00:00.000000000 Z
+date: 2014-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bb-ruby
+  name: bbcoder
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: unf
+  name: fog
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: fog
+  name: friendly_id
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -95,7 +95,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: friendly_id
+  name: gemoji
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: github-markdown
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -136,6 +150,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: html-pipeline
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: htmlentities
   requirement: !ruby/object:Gem::Requirement
@@ -235,7 +263,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 4.0.0
 - !ruby/object:Gem::Dependency
-  name: rails_emoji
+  name: rinku
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sanitize
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -249,7 +291,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: redcarpet
+  name: unf
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -374,7 +416,7 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Extracted from the full rails app at thredded.com
+description: A messageboard and/or forum engine for Rails 4.0 apps
 email:
 - joel@thredded.com
 executables: []
@@ -465,6 +507,9 @@ files:
 - db/migrate/20131019014258_index_necessary_columns.rb
 - db/migrate/20131026202621_move_filter_to_messageboards.rb
 - db/migrate/20131029034507_convert_textile_to_markdown.rb
+- lib/html/pipeline/at_mention_filter.rb
+- lib/html/pipeline/attached_image_filter.rb
+- lib/html/pipeline/bbcode_filter.rb
 - lib/tasks/thredded_tasks.rake
 - lib/thredded/at_notification_extractor.rb
 - lib/thredded/at_notifier.rb
@@ -472,14 +517,6 @@ files:
 - lib/thredded/email_processor.rb
 - lib/thredded/engine.rb
 - lib/thredded/errors.rb
-- lib/thredded/filter/at_notification.rb
-- lib/thredded/filter/attachment.rb
-- lib/thredded/filter/base.rb
-- lib/thredded/filter/bbcode.rb
-- lib/thredded/filter/emoji.rb
-- lib/thredded/filter/markdown.rb
-- lib/thredded/filter/syntax.rb
-- lib/thredded/filter.rb
 - lib/thredded/messageboard_user_permissions.rb
 - lib/thredded/post_sql_builder.rb
 - lib/thredded/post_user_permissions.rb

data/lib/thredded/filter.rb DELETED

@@ -1,4 +0,0 @@
-module Thredded
-  module Filter
-  end
-end

data/lib/thredded/filter/at_notification.rb DELETED

@@ -1,11 +0,0 @@
-require 'thredded/at_users'
-module Thredded
-  module Filter
-    module AtNotification
-      def filtered_content
-        @filtered_content = Thredded::AtUsers.render(super, messageboard).html_safe
-      end
-    end
-  end
-end

data/lib/thredded/filter/base.rb DELETED

@@ -1,13 +0,0 @@
-module Thredded
-  module Filter
-    module Base
-      Filters = []
-      def filters; Filters; end
-      def filtered_content
-        self.content
-      end
-    end
-  end
-end

data/lib/thredded/filter/bbcode.rb DELETED

@@ -1,75 +0,0 @@
-module Thredded
-  module Filter
-    module Bbcode
-      require 'bb-ruby'
-      BB = {
-        'Spoilers' => [
-          /\[spoiler\](.*?)\[\/spoiler\1?\]/mi,
-          '<blockquote class="spoiler">\1</blockquote>',
-          'Spoiler Text',
-          '[spoiler]Dumbledore dies[/spoiler]',
-          :spoiler],
-        'YouTube' => [
-          /\[youtube\]https?\:\/\/(www\.)?youtube.com\/((watch)?\?vi?=|embed\/)(.*?)\[\/youtube\1?\]/i,
-          '<iframe class="youtube" width="560" height="315" src="//www.youtube.com/embed/\4?&rel=0&theme=light&showinfo=0&hd=1&autohide=1&color=white" frameborder="0" allowfullscreen="allowfullscreen"></iframe>',
-          'Youtube Video',
-          :video],
-        'Link (Legacy)' => [
-          /\[link=(?:&quot;)?(.*?)(?:&quot;)?\](.*?)\[\/link\]/mi,
-          '<a href="\1">\2</a>',
-          'Hyperlink to somewhere else',
-          'Maybe try looking on [link=http://google.com]Google[/link]?',
-          :link],
-        'Link (Legacy Implied)' => [
-          /\[link\](.*?)\[\/link\]/mi,
-          '<a href="\1">\1</a>',
-          'Hyperlink (legacy implied)',
-          "Maybe try looking on [link]http://google.com[/link]",
-          :link],
-      }
-      def self.included(base)
-        base.class_eval do
-          Thredded::Post::Filters << :bbcode
-        end
-      end
-      def filtered_content
-        if filter.to_sym == :bbcode
-          content = super
-          content = replace_code_tags(content)
-          content = replace_quote_tags(content)
-          content = content.bbcode_to_html(BB)
-          content = remove_empty_p_tags(content)
-          content = CGI.unescapeHTML(content)
-          content.html_safe
-        else
-          super
-        end
-      end
-      def replace_code_tags(content)
-        content.gsub!(/\[code\]/, '<pre><code>')
-        content.gsub!(/\[code:(\D+?)\]/, '<pre><code class="language-\1" lang="\1">')
-        content.gsub!(/\[\/code\]/, '</code></pre>')
-        content.html_safe
-      end
-      def replace_quote_tags(content)
-        content.gsub!(/\[quote(:.*)?=(?:&quot;)?(.*?)(?:&quot;)?\]/,
-          '</p><fieldset><legend>\2</legend><blockquote><p>')
-        content.gsub!(/\[quote(:.*?)?\]/,
-          '</p><fieldset><blockquote><p>')
-        content.gsub!(/\[\/quote\]/,
-          '</p></blockquote></fieldset><p>')
-        content.html_safe
-      end
-      def remove_empty_p_tags(content)
-        content.gsub(/&lt;p&gt;\s*?&lt;\/p&gt;/, '')
-      end
-    end
-  end
-end

data/lib/thredded/filter/emoji.rb DELETED

@@ -1,11 +0,0 @@
-require 'rails_emoji'
-module Thredded
-  module Filter
-    module Emoji
-      def filtered_content
-        @filtered_content = RailsEmoji.render(super, size: 26).html_safe
-      end
-    end
-  end
-end

data/lib/thredded/filter/markdown.rb DELETED

@@ -1,25 +0,0 @@
-require 'redcarpet'
-module Thredded
-  module Filter
-    module Markdown
-      def self.included(base)
-        base.class_eval do
-          Thredded::Post::Filters << :markdown
-        end
-      end
-      def filtered_content
-        if filter.to_sym == :markdown
-          renderer = Redcarpet::Render::HTML.new(hard_wrap: true, filter_html: true)
-          markdown = Redcarpet::Markdown.new(renderer, autolink: true,
-            space_after_headers: true, no_intraemphasis: true,
-            fenced_code: true, gh_blockcode: true)
-          @filtered_content = markdown.render(super).html_safe
-        else
-          super
-        end
-      end
-    end
-  end
-end

data/lib/thredded/filter/syntax.rb DELETED

@@ -1,28 +0,0 @@
-require 'coderay'
-require 'htmlentities'
-module Thredded
-  module Filter
-    module Syntax
-      def filtered_content
-        content = String.new(super)
-        content = HTMLEntities.new.decode(content)
-        content = content.to_s
-          .gsub(/\<pre\>\<code( lang="(.+?)")?\>(.+?)\<\/code\>\<\/pre\>/m) do
-          filter = $2.nil? ? :ruby : $2.to_sym
-          temp_code = $3.gsub(/&quot;/, '"').
-            gsub(/&#39;/,"'").
-            gsub(/&amp;/, "&").
-            gsub(/&gt;/, ">").
-            gsub(/&lt;/, "<").
-            gsub(/\<br \/\>/, "")
-          ::CodeRay.scan(temp_code, filter).div(css: :class)
-        end
-        content.html_safe
-      end
-    end
-  end
-end