thredded 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a5e4586746eb175f9abdee9164cba73afdbf5d2
-  data.tar.gz: 49ff149e997cc823e4ebdf231f7b710e3c4b4f7c
+  metadata.gz: f5bbfffd3928efffdf26597640c19eb5f9d52f24
+  data.tar.gz: 1c1fd24a8c1d0d52d01bea3727539b99bf5898f7
 SHA512:
-  metadata.gz: 672530495e5d3ed43d6cb93283e56e4a6fa2a6be6ba2cefc593cc49b79c3073e246f1a4c2516a179d10e1f6a808d31886dd3fa3a740a64a26d6795d8fac20b71
-  data.tar.gz: 9fe0b3d1e977e15e4e984abb7e2c20c1d637c78566360041891a7b1c7e6e2f164a593853155015e6f0baab388bc24ec3f7d240158a5b28bf40517b296a092b6c
+  metadata.gz: c98c1f4eacd78aa4df72ab88b92d9fa4f08ae12aff4118ba5c67013c58a6410eac3a46da923fcac53fd5a68820d3b603dc834c2c20cbefd8676950a4f3b4baad
+  data.tar.gz: e503d2a13970801509b6aada495bcee7308c32547074bc18b3f3d561089825d7131120ea66d2a9dce586f6ddda63c6ea6b0b3c60cadece68b926a7d31e88814c

data/app/controllers/thredded/messageboards_controller.rb

@@ -3,7 +3,7 @@ module Thredded
     before_filter :messageboard, only: :show
 
     def index
-      @messageboards = Messageboard.where(closed: false)
+      @messageboards = Messageboard.where(closed: false).decorate
     end
   end
 end

data/app/controllers/thredded/posts_controller.rb

@@ -12,7 +12,7 @@ module Thredded
       authorize! :read, topic
 
       @posts = topic.posts.page(current_page)
-      @post  = messageboard.posts.build(topic: topic, filter: post_filter)
+      @post  = messageboard.posts.build(topic: topic)
 
       update_read_status!
     end
@@ -41,6 +41,7 @@ module Thredded
           ip: request.remote_ip,
           user: current_user,
           messageboard: messageboard,
+          filter: messageboard.filter,
         )
     end
 
@@ -60,7 +61,11 @@ module Thredded
     end
 
     def topic
-      @topic ||= messageboard.topics.find_by_slug(params[:topic_id])
+      @topic ||= topic_with_eager_loaded_user_topic_reads
+    end
+
+    def topic_with_eager_loaded_user_topic_reads
+      messageboard.topics.find_by_slug(params[:topic_id])
     end
 
     def user_topic
@@ -71,10 +76,6 @@ module Thredded
       @post ||= topic.posts.find(params[:id])
     end
 
-    def post_filter
-      messageboard.preferences_for(current_user).filter
-    end
-
     def current_page
       params[:page].nil? ? 1 : params[:page].to_i
     end

data/app/controllers/thredded/topics_controller.rb

@@ -26,7 +26,7 @@ module Thredded
       @topic = messageboard.topics.build
       @topic
         .posts
-        .build(filter: messageboard.preferences_for(current_user).filter)
+        .build
 
       unless can? :create, @topic
         error = 'Sorry, you are not authorized to post on this messageboard.'
@@ -58,7 +58,7 @@ module Thredded
 
     def topic
       if messageboard
-        @topic ||= messageboard.topics.where(slug: params[:id]).first
+        @topic ||= messageboard.topics.friendly.find(params[:id])
       end
     end
 
@@ -84,6 +84,7 @@ module Thredded
               messageboard: messageboard,
               ip: request.remote_ip,
               user: current_user,
+              filter: messageboard.filter,
             }
           }
         })

data/app/decorators/thredded/messageboard_decorator.rb

@@ -0,0 +1,74 @@
+module Thredded
+  class MessageboardDecorator < SimpleDelegator
+    include ActionView::Helpers::NumberHelper
+    include ActionView::Helpers::TagHelper
+
+    def initialize(messageboard)
+      super
+      @messageboard = messageboard
+    end
+
+    def original
+      messageboard
+    end
+
+    def meta
+      topics_count = number_to_human(messageboard.topics_count)
+      posts_count = number_to_human(messageboard.posts_count)
+
+      "#{topics_count} topics, #{posts_count} posts".downcase
+    end
+
+    def description
+      if messageboard.description.blank?
+        ''
+      else
+        content_tag :p, messageboard.description
+      end
+    end
+
+    def latest_topic_timeago
+      if latest_topic.updated_at.nil?
+        <<-eohtml.html_safe
+          <abbr>
+            a little while ago
+          </abbr>
+        eohtml
+      else
+        <<-eohtml.html_safe
+          <abbr class="timeago" title="#{topic_updated_at_utc}">
+            #{topic_updated_at_str}
+          </abbr>
+        eohtml
+      end
+    end
+
+    def latest_topic
+      @latest_topic ||= messageboard.topics.order('updated_at DESC').first || Thredded::NullTopic.new
+    end
+
+    def latest_user
+      latest_topic.last_user
+    end
+
+    def category_options
+      messageboard.categories.map { |cat| [cat.name, cat.id] }
+    end
+
+    def users_options
+      messageboard.users.map { |user| [user.to_s, user.id] }
+    end
+
+    private
+
+    attr_reader :messageboard
+
+    def topic_updated_at_utc
+      latest_topic.updated_at.getutc.iso8601
+    end
+
+    def topic_updated_at_str
+      latest_topic.updated_at.to_s
+    end
+  end
+end

data/app/models/thredded/messageboard.rb

@@ -2,20 +2,27 @@ module Thredded
   class Messageboard < ActiveRecord::Base
     SECURITY = %w{private logged_in public}
     PERMISSIONS = %w{members logged_in anonymous}
+    FILTERS = %w{markdown bbcode}
 
     extend FriendlyId
     friendly_id :name
 
-    validates_numericality_of :topics_count
-    validates_inclusion_of :security, in: SECURITY
-    validates_inclusion_of :posting_permission, in: PERMISSIONS
-    validates_presence_of :name
-    validates_format_of :name, with: /\A[\w\-]+\z/, on: :create,
+    validates :filter, presence: true
+    validates :filter, inclusion: { in: FILTERS }
+    validates :name, format: {
+      with: /\A[\w\-]+\z/,
+      on: :create,
       message: 'should be letters, nums, dash, underscore only.'
-    validates_uniqueness_of :name,
-      message: 'must be a unique board name. Try again.'
-    validates_length_of :name, within: 1..16,
+    }
+    validates :name, length: {
+      within: 1..16,
       message: 'should be between 1 and 16 characters'
+    }
+    validates :name, presence: true
+    validates :name, uniqueness: { message: 'must be a unique board name.' }
+    validates :posting_permission, inclusion: { in: PERMISSIONS }
+    validates :security, inclusion: { in: SECURITY }
+    validates :topics_count, numericality: true
 
     has_many :categories
     has_many :messageboard_preferences
@@ -29,9 +36,15 @@ module Thredded
       where(closed: false).order('topics_count DESC')
     end
 
+    def self.decorate
+      all.map do |messageboard|
+        MessageboardDecorator.new(messageboard)
+      end
+    end
+
     def preferences_for(user)
       @preferences_for ||=
-        messageboard_preferences.where(user_id: user).first || NullMessageboardPreference.new
+        messageboard_preferences.where(user_id: user).first_or_create
     end
 
     def active_users

data/app/models/thredded/null_topic.rb

@@ -0,0 +1,16 @@
+module Thredded
+  class NullTopic
+    def updated_at
+      Time.now
+    end
+
+    def user
+      'Anonymous User'
+    end
+
+    def last_user
+      'Anonymous User'
+    end
+  end
+end
+

data/app/models/thredded/post.rb

@@ -5,7 +5,6 @@ module Thredded
   class Post  < ActiveRecord::Base
     include Gravtastic
     include Thredded::Filter::Base
-    include Thredded::Filter::Textile
     include Thredded::Filter::Bbcode
     include Thredded::Filter::Markdown
     include Thredded::Filter::Attachment

data/app/models/thredded/topic.rb

@@ -80,8 +80,11 @@ module Thredded
     end
 
     def self.find_by_slug(slug)
-      where(slug: slug).includes(:user_topic_reads).first or
+      begin
+        includes(:user_topic_reads).friendly.find(slug)
+      rescue ActiveRecord::RecordNotFound
         raise Thredded::Errors::TopicNotFound
+      end
     end
 
     def decorate

data/app/views/thredded/messageboards/_messageboard.html.erb

@@ -1,16 +1,19 @@
-<% if can? :read, messageboard %>
+<% if can? :read, messageboard.original %>
   <div class="messageboard">
     <header>
-      <h2><%= link_or_text_to(messageboard) %></h2>
-      <div class="meta"><%= meta_for(messageboard) %></div>
+      <h2>
+        <%= link_to messageboard.name, messageboard_topics_path(messageboard) %>
+      </h2>
+
+      <div class="meta"><%= messageboard.meta %></div>
     </header>
 
-    <% content_tag :p, messageboard.description if messageboard.description %>
+    <%= messageboard.description %>
 
     <footer>
       <p>
-        <%= latest_thread_for(messageboard) %>
-        <cite>by <%= latest_user_for(messageboard) %></cite>
+        <%= messageboard.latest_topic_timeago %>
+        <cite>by <%= messageboard.latest_user %></cite>
       </p>
     </footer>
   </div>

data/app/views/thredded/posts/_form.html.erb

@@ -15,11 +15,3 @@
   <%= f.link_to_add 'Add an attachment', :attachments,
     { class: :add_attachment } %>
 </li>
-
-<li>
-  <%= f.select :filter, Thredded::Post.filters, {} %>
-  <a href="#pseudo-help"
-    title="huh?"
-    class="hide-for-small filter-help"
-    id="filter-help">?</a>
-</li>

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

@@ -13,10 +13,6 @@
         <%= f.label :notify_on_message, 'Notify me when I am included in a private topic' %>
         <%= f.check_box :notify_on_message %>
       </li>
-      <li>
-        <%= f.label :filter, 'Preferred post filter' %>
-        <%= f.select :filter, Thredded::Post.filters %>
-      </li>
       <li class="submit"><%= f.submit 'Update Preferences' %></li>
     </ul>
   <% end %>

data/db/migrate/20131026202621_move_filter_to_messageboards.rb

@@ -0,0 +1,11 @@
+class MoveFilterToMessageboards < ActiveRecord::Migration
+  def up
+    add_column :thredded_messageboards, :filter, :string, null: false, default: 'markdown'
+    remove_column :thredded_messageboard_preferences, :filter
+  end
+
+  def down
+    add_column :thredded_messageboard_preferences, :filter, :string, null: false, default: 'markdown'
+    remove_column :thredded_messageboards, :filter
+  end
+end

data/db/migrate/20131029034507_convert_textile_to_markdown.rb

@@ -0,0 +1,7 @@
+class ConvertTextileToMarkdown < ActiveRecord::Migration
+  def up
+    execute <<-sql
+      UPDATE thredded_posts SET filter='markdown' WHERE filter == 'textile'
+    sql
+  end
+end

data/lib/thredded.rb

@@ -8,12 +8,12 @@ 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 'thredded/filter/textile'
 require 'thredded/messageboard_user_permissions'
 require 'thredded/post_user_permissions'
 require 'thredded/private_topic_user_permissions'

data/lib/thredded/version.rb

@@ -1,3 +1,3 @@
 module Thredded
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: thredded
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Joel Oliveira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-24 00:00:00.000000000 Z
+date: 2013-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: RedCloth
+  name: bb-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bb-ruby
+  name: cancan
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: cancan
+  name: carrierwave
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: carrierwave
+  name: escape_utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: escape_utils
+  name: unf
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -391,11 +391,11 @@ files:
 - app/controllers/thredded/private_topics_controller.rb
 - app/controllers/thredded/setups_controller.rb
 - app/controllers/thredded/topics_controller.rb
+- app/decorators/thredded/messageboard_decorator.rb
 - app/decorators/thredded/post_decorator.rb
 - app/decorators/thredded/topic_decorator.rb
 - app/decorators/thredded/user_topic_decorator.rb
 - app/helpers/thredded/application_helper.rb
-- app/helpers/thredded/messageboard_helper.rb
 - app/helpers/thredded/posts_helper.rb
 - app/helpers/thredded/topics_helper.rb
 - app/mailers/thredded/post_mailer.rb
