acts-as-messageable 0.4.8 → 0.4.9

data/Rakefile

@@ -25,7 +25,7 @@ Jeweler::RubygemsDotOrgTasks.new
 require 'rspec/core'
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec) do |spec|
-  spec.rspec_opts = ['-fd -c']
+  spec.rspec_opts = ['-fd -c --order random']
   spec.pattern = FileList['spec/**/*_spec.rb']
 end
 

data/VERSION

@@ -1 +1 @@
-0.4.8
+0.4.9

data/acts-as-messageable.gemspec

@@ -2,22 +2,25 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+# stub: acts-as-messageable 0.4.9 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "acts-as-messageable"
-  s.version = "0.4.8"
+  s.version = "0.4.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Piotr Nielacny"]
-  s.date = "2013-02-05"
+  s.date = "2013-11-25"
   s.email = "piotr.nielacny@gmail.com"
   s.extra_rdoc_files = [
     "README.md"
   ]
   s.files = [
+    ".coveralls.yml",
     ".rspec",
     ".travis.yml",
     "Gemfile",
+    "Gemfile.lock",
     "MIT-LICENSE",
     "README.md",
     "Rakefile",
@@ -26,17 +29,22 @@ Gem::Specification.new do |s|
     "gemfiles/Gemfile-3.0",
     "gemfiles/Gemfile-3.1",
     "gemfiles/Gemfile-3.2",
+    "gemfiles/Gemfile-4.0",
     "lib/acts-as-messageable.rb",
     "lib/acts-as-messageable/message.rb",
     "lib/acts-as-messageable/model.rb",
+    "lib/acts-as-messageable/rails3.rb",
+    "lib/acts-as-messageable/rails4.rb",
     "lib/acts-as-messageable/railtie.rb",
     "lib/acts-as-messageable/relation.rb",
+    "lib/acts-as-messageable/scopes.rb",
     "lib/generators/acts-as-messageable/migration/migration_generator.rb",
     "lib/generators/acts-as-messageable/migration/templates/migration.rb",
     "lib/generators/acts-as-messageable/migration/templates/migration_permanent.rb",
     "spec/acts-as-messageable_spec.rb",
     "spec/custom-class_spec.rb",
     "spec/custom-required_spec.rb",
+    "spec/group-messages_spec.rb",
     "spec/spec_helper.rb",
     "spec/support/admin.rb",
     "spec/support/send_message.rb",
@@ -44,37 +52,40 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/LTe/acts-as-messageable"
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.24"
+  s.rubygems_version = "2.1.11"
   s.summary = "Make user messageable!;-)"
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activerecord>, [">= 3.0.0"])
       s.add_runtime_dependency(%q<activesupport>, [">= 3.0.0"])
-      s.add_runtime_dependency(%q<ancestry>, ["~> 1.3.0"])
+      s.add_runtime_dependency(%q<ancestry>, [">= 1.3.0"])
       s.add_runtime_dependency(%q<railties>, [">= 3.0.0"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.11.0"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.0"])
       s.add_development_dependency(%q<sqlite3>, [">= 0"])
+      s.add_development_dependency(%q<coveralls>, [">= 0"])
     else
       s.add_dependency(%q<activerecord>, [">= 3.0.0"])
       s.add_dependency(%q<activesupport>, [">= 3.0.0"])
-      s.add_dependency(%q<ancestry>, ["~> 1.3.0"])
+      s.add_dependency(%q<ancestry>, [">= 1.3.0"])
       s.add_dependency(%q<railties>, [">= 3.0.0"])
-      s.add_dependency(%q<rspec>, ["~> 2.11.0"])
+      s.add_dependency(%q<rspec>, ["~> 2.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.8.0"])
       s.add_dependency(%q<sqlite3>, [">= 0"])
+      s.add_dependency(%q<coveralls>, [">= 0"])
     end
   else
     s.add_dependency(%q<activerecord>, [">= 3.0.0"])
     s.add_dependency(%q<activesupport>, [">= 3.0.0"])
-    s.add_dependency(%q<ancestry>, ["~> 1.3.0"])
+    s.add_dependency(%q<ancestry>, [">= 1.3.0"])
     s.add_dependency(%q<railties>, [">= 3.0.0"])
-    s.add_dependency(%q<rspec>, ["~> 2.11.0"])
+    s.add_dependency(%q<rspec>, ["~> 2.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.8.0"])
     s.add_dependency(%q<sqlite3>, [">= 0"])
+    s.add_dependency(%q<coveralls>, [">= 0"])
   end
 end
 

data/gemfiles/Gemfile-3.0

@@ -4,3 +4,4 @@ gemspec :path => File.expand_path('../..', __FILE__)
 gem "activerecord", "~> 3.0.0"
 gem "activesupport", "~> 3.0.0"
 gem "railties", "~> 3.0.0"
+gem "mime-types", "~> 1.25.1", :platforms => :ruby_18

data/gemfiles/Gemfile-3.1

@@ -4,3 +4,4 @@ gemspec :path => File.expand_path('../..', __FILE__)
 gem "activerecord", "~> 3.1.0"
 gem "activesupport", "~> 3.1.0"
 gem "railties", "~> 3.1.0"
+gem "mime-types", "~> 1.25.1", :platforms => :ruby_18

data/gemfiles/Gemfile-3.2

@@ -4,3 +4,4 @@ gemspec :path => File.expand_path('../..', __FILE__)
 gem "activerecord", "~> 3.2.0"
 gem "activesupport", "~> 3.2.0"
 gem "railties", "~> 3.2.0"
+gem "mime-types", "~> 1.25.1", :platforms => :ruby_18

data/gemfiles/Gemfile-4.0

@@ -0,0 +1,6 @@
+source "https://rubygems.org"
+
+gemspec :path => File.expand_path('../..', __FILE__)
+gem "activerecord", "~> 4.0.0"
+gem "activesupport", "~> 4.0.0"
+gem "railties", "~> 4.0.0"

data/lib/acts-as-messageable.rb

@@ -1,7 +1,18 @@
-module ActsAsMessageable
-  autoload :Model,    'acts-as-messageable/model'
-  autoload :Message,  'acts-as-messageable/message'
-  autoload :Relation, 'acts-as-messageable/relation'
-end
-
-require 'acts-as-messageable/railtie'
+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'
+
+  def self.rails_api
+    if Rails::VERSION::MAJOR >= 4
+      Rails4
+    else
+      Rails3
+    end
+  end
+end
+
+require 'acts-as-messageable/railtie'

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

