acts-as-messageable 0.4.10 → 0.4.11

data/spec/custom-class_spec.rb

@@ -1,40 +1,39 @@
-require "spec_helper"
+require 'spec_helper'
 
 class CustomMessage < ActsAsMessageable::Message
-  def custom_method;end
+  def custom_method; end
 end
 
-describe "custom class" do
-  let(:alice) { User.find_by_email("alice@example.com") }
-  let(:bob)   { User.find_by_email("bob@example.com") }
+describe 'custom class' do
+  let(:alice) { User.find_by_email('alice@example.com') }
+  let(:bob)   { User.find_by_email('bob@example.com') }
 
   before do
-    User.acts_as_messageable :class_name => "CustomMessage", :table_name => "custom_messages"
-    @message = alice.send_message(bob, :topic => "Helou bob!", :body => "What's up?")
+    User.acts_as_messageable class_name: 'CustomMessage', table_name: 'custom_messages'
+    @message = alice.send_message(bob, topic: 'Helou bob!', body: "What's up?")
   end
 
   after { User.acts_as_messageable }
 
-  it "returns messages from alice with filter" do
-    bob.messages.are_from(alice).should include(@message)
+  it 'returns messages from alice with filter' do
+    expect(bob.messages.are_from(alice)).to include(@message)
   end
 
-  it "uses new table name" do
-    CustomMessage.are_from(alice).should include(@message)
+  it 'uses new table name' do
+    expect(CustomMessage.are_from(alice)).to include(@message)
   end
 
-  it "message should have CustomMessage class" do
-    @message.class.should == CustomMessage
+  it 'message should have CustomMessage class' do
+    expect(@message.class).to eq(CustomMessage)
   end
 
-  it "responds to custom_method" do
-    @message.should respond_to(:custom_method)
+  it 'responds to custom_method' do
+    expect(@message).to respond_to(:custom_method)
   end
 
-  it "return proper class with ancestry methods" do
-    @reply_message = @message.reply(:topic => "Re: Helou bob!", :body => "Fine!")
-    @reply_message.root.should == @message
-    @reply_message.root.class.should == CustomMessage
+  it 'return proper class with ancestry methods' do
+    @reply_message = @message.reply(topic: 'Re: Helou bob!', body: 'Fine!')
+    expect(@reply_message.root).to eq(@message)
+    expect(@reply_message.root.class).to eq(CustomMessage)
   end
 end
-

data/spec/custom-required_spec.rb

@@ -1,50 +1,50 @@
 require 'spec_helper'
 
-describe "custom require" do
+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"
+    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])
+  it 'should work with non-array require' do
+    User.acts_as_messageable required: :body
+    expect(ActsAsMessageable::Message.required).to eq([:body])
   end
 
-  it "should work with array require" do
-    User.acts_as_messageable :required => [:body, :topic]
-    ActsAsMessageable::Message.required.should == ([:body, :topic])
+  it 'should work with array require' do
+    User.acts_as_messageable required: %i[body topic]
+    expect(ActsAsMessageable::Message.required).to eq(%i[body topic])
   end
 
-  context "only body" do
+  context 'only body' do
     before(:each) do
-      User.acts_as_messageable :required => :body
+      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!"
+    it 'alice should able to send message to bob only with body' do
+      @alice.send_message(@bob, 'Hello bob!')
+      expect(@alice.messages.first.body).to eq('Hello bob!')
+      expect(@bob.received_messages.first.body).to eq('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"
+    it 'alice should able to send message to bob with hash' do
+      @alice.send_message(@bob, body: "Hi Bob! I'm hash master")
+      expect(@alice.messages.first.body).to eq("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!")
+    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!"
+      expect(@message_from_alice.body).to eq('Hi Bob!')
+      @bob.reply_to(@message_from_alice, 'Hi Alice!')
+      expect(@alice.received_messages.first.body).to eq('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!"
+    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!')
+      expect(@alice.received_messages.first.body).to eq('Hi Alice!')
     end
   end
 end

data/spec/group-messages_spec.rb

@@ -1,28 +1,26 @@
-require "spec_helper"
+require 'spec_helper'
 
-describe "group messages" do
-  let(:alice) { User.find_by_email("alice@example.com") }
-  let(:bob)   { User.find_by_email("bob@example.com") }
-  let(:pat)   { User.find_by_email("pat@example.com") }
+describe 'group messages' do
+  let(:alice) { User.find_by_email('alice@example.com') }
+  let(:bob)   { User.find_by_email('bob@example.com') }
+  let(:pat)   { User.find_by_email('pat@example.com') }
 
   before do
-    User.acts_as_messageable :group_messages => true
-    @message = alice.send_message(bob, :topic => "Helou bob!", :body => "What's up?")
+    User.acts_as_messageable group_messages: true
+    @message = alice.send_message(bob, topic: 'Helou bob!', body: "What's up?")
   end
 
-  it "joins to conversation" do
-    @reply_message = pat.reply_to(@message, "Hi there!", "I would like to join to this conversation!")
-    @sec_reply_message = bob.reply_to(@message, "Hi!", "Fine!")
-    @third_reply_message = alice.reply_to(@reply_message, "hi!", "no problem")
-    @message.conversation.should include(@sec_reply_message, @third_reply_message, @reply_message, @message)
+  it 'joins to conversation' do
+    @reply_message = pat.reply_to(@message, 'Hi there!', 'I would like to join to this conversation!')
+    @sec_reply_message = bob.reply_to(@message, 'Hi!', 'Fine!')
+    @third_reply_message = alice.reply_to(@reply_message, 'hi!', 'no problem')
+    expect(@message.conversation).to include(@sec_reply_message, @third_reply_message, @reply_message, @message)
   end
 
-  it "alice,bob and pat should be involve into conversation" do
-    @reply_message = pat.reply_to(@message, "Hi there!", "I would like to join to this conversation!")
-    @sec_reply_message = bob.reply_to(@message, "Hi!", "Fine!")
-    @third_reply_message = alice.reply_to(@reply_message, "hi!", "no problem")
-    @message.people.should == [alice, bob, pat]
+  it 'alice,bob and pat should be involve into conversation' do
+    @reply_message = pat.reply_to(@message, 'Hi there!', 'I would like to join to this conversation!')
+    @sec_reply_message = bob.reply_to(@message, 'Hi!', 'Fine!')
+    @third_reply_message = alice.reply_to(@reply_message, 'hi!', 'no problem')
+    expect(@message.people).to eq([alice, bob, pat])
   end
-
 end
-

data/spec/spec_helper.rb

@@ -13,20 +13,20 @@ Bundler.require(:default)
 
 require 'acts-as-messageable'
 
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
+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:")
+    ActiveRecord::Base.establish_connection(adapter: 'sqlite3', database: ':memory:')
     create_database
 
-    @alice = User.create  :email  => "alice@example.com"
-    @bob   = User.create  :email  => "bob@example.com"
-    @pat   = User.create  :email  => "pat@example.com"
-    @admin = Admin.create :email  => "admin@example.com"
-    @men   = Men.create   :email  => "men@example.com"
+    @alice = User.create  email: 'alice@example.com'
+    @bob   = User.create  email: 'bob@example.com'
+    @pat   = User.create  email: 'pat@example.com'
+    @admin = Admin.create email: 'admin@example.com'
+    @men   = Men.create   email: 'men@example.com'
   end
 
   config.after(:all) do
@@ -39,17 +39,17 @@ RSpec.configure do |config|
 end
 
 def create_database
-  ActiveRecord::Schema.define(:version => 1) do
+  ActiveRecord::Schema.define(version: 1) do
     create_table :messages do |t|
       t.string :topic
       t.text :body
-      t.references :received_messageable, :polymorphic => true
-      t.references :sent_messageable, :polymorphic => true
-      t.boolean :opened, :default => false
-      t.boolean :recipient_delete, :default => false
-      t.boolean :sender_delete, :default => false
-      t.boolean :recipient_permanent_delete, :default => false
-      t.boolean :sender_permanent_delete, :default => false
+      t.references :received_messageable, polymorphic: true, index: false
+      t.references :sent_messageable, polymorphic: true, index: false
+      t.boolean :opened, default: false
+      t.boolean :recipient_delete, default: false
+      t.boolean :sender_delete, default: false
+      t.boolean :recipient_permanent_delete, default: false
+      t.boolean :sender_permanent_delete, default: false
       t.string :ancestry
       t.timestamps
     end
@@ -57,13 +57,13 @@ def create_database
     create_table :custom_messages do |t|
       t.string :topic
       t.text :body
-      t.references :received_messageable, :polymorphic => true
-      t.references :sent_messageable, :polymorphic => true
-      t.boolean :opened, :default => false
-      t.boolean :recipient_delete, :default => false
-      t.boolean :sender_delete, :default => false
-      t.boolean :recipient_permanent_delete, :default => false
-      t.boolean :sender_permanent_delete, :default => false
+      t.references :received_messageable, polymorphic: true, index: false
+      t.references :sent_messageable, polymorphic: true, index: false
+      t.boolean :opened, default: false
+      t.boolean :recipient_delete, default: false
+      t.boolean :sender_delete, default: false
+      t.boolean :recipient_permanent_delete, default: false
+      t.boolean :sender_permanent_delete, default: false
       t.string :ancestry
       t.timestamps
     end

data/spec/support/admin.rb

@@ -1,3 +1,3 @@
-class Admin < ActiveRecord::Base
-  acts_as_messageable
-end
+class Admin < ActiveRecord::Base
+  acts_as_messageable
+end

data/spec/support/send_message.rb

@@ -1,3 +1,3 @@
-def send_message(from=@bob, to=@alice, topic="Topic", body="Body")
+def send_message(from = @bob, to = @alice, topic = 'Topic', body = 'Body')
   from.send_message(to, topic, body)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acts-as-messageable
 version: !ruby/object:Gem::Version
-  version: 0.4.10
+  version: 0.4.11
 platform: ruby
 authors:
 - Piotr Nielacny
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-10 00:00:00.000000000 Z
+date: 2019-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -67,35 +67,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: jeweler
+  name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: jeweler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: appraisal
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -154,12 +154,14 @@ files:
 - Rakefile
 - VERSION
 - acts-as-messageable.gemspec
-- gemfiles/rails_3.0.gemfile
-- gemfiles/rails_3.1.gemfile
 - gemfiles/rails_3.2.gemfile
-- gemfiles/rails_4.0.gemfile
-- gemfiles/rails_4.1.gemfile
-- gemfiles/rails_4.1_ProtectedAttributes.gemfile
+- gemfiles/rails_3.2.gemfile.lock
+- gemfiles/rails_4.2.11.gemfile
+- gemfiles/rails_4.2.11.gemfile.lock
+- gemfiles/rails_5.2.gemfile
+- gemfiles/rails_5.2.gemfile.lock
+- gemfiles/rails_6.0.gemfile
+- gemfiles/rails_6.0.gemfile.lock
 - lib/acts-as-messageable.rb
 - lib/acts-as-messageable/message.rb
 - lib/acts-as-messageable/model.rb
@@ -198,7 +200,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Make user messageable!;-)

data/gemfiles/rails_3.0.gemfile

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

data/gemfiles/rails_3.1.gemfile

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

data/gemfiles/rails_4.0.gemfile

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

data/gemfiles/rails_4.1.gemfile

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