enju_message 0.1.16 → 0.2.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ba0a9db2e5538b3bb8055a72de0266eec5fa5e2
-  data.tar.gz: 7e0d68c08b38105dbc794b7f37f476f300471c78
+  metadata.gz: 70bfb609fae09c6b2e84bdb4205af0bdc310c9cd
+  data.tar.gz: c3cbe54bcb38ec0ad1e3bddaeed46b122ba443c8
 SHA512:
-  metadata.gz: a64ba118771a50b9fc917bd1ab32158dbf23650ecd7d4170ea68b3214181bd98d8dec767015cd553899bca5fad02f0fdcf50daeaf4030409adeaef934359e089
-  data.tar.gz: aaf425cce25954228f3883ace715708213dfd27b4a80961aac602fcd5f311a962d647913e254ef64e29a3572a22be16c5fc44aadb06e83fd338475ca9d4864f0
+  metadata.gz: a6b2d1eb07db5f5d7a031a6c715e6e0f280740864dd2de00df55d179c69be77785942466075c19cc0a4a5633834c2296a2ce41f282b641e971453c6db916ba7d
+  data.tar.gz: f28a2b8f22cc4e78e739267192110ee075952fdb8e366f9c005056b88ea996c51df848cf151f0002a0907f793ec0d488547493c69b567c520f75d03698d1774c

data/README.rdoc

@@ -1,7 +1,7 @@
 = EnjuMessage