@@ -1,97 +1,62 @@
-require 'ancestry'
-
-module ActsAsMessageable
-  class Message < ::ActiveRecord::Base
-    belongs_to :received_messageable, :polymorphic => true
-    belongs_to :sent_messageable,     :polymorphic => true
-
-    attr_accessible :topic,
-                    :body,
-                    :received_messageable_type,
-                    :received_messageable_id,
-                    :sent_messageable_type,
-                    :sent_messageable_id,
-                    :opened,
-                    :recipient_delete,
-                    :sender_delete,
-                    :recipient_permanent_delete,
-                    :sender_permanent_delete,
-                    :created_at,
-                    :updated_at
-
-    attr_accessor   :removed, :restored
-    cattr_accessor  :required
-
-
-    # Sample documentation for scope
-    default_scope order("created_at desc")
-    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 :with_id,           lambda { |*args|
-      ActiveSupport::Deprecation.warn("Calling with_id is deprecated. Please use `find` instead.")
-      where(:id => 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
-                                                (received_messageable_type = :received_type and
-                                                received_messageable_id = :received_id and
-                                                recipient_delete = :r_delete and recipient_permanent_delete = :r_perm_delete)",
-                                                :sent_type      => args.first.class.resolve_active_record_ancestor.to_s,
-                                                :sent_id        => args.first.id,
-                                                :received_type  => args.first.class.resolve_active_record_ancestor.to_s,
-                                                :received_id    => args.first.id,
-                                                :r_delete       => args.last,
-                                                :s_delete       => args.last,
-                                                :r_perm_delete  => false,
-                                                :s_perm_delete  => false)
-                                     }
-    scope :readed,            lambda { where(:opened => true)  }
-    scope :unreaded,          lambda { where(:opened => false) }
-    scope :deleted,           lambda { where(:recipient_delete => true, :sender_delete => true) }
-
-    def open?
-      self.opened?
-    end
-
-    def open
-      update_attributes!(:opened => true)
-    end
-    alias :mark_as_read :open
-    alias :read         :open
-
-    def close
-      update_attributes!(:opened => false)
-    end
-    alias :mark_as_unread :close
-    alias :unread         :close
-
-    alias :from :sent_messageable
-    alias :to   :received_messageable
-
-    def real_receiver(user)
-      user == from ? to : from
-    end
-
-    def participant?(user)
-      (to == user) || (from == user)
-    end
-
-    def conversation
-      root.subtree
-    end
-
-    def delete
-      self.removed = true
-    end
-
-    def restore
-      self.restored = true
-    end
-
-    def reply(*args)
-      to.reply_to(self, *args)
-    end
-  end
-end
+require 'ancestry'
+
+module ActsAsMessageable
+  class Message < ::ActiveRecord::Base
+    include ActsAsMessageable::Scopes
+
+    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")
+
+    def open?
+      self.opened?
+    end
+
+    def open
+      update_attributes!(:opened => true)
+    end
+    alias :mark_as_read :open
+    alias :read         :open
+
+    def close
+      update_attributes!(:opened => false)
+    end
+    alias :mark_as_unread :close
+    alias :unread         :close
+
+    alias :from :sent_messageable
+    alias :to   :received_messageable
+
+    def real_receiver(user)
+      user == from ? to : from
+    end
+
+    def participant?(user)
+      user.class.group_messages || (to == user) || (from == user)
+    end
+
+    def conversation
+      root.subtree
+    end
+
+    def delete
+      self.removed = true
+    end
+
+    def restore
+      self.restored = true
+    end
+
+    def reply(*args)
+      to.reply_to(self, *args)
+    end
+
+    def people
+      conversation.map{ |x| x.from }.uniq!
+    end
+  end
+end

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

