acts-as-messageable 0.4.10 → 0.4.11

data/gemfiles/rails_5.2.gemfile

@@ -0,0 +1,16 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "activerecord", "~> 5.2.0"
+gem "activesupport", "~> 5.2.0"
+gem "ancestry", ">= 1.3.0"
+gem "railties", "~> 5.2.0"
+
+group :development do
+  gem "appraisal"
+  gem "coveralls", require: false
+  gem "jeweler"
+  gem "rspec"
+  gem "sqlite3", "~> 1.3.6"
+end

data/gemfiles/rails_5.2.gemfile.lock

@@ -0,0 +1,155 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionpack (5.2.3)
+      actionview (= 5.2.3)
+      activesupport (= 5.2.3)
+      rack (~> 2.0)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (5.2.3)
+      activesupport (= 5.2.3)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activemodel (5.2.3)
+      activesupport (= 5.2.3)
+    activerecord (5.2.3)
+      activemodel (= 5.2.3)
+      activesupport (= 5.2.3)
+      arel (>= 9.0)
+    activesupport (5.2.3)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    addressable (2.4.0)
+    ancestry (3.0.6)
+      activerecord (>= 3.2.0)
+    appraisal (2.2.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    arel (9.0.0)
+    builder (3.2.3)
+    concurrent-ruby (1.1.5)
+    coveralls (0.8.23)
+      json (>= 1.8, < 3)
+      simplecov (~> 0.16.1)
+      term-ansicolor (~> 1.3)
+      thor (>= 0.19.4, < 2.0)
+      tins (~> 1.6)
+    crass (1.0.4)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
+    diff-lcs (1.3)
+    docile (1.3.1)
+    erubi (1.8.0)
+    faraday (0.9.2)
+      multipart-post (>= 1.2, < 3)
+    git (1.5.0)
+    github_api (0.16.0)
+      addressable (~> 2.4.0)
+      descendants_tracker (~> 0.0.4)
+      faraday (~> 0.8, < 0.10)
+      hashie (>= 3.4)
+      mime-types (>= 1.16, < 3.0)
+      oauth2 (~> 1.0)
+    hashie (3.6.0)
+    highline (2.0.2)
+    i18n (1.6.0)
+      concurrent-ruby (~> 1.0)
+    jeweler (2.3.9)
+      builder
+      bundler
+      git (>= 1.2.5)
+      github_api (~> 0.16.0)
+      highline (>= 1.6.15)
+      nokogiri (>= 1.5.10)
+      psych
+      rake
+      rdoc
+      semver2
+    json (2.2.0)
+    jwt (2.2.1)
+    loofah (2.2.3)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    method_source (0.9.2)
+    mime-types (2.99.3)
+    mini_portile2 (2.4.0)
+    minitest (5.11.3)
+    multi_json (1.13.1)
+    multi_xml (0.6.0)
+    multipart-post (2.1.1)
+    nokogiri (1.10.3)
+      mini_portile2 (~> 2.4.0)
+    oauth2 (1.4.1)
+      faraday (>= 0.8, < 0.16.0)
+      jwt (>= 1.0, < 3.0)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
+      rack (>= 1.2, < 3)
+    psych (3.1.0)
+    rack (2.0.7)
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.0.4)
+      loofah (~> 2.2, >= 2.2.2)
+    railties (5.2.3)
+      actionpack (= 5.2.3)
+      activesupport (= 5.2.3)
+      method_source
+      rake (>= 0.8.7)
+      thor (>= 0.19.0, < 2.0)
+    rake (12.3.2)
+    rdoc (6.1.1)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+    rspec-core (3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.3)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.0)
+    semver2 (3.4.2)
+    simplecov (0.16.1)
+      docile (~> 1.1)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.2)
+    sqlite3 (1.3.13)
+    term-ansicolor (1.7.1)
+      tins (~> 1.0)
+    thor (0.20.3)
+    thread_safe (0.3.6)
+    tins (1.20.3)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (~> 5.2.0)
+  activesupport (~> 5.2.0)
+  ancestry (>= 1.3.0)
+  appraisal
+  coveralls
+  jeweler
+  railties (~> 5.2.0)
+  rspec
+  sqlite3 (~> 1.3.6)
+
+BUNDLED WITH
+   2.0.1

data/gemfiles/rails_6.0.gemfile

@@ -0,0 +1,16 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "activerecord", "~> 6.0.0.rc1"
+gem "activesupport", "~> 6.0.0.rc1"
+gem "ancestry", ">= 1.3.0"
+gem "railties", "~> 6.0.0.rc1"
+
+group :development do
+  gem "appraisal"
+  gem "coveralls", require: false
+  gem "jeweler"
+  gem "rspec"
+  gem "sqlite3", "~> 1.4.0"
+end

data/gemfiles/rails_6.0.gemfile.lock

