message_train 0.6.17 → 0.7.1

data/Rakefile

@@ -10,21 +10,20 @@ rescue Bundler::BundlerError => e
 end
 require 'rake'
 
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
+require 'juwelier'
+Juwelier::Tasks.new do |gem|
   # gem is a Gem::Specification...
   # see http://guides.rubygems.org/specification-reference/ for more options
   gem.name = 'message_train'
   gem.homepage = 'http://www.gemvein.com/museum/cases/message_train'
   gem.license = 'MIT'
-  gem.summary = 'Rails 4 Engine providing messaging for any object'
-  gem.description = 'Rails 4 Engine providing private/public messaging for '\
-    'any object, such as Users or Groups'
+  gem.summary = 'Rails 4 & 5 Engine providing messaging for any object'
+  gem.description = 'Rails 4 & 5 Engine providing private and public messaging'\
+                    ' for any object, such as Users or Groups'
   gem.email = 'karen.e.lundgren@gmail.com'
   gem.authors = ['Karen Lundgren']
-  # dependencies defined in Gemfile
 end
-Jeweler::RubygemsDotOrgTasks.new
+Juwelier::RubygemsDotOrgTasks.new
 
 require 'rspec/core'
 require 'rspec/core/rake_task'

data/VERSION

@@ -1 +1 @@
-0.6.17
+0.7.1

data/app/assets/javascripts/ckeditor/{config.js.coffee → config.js}

@@ -1,6 +1,6 @@
-CKEDITOR.editorConfig = (config) ->
-  config.allowedContent = true
-  config.width = '100%'
+CKEDITOR.editorConfig = function(config) {
+  config.allowedContent = true;
+  config.width = '100%';
   config.toolbar_full = [
     {
       name: 'links',
@@ -43,6 +43,7 @@ CKEDITOR.editorConfig = (config) ->
         'RemoveFormat'
       ]
     }
-  ]
-  config.toolbar = 'full'
-  true
+  ];
+  config.toolbar = 'full';
+  return true;
+};

data/app/assets/stylesheets/message_train.scss

@@ -82,20 +82,12 @@ div.conversation-actions {
 
 td.conversation-actions {
   white-space: nowrap;
-
-  a {
-    visibility: hidden;
-  }
 }
 
 .date-column {
   white-space: nowrap;
 }
 
-tr:hover .conversation-actions a {
-  visibility: visible;
-}
-
 .glyphicon-thumbnail {
   font-size: 170px;
 }

data/app/controllers/concerns/message_train_authorization.rb

@@ -0,0 +1,37 @@
+# MessageTrain authorization
+module MessageTrainAuthorization
+  extend ActiveSupport::Concern
+
+  protected
+
+  def authorize_collective(collective, division)
+    return false unless authorize_collective_access(collective)
+    case division
+    when :in, :ignored
+      authorize_collective_receiving(collective)
+    when :sent, :drafts
+      authorize_collective_sending(collective)
+    end
+  end
+
+  def authorize_collective_access(collective)
+    return true if collective.allows_access_by? @box_user
+    flash[:error] = :access_to_that_box_denied.l
+    redirect_to main_app.root_url
+    false
+  end
+
+  def authorize_collective_receiving(collective)
+    return true if collective.allows_receiving_by? @box_user
+    flash[:error] = :access_to_that_box_denied.l
+    redirect_to message_train.collective_box_url(collective.path_part, :sent)
+    false
+  end
+
+  def authorize_collective_sending(collective)
+    return true if collective.allows_sending_by? @box_user
+    flash[:error] = :access_to_that_box_denied.l
+    redirect_to message_train.collective_box_url(collective.path_part, :in)
+    false
+  end
+end

data/app/controllers/concerns/message_train_support.rb

@@ -3,13 +3,13 @@ module MessageTrainSupport
   extend ActiveSupport::Concern
   included do
     # Last in first out
-    prepend_before_filter :load_collective_boxes,
+    prepend_before_action :load_collective_boxes,
                           :load_box,
                           :load_collective,
                           :load_division,
                           :load_box_user,
                           unless: :devise_controller?
-    before_filter :load_objects
+    before_action :load_objects
     before_action :set_locale
 
     helper MessageTrain::ApplicationHelper
@@ -24,6 +24,11 @@ module MessageTrainSupport
     end
   end
 
+  def redirect_to_sign_in
+    flash[:error] = :you_must_sign_in_or_sign_up_to_continue.l
+    redirect_to MessageTrain.configuration.user_sign_in_path
+  end
+
   protected
 
   def anonymous
@@ -36,9 +41,8 @@ module MessageTrainSupport
   end
 
   def load_box_user
-    @box_user = send(
-      MessageTrain.configuration.current_user_method
-    ) || anonymous
+    @box_user = send(MessageTrain.configuration.current_user_method)
+    @box_user ||= anonymous
   end
 
   def load_division
@@ -46,45 +50,15 @@ module MessageTrainSupport
   end
 
   def load_collective
-    if params[:collective_id].present?
-      collective_table, collective_id = params[:collective_id].split(':')
-      collective_class_name = MessageTrain.configuration.recipient_tables[
-        collective_table.to_sym
-      ]
-      collective_model = collective_class_name.constantize
-      slug_column = MessageTrain.configuration
-                                .slug_columns[collective_table.to_sym] || :slug
-      @collective = collective_model.find_by!(slug_column => collective_id)
-
-      unless @collective.allows_receiving_by?(
-        @box_user
-      ) || @collective.allows_sending_by?(
-        @box_user
-      )
-        flash[:error] = :access_to_that_box_denied.l
-        redirect_to main_app.root_url
-        return
-      end
+    return unless params[:collective_id].present?
+    collective_table, collective_id = params[:collective_id].split(':')
+    model = get_collective_model(collective_table)
+    @collective = model.find_by!(model.slug_column => collective_id)
+    authorize_collective(@collective, @division)
+  end
 
-      case @division
-      when :in, :ignored
-        unless @collective.allows_receiving_by? @box_user
-          flash[:error] = :access_to_that_box_denied.l
-          redirect_to message_train.collective_box_url(
-            @collective.path_part,
-            :sent
-          )
-        end
-      when :sent, :drafts
-        unless @collective.allows_sending_by? @box_user
-          flash[:error] = :access_to_that_box_denied.l
-          redirect_to message_train.collective_box_url(
-            @collective.path_part,
-            :in
-          )
-        end
-      end
-    end
+  def get_collective_model(table)
+    MessageTrain.configuration.recipient_tables[table.to_sym].constantize
   end
 
   def load_box
@@ -100,39 +74,37 @@ module MessageTrainSupport
   end
 
   def load_objects
-    @objects = {}
-    @objects['conversations'] = {}
-    @objects['messages'] = {}
-    if params[:objects].present?
-      params[:objects].each do |type, list|
-        list.each do |key, list_item|
-          @objects[type][key.to_s] = list_item.to_i
-        end
+    @objects = { 'conversations' => {}, 'messages' => {} }
+    return unless params[:objects].present?
+    params[:objects].each do |type, list|
+      list.each do |key, list_item|
+        @objects[type][key.to_s] = list_item.to_i
       end
     end
   end
 
   def respond_to_marking
-    if !@box.errors.all.empty?
-      respond_to do |format|
-        format.html do
-          flash[:error] = @box.message
-          show
-        end
-        format.json { render :results, status: :unprocessable_entity }
+    @box.errors.any? ? marking_error : marking_success
+  end
+
+  def marking_error
+    respond_to do |format|
+      format.html do
+        flash[:error] = @box.message
+        show
       end
-    else
-      respond_to do |format|
-        format.html do
-          if @box.results.all.empty?
-            flash[:alert] = @box.message
-          else
-            flash[:notice] = @box.message
-          end
-          show
-        end
-        format.json { render :results, status: :accepted }
+      format.json { render :results, status: :unprocessable_entity }
+    end
+  end
+
+  def marking_success
+    respond_to do |format|
+      format.html do
+        flash_type = @box.results.any? ? :notice : :alert
+        flash[flash_type] = @box.message
+        show
       end
+      format.json { render :results, status: :accepted }
     end
   end
 end

data/app/controllers/message_train/application_controller.rb

@@ -2,5 +2,6 @@ module MessageTrain
   # Application controller
   class ApplicationController < ::ApplicationController
     include MessageTrainSupport
+    include MessageTrainAuthorization
   end
 end

data/app/controllers/message_train/boxes_controller.rb

@@ -1,11 +1,12 @@
 module MessageTrain
   # Boxes controller
   class BoxesController < MessageTrain::ApplicationController
-    before_filter :load_conversations
+    before_action :load_conversations
 
     # GET /box/:division
     def show
-      @conversations = @conversations.page(params[:page])
+      @conversations = @conversations.order(updated_at: :desc)
+                                     .page(params[:page])
       render :show
     end
 
@@ -19,8 +20,8 @@ module MessageTrain
 
     # DELETE /box/:division
     def destroy
-      if %w( ignore unignore ).include? params[:mark_to_set]
-        @box.send(params[:mark_to_set], @objects)
+      if %w(ignore unignore).include? params[:mark_to_set]
+        MessageTrain::Ignore.send(params[:mark_to_set], @objects, @box)
       end
       respond_to_marking
     end

data/app/controllers/message_train/conversations_controller.rb

@@ -1,12 +1,14 @@
 module MessageTrain
   # Conversations controller
   class ConversationsController < MessageTrain::ApplicationController
-    before_filter :load_conversation
-    after_filter :mark_as_read
+    before_action :load_conversation
+    after_action :mark_as_read
 
     # GET /box/:division/conversations/:id
     def show
-      @messages = @conversation.messages.page(params[:page])
+      @messages = @conversation.messages
+                               .order(updated_at: :desc)
+                               .page(params[:page])
       render :show
       @box.mark :read, @messages
     end
@@ -21,8 +23,8 @@ module MessageTrain
 
     # DELETE /box/:division/conversations/:id
     def destroy
-      if %w( ignore unignore ).include? params[:mark_to_set]
-        @box.send(params[:mark_to_set], @conversation)
+      if %w(ignore unignore).include? params[:mark_to_set]
+        MessageTrain::Ignore.send(params[:mark_to_set], @conversation, @box)
       end
       respond_to_marking
     end

data/app/controllers/message_train/messages_controller.rb

@@ -1,7 +1,7 @@
 module MessageTrain
   # Messages controller
   class MessagesController < MessageTrain::ApplicationController
-    before_filter :load_message, only: [:show, :edit, :update]
+    before_action :load_message, only: [:show, :edit, :update]
 
     # GET /box/in/messages/1
     def show
@@ -12,9 +12,12 @@ module MessageTrain
 
     # GET /box/:division/messages/new
     def new
-      @message = @box.new_message(
-        message_train_conversation_id: params[:conversation_id]
-      )
+      if params[:conversation_id]
+        @conversation = @box.find_conversation params[:conversation_id]
+        @message = @conversation.new_reply(box: @box)
+      else
+        @message = MessageTrain::Message.new(box: @box)
+      end
     end
 
     # GET /box/:division/messages/:id/edit
@@ -25,42 +28,55 @@ module MessageTrain
     # POST /box/:division/messages
     def create
       @message = @box.send_message(message_params)
-      if @box.errors.all.empty?
-        if @message.draft
-          redirect_to message_train.box_path(:drafts), alert: @box.message
-        else
-          redirect_to message_train.box_path(:sent), notice: @box.message
-        end
+      return create_error if @box.errors.any?
+      if @message.draft
+        redirect_to message_train.box_path(:drafts), alert: @box.message
       else
-        flash[:error] = @box.message
-        render :new
+        redirect_to message_train.box_path(:sent), notice: @box.message
       end
     end
 
     # PATCH/PUT /box/:division/messages/:id
     def update
-      !@message.draft && raise(ActiveRecord::RecordNotFound)
       @box.update_message(@message, message_params)
-      if @box.errors.all.empty?
-        if @message.draft
-          redirect_to(
-            message_train.box_conversation_url(@box, @message.conversation),
-            alert: @box.message
-          )
-        else
-          redirect_to(
-            message_train.box_path(:sent),
-            notice: @box.message
-          )
-        end
+
+      return update_error if @box.errors.any?
+
+      if @message.draft
+        redirect_draft
       else
-        flash[:error] = @box.message
-        render :edit
+        redirect_ready
       end
     end
 
     private
 
+    def redirect_draft
+      redirect_to(
+        message_train.box_conversation_url(@box, @message.conversation),
+        alert: @box.message
+      )
+    end
+
+    def redirect_ready
+      redirect_to(
+        message_train.box_path(:sent),
+        notice: @box.message
+      )
+    end
+
+    def update_error
+      flash[:error] = @box.message
+      render :edit
+      false
+    end
+
+    def create_error
+      flash[:error] = @box.message
+      render :new
+      false
+    end
+
     def load_message
       @message = @box.find_message(params[:id])
     end

data/app/controllers/message_train/participants_controller.rb

@@ -1,17 +1,18 @@
 module MessageTrain
   # Participants controller
   class ParticipantsController < MessageTrain::ApplicationController
-    before_filter :load_participants
-    before_filter :load_participant, only: :show
+    before_action :load_model
+    before_action :load_participants
+    before_action :load_participant, only: :show
 
-    # GET /box/:division/participants/:model
+    # GET /box/:division/participants/:model.json
     def index
       respond_to do |format|
         format.json { render :index }
       end
     end
 
-    # GET /box/:division/participants/:model/:id
+    # GET /box/:division/participants/:model/:id.json
     def show
       respond_to do |format|
         format.json { render :show }
@@ -20,29 +21,17 @@ module MessageTrain
 
     private
 
-    def load_participants
+    def load_model
       params[:model].empty? && raise(ActiveRecord::RecordNotFound)
-      model_sym = params[:model].to_sym
-      model = MessageTrain.configuration.recipient_tables[model_sym].constantize
-      method = MessageTrain.configuration.address_book_methods[model_sym]
-      fallback_method = MessageTrain.configuration.address_book_method
+      @model = MessageTrain.configuration
+                           .recipient_tables[params[:model].to_sym]
+                           .constantize
+    end
+
+    def load_participants
       current_participant = send(MessageTrain.configuration.current_user_method)
-      if !method.nil? && model.respond_to?(method)
-        @participants = model.send(method, current_participant)
-      elsif !fallback_method.nil? && model.respond_to?(fallback_method)
-        @participants = model.send(fallback_method, current_participant)
-      else
-        @participants = model.all
-      end
-      if params[:query].present?
-        field_name = MessageTrain.configuration.slug_columns[model_sym]
-        pattern = Regexp.union('\\', '%', '_')
-        query = params[:query].gsub(pattern) { |x| ['\\', x].join }
-        @participants = @participants.where(
-          "#{field_name} LIKE ?",
-          "#{query}%"
-        )
-      end
+      @participants = @model.message_train_address_book(current_participant)
+      @participants = @participants.where_slug_starts_with(params[:query])
     end
 
     def load_participant