acts-as-messageable 0.4.11 → 0.5.0

data/lib/generators/{acts-as-messageable → acts_as_messageable}/migration/templates/migration.rb

@@ -1,10 +1,10 @@
-class CreateMessagesTable < ActiveRecord::Migration
+class CreateMessagesTable < ActiveRecord::Migration[4.2]
   def self.up
     create_table :<%= table_name %> do |t|
       t.string :topic
       t.text :body
-      t.references :received_messageable, :polymorphic => true
-      t.references :sent_messageable, :polymorphic => true
+      t.references :received_messageable, :polymorphic => true, :type => :<%= options[:uuid] ? 'uuid' : 'bigint' %>
+      t.references :sent_messageable, :polymorphic => true, :type => :<%= options[:uuid] ? 'uuid' : 'bigint' %>
       t.boolean :opened, :default => false
       t.boolean :recipient_delete, :default => false
       t.boolean :sender_delete, :default => false

data/lib/generators/acts_as_messageable/migration/templates/migration_indexes.rb

@@ -0,0 +1,11 @@
+class AddIndexesToMessages < ActiveRecord::Migration[4.2]
+  def self.up
+    add_index :<%= table_name %>, [:sent_messageable_id, :sent_messageable_type], :name => "acts_as_messageable_sent"
+    add_index :<%= table_name %>, [:received_messageable_id, :received_messageable_type], :name => "acts_as_messageable_received"
+  end
+
+  def self.down
+    remove_index :<%= table_name %>, :name => "acts_as_messageable_sent"
+    remove_index :<%= table_name %>, :name => "acts_as_messageable_received"
+  end
+end

data/lib/generators/acts_as_messageable/migration/templates/migration_opened_as_datetime.rb

@@ -0,0 +1,15 @@
+class AddOpenedAtToMessages < ActiveRecord::Migration[4.2]
+  class MigrationMessage < ActiveRecord::Base
+    self.table_name = :<%= table_name %>
+  end
+
+  def self.up
+    add_column :<%= table_name %>, :opened_at, :datetime
+    MigrationMessage.where(opened: true).update_all(opened_at: DateTime.now)
+  end
+
+  def self.down
+    MigrationMessage.where('opened_at is not null').update_all(opened: true)
+    remove_column :<%= table_name %>, :opened_at
+  end
+end

data/lib/generators/{acts-as-messageable → acts_as_messageable}/migration/templates/migration_permanent.rb

@@ -1,4 +1,4 @@
-class AddRecipientPermanentDeleteAndSenderPermanentDeleteToMessages < ActiveRecord::Migration
+class AddRecipientPermanentDeleteAndSenderPermanentDeleteToMessages < ActiveRecord::Migration[4.2]
   def self.up
     add_column :<%= table_name %>, :recipient_permanent_delete, :boolean, :default => false
     add_column :<%= table_name %>, :sender_permanent_delete, :boolean, :default => false

data/spec/{acts-as-messageable_spec.rb → acts_as_messageable_spec.rb}

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'ActsAsMessageable' do
@@ -70,14 +72,14 @@ describe 'ActsAsMessageable' do
     end
 
     it 'alice should be able to reply to a message from bob to alice' do
-      @reply_message =  @alice.reply_to(@message, 'Re: Topic', 'Body')
+      @reply_message = @alice.reply_to(@message, 'Re: Topic', 'Body')
       expect(@reply_message).not_to be_nil
       expect(@bob.messages.are_from(@alice).count).to eq(1)
       expect(@alice.sent_messages.are_to(@bob).count).to eq(1)
     end
 
     it 'alice should be able to reply to a message using the message object' do
-      @reply_message =  @message.reply('Re: Topic', 'Body')
+      @reply_message = @message.reply('Re: Topic', 'Body')
       expect(@reply_message).not_to be_nil
       expect(@bob.messages.are_from(@alice).count).to eq(1)
       expect(@alice.sent_messages.are_to(@bob).count).to eq(1)
@@ -85,13 +87,13 @@ describe 'ActsAsMessageable' do
 
     it 'bob try to add something to conversation' do
       @reply_message = @bob.reply_to(@message, 'Oh, I Forget', '1+1=2')
-      expect(@reply_message.from).to  eq(@message.from)
-      expect(@reply_message.to).to    eq(@message.to)
+      expect(@reply_message.from).to eq(@message.from)
+      expect(@reply_message.to).to eq(@message.to)
     end
 
     it 'bob try to add something to conversation and should receive proper order' do
       @reply_message = @bob.reply_to(@message, 'Oh, I Forget', '1+1=2')
-      @sec_message   = @alice.reply_to(@message, 'Yeah, right', '1+1=3!')
+      @sec_message = @alice.reply_to(@message, 'Yeah, right', '1+1=3!')
 
       expect(@message.conversation).to eq([@sec_message, @reply_message, @message])
     end
@@ -148,6 +150,12 @@ describe 'ActsAsMessageable' do
       expect(@alice.received_messages.count).to eq(1)
     end
 
+    it 'bob should be able to restore message' do
+      @bob.sent_messages.process(&:delete)
+      @bob.restore_message(@message.reload)
+      expect(@bob.sent_messages.count).to eq(1)
+    end
+
     it 'should works with relation' do
       @alice.received_messages.process(&:delete)
       expect(@alice.received_messages.count).to eq(0)
@@ -164,6 +172,7 @@ describe 'ActsAsMessageable' do
     it 'alice should have one unread message from bob' do
       expect(@alice.messages.are_from(@bob).unreaded.count).to eq(1)
       expect(@alice.messages.are_from(@bob).readed.count).to eq(0)
+      expect(@alice.messages.are_from(@bob).readed.all?(&:open?)).to be_truthy
     end
 
     it 'alice should able to read message from bob' do
@@ -177,11 +186,33 @@ describe 'ActsAsMessageable' do
       expect(@alice.messages.are_from(@bob).unreaded.count).to eq(1)
     end
 
+    it 'alice should see the read_at updated' do
+      date_time_when_read = Time.new(2014, 9, 4, 15, 12, 34)
+      Timecop.freeze(date_time_when_read) do
+        @alice.messages.are_from(@bob).first.read
+        first_message = @alice.messages.are_from(@bob).first
+        expect(first_message.opened_at).to eql(date_time_when_read)
+      end
+    end
+
     it 'alice should able to get datetime when he read bob message' do
       @alice.messages.are_from(@bob).first.read
       read_datetime = @alice.messages.are_from(@bob).first.updated_at
       expect(@alice.messages.are_from(@bob).reorder('updated_at asc').first.updated_at).to eq(read_datetime)
     end
+
+    describe '#open?' do
+      let(:message) { @alice.messages.are_from(@bob).first }
+
+      it 'returns false for closed message' do
+        expect(message.open?).to be_falsey
+      end
+
+      it 'returns true for open message' do
+        message.read
+        expect(message.open?).to be_truthy
+      end
+    end
   end
 
   it 'finds proper message' do
@@ -268,6 +299,10 @@ describe 'ActsAsMessageable' do
     expect(@bob.sent_messages.loaded?).to be_falsey
   end
 
+  it 'sent_messages should return unloaded messages' do
+    expect(@bob.sent_messages.loaded?).to be_falsey
+  end
+
   describe 'send messages between two different models (the same id)' do
     it 'should have the same id' do
       expect(@alice.id).to be_equal(@admin.id)
@@ -285,4 +320,41 @@ describe 'ActsAsMessageable' do
       expect(@bob.messages.are_from(@alice).size).to be_equal(0)
     end
   end
+
+  describe 'mass assigment', rails: 4 do
+    it 'allows to mass assign topic and body attributes' do
+      @message = send_message(@bob, @alice, 'Example', 'Example Body')
+      @message.update_attributes!(topic: 'Changed topic', body: 'Changed body')
+
+      expect(@message.topic).to eq('Changed topic')
+      expect(@message.body).to eq('Changed body')
+    end
+  end
+
+  describe 'ancestry initialization' do # GH#78
+    let(:message) { ActsAsMessageable::Message.create!(topic: 'topic', body: 'body') }
+
+    before do
+      # Use clean version of Message class
+      ActsAsMessageable.instance_eval { remove_const 'Message' }
+      load 'acts_as_messageable/message.rb'
+    end
+
+    it 'returns root of the conversation' do
+      expect(message.conversation).to include(message)
+    end
+  end
+
+  describe 'user primary key is uuid type', rails: [5, 6] do # GH#107
+    let(:bob) { UuidUser.create(id: SecureRandom.uuid, email: 'bob@example.com') }
+    let(:alice) { UuidUser.create(id: SecureRandom.uuid, email: 'alice@example.com') }
+
+    before do
+      bob.send_message(alice, 'Subject', 'Body')
+    end
+
+    it 'returns messages for alice' do
+      expect(alice.messages).not_to be_empty
+    end
+  end
 end

data/spec/{custom-class_spec.rb → custom_class_spec.rb}

@@ -1,12 +1,11 @@
-require 'spec_helper'
+# frozen_string_literal: true
 
-class CustomMessage < ActsAsMessageable::Message
-  def custom_method; end
-end
+require 'spec_helper'
 
 describe 'custom class' do
   let(:alice) { User.find_by_email('alice@example.com') }
-  let(:bob)   { User.find_by_email('bob@example.com') }
+  let(:bob) { User.find_by_email('bob@example.com') }
+  let(:custom_user) { CustomSearchUser.find_by_email('custom@example.com') }
 
   before do
     User.acts_as_messageable class_name: 'CustomMessage', table_name: 'custom_messages'
@@ -36,4 +35,14 @@ describe 'custom class' do
     expect(@reply_message.root).to eq(@message)
     expect(@reply_message.root.class).to eq(CustomMessage)
   end
+
+  context 'with custom search scope' do
+    before do
+      send_message(custom_user, bob, 'Test subject', 'Test body')
+    end
+
+    it 'will use custom search scope' do
+      expect(custom_user.messages.custom_search('Test body').count).to eq(1)
+    end
+  end
 end

data/spec/{custom-required_spec.rb → custom_required_spec.rb}

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 require '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'
+    load 'acts_as_messageable/message.rb'
   end
 
   it 'should work with non-array require' do

data/spec/{group-messages_spec.rb → group_messages_spec.rb}

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 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') }
+  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

data/spec/migrations_spec.rb

@@ -0,0 +1,75 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+def create_dummy_app
+  system <<-COMMAND
+    bundle exec rails new dummy --skip-test-unit --skip-spring --skip-webpack-install --skip-bootsnap \
+    --skip-active-storage --skip-active-job -d sqlite3
+  COMMAND
+end
+
+def add_gem_to_gemfile
+  run_in_app("echo gem \"'acts-as-messageable', path: '../'\" >> Gemfile; bundle")
+end
+
+def run_bundler
+  run_in_app('bundle update')
+end
+
+def run_generators(option = '')
+  run_in_app("bundle exec rails g acts_as_messageable:migration #{option}")
+end
+
+def run_migrations
+  run_in_app('bundle exec rake db:migrate')
+end
+
+def rollback_migrations
+  run_in_app('bundle exec rake db:migrate VERSION=0')
+end
+
+def run_in_app(command)
+  Bundler.clean_system("cd dummy; BUNDLE_GEMFILE=./Gemfile #{command}")
+end
+
+def remove_dummy_app
+  system 'rm -rf dummy'
+end
+
+def skip_generators?
+  ENV.fetch('RUN_GENERATORS', 'false') == 'false'
+end
+
+describe 'migration' do
+  before do
+    create_dummy_app
+    add_gem_to_gemfile
+    run_bundler
+  end
+
+  after do
+    remove_dummy_app
+  end
+
+  it 'runs migrations and revert them', skip: skip_generators? do
+    run_generators
+
+    expect(run_migrations).to be_truthy
+    expect(rollback_migrations).to be_truthy
+  end
+
+  it 'runs migrations and revert them with uuid option', skip: skip_generators? do
+    run_generators('--uuid')
+
+    expect(run_migrations).to be_truthy
+    expect(rollback_migrations).to be_truthy
+  end
+
+  it 'runs migrations and revert them with uuid option and custom table', skip: skip_generators? do
+    run_generators('my_messages --uuid')
+
+    expect(run_migrations).to be_truthy
+    expect(rollback_migrations).to be_truthy
+  end
+end

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'rspec'
@@ -8,25 +10,32 @@ ActiveRecord::Base.logger.level = 3
 require 'coveralls'
 Coveralls.wear!
 
+require 'timecop'
+
 require 'bundler/setup'
 Bundler.require(:default)
 
+require 'pry'
 require 'acts-as-messageable'
 
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].sort.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: ENV.fetch('DATABASE_ADAPTER', 'sqlite3'),
+      database: ENV.fetch('DATABASE_NAME', ':memory:')
+    )
     create_database
 
-    @alice = User.create  email: 'alice@example.com'
-    @bob   = User.create  email: 'bob@example.com'
-    @pat   = User.create  email: 'pat@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'
+    @men = Men.create email: 'men@example.com'
+    @custom_search_user = CustomSearchUser.create email: 'custom@example.com'
   end
 
   config.after(:all) do
@@ -36,44 +45,28 @@ RSpec.configure do |config|
   config.after(:each) do
     User.messages_class_name.destroy_all
   end
+
+  config.around(:each) do |example|
+    supported_rails = Array.wrap(example.metadata[:rails]).presence || [3, 4, 5, 6]
+
+    example.run if supported_rails.include?(Rails::VERSION::MAJOR)
+  end
 end
 
 def create_database
   ActiveRecord::Schema.define(version: 1) do
-    create_table :messages do |t|
-      t.string :topic
-      t.text :body
-      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
+    if ENV.fetch('DATABASE_ADAPTER', '') == 'postgresql'
+      enable_extension 'pgcrypto' unless extension_enabled?('pgcrypto')
     end
 
-    create_table :custom_messages do |t|
-      t.string :topic
-      t.text :body
-      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
-    create_table :users do |t|
-      t.string :email
-    end
+    create_table(:messages, &TABLE_SCHEMA)
+    create_table(:custom_messages, &TABLE_SCHEMA)
+    create_table(:custom_messages_uuid, &TABLE_SCHEMA_UUID)
 
-    create_table :admins do |t|
-      t.string :email
-    end
+    create_table(:users, &USER_SCHEMA)
+    create_table(:admins, &USER_SCHEMA)
+    create_table(:custom_search_users, &USER_SCHEMA)
+    create_table(:uuid_users, id: :uuid, &USER_SCHEMA)
   end
 end
 

data/spec/support/admin.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Admin < ActiveRecord::Base
   acts_as_messageable
 end

data/spec/support/custom_message.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+class CustomMessage < ActsAsMessageable::Message
+  def custom_method; end
+end