enju_message 0.2.4 → 0.3.0.beta.1

data/spec/controllers/messages_controller_spec.rb

@@ -19,7 +19,7 @@ describe MessagesController do
 
       describe 'When user_id is specified' do
         it 'assigns all messages as @messages' do
-          get :index, user_id: @user.username
+          get :index, params: { user_id: @user.username }
           assigns(:messages).should_not be_nil
         end
       end
@@ -36,7 +36,7 @@ describe MessagesController do
 
       describe 'When user_id is specified' do
         it 'assigns all messages as @messages' do
-          get :index, user_id: @user.username
+          get :index, params: { user_id: @user.username }
           assigns(:messages).should_not be_nil
         end
       end
@@ -59,7 +59,7 @@ describe MessagesController do
       end
 
       it 'should get index with query' do
-        get :index, query: 'you'
+        get :index, params: { query: 'you' }
         assigns(:messages).first.receiver.should eq users(:user1)
         response.should be_success
       end
@@ -81,7 +81,7 @@ describe MessagesController do
       it 'assigns the requested message as @message' do
         message = messages(:user1_to_user2_1)
         lambda do
-          get :show, id: message.id
+          get :show, params: { id: message.id }
         end.should raise_error(ActiveRecord::RecordNotFound)
         assigns(:message).should be_nil
         # response.should be_missing
@@ -94,7 +94,7 @@ describe MessagesController do
       it 'assigns the requested message as @message' do
         message = messages(:user1_to_user2_1)
         lambda do
-          get :show, id: message.id
+          get :show, params: { id: message.id }
         end.should raise_error(ActiveRecord::RecordNotFound)
         assigns(:message).should be_nil
         # response.should be_forbidden
@@ -105,13 +105,13 @@ describe MessagesController do
       login_fixture_user
 
       it 'should show my message' do
-        get :show, id: messages(:user2_to_user1_1).id
+        get :show, params: { id: messages(:user2_to_user1_1).id }
         response.should be_success
       end
 
       it "should should not show other user's message" do
         lambda do
-          get :show, id: messages(:user1_to_user2_1).id
+          get :show, params: { id: messages(:user1_to_user2_1).id }
         end.should raise_error(ActiveRecord::RecordNotFound)
         # response.should be_missing
       end
@@ -119,7 +119,7 @@ describe MessagesController do
 
     describe 'When not logged in' do
       it 'assigns the requested message as @message' do
-        get :show, id: messages(:user1_to_user2_1).id
+        get :show, params: { id: messages(:user1_to_user2_1).id }
         response.should redirect_to new_user_session_url
       end
     end
@@ -160,12 +160,12 @@ describe MessagesController do
       end
 
       it 'should not get new template with invalid parent_id' do
-        get :new, parent_id: 1
+        get :new, params: { parent_id: 1 }
         response.should be_forbidden
       end
 
       it 'should not get new template with valid parent_id' do
-        get :new, parent_id: 2
+        get :new, params: { parent_id: 2 }
         response.should be_forbidden
       end
     end
@@ -186,7 +186,7 @@ describe MessagesController do
       it 'assigns the requested message as @message' do
         message = messages(:user1_to_user2_1)
         lambda do
-          get :edit, id: message.id
+          get :edit, params: { id: message.id }
         end.should raise_error(ActiveRecord::RecordNotFound)
         assigns(:message).should be_nil
         response.should be_success
@@ -199,7 +199,7 @@ describe MessagesController do
       it 'assigns the requested message as @message' do
         message = messages(:user1_to_user2_1)
         lambda do
-          get :edit, id: message.id
+          get :edit, params: { id: message.id }
         end.should raise_error(ActiveRecord::RecordNotFound)
         assigns(:message).should be_nil
         response.should be_success
@@ -212,7 +212,7 @@ describe MessagesController do
       it 'assigns the requested message as @message' do
         message = messages(:user1_to_user2_1)
         lambda do
-          get :edit, id: message.id
+          get :edit, params: { id: message.id }
         end.should raise_error(ActiveRecord::RecordNotFound)
         assigns(:message).should be_nil
         response.should be_success
@@ -222,7 +222,7 @@ describe MessagesController do
     describe 'When not logged in' do
       it 'assigns the requested message as @message' do
         message = FactoryBot.create(:message)
-        get :edit, id: message.id
+        get :edit, params: { id: message.id }
         assigns(:message).should be_nil
         response.should redirect_to new_user_session_url
       end
@@ -242,31 +242,31 @@ describe MessagesController do
 
       describe 'with valid params' do
         it 'assigns a newly created message as @message' do
-          post :create, message: @attrs, user_id: users(:user1).username
+          post :create, params: { message: @attrs, user_id: users(:user1).username }
           assigns(:message).should be_valid
         end
 
         it 'redirects to the created message' do
-          post :create, message: @attrs, user_id: users(:user1).username
+          post :create, params: { message: @attrs, user_id: users(:user1).username }
           response.should redirect_to(messages_url)
         end
       end
 
       describe 'with invalid params' do
         it 'assigns a newly created but unsaved message as @message' do
-          post :create, message: @invalid_attrs, user_id: users(:user1).username
+          post :create, params: { message: @invalid_attrs, user_id: users(:user1).username }
           assigns(:message).should_not be_valid
         end
 
         it "re-renders the 'new' template" do
-          post :create, message: @invalid_attrs, user_id: users(:user1).username
+          post :create, params: { message: @invalid_attrs, user_id: users(:user1).username }
           response.should render_template('new')
           response.should be_success
         end
       end
       describe 'with invalid recipient' do
         it "re-renders the 'new' template" do
-          post :create, message: @invalid_user_attrs
+          post :create, params: { message: @invalid_user_attrs }
           message = assigns(:message)
           message.should_not be_valid
           message.errors.should have_key :receiver
@@ -274,7 +274,7 @@ describe MessagesController do
           response.should render_template('new')
         end
         it "re-renders the 'new' template" do
-          post :create, message: @blank_user_attrs
+          post :create, params: { message: @blank_user_attrs }
           message = assigns(:message)
           message.should_not be_valid
           message.errors.should have_key :recipient
@@ -288,7 +288,7 @@ describe MessagesController do
       login_fixture_librarian
 
       it 'should create message without parent_id' do
-        post :create, message: { recipient: 'user2', subject: 'test', body: 'test' }
+        post :create, params: { message: { recipient: 'user2', subject: 'test', body: 'test' } }
         response.should redirect_to messages_url
       end
     end
@@ -297,12 +297,12 @@ describe MessagesController do
       login_fixture_user
 
       it 'should not create message without parent_id' do
-        post :create, message: { recipient: 'user2', subject: 'test', body: 'test' }
+        post :create, params: { message: { recipient: 'user2', subject: 'test', body: 'test' } }
         response.should be_forbidden
       end
 
       it 'should not create message with parent_id' do
-        post :create, message: { recipient: 'user2', subject: 'test', body: 'test', parent_id: 2 }
+        post :create, params: { message: { recipient: 'user2', subject: 'test', body: 'test', parent_id: 2 } }
         response.should be_forbidden
       end
     end
@@ -310,24 +310,24 @@ describe MessagesController do
     describe 'When not logged in' do
       describe 'with valid params' do
         it 'assigns a newly created message as @message' do
-          post :create, message: @attrs
+          post :create, params: { message: @attrs }
           assigns(:message).should be_nil
         end
 
         it 'should redirect to new_user_session_url' do
-          post :create, message: @attrs
+          post :create, params: { message: @attrs }
           response.should redirect_to(new_user_session_url)
         end
       end
 
       describe 'with invalid params' do
         it 'assigns a newly created but unsaved message as @message' do
-          post :create, message: @invalid_attrs
+          post :create, params: { message: @invalid_attrs }
           assigns(:message).should be_nil
         end
 
         it 'should redirect to new_user_session_url' do
-          post :create, message: @invalid_attrs
+          post :create, params: { message: @invalid_attrs }
           response.should redirect_to(new_user_session_url)
         end
       end
@@ -347,13 +347,13 @@ describe MessagesController do
       describe 'with valid params' do
         it 'updates the requested message' do
           lambda do
-            put :update, id: @message.id, message: @attrs
+            put :update, params: { id: @message.id, message: @attrs }
           end.should raise_error(ActiveRecord::RecordNotFound)
         end
 
         it 'assigns the requested message as @message' do
           lambda do
-            put :update, id: @message.id, message: @attrs
+            put :update, params: { id: @message.id, message: @attrs }
           end.should raise_error(ActiveRecord::RecordNotFound)
           assigns(:message).should be_nil
           # response.should be_missing
@@ -363,13 +363,13 @@ describe MessagesController do
       describe 'with invalid params' do
         it 'assigns the requested message as @message' do
           lambda do
-            put :update, id: @message.id, message: @invalid_attrs
+            put :update, params: { id: @message.id, message: @invalid_attrs }
           end.should raise_error(ActiveRecord::RecordNotFound)
         end
 
         it "re-renders the 'edit' template" do
           lambda do
-            put :update, id: @message.id, message: @invalid_attrs
+            put :update, params: { id: @message.id, message: @invalid_attrs }
           end.should raise_error(ActiveRecord::RecordNotFound)
           response.should be_success
         end
@@ -382,13 +382,13 @@ describe MessagesController do
       describe 'with valid params' do
         it 'updates the requested message' do
           lambda do
-            put :update, id: @message.id, message: @attrs
+            put :update, params: { id: @message.id, message: @attrs }
           end.should raise_error(ActiveRecord::RecordNotFound)
         end
 
         it 'assigns the requested message as @message' do
           lambda do
-            put :update, id: @message.id, message: @attrs
+            put :update, params: { id: @message.id, message: @attrs }
           end.should raise_error(ActiveRecord::RecordNotFound)
           assigns(:message).should be_nil
           response.should be_success
@@ -398,13 +398,13 @@ describe MessagesController do
       describe 'with invalid params' do
         it 'assigns the requested message as @message' do
           lambda do
-            put :update, id: @message.id, message: @invalid_attrs
+            put :update, params: { id: @message.id, message: @invalid_attrs }
           end.should raise_error(ActiveRecord::RecordNotFound)
         end
 
         it "re-renders the 'edit' template" do
           lambda do
-            put :update, id: @message.id, message: @invalid_attrs
+            put :update, params: { id: @message.id, message: @invalid_attrs }
           end.should raise_error(ActiveRecord::RecordNotFound)
           response.should be_success
         end
@@ -417,13 +417,13 @@ describe MessagesController do
       describe 'with valid params' do
         it 'updates the requested message' do
           lambda do
-            put :update, id: @message.id, message: @attrs
+            put :update, params: { id: @message.id, message: @attrs }
           end.should raise_error(ActiveRecord::RecordNotFound)
         end
 
         it 'assigns the requested message as @message' do
           lambda do
-            put :update, id: @message.id, message: @attrs
+            put :update, params: { id: @message.id, message: @attrs }
           end.should raise_error(ActiveRecord::RecordNotFound)
           assigns(:message).should be_nil
           response.should be_success
@@ -433,26 +433,26 @@ describe MessagesController do
       describe 'with invalid params' do
         it 'assigns the requested message as @message' do
           lambda do
-            put :update, id: @message.id, message: @invalid_attrs
+            put :update, params: { id: @message.id, message: @invalid_attrs }
           end.should raise_error(ActiveRecord::RecordNotFound)
         end
 
         it "re-renders the 'edit' template" do
           lambda do
-            put :update, id: @message.id, message: @invalid_attrs
+            put :update, params: { id: @message.id, message: @invalid_attrs }
           end.should raise_error(ActiveRecord::RecordNotFound)
           response.should be_success
         end
       end
 
       it 'should not update my message' do
-        put :update, id: 2, message: {}
+        put :update, params: { id: 2, message: {} }
         response.should be_forbidden
       end
 
       it "should not update other user's message" do
         lambda do
-          put :update, id: 1, message: {}
+          put :update, params: { id: 1, message: {} }
         end.should raise_error(ActiveRecord::RecordNotFound)
         response.should be_success
       end
@@ -460,7 +460,7 @@ describe MessagesController do
 
     describe 'When not logged in' do
       it 'assigns the requested message as @message' do
-        put :update, id: 2, message: {}
+        put :update, params: { id: 2, message: {} }
         response.should redirect_to new_user_session_url
       end
     end
@@ -472,7 +472,7 @@ describe MessagesController do
 
       it 'should destroy own message' do
         @message = FactoryBot.create(:message, recipient: @user.username)
-        delete :destroy, id: @message.id
+        delete :destroy, params: { id: @message.id }
         response.should redirect_to messages_url
       end
     end
@@ -480,14 +480,14 @@ describe MessagesController do
       login_fixture_user
 
       it 'should destroy own message' do
-        delete :destroy, id: 2
+        delete :destroy, params: { id: 2 }
         response.should redirect_to messages_url
         response.should_not be_forbidden
       end
 
       it "should not destroy other user's message" do
         lambda do