@@ -0,0 +1,155 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionpack (6.0.0.rc1)
+      actionview (= 6.0.0.rc1)
+      activesupport (= 6.0.0.rc1)
+      rack (~> 2.0)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (6.0.0.rc1)
+      activesupport (= 6.0.0.rc1)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activemodel (6.0.0.rc1)
+      activesupport (= 6.0.0.rc1)
+    activerecord (6.0.0.rc1)
+      activemodel (= 6.0.0.rc1)
+      activesupport (= 6.0.0.rc1)
+    activesupport (6.0.0.rc1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+      zeitwerk (~> 2.1, >= 2.1.4)
+    addressable (2.4.0)
+    ancestry (3.0.6)
+      activerecord (>= 3.2.0)
+    appraisal (2.2.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    builder (3.2.3)
+    concurrent-ruby (1.1.5)
+    coveralls (0.8.23)
+      json (>= 1.8, < 3)
+      simplecov (~> 0.16.1)
+      term-ansicolor (~> 1.3)
+      thor (>= 0.19.4, < 2.0)
+      tins (~> 1.6)
+    crass (1.0.4)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
+    diff-lcs (1.3)
+    docile (1.3.1)
+    erubi (1.8.0)
+    faraday (0.9.2)
+      multipart-post (>= 1.2, < 3)
+    git (1.5.0)
+    github_api (0.16.0)
+      addressable (~> 2.4.0)
+      descendants_tracker (~> 0.0.4)
+      faraday (~> 0.8, < 0.10)
+      hashie (>= 3.4)
+      mime-types (>= 1.16, < 3.0)
+      oauth2 (~> 1.0)
+    hashie (3.6.0)
+    highline (2.0.2)
+    i18n (1.6.0)
+      concurrent-ruby (~> 1.0)
+    jeweler (2.3.9)
+      builder
+      bundler
+      git (>= 1.2.5)
+      github_api (~> 0.16.0)
+      highline (>= 1.6.15)
+      nokogiri (>= 1.5.10)
+      psych
+      rake
+      rdoc
+      semver2
+    json (2.2.0)
+    jwt (2.2.1)
+    loofah (2.2.3)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    method_source (0.9.2)
+    mime-types (2.99.3)
+    mini_portile2 (2.4.0)
+    minitest (5.11.3)
+    multi_json (1.13.1)
+    multi_xml (0.6.0)
+    multipart-post (2.1.1)
+    nokogiri (1.10.3)
+      mini_portile2 (~> 2.4.0)
+    oauth2 (1.4.1)
+      faraday (>= 0.8, < 0.16.0)
+      jwt (>= 1.0, < 3.0)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
+      rack (>= 1.2, < 3)
+    psych (3.1.0)
+    rack (2.0.7)
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.0.4)
+      loofah (~> 2.2, >= 2.2.2)
+    railties (6.0.0.rc1)
+      actionpack (= 6.0.0.rc1)
+      activesupport (= 6.0.0.rc1)
+      method_source
+      rake (>= 0.8.7)
+      thor (>= 0.20.3, < 2.0)
+    rake (12.3.2)
+    rdoc (6.1.1)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+    rspec-core (3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.3)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.0)
+    semver2 (3.4.2)
+    simplecov (0.16.1)
+      docile (~> 1.1)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.2)
+    sqlite3 (1.4.1)
+    term-ansicolor (1.7.1)
+      tins (~> 1.0)
+    thor (0.20.3)
+    thread_safe (0.3.6)
+    tins (1.20.3)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+    zeitwerk (2.1.6)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (~> 6.0.0.rc1)
+  activesupport (~> 6.0.0.rc1)
+  ancestry (>= 1.3.0)
+  appraisal
+  coveralls
+  jeweler
+  railties (~> 6.0.0.rc1)
+  rspec
+  sqlite3 (~> 1.4.0)
+
+BUNDLED WITH
+   2.0.1

data/lib/acts-as-messageable/message.rb

@@ -4,32 +4,32 @@ module ActsAsMessageable
   class Message < ::ActiveRecord::Base
     include ActsAsMessageable::Scopes
 
-    belongs_to :received_messageable, :polymorphic => true
-    belongs_to :sent_messageable,     :polymorphic => true
+    belongs_to :received_messageable, polymorphic: true
+    belongs_to :sent_messageable,     polymorphic: true
 
     attr_accessor   :removed, :restored
     cattr_accessor  :required
 
-    ActsAsMessageable.rails_api.new(self).default_scope("created_at desc")
+    ActsAsMessageable.rails_api.new(self).default_scope('created_at desc')
 
     def open?
-      self.opened?
+      opened?
     end
 
     def open
-      update_attributes!(:opened => true)
+      update_attributes!(opened: true)
     end
-    alias :mark_as_read :open
-    alias :read         :open
+    alias mark_as_read open
+    alias read         open
 
     def close
-      update_attributes!(:opened => false)
+      update_attributes!(opened: false)
     end
-    alias :mark_as_unread :close
-    alias :unread         :close
+    alias mark_as_unread close
+    alias unread         close
 
-    alias :from :sent_messageable
-    alias :to   :received_messageable
+    alias from sent_messageable
+    alias to   received_messageable
 
     def real_receiver(user)
       user == from ? to : from
@@ -56,7 +56,7 @@ module ActsAsMessageable
     end
 
     def people
-      conversation.map{ |x| x.from }.uniq!
+      conversation.map(&:from).uniq!
     end
   end
 end

data/lib/acts-as-messageable/model.rb

@@ -1,6 +1,5 @@
 module ActsAsMessageable
   module Model
-
     def self.included(base)
       base.extend ClassMethods
     end
@@ -15,47 +14,46 @@ module ActsAsMessageable
       # @param [Symbol] :dependent - dependent option from ActiveRecord has_many method
       def acts_as_messageable(options = {})
         default_options = {
-          :table_name => "messages",
-          :class_name => "ActsAsMessageable::Message",
-          :required => [:topic, :body],
-          :dependent => :nullify,
-          :group_messages => false,
+          table_name: 'messages',
+          class_name: 'ActsAsMessageable::Message',
+          required: %i[topic body],
+          dependent: :nullify,
+          group_messages: false
         }
         options = default_options.merge(options)
 
         has_many  :received_messages_relation,
-                  :as => :received_messageable,
-                  :class_name => options[:class_name],
-                  :dependent => options[:dependent]
+                  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]
+                  as: :sent_messageable,
+                  class_name: options[:class_name],
+                  dependent: options[:dependent]
 
         self.messages_class_name = options[:class_name].constantize
-        self.messages_class_name.has_ancestry
+        messages_class_name.has_ancestry
 
-        if self.messages_class_name.respond_to?(:table_name=)
-          self.messages_class_name.table_name = options[:table_name]
-          self.messages_class_name.initialize_scopes
+        if messages_class_name.respond_to?(:table_name=)
+          messages_class_name.table_name = options[:table_name]
+          messages_class_name.initialize_scopes
         else
-          self.messages_class_name.set_table_name(options[:table_name])
+          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
 
-        self.messages_class_name.required = Array.wrap(options[:required])
-        self.messages_class_name.validates_presence_of self.messages_class_name.required
+        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
 
-    # Method recognize real object class
-    # @return [ActiveRecord::Base] class or relation object
-    def resolve_active_record_ancestor
-      self.reflect_on_association(:received_messages_relation).active_record
-    end
-
+      # Method recognize real object class
+      # @return [ActiveRecord::Base] class or relation object
+      def resolve_active_record_ancestor
+        reflect_on_association(:received_messages_relation).active_record
+      end
     end
 
     module InstanceMethods
@@ -70,7 +68,7 @@ module ActsAsMessageable
       # @return [ActiveRecord::Relation] returns all messages from inbox
       def received_messages
         result = ActsAsMessageable.rails_api.new(received_messages_relation)
-        result = result.scoped.where(:recipient_delete => false)
+        result = result.scoped.where(recipient_delete: false)
         result.relation_context = self
 
         result
@@ -79,7 +77,7 @@ module ActsAsMessageable
       # @return [ActiveRecord::Relation] returns all messages from outbox
       def sent_messages
         result = ActsAsMessageable.rails_api.new(sent_messages_relation)
-        result = result.scoped.where(:sender_delete => false)
+        result = result.scoped.where(sender_delete: false)
         result.relation_context = self
 
         result
@@ -100,12 +98,12 @@ module ActsAsMessageable
         message_attributes = {}
 
         case args.first
-          when String
-            self.class.messages_class_name.required.each_with_index do |attribute, index|
-              message_attributes[attribute] = args[index]
-            end
-          when Hash
-            message_attributes = args.first
+        when String
+          self.class.messages_class_name.required.each_with_index do |attribute, index|
+            message_attributes[attribute] = args[index]
+          end
+        when Hash
+          message_attributes = args.first
         end
 
         message = self.class.messages_class_name.new message_attributes
@@ -124,7 +122,9 @@ module ActsAsMessageable
       #
       # @return [ActsAsMessageable::Message] the message object
       def send_message!(to, *args)
-        send_message(to, *args).save!
+        send_message(to, *args).tap do |message|
+          message.save!
+        end
       end
 
       # Reply to given message
@@ -150,12 +150,12 @@ module ActsAsMessageable
         current_user = self
 
         case current_user
-          when message.to
-            attribute = message.recipient_delete ? :recipient_permanent_delete : :recipient_delete
-          when message.from
-            attribute = message.sender_delete ? :sender_permanent_delete : :sender_delete
-          else
-            raise "#{current_user} can't delete this message"
+        when message.to
+          attribute = message.recipient_delete ? :recipient_permanent_delete : :recipient_delete
+        when message.from
+          attribute = message.sender_delete ? :sender_permanent_delete : :sender_delete
+        else
+          raise "#{current_user} can't delete this message"
         end
 
         message.update_attributes!(attribute => true)
@@ -166,12 +166,12 @@ module ActsAsMessageable
         current_user = self
 
         case current_user
-          when message.to
-            attribute = :recipient_delete
-          when message.from
-            attribute = :sender_delete
-          else
-            raise "#{current_user} can't restore this message"
+        when message.to
+          attribute = :recipient_delete
+        when message.from
+          attribute = :sender_delete
+        else
+          raise "#{current_user} can't restore this message"
         end
 
         message.update_attributes!(attribute => false)