-{<img src="https://travis-ci.org/next-l/enju_message.svg?branch=1.1" alt="Build Status" />}[https://travis-ci.org/next-l/enju_message]
-{<img src="https://coveralls.io/repos/next-l/enju_message/badge.svg?branch=1.1&service=github" alt="Coverage Status" />}[https://coveralls.io/github/next-l/enju_message?branch=1.1]
-{<img src="https://hakiri.io/github/next-l/enju_message/1.1.svg" alt="security" />}[https://hakiri.io/github/next-l/enju_message/1.1]
+{<img src="https://travis-ci.org/next-l/enju_message.svg?branch=1.2" alt="Build Status" />}[https://travis-ci.org/next-l/enju_message]
+{<img src="https://coveralls.io/repos/next-l/enju_message/badge.svg?branch=1.2&service=github" alt="Coverage Status" />}[https://coveralls.io/github/next-l/enju_message?branch=1.2]
+{<img src="https://hakiri.io/github/next-l/enju_message/1.2.svg" alt="security" />}[https://hakiri.io/github/next-l/enju_message/1.2]
 
 This project rocks and uses MIT-LICENSE.
 

data/app/controllers/message_requests_controller.rb

@@ -1,5 +1,6 @@
 class MessageRequestsController < ApplicationController
-  load_and_authorize_resource
+  before_action :set_message_request, only: [:show, :edit, :update, :destroy]
+  before_action :check_policy, only: [:index, :new, :create]
 
   # GET /message_requests
   # GET /message_requests.json
@@ -30,7 +31,7 @@ class MessageRequestsController < ApplicationController
 
   # GET /message_requests/1/edit
   def edit
-    @message_requests = MessageTemplate.all
+    @message_requests = MessageTemplate.order(:position)
   end
 
   # PUT /message_requests/1
@@ -42,7 +43,7 @@ class MessageRequestsController < ApplicationController
         format.html { redirect_to(@message_request) }
         format.json { head :no_content }
       else
-        @message_requests = MessageTemplate.all
+        @message_requests = MessageTemplate.order(:position)
         format.html { render action: "edit" }
         format.json { render json: @message_request.errors, status: :unprocessable_entity }
       end
@@ -61,6 +62,15 @@ class MessageRequestsController < ApplicationController
   end
 
   private
+  def set_message_request
+    @message_request = MessageRequest.find(params[:id])
+    authorize @message_request
+  end
+
+  def check_policy
+    authorize MessageRequest
+  end
+
   def message_request_params
     params.require(:message_request).permit(
       :body,

data/app/controllers/message_templates_controller.rb

@@ -1,5 +1,7 @@
 class MessageTemplatesController < ApplicationController
-  load_and_authorize_resource
+  before_action :set_message_template, only: [:show, :edit, :update, :destroy]
+  before_action :check_policy, only: [:index, :new, :create]
+
   # GET /message_templates
   # GET /message_templates.json
   def index
@@ -82,6 +84,15 @@ class MessageTemplatesController < ApplicationController
   end
 
   private
+  def set_message_template
+    @message_template = MessageTemplate.find(params[:id])
+    authorize @message_template
+  end
+
+  def check_policy
+    authorize MessageTemplate
+  end
+
   def message_template_params
     params.require(:message_template).permit(:status, :title, :body, :locale)
   end

data/app/controllers/messages_controller.rb

@@ -1,8 +1,7 @@
 class MessagesController < ApplicationController
-  load_and_authorize_resource except: [:index, :show]
-  authorize_resource only: [:index, :show]
-  before_filter :get_user, only: :index
-  after_filter :solr_commit, only: [:create, :update, :destroy, :destroy_selected]
+  before_action :set_message, only: [:show, :edit, :update, :destroy]
+  before_action :check_policy, only: [:index, :new, :create, :destroy_selected]
+  before_action :get_user, only: :index
 
   # GET /messages
   # GET /messages.json
@@ -43,7 +42,6 @@ class MessagesController < ApplicationController
   # GET /messages/1
   # GET /messages/1.json
   def show
-    @message = current_user.received_messages.find(params[:id])
     @message.transition_to!(:read) if @message.current_state != 'read'
 
     respond_to do |format|
@@ -131,7 +129,7 @@ class MessagesController < ApplicationController
       end
       if messages.present?
         messages.each do |message|
-          message.destroy
+          message.destroy if message.receiver == current_user
         end
         flash[:notice] = t('message.messages_were_deleted')
         format.html { redirect_to messages_url }
@@ -143,6 +141,19 @@ class MessagesController < ApplicationController
   end
 
   private
+  def set_message
+    if current_user
+      @message = current_user.received_messages.find(params[:id])
+      authorize @message
+    else
+      access_denied; return
+    end
+  end
+
+  def check_policy
+    authorize Message
+  end
+
   def message_params
     params.require(:message).permit(
       :subject, :body, :sender, :recipient, :parent_id

data/app/models/concerns/enju_message/enju_user.rb

@@ -0,0 +1,21 @@
+module EnjuMessage
+  module EnjuUser
+    extend ActiveSupport::Concern
+
+    included do
+      has_many :sent_messages, :foreign_key => 'sender_id', :class_name => 'Message'
+      has_many :received_messages, :foreign_key => 'receiver_id', :class_name => 'Message'
+    end
+
+    def send_message(status, options = {})
+      MessageRequest.transaction do
+        request = MessageRequest.new
+        request.sender = self.class.find(1)
+        request.receiver = self
+        request.message_template = MessageTemplate.localized_template(status, profile.locale)
+        request.save_message_body(options)
+        request.transition_to!(:sent)
+      end
+    end
+  end
+end

data/app/models/message.rb

@@ -48,7 +48,7 @@ class Message < ActiveRecord::Base
   end
 
   def send_notification
-    Notifier.message_notification(id).deliver if receiver.try(:email).present?
+    Notifier.message_notification(id).deliver_later if receiver.try(:email).present?
   end
 
   def read

data/app/models/message_template.rb

@@ -1,5 +1,4 @@
 class MessageTemplate < ActiveRecord::Base
-  default_scope {order("message_templates.position")}
   has_many :message_requests
 
   validates_uniqueness_of :status

data/app/policies/message_policy.rb

@@ -0,0 +1,37 @@
+class MessagePolicy < ApplicationPolicy
+  def index?
+    true if user.try(:has_role?, 'User')
+  end
+
+  def show?
+    case user.try(:role).try(:name)
+    when 'Administrator'
+      true
+    when 'Librarian'
+      true if record.try(:receiver) == user
+    when 'User'
+      true if record.try(:receiver) == user
+    end
+  end
+
+  def create?
+    true if user.try(:has_role?, 'Librarian')
+  end
+
+  def update?
+    case user.try(:role).try(:name)
+    when 'Administrator'
+      true if record.try(:receiver) == user
+    when 'Librarian'
+      true if record.try(:receiver) == user
+    end
+  end
+
+  def destroy?
+    show?
+  end
+
+  def destroy_selected?
+    true if user.try(:has_role?, 'User')
+  end
+end

data/app/policies/message_request_policy.rb

@@ -0,0 +1,21 @@
+class MessageRequestPolicy < ApplicationPolicy
+  def index?
+    true if user.try(:has_role?, 'Librarian')
+  end
+
+  def show?
+    true if user.try(:has_role?, 'Librarian')
+  end
+
+  def create?
+    false
+  end
+
+  def update?
+    true if user.try(:has_role?, 'Librarian')
+  end
+
+  def destroy?
+    true if user.try(:has_role?, 'Librarian')
+  end
+end

data/app/policies/message_template_policy.rb

@@ -0,0 +1,21 @@
+class MessageTemplatePolicy < ApplicationPolicy
+  def index?
+    true if user.try(:has_role?, 'Librarian')
+  end
+
+  def show?
+    true if user.try(:has_role?, 'Librarian')
+  end
+
+  def create?
+    false
+  end
+
+  def update?
+    true if user.try(:has_role?, 'Administator')
+  end
+
+  def destroy?
+    false
+  end
+end

data/app/views/message_requests/show.html.erb

@@ -49,7 +49,7 @@
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.edit'), edit_message_request_path(@message_request) -%></li>
-    <li><%= back_to_index(flash[:page_info]) -%></li>
+    <li><%= link_to t('page.back'), :back -%></li>
     <li><%= link_to t('message.send'), new_message_path(message_request_id: @message_request.id) -%></li>
   </ul>
 </div>

data/app/views/message_templates/index.html.erb

@@ -15,7 +15,7 @@
 <%- @message_templates.each do |message_template| -%>
   <tr class="line<%= cycle("0", "1") -%>">
     <td>
-      <%- if can? :update, message_template -%>
+      <%- if policy(message_template).update? -%>
         <%= move_position(message_template) -%>
       <%- end -%>
     </td>
@@ -23,10 +23,10 @@
     <td><%= message_template.locale -%></td>
     <td><%= message_template.title -%></td>
     <td>
-      <%- if can? :update, message_template -%>
+      <%- if policy(message_template).update? -%>
         <%= link_to t('page.edit'), edit_message_template_path(message_template) -%>
       <% end %>
-      <%- if can? :delete, message_template -%>
+      <%- if policy(message_template).destroy? -%>
         <%= link_to t('page.destroy'), message_template, data: {confirm: t('page.are_you_sure')}, method: :delete -%>
       <%- end -%>
     </td>
@@ -40,7 +40,7 @@
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <%- if can? :create, MessageTemplate -%>
+    <%- if policy(MessageTemplate).create? -%>
       <li><%= link_to t('page.new', model: t('activerecord.models.message_template')), new_message_template_path -%></li>
     <%- end -%>
   </ul>

data/app/views/message_templates/show.html.erb

@@ -27,9 +27,9 @@
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <%- if can? :update, @message_template -%>
+    <%- if policy(@message_template).update? -%>
       <li><%= link_to t('page.edit'), edit_message_template_path(@message_template) -%></li>
     <%- end -%>
-    <li><%= back_to_index(flash[:page_info]) -%></li>
+    <li><%= link_to t('page.back'), :back -%></li>
   </ul>
 </div>

data/app/views/messages/index.html.erb

@@ -21,7 +21,7 @@
   <%- @messages.each do |message| -%>
     <tr class="line<%= cycle("0", "1") -%>">
       <td>
-        <% if can? :delete, message %>
+        <% if policy(message).destroy? %>
           <input id="delete_<%=h message.id -%>" name="delete[]" type="checkbox" value="<%=h message.id %>" class="checkbox" />
         <% end %>
       </td>
@@ -64,7 +64,7 @@
   </ul>
 
   <ul>
-    <% if can? :create, Message %>
+    <% if policy(Message).create? %>
       <li><%= link_to t('page.new', model: t('activerecord.models.message')), new_message_path -%></li>
     <% end %>
   </ul>

data/app/views/messages/show.html.erb

@@ -40,10 +40,10 @@
     <% else %>
       <li><%= link_to t('page.listing', model: t('activerecord.models.message')), messages_path -%></li>
     <% end %>
-    <% if can? :create, @message %>
+    <% if policy(Message).create? %>
       <li><%= link_to t('message.reply'), new_message_path(parent_id: @message.id) -%></li>
     <% end %>
-    <% if can? :delete, @message %>
+    <% if policy(@message).destroy? %>
       <li><%= link_to t('page.destroy'), @message, data: {confirm: t('page.are_you_sure')}, method: :delete -%></li>
     <% end %>
   </ul>

data/db/migrate/20160703185015_add_most_recent_to_message_transitions.rb

@@ -0,0 +1,9 @@
+class AddMostRecentToMessageTransitions < ActiveRecord::Migration
+  def up
+    add_column :message_transitions, :most_recent, :boolean, null: true
+  end
+
+  def down
+    remove_column :message_transitions, :most_recent
+  end
+end

data/lib/enju_message/engine.rb

@@ -1,6 +1,5 @@
 require 'statesman'
 require 'awesome_nested_set'
-require 'resque_mailer'
 
 module EnjuMessage
   class Engine < ::Rails::Engine

data/lib/enju_message/version.rb

@@ -1,3 +1,3 @@
 module EnjuMessage
-  VERSION = "0.1.16"
+  VERSION = "0.2.0.beta.1"
 end

data/lib/enju_message.rb

@@ -1,7 +1,4 @@
 require "enju_message/engine"
-require "enju_message/user"
 
 module EnjuMessage
 end
-
-ActiveRecord::Base.send :include, EnjuMessage::MessageUser

data/lib/generators/enju_message/setup/setup_generator.rb

@@ -6,7 +6,8 @@ class EnjuMessage::SetupGenerator < Rails::Generators::Base
     directory("db/fixtures", "db/fixtures/enju_message")
     return if file == 'fixture'
     rake("enju_message_engine:install:migrations")
-    inject_into_file 'app/models/user.rb',
-      "  enju_message_user_model\n", :after => "enju_leaf_user_model\n"
+    inject_into_class "app/models/user.rb", User do
+      "  include EnjuMessage::EnjuUser\n"
+    end
   end
 end

data/lib/tasks/enju_message_tasks.rake

@@ -5,7 +5,7 @@ namespace :enju_message do
   desc "create initial records for enju_message"
   task :setup => :environment do
     Dir.glob(Rails.root.to_s + '/db/fixtures/enju_message/*.yml').each do |file|
-      ActiveRecord::Fixtures.create_fixtures('db/fixtures/enju_message', File.basename(file, '.*'))
+      ActiveRecord::FixtureSet.create_fixtures('db/fixtures/enju_message', File.basename(file, '.*'))
     end
   end
 

data/spec/controllers/message_requests_controller_spec.rb

@@ -29,14 +29,14 @@ describe MessageRequestsController do
 
       it "assigns all message_requests as @message_requests" do
         get :index
-        assigns(:message_requests).should be_empty
+        assigns(:message_requests).should be_nil
       end
     end
 
     describe "When not logged in" do
       it "assigns all message_requests as @message_requests" do
         get :index
-        assigns(:message_requests).should be_empty
+        assigns(:message_requests).should be_nil
       end
     end
   end

data/spec/controllers/message_templates_controller_spec.rb

@@ -29,7 +29,7 @@ describe MessageTemplatesController do
 
       it "assigns empty as @message_templates" do
         get :index
-        assigns(:message_templates).should be_empty
+        assigns(:message_templates).should be_nil
         response.should be_forbidden
       end
     end
@@ -37,7 +37,7 @@ describe MessageTemplatesController do
     describe "When not logged in" do
       it "assigns empty as @message_templates" do
         get :index
-        assigns(:message_templates).should be_empty
+        assigns(:message_templates).should be_nil
         response.should redirect_to(new_user_session_url)
       end
     end
@@ -89,7 +89,7 @@ describe MessageTemplatesController do
 
       it "assigns the requested message_template as @message_template" do
         get :new
-        assigns(:message_template).should_not be_valid
+        assigns(:message_template).should be_nil
         response.should be_forbidden
       end
     end
@@ -99,7 +99,7 @@ describe MessageTemplatesController do
 
       it "should not assign the requested message_template as @message_template" do
         get :new
-        assigns(:message_template).should_not be_valid
+        assigns(:message_template).should be_nil
         response.should be_forbidden
       end
     end
@@ -109,7 +109,7 @@ describe MessageTemplatesController do
 
       it "should not assign the requested message_template as @message_template" do
         get :new
-        assigns(:message_template).should_not be_valid
+        assigns(:message_template).should be_nil
         response.should be_forbidden
       end
     end
@@ -117,7 +117,7 @@ describe MessageTemplatesController do
     describe "When not logged in" do
       it "should not assign the requested message_template as @message_template" do
         get :new
-        assigns(:message_template).should_not be_valid
+        assigns(:message_template).should be_nil
         response.should redirect_to(new_user_session_url)
       end
     end
@@ -175,7 +175,7 @@ describe MessageTemplatesController do
       describe "with valid params" do
         it "assigns a newly created message_template as @message_template" do
           post :create, :message_template => @attrs
-          assigns(:message_template).should be_valid
+          assigns(:message_template).should be_nil
         end
 
         it "should be forbidden" do
@@ -187,7 +187,7 @@ describe MessageTemplatesController do
       describe "with invalid params" do
         it "assigns a newly created but unsaved message_template as @message_template" do
           post :create, :message_template => @invalid_attrs
-          assigns(:message_template).should_not be_valid
+          assigns(:message_template).should be_nil
         end
 
         it "should be forbidden" do
@@ -203,7 +203,7 @@ describe MessageTemplatesController do
       describe "with valid params" do
         it "assigns a newly created message_template as @message_template" do
           post :create, :message_template => @attrs
-          assigns(:message_template).should be_valid
+          assigns(:message_template).should be_nil
         end
 
         it "should be forbidden" do
@@ -215,7 +215,7 @@ describe MessageTemplatesController do
       describe "with invalid params" do
         it "assigns a newly created but unsaved message_template as @message_template" do
           post :create, :message_template => @invalid_attrs
-          assigns(:message_template).should_not be_valid
+          assigns(:message_template).should be_nil
         end
 
         it "should be forbidden" do
@@ -231,7 +231,7 @@ describe MessageTemplatesController do
       describe "with valid params" do
         it "assigns a newly created message_template as @message_template" do
           post :create, :message_template => @attrs
-          assigns(:message_template).should be_valid
+          assigns(:message_template).should be_nil
         end
 
         it "should be forbidden" do
@@ -243,7 +243,7 @@ describe MessageTemplatesController do
       describe "with invalid params" do
         it "assigns a newly created but unsaved message_template as @message_template" do
           post :create, :message_template => @invalid_attrs
-          assigns(:message_template).should_not be_valid
+          assigns(:message_template).should be_nil
         end
 
         it "should be forbidden" do
@@ -257,7 +257,7 @@ describe MessageTemplatesController do
       describe "with valid params" do
         it "assigns a newly created message_template as @message_template" do
           post :create, :message_template => @attrs
-          assigns(:message_template).should be_valid
+          assigns(:message_template).should be_nil
         end
 
         it "should be forbidden" do
@@ -269,7 +269,7 @@ describe MessageTemplatesController do
       describe "with invalid params" do
         it "assigns a newly created but unsaved message_template as @message_template" do
           post :create, :message_template => @invalid_attrs
-          assigns(:message_template).should_not be_valid
+          assigns(:message_template).should be_nil
         end
 
         it "should be forbidden" do