thredded 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16d3cfd85997b2495d072774e55f3c491824d21b
-  data.tar.gz: 0adb8511cd83a9ab1f7c5c0275d30778f466e8c9
+  metadata.gz: 7c2929ae0328e4fd8c0faf14a7dbd5ba4a1bd4b3
+  data.tar.gz: 50f7bb4efdbdf97b372ceb9da07ef6b6bf6aa692
 SHA512:
-  metadata.gz: 7e10056d0888670f993b7b3ee062e8a8214d2c72f7c4da9d2b91d55c5faf664f6d7677d54a0f655739883e1cdf28e707a78dfa70a28c5fc4250333d622f1cee2
-  data.tar.gz: cbd651748b820ab011e19c4af9586910906d26a4a5fe0574284a7eced94383be631adea6a30e2a3527979ab239e9f2845c6645a409e79bcd0b330398fd6b5ca6
+  metadata.gz: a1c7d85da251177d9c62120f40281e2710a4e9c61c5622e998dd47179ac75aa5f60651176fefdc50adc787de144da33868c525c8c88fc3193095fd0278a6cd8c
+  data.tar.gz: 15cc242a83c68ac14700c019bc59624a64260f43d0510b5bd234e43ab322b983f30a283b1170b70285bbc39be95f78c5da8cf699d412de4f986cf750d4489468

data/app/controllers/thredded/application_controller.rb

@@ -2,10 +2,13 @@ module Thredded
   class ApplicationController < ::ApplicationController
     helper Thredded::Engine.helpers
     helper_method :messageboard, :topic, :preferences
-    before_filter :update_user_activity
 
     rescue_from CanCan::AccessDenied do |exception|
-      redirect_to root_path, alert: exception.message
+      redirect_to thredded.root_path, alert: exception.message
+    end
+
+    rescue_from Thredded::Errors::MessageboardNotFound do |exception|
+      redirect_to thredded.root_path, alert: exception.message
     end
 
     private
@@ -21,9 +24,7 @@ module Thredded
     end
 
     def messageboard
-      if params.key? :messageboard_id
-        @messageboard ||= Messageboard.where(slug: params[:messageboard_id]).first
-      end
+      @messageboard ||= Messageboard.find_by_slug(params[:messageboard_id])
     end
 
     def preferences
@@ -37,12 +38,5 @@ module Thredded
         @topic ||= messageboard.topics.find(params[:topic_id])
       end
     end
-
-    def ensure_messageboard_exists
-      if messageboard.blank?
-        redirect_to thredded.root_path,
-          flash: { error: 'This messageboard does not exist.' }
-      end
-    end
   end
 end

data/app/controllers/thredded/messageboards_controller.rb

@@ -1,7 +1,5 @@
 module Thredded
   class MessageboardsController < Thredded::ApplicationController
-    before_filter :messageboard, only: :show
-
     def index
       @messageboards = Messageboard.where(closed: false).decorate
     end

data/app/controllers/thredded/posts_controller.rb

@@ -2,10 +2,10 @@ module Thredded
   class PostsController < Thredded::ApplicationController
     load_and_authorize_resource only: [:index, :show]
     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: 'This topic does not exist.'
+      redirect_to messageboard_topics_path(messageboard), alert: exception.message
     end
 
     def index

data/app/controllers/thredded/private_topics_controller.rb

@@ -1,7 +1,5 @@
 module Thredded
   class PrivateTopicsController < Thredded::ApplicationController
-    before_filter :ensure_messageboard_exists
-
     def index
       if cannot? :read, messageboard
         error = 'You are not authorized access to this messageboard.'

data/app/controllers/thredded/topics_controller.rb

@@ -1,7 +1,7 @@
 module Thredded
   class TopicsController < Thredded::ApplicationController
-    before_filter :ensure_messageboard_exists
     helper_method :current_page
+    before_filter :update_user_activity
 
     def index
       if cannot? :read, messageboard

data/app/models/thredded/messageboard.rb

@@ -5,15 +5,10 @@ module Thredded
     FILTERS = %w{markdown bbcode}
 
     extend FriendlyId
-    friendly_id :name
+    friendly_id :name, use: :slugged
 
     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 :name, length: {
       within: 1..16,
       message: 'should be between 1 and 16 characters'
@@ -32,6 +27,14 @@ module Thredded
     has_many :private_topics
     has_many :users, through: :roles, class_name: Thredded.user_class
 
+    def self.find_by_slug(slug)
+      begin
+        friendly.find(slug)
+      rescue ActiveRecord::RecordNotFound
+        raise Thredded::Errors::MessageboardNotFound
+      end
+    end
+
     def self.default_scope
       where(closed: false).order('topics_count DESC')
     end

data/config/routes.rb

@@ -15,7 +15,7 @@ Thredded::Engine.routes.draw do
   get '/:messageboard_id/preferences/edit' => 'preferences#edit'
   get '/:messageboard_id/new(.:format)' => 'topics#new', as: :new_messageboard_topic
   get '/:messageboard_id/:id/edit(.:format)' => 'topics#edit', as: :edit_messageboard_topic
-  get '/:messageboard_id/:topic_id/:page(.:format)' => 'posts#index',
+  get '/:messageboard_id/:topic_id/page-:page(.:format)' => 'posts#index',
     as: :paged_messageboard_topic_posts, constraints: { page: /\d+/ }
 
   resources :messageboards, only: [:index], path: '' do

data/lib/thredded/errors.rb

@@ -3,6 +3,16 @@ module Thredded
   end
 
   module Errors
-    class TopicNotFound < Thredded::Error; end
+    class TopicNotFound < Thredded::Error
+      def message
+        'This topic does not exist.'
+      end
+    end
+
+    class MessageboardNotFound < Thredded::Error
+      def message
+        'This messageboard does not exist.'
+      end
+    end
   end
 end

data/lib/thredded/version.rb

@@ -1,3 +1,3 @@
 module Thredded
-  VERSION = '0.0.7'
+  VERSION = '0.0.8'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thredded
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Joel Oliveira
@@ -516,7 +516,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.7
+rubygems_version: 2.1.10
 signing_key: 
 specification_version: 4
 summary: A forum engine