inboxes 0.1.0 → 0.1.1

data/app/controllers/inboxes/base_controller.rb

@@ -1,3 +1,7 @@
 class Inboxes::BaseController < ApplicationController
+  private
   
+  def init_discussion
+    @discussion = Discussion.find(params[:discussion_id])
+  end
 end

data/app/controllers/inboxes/discussions_controller.rb

@@ -1,6 +1,7 @@
 class Inboxes::DiscussionsController < Inboxes::BaseController
-  before_filter :authenticate_user!
-  before_filter :init_and_check_permissions, :only => :show
+  load_and_authorize_resource
+  # before_filter :authenticate_user!
+  # before_filter :init_and_check_permissions, :only => :show
   before_filter :load_and_check_discussion_recipient, :only => [:create, :new]
   
   def index
@@ -10,6 +11,7 @@ class Inboxes::DiscussionsController < Inboxes::BaseController
   # GET /discussions/1
   # GET /discussions/1.json
   def show
+    # @discussion = Discussion.includes(:messages, :speakers).find(params[:id])
     @discussion.mark_as_read_for(current_user)
   end
 
@@ -40,10 +42,10 @@ class Inboxes::DiscussionsController < Inboxes::BaseController
   
   private
   
-  def init_and_check_permissions
-    @discussion = Discussion.includes(:messages, :speakers).find(params[:id])
-    redirect_to discussions_url, :notice => t("inboxes.discussions.can_not_participate") unless @discussion.can_participate?(current_user)
-  end
+  # def init_and_check_permissions
+  #   @discussion = Discussion.includes(:messages, :speakers).find(params[:id])
+  #   redirect_to discussions_url, :notice => t("inboxes.discussions.can_not_participate") unless @discussion.can_participate?(current_user)
+  # end
   
   def load_and_check_discussion_recipient
     # initializing model fir new and create actions

data/app/controllers/inboxes/messages_controller.rb

@@ -1,10 +1,10 @@
 class Inboxes::MessagesController < Inboxes::BaseController
+  # before_filter :init_discussion
+  # load_and_authorize_resource
+  load_and_authorize_resource :discussion
+  load_resource :message, :through => :discussion, :shallow => true
   
   def create
-    @discussion = Discussion.find(params[:discussion_id])
-    redirect_to root_url, :notice => t("inboxes.discussions.can_not_participate") unless @discussion.can_participate?(current_user)
-    
-    @message = Message.new(params[:message])
     @message.user = current_user
     @message.discussion = @discussion
     @message.save
@@ -14,5 +14,11 @@ class Inboxes::MessagesController < Inboxes::BaseController
       format.js
     end
   end
-  
+
+  # private
+  # 
+  # def init_and_check_permissions
+  #   @discussion = Discussion.find(params[:discussion_id])
+  #   redirect_to discussions_url, :notice => t("inboxes.discussions.can_not_participate") unless @discussion.can_participate?(current_user)
+  # end
 end

data/app/controllers/inboxes/speakers_controller.rb

@@ -1,12 +1,13 @@
 class Inboxes::SpeakersController < Inboxes::BaseController
-  before_filter :init_and_check_permissions
+  # before_filter :init_discussion
+  load_and_authorize_resource :discussion
+  load_resource :speaker, :through => :discussion, :shallow => true
+  # load_and_authorize_resource
   
   def create
-    # check permissions
     raise ActiveRecord::RecordNotFound unless params[:speaker] && params[:speaker][:user_id]
     @user = User.find(params[:speaker][:user_id])
-    
-    flash[:notice] = t("views.speakers.added") if @discussion.add_speaker(@user)
+    flash[:notice] = t("inboxes.speakers.added") if @discussion.add_speaker(@user)
     redirect_to @discussion
   end
   
@@ -16,11 +17,4 @@ class Inboxes::SpeakersController < Inboxes::BaseController
     flash[:notice] = @speaker.user == current_user ? t("inboxes.discussions.leaved") : t("inboxes.speakers.removed")
     redirect_to @discussion.speakers.any? && @discussion.can_participate?(current_user) ? @discussion : discussions_url
   end
-  
-  private
-  
-  def init_and_check_permissions
-    @discussion = Discussion.find(params[:discussion_id])
-    redirect_to discussions_url, :notice => t("inboxes.discussions.can_not_participate") unless @discussion.can_participate?(current_user)
-  end
 end

data/app/views/inboxes/discussions/index.html.haml

@@ -1,6 +1,4 @@
 %h1 Discussions list
-%p
-  Unread messages: 
 %table
   %tr
     %th Last message

data/config/locales/ru.yml

@@ -13,5 +13,5 @@ ru:
       can_not_participate: "Вы не состоите в этой дискуссии"
       choose_at_least_one_recipient: "Укажите хотя бы одного получателя"
     speakers:
-      added: "Участник дискуссии добавлен"
-      removed: "Участник дискуссии удален"
+      added: "Собеседник успешно добавлен"
+      removed: "Собеседник удален"

data/inboxes.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |s|
   # specify any dependencies here; for example:
   # s.add_development_dependency "ruby-debug"
   s.add_runtime_dependency "haml-rails"
+  s.add_runtime_dependency "cancan"
   # s.add_runtime_dependency "inherited_resources"
   
   # s.add_development_dependency 'dm-sqlite-adapter', ['>= 1.1.0']

data/lib/inboxes/ability.rb

@@ -0,0 +1,24 @@
+module Inboxes
+  class InboxesAbility
+    include CanCan::Ability
+
+    def initialize(user)
+      # Discussion
+      can [:index, :create], Discussion
+      can :read, Discussion do |discussion|
+        discussion.can_participate?(user)
+      end
+      
+      # Message
+      # can :create, Message do |message|
+      #   message.discussion.can_participate?(user)
+      # end
+      # 
+      # # Speaker
+      # can [:create, :destroy], Speaker do |speaker|
+      #   speaker.discussion.can_participate?(user)
+      # end
+    end
+  end
+  
+end

data/lib/inboxes/engine.rb

@@ -1,4 +1,9 @@
+require "inboxes/ability"
+
 module Inboxes
   class Engine < ::Rails::Engine
+    def self.activate
+      Ability.register_ability(InboxesAbility)
+    end
   end
 end

data/lib/inboxes/version.rb

@@ -1,3 +1,3 @@
 module Inboxes
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: inboxes
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Kir Shatrov
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-16 00:00:00 Z
+date: 2011-11-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: haml-rails
@@ -32,7 +32,7 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: cancan
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -43,10 +43,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
+  type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rspec-rails
+  name: rspec
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -60,7 +60,7 @@ dependencies:
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: database_cleaner
+  name: rspec-rails
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -73,6 +73,20 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: database_cleaner
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id005
 description: Messaging system for Rails 3 app
 email: 
 - razor.psp@gmail.com
@@ -109,6 +123,7 @@ files:
 - lib/generators/inboxes/templates/install.rb
 - lib/generators/inboxes/views_generator.rb
 - lib/inboxes.rb
+- lib/inboxes/ability.rb
 - lib/inboxes/active_record_extension.rb
 - lib/inboxes/engine.rb
 - lib/inboxes/railtie.rb