@@ -1,165 +1,181 @@
-module ActsAsMessageable
-  module Model
-
-    def self.included(base)
-      base.extend ClassMethods
-    end
-
-    module ClassMethods
-      mattr_accessor :messages_class_name
-
-      # 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
-      def acts_as_messageable(options = {})
-        default_options = {
-          :table_name => "messages",
-          :class_name => "ActsAsMessageable::Message",
-          :required => [:topic, :body],
-          :dependent => :nullify,
-        }
-        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]
-
-        self.messages_class_name = options[:class_name].constantize
-        self.messages_class_name.has_ancestry
-
-        if self.messages_class_name.respond_to?(:table_name=)
-          self.messages_class_name.table_name = options[:table_name]
-        else
-          self.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
-
-        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
-
-    end
-
-    module InstanceMethods
-      # @return [ActiveRecord::Relation] all messages connected with user
-      def messages(trash = false)
-        result = self.class.messages_class_name.connected_with(self, trash)
-        result.relation_context = self
-
-        result
-      end
-
-      # @return [ActiveRecord::Relation] returns all messages from inbox
-      def received_messages
-        result = received_messages_relation.scoped.where(:recipient_delete => false)
-        result.relation_context = self
-
-        result
-      end
-
-      # @return [ActiveRecord::Relation] returns all messages from outbox
-      def sent_messages
-        result = sent_messages_relation.scoped.where(:sender_delete => false)
-        result.relation_context = self
-
-        result
-      end
-
-      # @return [ActiveRecord::Relation] returns all messages from trash
-      def deleted_messages
-        messages true
-      end
-
-      # Method sens message to another user
-      # @param [ActiveRecord::Base] to
-      # @param [String] topic
-      # @param [String] body
-      #
-      # @return [ActsAsMessageable::Message] the message object
-      def send_message(to, *args)
-        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
-        end
-
-        message = self.class.messages_class_name.create message_attributes
-        message.received_messageable = to
-        message.sent_messageable = self
-        message.save
-
-        message
-      end
-
-      # Reply to given message
-      # @param [ActsAsMessageable::Message] message
-      # @param [String] topic
-      # @param [String] body
-      #
-      # @return [ActsAsMessageable::Message] a message that is a response to a given message
-      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
-
-          reply_message
-        end
-      end
-
-      # Mark message as deleted
-      def delete_message(message)
-        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"
-        end
-
-        message.update_attributes!(attribute => true)
-      end
-
-      # Mark message as restored
-      def restore_message(message)
-        current_user = self
-
-        case current_user
-          when message.to
-            attribute = :recipient_delete
-          when message.from
-            attribute = :sender_delete
-          else
-            raise "#{current_user} can't delete this message"
-        end
-
-        message.update_attributes!(attribute => false)
-      end
-    end
-  end
-end
+module ActsAsMessageable
+  module Model
+
+    def self.included(base)
+      base.extend ClassMethods
+    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
+      def acts_as_messageable(options = {})
+        default_options = {
+          :table_name => "messages",
+          :class_name => "ActsAsMessageable::Message",
+          :required => [: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]
+        has_many  :sent_messages_relation,
+                  :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
+
+        if self.messages_class_name.respond_to?(:table_name=)
+          self.messages_class_name.table_name = options[:table_name]
+          self.messages_class_name.initialize_scopes
+        else
+          self.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
+        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
+
+    end
+
+    module InstanceMethods
+      # @return [ActiveRecord::Relation] all messages connected with user
+      def messages(trash = false)
+        result = self.class.messages_class_name.connected_with(self, trash)
+        result.relation_context = self
+
+        result
+      end
+
+      # @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.relation_context = self
+
+        result
+      end
+
+      # @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.relation_context = self
+
+        result
+      end
+
+      # @return [ActiveRecord::Relation] returns all messages from trash
+      def deleted_messages
+        messages true
+      end
+
+      # Method sens message to another user
+      # @param [ActiveRecord::Base] to
+      # @param [String] topic
+      # @param [String] body
+      #
+      # @return [ActsAsMessageable::Message] the message object
+      def send_message(to, *args)
+        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
+        end
+
+        message = self.class.messages_class_name.new message_attributes
+        message.received_messageable = to
+        message.sent_messageable = self
+        message.save
+
+        message
+      end
+
+      # Method send message to another user
+      # and raise exception in case of validation errors
+      # @param [ActiveRecord::Base] to
+      # @param [String] topic
+      # @param [String] body
+      #
+      # @return [ActsAsMessageable::Message] the message object
+      def send_message!(to, *args)
+        send_message(to, *args).save!
+      end
+
+      # Reply to given message
+      # @param [ActsAsMessageable::Message] message
+      # @param [String] topic
+      # @param [String] body
+      #
+      # @return [ActsAsMessageable::Message] a message that is a response to a given message
+      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
+
+          reply_message
+        end
+      end
+
+      # Mark message as deleted
+      def delete_message(message)
+        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"
+        end
+
+        message.update_attributes!(attribute => true)
+      end
+
+      # Mark message as restored
+      def restore_message(message)
+        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"
+        end
+
+        message.update_attributes!(attribute => false)
+      end
+    end
+  end
+end