acts-as-messageable 0.4.1 → 0.4.2

data/Gemfile

@@ -3,6 +3,7 @@ source "http://rubygems.org"
 gem "activerecord", ">= 3.0.0"
 gem "activesupport", ">= 3.0.0"
 gem "ancestry", "~> 1.2.4"
+gem "railties", ">= 3.0.0"
 
 group :development do
   gem "rspec", "~> 2.6.0"

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.2

data/acts-as-messageable.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "acts-as-messageable"
-  s.version = "0.4.1"
+  s.version = "0.4.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Piotr Nielacny"]
-  s.date = "2011-11-16"
+  s.date = "2011-11-19"
   s.email = "piotr.nielacny@gmail.com"
   s.extra_rdoc_files = [
     "README.md"
@@ -26,6 +26,7 @@ Gem::Specification.new do |s|
     "lib/acts-as-messageable.rb",
     "lib/acts-as-messageable/acts-as-messageable.rb",
     "lib/acts-as-messageable/message.rb",
+    "lib/acts-as-messageable/model.rb",
     "lib/acts-as-messageable/relation.rb",
     "lib/generators/acts-as-messageable/migration/migration_generator.rb",
     "lib/generators/acts-as-messageable/migration/templates/migration.rb",
@@ -49,6 +50,7 @@ Gem::Specification.new do |s|
       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.2.4"])
+      s.add_runtime_dependency(%q<railties>, [">= 3.0.0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.6.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.0"])
       s.add_development_dependency(%q<sqlite3-ruby>, [">= 0"])
@@ -56,6 +58,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<activerecord>, [">= 3.0.0"])
       s.add_dependency(%q<activesupport>, [">= 3.0.0"])
       s.add_dependency(%q<ancestry>, ["~> 1.2.4"])
+      s.add_dependency(%q<railties>, [">= 3.0.0"])
       s.add_dependency(%q<rspec>, ["~> 2.6.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.0"])
       s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
@@ -64,6 +67,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<activerecord>, [">= 3.0.0"])
     s.add_dependency(%q<activesupport>, [">= 3.0.0"])
     s.add_dependency(%q<ancestry>, ["~> 1.2.4"])
+    s.add_dependency(%q<railties>, [">= 3.0.0"])
     s.add_dependency(%q<rspec>, ["~> 2.6.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.0"])
     s.add_dependency(%q<sqlite3-ruby>, [">= 0"])

data/lib/acts-as-messageable.rb

@@ -1,16 +1,7 @@
-require "active_record"
-require "active_support/core_ext"
-require "acts-as-messageable/acts-as-messageable"
-
 module ActsAsMessageable
-  autoload :Message, "acts-as-messageable/message"
-  autoload :Relation, "acts-as-messageable/relation"
-end
-
-if defined?(ActiveRecord::Base)
-  ActiveRecord::Base.send :include, ActsAsMessageable::Model
+  autoload :Model,    'acts-as-messageable/model'
+  autoload :Message,  'acts-as-messageable/message'
+  autoload :Relation, 'acts-as-messageable/relation'
 end
 
-if defined?(ActiveRecord::Relation)
-  ActiveRecord::Relation.send :include, ActsAsMessageable::Relation
-end
+require 'acts-as-messageable/acts-as-messageable'

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

@@ -1,122 +1,14 @@
-module ActsAsMessageable
-  module Model
-
-    def self.included(base)
-      base.extend ClassMethods
-    end
-
-    module ClassMethods
-      mattr_accessor :class_name
-
-      # Method make ActiveRecord::Base object messageable
-      # @param [Symbol] :table_name - table name for messages
-      def acts_as_messageable(options = {})
-        has_many  :received_messages_relation, 
-                  :as => :received_messageable, 
-                  :class_name => options[:class_name] || "ActsAsMessageable::Message",
-                  :dependent => :nullify
-        has_many  :sent_messages_relation, 
-                  :as => :sent_messageable,
-                  :class_name => options[:class_name] || "ActsAsMessageable::Message",
-                  :dependent => :nullify
-
-        self.class_name = (options[:class_name] || "ActsAsMessageable::Message").constantize
-        self.class_name.set_table_name(options[:table_name] || "messages")
-
-        if options[:required].is_a? Symbol
-          self.class_name.required = [options[:required]]
-        elsif options[:required].is_a? Array
-          self.class_name.required = options[:required]
-        else
-          self.class_name.required = [:topic, :body]
-        end
-
-        self.class_name.validates_presence_of self.class_name.required
-        include ActsAsMessageable::Model::InstanceMethods
-    end
+require 'active_record/railtie'
+require 'active_support/core_ext'
 
+module ActsAsMessageable
+  class Railtie < Rails::Railtie
+    if defined?(ActiveRecord::Base)
+      ActiveRecord::Base.send :include, ActsAsMessageable::Model
     end
 