@@ -405,10 +405,9 @@ files:
 - app/models/thredded/category.rb
 - app/models/thredded/image.rb
 - app/models/thredded/messageboard.rb
-- app/models/thredded/messageboard_decorator.rb
 - app/models/thredded/messageboard_preference.rb
-- app/models/thredded/null_messageboard_preference.rb
 - app/models/thredded/null_preference.rb
+- app/models/thredded/null_topic.rb
 - app/models/thredded/null_topic_read.rb
 - app/models/thredded/null_user.rb
 - app/models/thredded/post.rb
@@ -464,6 +463,8 @@ files:
 - db/migrate/20131005032727_prevent_null_sticky_and_locked.rb
 - db/migrate/20131014014258_uniqs_on_user_topic_read.rb
 - db/migrate/20131019014258_index_necessary_columns.rb
+- db/migrate/20131026202621_move_filter_to_messageboards.rb
+- db/migrate/20131029034507_convert_textile_to_markdown.rb
 - lib/tasks/thredded_tasks.rake
 - lib/thredded/at_notification_extractor.rb
 - lib/thredded/at_notifier.rb
@@ -478,7 +479,6 @@ files:
 - lib/thredded/filter/emoji.rb
 - lib/thredded/filter/markdown.rb
 - lib/thredded/filter/syntax.rb
-- lib/thredded/filter/textile.rb
 - lib/thredded/filter.rb
 - lib/thredded/messageboard_user_permissions.rb
 - lib/thredded/post_sql_builder.rb
@@ -516,7 +516,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.7
 signing_key: 
 specification_version: 4
 summary: A forum engine

data/app/helpers/thredded/messageboard_helper.rb

@@ -1,44 +0,0 @@
-module Thredded
-  module MessageboardHelper
-    def link_or_text_to(messageboard)
-      if can? :read, messageboard
-        link_to messageboard.name, messageboard_topics_path(messageboard)
-      else
-        messageboard.name
-      end
-    end
-
-    def meta_for(messageboard)
-      topics = messageboard.topics_count
-      posts  = messageboard.posts_count
-      "#{number_to_human topics} topics,
-        #{number_to_human posts} posts".downcase
-    end
-
-    def latest_thread_for(messageboard)
-      topic = messageboard.topics.first
-
-      if topic.present?
-        abbr = content_tag :abbr, class: 'updated_at timeago', title: topic.updated_at.strftime('%Y-%m-%dT%H:%M:%S') do
-          topic.updated_at.strftime('%b %d, %Y %I:%M:%S %Z')
-        end
-
-        if can? :read, messageboard
-          link_to abbr , messageboard_topic_posts_path(messageboard, topic)
-        else
-          abbr
-        end
-      else
-        ''
-      end
-    end
-
-    def latest_user_for(messageboard)
-      if messageboard.topics.first.present? && messageboard.topics.first.user.present?
-        messageboard.topics.first.last_user.to_s
-      else
-        ''
-      end
-    end
-  end
-end

data/app/models/thredded/messageboard_decorator.rb

@@ -1,18 +0,0 @@
-module Thredded
-  class MessageboardDecorator < SimpleDelegator
-    attr_reader :messageboard
-
-    def initialize(messageboard)
-      super
-      @messageboard = messageboard
-    end
-
-    def category_options
-      messageboard.categories.map { |cat| [cat.name, cat.id] }
-    end
-
-    def users_options
-      messageboard.users.map { |user| [user.to_s, user.id] }
-    end
-  end
-end

data/app/models/thredded/null_messageboard_preference.rb

@@ -1,7 +0,0 @@
-module Thredded
-  class NullMessageboardPreference
-    def filter
-      'markdown'
-    end
-  end
-end

data/lib/thredded/filter/textile.rb

@@ -1,21 +0,0 @@
-require 'redcloth'
-
-module Thredded
-  module Filter
-    module Textile
-      def self.included(base)
-        base.class_eval do
-          Thredded::Post::Filters << :textile
-        end
-      end
-
-      def filtered_content
-        if filter.to_sym == :textile
-          @filtered_content = RedCloth.new(super).to_html.html_safe
-        else
-          @filtered_content = super
-        end
-      end
-    end
-  end
-end