-          delete :destroy, id: 1
+          delete :destroy, params: { id: 1 }
         end.should raise_error(ActiveRecord::RecordNotFound)
         response.should be_success
       end
@@ -495,12 +495,12 @@ describe MessagesController do
 
     describe 'When not logged in' do
       it 'destroys the requested message' do
-        delete :destroy, id: 1
+        delete :destroy, params: { id: 1 }
         response.should redirect_to(new_user_session_url)
       end
 
       it 'should be redirected to new_user_session_url' do
-        delete :destroy, id: 1
+        delete :destroy, params: { id: 1 }
         response.should redirect_to(new_user_session_url)
       end
     end
@@ -511,7 +511,7 @@ describe MessagesController do
       login_fixture_librarian
       it 'should destroy own message' do
         message = FactoryBot.create(:message, recipient: @user.username)
-        post :destroy_selected, delete: [message.id]
+        post :destroy_selected, params: { delete: [message.id] }
         response.should_not be_forbidden
         response.should redirect_to(messages_url)
       end
@@ -521,7 +521,7 @@ describe MessagesController do
       login_fixture_user
       it 'should destroy own message' do
         message = FactoryBot.create(:message, recipient: @user.username)
-        post :destroy_selected, delete: [message.id]
+        post :destroy_selected, params: { delete: [message.id] }
         response.should_not be_forbidden
         response.should redirect_to(messages_url)
       end

data/spec/dummy/app/models/user.rb

@@ -3,7 +3,7 @@ class User < ActiveRecord::Base
   # :token_authenticatable, :encryptable, :confirmable, :lockable, :timeoutable and :omniauthable
   devise :database_authenticatable, #:registerable,
          :recoverable, :rememberable, :trackable, #:validatable,
-         :lockable, :lock_strategy => :none, :unlock_strategy => :none
+         :lockable, lock_strategy: :none, unlock_strategy: :none
 
   # Setup accessible (or protected) attributes for your model
   include EnjuSeed::EnjuUser

data/spec/dummy/bin/rails

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
-APP_PATH = File.expand_path('../../config/application', __FILE__)
+APP_PATH = File.expand_path('../config/application', __dir__)
 require_relative '../config/boot'
 require 'rails/commands'

data/spec/dummy/bin/setup

@@ -1,29 +1,38 @@
 #!/usr/bin/env ruby
 require 'pathname'
+require 'fileutils'
+include FileUtils
 
 # path to your application root.
-APP_ROOT = Pathname.new File.expand_path('../../',  __FILE__)
+APP_ROOT = Pathname.new File.expand_path('../../', __FILE__)
 
-Dir.chdir APP_ROOT do
+def system!(*args)
+  system(*args) || abort("\n== Command #{args} failed ==")
+end
+
+chdir APP_ROOT do
   # This script is a starting point to setup your application.
-  # Add necessary setup steps to this file:
+  # Add necessary setup steps to this file.
+
+  puts '== Installing dependencies =='
+  system! 'gem install bundler --conservative'
+  system('bundle check') || system!('bundle install')
+
+  # Install JavaScript dependencies if using Yarn
+  # system('bin/yarn')
 
-  puts "== Installing dependencies =="
-  system "gem install bundler --conservative"
-  system "bundle check || bundle install"
 
   # puts "\n== Copying sample files =="
-  # unless File.exist?("config/database.yml")
-  #   system "cp config/database.yml.sample config/database.yml"
+  # unless File.exist?('config/database.yml')
+  #   cp 'config/database.yml.sample', 'config/database.yml'
   # end
 
   puts "\n== Preparing database =="
-  system "bin/rake db:setup"
+  system! 'bin/rails db:setup'
 
   puts "\n== Removing old logs and tempfiles =="
-  system "rm -f log/*"
-  system "rm -rf tmp/cache"
+  system! 'bin/rails log:clear tmp:clear'
 
   puts "\n== Restarting application server =="
-  system "touch tmp/restart.txt"
+  system! 'bin/rails restart'
 end

data/spec/dummy/bin/update

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+require 'pathname'
+require 'fileutils'
+include FileUtils
+
+# path to your application root.
+APP_ROOT = Pathname.new File.expand_path('../../', __FILE__)
+
+def system!(*args)
+  system(*args) || abort("\n== Command #{args} failed ==")
+end
+
+chdir APP_ROOT do
+  # This script is a way to update your development environment automatically.
+  # Add necessary update steps to this file.
+
+  puts '== Installing dependencies =='
+  system! 'gem install bundler --conservative'
+  system('bundle check') || system!('bundle install')
+
+  puts "\n== Updating database =="
+  system! 'bin/rails db:migrate'
+
+  puts "\n== Removing old logs and tempfiles =="
+  system! 'bin/rails log:clear tmp:clear'
+
+  puts "\n== Restarting application server =="
+  system! 'bin/rails restart'
+end

data/spec/dummy/bin/yarn

@@ -0,0 +1,11 @@
+#!/usr/bin/env ruby
+VENDOR_PATH = File.expand_path('..', __dir__)
+Dir.chdir(VENDOR_PATH) do
+  begin
+    exec "yarnpkg #{ARGV.join(" ")}"
+  rescue Errno::ENOENT
+    $stderr.puts "Yarn executable was not detected in the system."
+    $stderr.puts "Download Yarn at https://yarnpkg.com/en/docs/install"
+    exit 1
+  end
+end

data/spec/dummy/config/application.rb

@@ -1,29 +1,19 @@
-require File.expand_path('../boot', __FILE__)
+require_relative 'boot'
 
 require 'rails/all'
 
 Bundler.require(*Rails.groups)
-require 'enju_message'
-require 'enju_leaf'
-require 'globalize'
-require 'globalize-accessors'
+require "enju_message"
+require "enju_leaf"
 
 module Dummy
   class Application < Rails::Application
+    # Initialize configuration defaults for originally generated Rails version.
+    config.load_defaults 5.1
+
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration should go into files in config/initializers
     # -- all .rb files in that directory are automatically loaded.
-
-    # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
-    # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
-    # config.time_zone = 'Central Time (US & Canada)'
-
-    # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
-    # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
-    # config.i18n.default_locale = :de
-
-    # Do not swallow errors in after_commit/after_rollback callbacks.
-    config.active_record.raise_in_transactional_callbacks = true
   end
 end
 

data/spec/dummy/config/boot.rb

@@ -1,10 +1,5 @@
-require 'rubygems'
-gemfile = ENV['BUNDLE_GEMFILE'] || File.expand_path('../../../../Gemfile', __FILE__)
+# Set up gems listed in the Gemfile.
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../Gemfile', __dir__)
 
-if File.exist?(gemfile)
-  ENV['BUNDLE_GEMFILE'] = gemfile
-  require 'bundler'
-  Bundler.setup
-end
-
-$:.unshift File.expand_path('../../../../lib', __FILE__)
+require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
+$LOAD_PATH.unshift File.expand_path('../../../lib', __dir__)

data/spec/dummy/config/cable.yml

@@ -0,0 +1,10 @@
+development:
+  adapter: async
+
+test:
+  adapter: async
+
+production:
+  adapter: redis
+  url: redis://localhost:6379/1
+  channel_prefix: dummy_production

data/spec/dummy/config/database.yml

@@ -1,30 +1,25 @@
-sqlite: &sqlite
+# SQLite version 3.x
+#   gem install sqlite3
+#
+#   Ensure the SQLite 3 gem is defined in your Gemfile
+#   gem 'sqlite3'
+#
+default: &default
   adapter: sqlite3
-  database: db/<%= Rails.env %>.sqlite3
-
-mysql: &mysql
-  adapter: mysql2
-  username: root
-  password:
-  database: enju_<%= Rails.env %>
-
-postgresql: &postgresql
-  adapter: postgresql
-  username: postgres
-  password:
-  database: enju_<%= Rails.env %>
-
-defaults: &defaults
-  pool: 5
+  pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
   timeout: 5000
-  host: localhost
-  <<: *<%= ENV['DB'] || "sqlite" %>
 
 development:
-  <<: *defaults
+  <<: *default
+  database: db/development.sqlite3
 
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
+# Do not set this db to the same as development or production.
 test:
-  <<: *defaults
+  <<: *default
+  database: db/test.sqlite3
 
 production:
-  <<: *defaults
+  <<: *default
+  database: db/production.sqlite3

data/spec/dummy/config/environment.rb

@@ -1,5 +1,5 @@
-# Load the rails application
-require File.expand_path('../application', __FILE__)
+# Load the Rails application.
+require_relative 'application'
 
-# Initialize the rails application
-Dummy::Application.initialize!
+# Initialize the Rails application.
+Rails.application.initialize!