acts-as-messageable 0.4.11 → 0.5.0

data/gemfiles/rails_master.gemfile

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+# This file was generated by Appraisal
+
+source 'http://rubygems.org'
+
+gem 'activerecord', git: 'https://github.com/rails/rails.git'
+gem 'activesupport', git: 'https://github.com/rails/rails.git'
+gem 'ancestry'
+gem 'railties', git: 'https://github.com/rails/rails.git'
+
+group :development do
+  gem 'appraisal'
+  gem 'coveralls', require: false
+  gem 'jeweler'
+  gem 'pg'
+  gem 'pry'
+  gem 'rspec'
+  gem 'rubocop', require: false
+  gem 'sqlite3'
+  gem 'timecop'
+  gem 'yard'
+end

data/lib/acts-as-messageable.rb

@@ -1,18 +1,3 @@
-module ActsAsMessageable
-  autoload :Model,    'acts-as-messageable/model'
-  autoload :Scopes,   'acts-as-messageable/scopes'
-  autoload :Message,  'acts-as-messageable/message'
-  autoload :Relation, 'acts-as-messageable/relation'
-  autoload :Rails3,   'acts-as-messageable/rails3'
-  autoload :Rails4,   'acts-as-messageable/rails4'
+# frozen_string_literal: true
 
-  def self.rails_api
-    if Rails::VERSION::MAJOR >= 4
-      Rails4
-    else
-      Rails3
-    end
-  end
-end
-
-require 'acts-as-messageable/railtie'
+require 'acts_as_messageable'

data/lib/acts_as_messageable.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module ActsAsMessageable
+  autoload :Model, 'acts_as_messageable/model'
+  autoload :Scopes, 'acts_as_messageable/scopes'
+  autoload :Message, 'acts_as_messageable/message'
+  autoload :Relation, 'acts_as_messageable/relation'
+  autoload :Rails3, 'acts_as_messageable/rails3'
+  autoload :Rails4, 'acts_as_messageable/rails4'
+  autoload :Rails6, 'acts_as_messageable/rails6'
+
+  def self.rails_api
+    if Rails::VERSION::MAJOR >= 6
+      Rails6
+    elsif Rails::VERSION::MAJOR >= 4
+      Rails4
+    else
+      Rails3
+    end
+  end
+end
+
+require 'acts_as_messageable/railtie'

data/lib/{acts-as-messageable → acts_as_messageable}/message.rb

@@ -1,35 +1,52 @@
+# frozen_string_literal: true
+
 require 'ancestry'
 
 module ActsAsMessageable
   class Message < ::ActiveRecord::Base
     include ActsAsMessageable::Scopes
 
+    has_ancestry
+
     belongs_to :received_messageable, polymorphic: true
-    belongs_to :sent_messageable,     polymorphic: true
+    belongs_to :sent_messageable, polymorphic: true
 
-    attr_accessor   :removed, :restored
-    cattr_accessor  :required
+    attr_accessor :removed, :restored
 
+    cattr_accessor :required
+
+    ActsAsMessageable.rails_api.new(self).attr_accessible(
+      :topic, :body, :opened, :opened_at, :recipient_permanent_delete,
+      :recipient_delete, :sender_permanent_delete, :sender_delete
+    )
     ActsAsMessageable.rails_api.new(self).default_scope('created_at desc')
 
     def open?
       opened?
     end
 
+    def opened?
+      opened_at.present? || super
+    end
+
     def open
-      update_attributes!(opened: true)
+      ActsAsMessageable.rails_api.new(self).update_attributes!(opened_at: DateTime.now)
+      ActsAsMessageable.rails_api.new(self).update_attributes!(opened: true)
     end
+
     alias mark_as_read open
-    alias read         open
+    alias read open
 
     def close
-      update_attributes!(opened: false)
+      ActsAsMessageable.rails_api.new(self).update_attributes!(opened_at: nil)
+      ActsAsMessageable.rails_api.new(self).update_attributes!(opened: false)
     end
+
     alias mark_as_unread close
-    alias unread         close
+    alias unread close
 
     alias from sent_messageable
-    alias to   received_messageable
+    alias to received_messageable
 
     def real_receiver(user)
       user == from ? to : from

data/lib/{acts-as-messageable → acts_as_messageable}/model.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActsAsMessageable
   module Model
     def self.included(base)
@@ -5,49 +7,46 @@ module ActsAsMessageable
     end
 
     module ClassMethods
-      mattr_accessor :messages_class_name, :group_messages
-
       # Method make ActiveRecord::Base object messageable
       # @param [Symbol] :table_name - table name for messages
       # @param [String] :class_name - message class name
       # @param [Array, Symbol] :required - required fields in message
       # @param [Symbol] :dependent - dependent option from ActiveRecord has_many method
+      # @param [Symbol] :search_scope - name of a scope for a full text search
       def acts_as_messageable(options = {})
         default_options = {
           table_name: 'messages',
           class_name: 'ActsAsMessageable::Message',
           required: %i[topic body],
           dependent: :nullify,
-          group_messages: false
+          group_messages: false,
+          search_scope: :search
         }
         options = default_options.merge(options)
 
-        has_many  :received_messages_relation,
-                  as: :received_messageable,
-                  class_name: options[:class_name],
-                  dependent: options[:dependent]
-        has_many  :sent_messages_relation,
-                  as: :sent_messageable,
-                  class_name: options[:class_name],
-                  dependent: options[:dependent]
+        mattr_accessor(:messages_class_name, :group_messages)
+
+        has_many :received_messages_relation,
+                 as: :received_messageable,
+                 class_name: options[:class_name],
+                 dependent: options[:dependent]
+        has_many :sent_messages_relation,
+                 as: :sent_messageable,
+                 class_name: options[:class_name],
+                 dependent: options[:dependent]
 
         self.messages_class_name = options[:class_name].constantize
         messages_class_name.has_ancestry
 
-        if messages_class_name.respond_to?(:table_name=)
-          messages_class_name.table_name = options[:table_name]
-          messages_class_name.initialize_scopes
-        else
-          messages_class_name.set_table_name(options[:table_name])
-          ActiveSupport::Deprecation.warn("Calling set_table_name is deprecated. Please use `self.table_name = 'the_name'` instead.")
-        end
+        messages_class_name.table_name = options[:table_name]
+        messages_class_name.initialize_scopes(options[:search_scope])
 
         messages_class_name.required = Array.wrap(options[:required])
         messages_class_name.validates_presence_of messages_class_name.required
         self.group_messages = options[:group_messages]
 
         include ActsAsMessageable::Model::InstanceMethods
-    end
+      end
 
       # Method recognize real object class
       # @return [ActiveRecord::Base] class or relation object
@@ -122,9 +121,7 @@ module ActsAsMessageable
       #
       # @return [ActsAsMessageable::Message] the message object
       def send_message!(to, *args)
-        send_message(to, *args).tap do |message|
-          message.save!
-        end
+        send_message(to, *args).tap(&:save!)
       end
 
       # Reply to given message
@@ -136,13 +133,13 @@ module ActsAsMessageable
       def reply_to(message, *args)
         current_user = self
 
-        if message.participant?(current_user)
-          reply_message = send_message(message.real_receiver(current_user), *args)
-          reply_message.parent = message
-          reply_message.save
+        return unless message.participant?(current_user)
 
-          reply_message
-        end
+        reply_message = send_message(message.real_receiver(current_user), *args)
+        reply_message.parent = message
+        reply_message.save
+
+        reply_message
       end
 
       # Mark message as deleted
@@ -158,7 +155,7 @@ module ActsAsMessageable
           raise "#{current_user} can't delete this message"
         end
 
-        message.update_attributes!(attribute => true)
+        ActsAsMessageable.rails_api.new(message).update_attributes!(attribute => true)
       end
 
       # Mark message as restored
@@ -174,7 +171,7 @@ module ActsAsMessageable
           raise "#{current_user} can't restore this message"
         end
 
-        message.update_attributes!(attribute => false)
+        ActsAsMessageable.rails_api.new(message).update_attributes!(attribute => false)
       end
     end
   end

data/lib/{acts-as-messageable → acts_as_messageable}/rails3.rb

@@ -1,19 +1,21 @@
+# frozen_string_literal: true
+
 module ActsAsMessageable
   class Rails3
     def initialize(subject)
       @subject = subject
     end
 
-    def attr_accessible(*args)
-      @subject.attr_accessible(*args)
-    end
-
     def default_scope(order_by)
       @subject.send(:default_scope, order(order_by))
     end
 
     def method_missing(name, *args)
-      @subject.send(name, *args)
+      @subject.send(name, *args) || super
+    end
+
+    def respond_to_missing?(method_name, include_private = false)
+      method_name.to_s == 'default_scope' || super
     end
   end
 end

data/lib/{acts-as-messageable → acts_as_messageable}/rails4.rb

@@ -1,12 +1,12 @@
+# frozen_string_literal: true
+
 module ActsAsMessageable
   class Rails4
     def initialize(subject)
       @subject = subject
     end
 
-    def attr_accessible(*args)
-      @subject.attr_accessible(*args) if defined?(ProtectedAttributes)
-    end
+    def attr_accessible(*); end
 
     def default_scope(order_by)
       @subject.send(:default_scope) { order(order_by) }
@@ -17,7 +17,11 @@ module ActsAsMessageable
     end
 
     def method_missing(name, *args)
-      @subject.send(name, *args)
+      @subject.send(name, *args) || super
+    end
+
+    def respond_to_missing?(method_name, include_private = false)
+      %w[default_scope scoped attr_accessible].include?(method_name) || super
     end
   end
 end

data/lib/acts_as_messageable/rails6.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module ActsAsMessageable
+  class Rails6
+    def initialize(subject)
+      @subject = subject
+    end
+
+    def attr_accessible(*); end
+
+    def default_scope(order_by)
+      @subject.send(:default_scope) { order(order_by) }
+    end
+
+    def scoped
+      @subject.scope
+    end
+
+    def update_attributes!(*args)
+      @subject.update!(*args)
+    end
+
+    def method_missing(name, *args)
+      @subject.send(name, *args) || super
+    end
+
+    def respond_to_missing?(method_name, include_private = false)
+      %w[attr_accessible default_scope scoped update_attributes!].include?(method_name) || super
+    end
+  end
+end

data/lib/acts_as_messageable/railtie.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'active_record/railtie'
+
+module ActsAsMessageable
+  class Railtie < Rails::Railtie
+    ActiveRecord::Base.include ActsAsMessageable::Model if defined?(ActiveRecord::Base)
+
+    ActiveRecord::Relation.include ActsAsMessageable::Relation if defined?(ActiveRecord::Relation)
+  end
+end

data/lib/{acts-as-messageable → acts_as_messageable}/relation.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActsAsMessageable
   module Relation
     attr_accessor :relation_context
@@ -5,8 +7,8 @@ module ActsAsMessageable
     def process(context = relation_context)
       each do |message|
         yield(message) if block_given?
-        context.delete_message(message)   if message.removed
-        context.restore_message(message)  if message.restored
+        context.delete_message(message) if message.removed
+        context.restore_message(message) if message.restored
       end
     end
 

data/lib/{acts-as-messageable → acts_as_messageable}/scopes.rb

@@ -1,19 +1,23 @@
+# frozen_string_literal: true
+
 require 'active_support/concern'
 
 module ActsAsMessageable
   module Scopes
     extend ActiveSupport::Concern
 
-    included do
-      initialize_scopes
-    end
-
     module ClassMethods
-      def initialize_scopes
-        scope :are_from,          ->(*args) { where(sent_messageable_id: args.first, sent_messageable_type: args.first.class.name) }
-        scope :are_to,            ->(*args) { where(received_messageable_id: args.first, received_messageable_type: args.first.class.name) }
-        scope :search,            ->(*args) { where('body like :search_txt or topic like :search_txt', search_txt: "%#{args.first}%") }
-        scope :connected_with,    lambda { |*args|
+      def initialize_scopes(search_scope)
+        scope :are_from, lambda { |*args|
+          where(sent_messageable_id: args.first, sent_messageable_type: args.first.class.name)
+        }
+        scope :are_to, lambda { |*args|
+          where(received_messageable_id: args.first, received_messageable_type: args.first.class.name)
+        }
+        scope search_scope, lambda { |*args|
+          where('body like :search_txt or topic like :search_txt', search_txt: "%#{args.first}%")
+        }
+        scope :connected_with, lambda { |*args|
           where("(sent_messageable_type = :sent_type and
                         sent_messageable_id = :sent_id and
                         sender_delete = :s_delete and sender_permanent_delete = :s_perm_delete) or
@@ -29,9 +33,9 @@ module ActsAsMessageable
                 r_perm_delete: false,
                 s_perm_delete: false)
         }
-        scope :readed,            -> { where(opened: true)  }
-        scope :unreaded,          -> { where(opened: false) }
-        scope :deleted,           -> { where(recipient_delete: true, sender_delete: true) }
+        scope :readed, -> { where('opened_at is not null OR opened = ?', true) }
+        scope :unreaded, -> { where('opened_at is null OR opened = ?', false) }
+        scope :deleted, -> { where(recipient_delete: true, sender_delete: true) }
       end
     end
   end

data/lib/generators/{acts-as-messageable → acts_as_messageable}/migration/migration_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails/generators/migration'
 require 'rails/generators/active_record'
 
@@ -5,10 +7,11 @@ module ActsAsMessageable
   class MigrationGenerator < Rails::Generators::Base
     include Rails::Generators::Migration
 
-    namespace 'acts-as-messageable:migration'
+    namespace 'acts_as_messageable:migration'
 
     source_root File.join(File.dirname(__FILE__), 'templates')
     argument :table_name, type: :string, default: 'messages'
+    class_option :uuid, type: :boolean, default: false
 
     def self.next_migration_number(dirname)
       ActiveRecord::Generators::Base.next_migration_number(dirname)
@@ -21,7 +24,18 @@ module ActsAsMessageable
         nil
       end
       begin
-        migration_template 'migration_permanent.rb', 'db/migrate/add_recipient_permanent_delete_and_sender_permanent_delete_to_messages.rb'
+        migration_template 'migration_permanent.rb',
+                           'db/migrate/add_recipient_permanent_delete_and_sender_permanent_delete_to_messages.rb'
+      rescue StandardError
+        nil
+      end
+      begin
+        migration_template 'migration_opened_as_datetime.rb', 'db/migrate/add_opened_at_to_messages.rb'
+      rescue StandardError
+        nil
+      end
+      begin
+        migration_template 'migration_indexes.rb', 'db/migrate/add_indexes_to_messages.rb'
       rescue StandardError
         nil
       end