-    module InstanceMethods
-      # Get all messages connected with user
-      # @return [ActiveRecord::Relation] all messages connected with user
-      def messages(trash = false)
-        result = self.class.class_name.connected_with(self, trash)
-        result.relation_context = self
-
-        result
-      end
-
-      def received_messages
-        result = received_messages_relation.scoped.where(:recipient_delete => false)
-        result.relation_context = self
-
-        result
-      end
-
-      def sent_messages
-        result = sent_messages_relation.scoped.where(:sender_delete => false)
-        result.relation_context = self
-
-        result
-      end
-
-      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)
-        case args.first
-          when String
-            message_attributes = {}
-            self.class.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.class_name.create! message_attributes
-
-        self.sent_messages_relation << message
-        to.received_messages_relation << message
-
-        message
-      end
-
-      def reply_to(message, *args)
-        reply_message = send_message(message.from, *args)
-        reply_message.parent = message
-        reply_message.save
-
-        reply_message
-      end
-
-      def delete_message(message)
-        current_user = self
-
-        if message.received_messageable == current_user
-          unless message.recipient_delete
-            message.update_attributes!(:recipient_delete => true)
-          else
-            message.update_attributes!(:recipient_permanent_delete => true)
-          end
-        elsif message.sent_messageable == current_user
-          unless message.sender_delete
-            message.update_attributes!(:sender_delete => true)
-          else
-            message.update_attributes!(:sender_permanent_delete => true)
-          end
-        end
-      end
-
+    if defined?(ActiveRecord::Relation)
+      ActiveRecord::Relation.send :include, ActsAsMessageable::Relation
     end
-
   end
 end

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

@@ -0,0 +1,122 @@
+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
+      def acts_as_messageable(options = {})
+        has_many  :received_messages_relation, 
+                  :as => :received_messageable, 
+                  :class_name => options[:class_name] || "ActsAsMessageable::Message",
+                  :dependent => :nullify
+        has_many  :sent_messages_relation, 
+                  :as => :sent_messageable,
+                  :class_name => options[:class_name] || "ActsAsMessageable::Message",
+                  :dependent => :nullify
+
+        self.messages_class_name = (options[:class_name] || "ActsAsMessageable::Message").constantize
+        self.messages_class_name.set_table_name(options[:table_name] || "messages")
+
+        if options[:required].is_a? Symbol
+          self.messages_class_name.required = [options[:required]]
+        elsif options[:required].is_a? Array
+          self.messages_class_name.required = options[:required]
+        else
+          self.messages_class_name.required = [:topic, :body]
+        end
+
+        self.messages_class_name.validates_presence_of self.messages_class_name.required
+        include ActsAsMessageable::Model::InstanceMethods
+    end
+
+    end
+
+    module InstanceMethods
+      # Get all messages connected with user
+      # @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
+
+      def received_messages
+        result = received_messages_relation.scoped.where(:recipient_delete => false)
+        result.relation_context = self
+
+        result
+      end
+
+      def sent_messages
+        result = sent_messages_relation.scoped.where(:sender_delete => false)
+        result.relation_context = self
+
+        result
+      end
+
+      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)
+        case args.first
+          when String
+            message_attributes = {}
+            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
+
+        self.sent_messages_relation << message
+        to.received_messages_relation << message
+
+        message
+      end
+
+      def reply_to(message, *args)
+        reply_message = send_message(message.from, *args)
+        reply_message.parent = message
+        reply_message.save
+
+        reply_message
+      end
+
+      def delete_message(message)
+        current_user = self
+
+        if message.received_messageable == current_user
+          unless message.recipient_delete
+            message.update_attributes!(:recipient_delete => true)
+          else
+            message.update_attributes!(:recipient_permanent_delete => true)
+          end
+        elsif message.sent_messageable == current_user
+          unless message.sender_delete
+            message.update_attributes!(:sender_delete => true)
+          else
+            message.update_attributes!(:sender_permanent_delete => true)
+          end
+        end
+      end
+
+    end
+
+  end
+end

data/spec/spec_helper.rb

@@ -21,7 +21,7 @@ RSpec.configure do |config|
   end
 
   config.after(:each) do
-    User.class_name.destroy_all
+    User.messages_class_name.destroy_all
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts-as-messageable
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-16 00:00:00.000000000Z
+date: 2011-11-19 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &69822268751920 !ruby/object:Gem::Requirement
+  requirement: &70019859513520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *69822268751920
+  version_requirements: *70019859513520
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &69822268749940 !ruby/object:Gem::Requirement
+  requirement: &70019859510340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *69822268749940
+  version_requirements: *70019859510340
 - !ruby/object:Gem::Dependency
   name: ancestry
-  requirement: &69822268747920 !ruby/object:Gem::Requirement
+  requirement: &70019859508340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,21 @@ dependencies:
         version: 1.2.4
   type: :runtime
   prerelease: false
-  version_requirements: *69822268747920
+  version_requirements: *70019859508340
+- !ruby/object:Gem::Dependency
+  name: railties
+  requirement: &70019859506340 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *70019859506340
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &69822268746840 !ruby/object:Gem::Requirement
+  requirement: &70019859505060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +65,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *69822268746840
+  version_requirements: *70019859505060
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &69822268745520 !ruby/object:Gem::Requirement
+  requirement: &70019859503360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +76,10 @@ dependencies:
         version: 1.6.0
   type: :development
   prerelease: false
-  version_requirements: *69822268745520
+  version_requirements: *70019859503360
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &69822268743820 !ruby/object:Gem::Requirement
+  requirement: &70019859501840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *69822268743820
+  version_requirements: *70019859501840
 description: 
 email: piotr.nielacny@gmail.com
 executables: []
@@ -95,6 +106,7 @@ files:
 - lib/acts-as-messageable.rb
 - lib/acts-as-messageable/acts-as-messageable.rb
 - lib/acts-as-messageable/message.rb
+- lib/acts-as-messageable/model.rb
 - lib/acts-as-messageable/relation.rb
 - lib/generators/acts-as-messageable/migration/migration_generator.rb
 - lib/generators/acts-as-messageable/migration/templates/migration.rb
@@ -119,7 +131,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3869198984656405401
+      hash: -2282999855817855460
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: