acts-as-messageable 0.3.0 → 0.3.1

data/.rspec

@@ -0,0 +1 @@
+-fd -color

data/.travis.yml

@@ -3,4 +3,3 @@ rvm:
   - 1.9.2
   - rbx
   - ree
-  - jruby

data/Gemfile

@@ -4,9 +4,8 @@ gem "activerecord", "~> 3.0.0"
 gem "ancestry", "~> 1.2.4"
 
 group :development do
-  gem "rspec", "~> 2.3.0"
+  gem "rspec", "~> 2.6.0"
   gem "bundler", "~> 1.0.0"
   gem "jeweler", "~> 1.6.0"
-  gem "rcov", ">= 0"
   gem "sqlite3-ruby"
 end

data/README.rdoc

@@ -57,6 +57,7 @@ or
 == Conversation
   @message = @alice.send_message(@bob, "Hello bob!", "How are you?")
   @reply_message = @bob.reply_to(@message, "Re: Hello bob!", "I'm fine!")
+  # or @bob.reply_to(@message, :topic => "Re: Hello bob!", :body => "I'm fine!")
 
   @message.conversation #=> [@message, @reply_message]
   @reply_message.conversation #=> [@message, @reply_message]

data/Rakefile

@@ -25,22 +25,8 @@ Jeweler::RubygemsDotOrgTasks.new
 require 'rspec/core'
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.rspec_opts = ['-fd -c']
   spec.pattern = FileList['spec/**/*_spec.rb']
 end
 
-RSpec::Core::RakeTask.new(:rcov) do |spec|
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-end
-
 task :default => :spec
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "acts-as-messageable #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/acts-as-messageable.gemspec

@@ -5,16 +5,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{acts-as-messageable}
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Piotr Nielacny"]
-  s.date = %q{2011-05-31}
+  s.date = %q{2011-07-02}
   s.email = %q{piotr.nielacny@gmail.com}
   s.extra_rdoc_files = [
     "README.rdoc"
   ]
   s.files = [
+    ".rspec",
     ".travis.yml",
     "Gemfile",
     "MIT-LICENSE",
@@ -30,6 +31,7 @@ Gem::Specification.new do |s|
     "lib/generators/acts-as-messageable/migration/templates/migration.rb",
     "rails/init.rb",
     "spec/acts-as-messageable_spec.rb",
+    "spec/custom-required_spec.rb",
     "spec/spec_helper.rb",
     "spec/support/user.rb"
   ]
@@ -44,27 +46,24 @@ Gem::Specification.new do |s|
     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<ancestry>, ["~> 1.2.4"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.6.0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.0"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
       s.add_development_dependency(%q<sqlite3-ruby>, [">= 0"])
     else
       s.add_dependency(%q<activerecord>, ["~> 3.0.0"])
       s.add_dependency(%q<ancestry>, ["~> 1.2.4"])
-      s.add_dependency(%q<rspec>, ["~> 2.3.0"])
+      s.add_dependency(%q<rspec>, ["~> 2.6.0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.0"])
-      s.add_dependency(%q<rcov>, [">= 0"])
       s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
     end
   else
     s.add_dependency(%q<activerecord>, ["~> 3.0.0"])
     s.add_dependency(%q<ancestry>, ["~> 1.2.4"])
-    s.add_dependency(%q<rspec>, ["~> 2.3.0"])
+    s.add_dependency(%q<rspec>, ["~> 2.6.0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.0"])
-    s.add_dependency(%q<rcov>, [">= 0"])
     s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
   end
 end

data/lib/acts-as-messageable.rb

@@ -1,7 +1,10 @@
 require "active_record"
-require 'acts-as-messageable/message'
 require 'acts-as-messageable/acts-as-messageable'
-require 'acts-as-messageable/relation'
+
+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

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

@@ -21,7 +21,16 @@ module ActsAsMessageable
 
         ActsAsMessageable::Message.set_table_name(options[:table_name] || "messages")
         ActsAsMessageable::Message.validates_presence_of(options[:required] || [:topic ,:body])
-        ActsAsMessageable::Message.required = options[:required] || [:topic, :body]
+
+        if options[:required].is_a? Symbol
+          ActsAsMessageable::Message.required = [options[:required]]
+        elsif options[:required].is_a? Array
+          ActsAsMessageable::Message.required = options[:required]
+        else
+          ActsAsMessageable::Message.required = [:topic, :body]
+        end
+
+        ActsAsMessageable::Message.validates_presence_of ActsAsMessageable::Message.required
 
         include ActsAsMessageable::Model::InstanceMethods
     end
@@ -67,8 +76,8 @@ module ActsAsMessageable
         message
       end
 
-      def reply_to(message, topic, body)
-        reply_message = send_message(self, topic, body)
+      def reply_to(message, *args)
+        reply_message = send_message(message.from, *args)
         reply_message.parent = message
         reply_message.save
 

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

@@ -24,7 +24,7 @@ module ActsAsMessageable
     # Sample documentation for scope
     scope :are_from,          lambda { |*args| where("sent_messageable_id = :sender", :sender => args.first) }
     scope :are_to,            lambda { |*args| where("received_messageable_id = :receiver", :receiver => args.first) }
-    scope :with_id,                lambda { |*args| where("id = :id", :id => args.first) }
+    scope :with_id,           lambda { |*args| where("id = :id", :id => args.first) }
 
     scope :connected_with,    lambda { |*args|  where("(sent_messageable_type = :sent_type and
                                                 sent_messageable_id = :sent_id and

data/spec/acts-as-messageable_spec.rb

@@ -1,6 +1,15 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
+class User < ActiveRecord::Base
+  acts_as_messageable
+end
+
 describe "ActsAsMessageable" do
+
+  before(:all) do
+    User.acts_as_messageable
+  end
+
   it "should be two users in database" do
     User.count.should == 2
   end

data/spec/custom-required_spec.rb

@@ -0,0 +1,51 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe "custom require" do
+  before(:each) do
+    # Use clean version of Message class
+    ActsAsMessageable.instance_eval { remove_const "Message" }
+    load "acts-as-messageable/message.rb"
+  end
+
+  it "should work with non-array require" do
+    User.acts_as_messageable :required => :body
+    ActsAsMessageable::Message.required.should == ([:body])
+  end
+
+  it "should work with array require" do
+    User.acts_as_messageable :required => [:body, :topic]
+    ActsAsMessageable::Message.required.should == ([:body, :topic])
+  end
+
+  context "only body" do
+    before(:each) do
+      User.acts_as_messageable :required => :body
+    end
+
+    it "alice should able to send message to bob only with body" do
+      @alice.send_message(@bob, "Hello bob!")
+      @alice.messages.first.body.should == "Hello bob!"
+      @bob.received_messages.first.body.should == "Hello bob!"
+    end
+
+    it "alice should able to send message to bob with hash" do
+      @alice.send_message(@bob, :body => "Hi Bob! I'm hash master")
+      @alice.messages.first.body.should == "Hi Bob! I'm hash master"
+    end
+
+    it "alice send message to bob with body and bob reply to alice" do
+      @alice.send_message(@bob, "Hi Bob!")
+      @message_from_alice = @bob.received_messages.first
+      @message_from_alice.body.should == "Hi Bob!"
+      @bob.reply_to(@message_from_alice, "Hi Alice!")
+      @alice.received_messages.first.body.should == "Hi Alice!"
+    end
+
+    it "alice send message to bob and bob reply with hash" do
+      @message_from_alice = @alice.send_message(@bob, "Hi Bob!")
+      @bob.reply_to(@message_from_alice, :body => "Hi Alice!")
+      @alice.received_messages.first.body.should == "Hi Alice!"
+    end
+  end
+
+end

data/spec/spec_helper.rb

@@ -3,10 +3,10 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'rspec'
 require 'acts-as-messageable'
 
-# Requires supporting files with custom matchers and macros, etc,
-# in ./support/ and its subdirectories.
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
+ActiveRecord::Migration.verbose = false
+
 RSpec.configure do |config|
   config.before(:all) do
     ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")

data/spec/support/user.rb

@@ -1,5 +1,3 @@
-require 'ancestry'
-
 class User < ActiveRecord::Base
   acts_as_messageable
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts-as-messageable
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-05-31 00:00:00.000000000 +02:00
+date: 2011-07-02 00:00:00.000000000 +02:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &5338400 !ruby/object:Gem::Requirement
+  requirement: &22115060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *5338400
+  version_requirements: *22115060
 - !ruby/object:Gem::Dependency
   name: ancestry
-  requirement: &5337340 !ruby/object:Gem::Requirement
+  requirement: &22114520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,21 +33,21 @@ dependencies:
         version: 1.2.4
   type: :runtime
   prerelease: false
-  version_requirements: *5337340
+  version_requirements: *22114520
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &5335900 !ruby/object:Gem::Requirement
+  requirement: &22113940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *5335900
+  version_requirements: *22113940
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &5334660 !ruby/object:Gem::Requirement
+  requirement: &22113380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *5334660
+  version_requirements: *22113380
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &5333300 !ruby/object:Gem::Requirement
+  requirement: &22112860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,21 +66,10 @@ dependencies:
         version: 1.6.0
   type: :development
   prerelease: false
-  version_requirements: *5333300
-- !ruby/object:Gem::Dependency
-  name: rcov
-  requirement: &5331960 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *5331960
+  version_requirements: *22112860
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &5251020 !ruby/object:Gem::Requirement
+  requirement: &22112200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,7 +77,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *5251020
+  version_requirements: *22112200
 description: 
 email: piotr.nielacny@gmail.com
 executables: []
@@ -96,6 +85,7 @@ extensions: []
 extra_rdoc_files:
 - README.rdoc
 files:
+- .rspec
 - .travis.yml
 - Gemfile
 - MIT-LICENSE
@@ -111,6 +101,7 @@ files:
 - lib/generators/acts-as-messageable/migration/templates/migration.rb
 - rails/init.rb
 - spec/acts-as-messageable_spec.rb
+- spec/custom-required_spec.rb
 - spec/spec_helper.rb
 - spec/support/user.rb
 has_rdoc: true
@@ -128,7 +119,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4035680522358941194
+      hash: -1671763449284017363
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: