enju_message 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86af615e611c78aa7455cb247a37fbfcbe4fabbf97ea75e7e3f7299ae33e30e2
-  data.tar.gz: e1f6331fbe4e8fd6d3831b3f26e4682bbde914acb4303b80cc91ec7b84276202
+  metadata.gz: 624376e2dbfc81534b053da0ea00034c9fd74e28097019525fb0f17159b70630
+  data.tar.gz: ea8c300d45c115ace37c41db2f3492fd0f27e7847222eb36c9741001b2316751
 SHA512:
-  metadata.gz: 808920419efade6ae75412f1a4aa8472c87dab8682ad9265bd7da02bf9f47623b7ddcde775a511031b599cae3359340148b5e372f878b1dcb87ef5606f7e5cc0
-  data.tar.gz: c5ba1032e2438e86ee5eedce8bd934c0de010cb75b9ff603541238f43c2edce5169ffd781bd605c6bc883cbb6e997faff97a5420087fcb005516513411a9d594
+  metadata.gz: 9106d542d5c6ddb7974727a0bb32db080597f7bbc6596a429eea0049ca0c8bdc99807e42aad20468be39dc922260a6b73f9933f87627f35108e4d57bb1d06c86
+  data.tar.gz: fb951fc23c9dbc64e40a887c398c71b2cd921562c105c798b676f690f965a04858f4aec899931a3052bfbf2ba794aee9ad3ff832dd9e640a6a7e93765fa41f31

data/README.md

@@ -0,0 +1,10 @@
+# EnjuMessage
+[![Travis CI](https://travis-ci.com/next-l/enju_message.svg?branch=1.3)](https://travis-ci.com/next-l/enju_message)
+[![Coverage Status](https://coveralls.io/repos/github/next-l/enju_message/badge.svg?branch=1.3)](https://coveralls.io/github/next-l/enju_message?branch=1.3)
+[![security](https://hakiri.io/github/next-l/enju_message/1.3.svg)](https://hakiri.io/github/next-l/enju_message/1.3)
+
+This project rocks and uses MIT-LICENSE.
+
+## 製作者・貢献者 (Authors and contributors)
+* [TANABE, Kosuke](https://github.com/nabeta) ([@nabeta](https://twitter.com/nabeta))
+* [Project Next-L](https://www.next-l.jp) ([@ProjectNextL](https://twitter.com/ProjectNextL))

data/app/models/message.rb

@@ -1,4 +1,4 @@
-class Message < ActiveRecord::Base
+class Message < ApplicationRecord
   include Statesman::Adapters::ActiveRecordQueries
   scope :unread, -> {in_state('unread')}
   belongs_to :message_request, optional: true
@@ -42,7 +42,7 @@ class Message < ActiveRecord::Base
 
   def set_receiver
     if recipient
-      self.receiver = User.where(username: recipient).first
+      self.receiver = User.find_by(username: recipient)
     end
   end
 
@@ -80,14 +80,14 @@ end
 #
 #  id                 :integer          not null, primary key
 #  read_at            :datetime
-#  receiver_id        :integer
 #  sender_id          :integer
+#  receiver_id        :integer
 #  subject            :string           not null
 #  body               :text
 #  message_request_id :integer
 #  parent_id          :integer
-#  created_at         :datetime
-#  updated_at         :datetime
+#  created_at         :datetime         not null
+#  updated_at         :datetime         not null
 #  lft                :integer
 #  rgt                :integer
 #  depth              :integer

data/app/models/message_request.rb

@@ -1,4 +1,4 @@
-class MessageRequest < ActiveRecord::Base
+class MessageRequest < ApplicationRecord
   include Statesman::Adapters::ActiveRecordQueries
   scope :not_sent, -> {in_state(:pending).where('sent_at IS NULL')}
   scope :sent, -> {in_state(:sent)}
@@ -83,8 +83,7 @@ end
 #  receiver_id         :integer
 #  message_template_id :integer
 #  sent_at             :datetime
-#  deleted_at          :datetime
 #  body                :text
-#  created_at          :datetime
-#  updated_at          :datetime
+#  created_at          :datetime         not null
+#  updated_at          :datetime         not null
 #

data/app/models/message_request_transition.rb

@@ -1,6 +1,5 @@
-class MessageRequestTransition < ActiveRecord::Base
+class MessageRequestTransition < ApplicationRecord
   include Statesman::Adapters::ActiveRecordTransition
-
   
   belongs_to :message_request, inverse_of: :message_request_transitions
   # attr_accessible :to_state, :sort_key, :metadata
@@ -15,7 +14,7 @@ end
 #  metadata           :text             default({})
 #  sort_key           :integer
 #  message_request_id :integer
-#  created_at         :datetime
-#  updated_at         :datetime
+#  created_at         :datetime         not null
+#  updated_at         :datetime         not null
 #  most_recent        :boolean          not null
 #

data/app/models/message_template.rb

@@ -1,4 +1,4 @@
-class MessageTemplate < ActiveRecord::Base
+class MessageTemplate < ApplicationRecord
   has_many :message_requests
 
   validates :status, uniqueness: true
@@ -31,6 +31,6 @@ end
 #  body       :text             not null
 #  position   :integer
 #  locale     :string           default("en")
-#  created_at :datetime
-#  updated_at :datetime
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
 #

data/app/models/message_transition.rb

@@ -1,6 +1,5 @@
-class MessageTransition < ActiveRecord::Base
+class MessageTransition < ApplicationRecord
   include Statesman::Adapters::ActiveRecordTransition
-
   
   belongs_to :message, inverse_of: :message_transitions
   # attr_accessible :to_state, :sort_key, :metadata
@@ -15,7 +14,7 @@ end
 #  metadata    :text             default({})
 #  sort_key    :integer
 #  message_id  :integer
-#  created_at  :datetime
-#  updated_at  :datetime
+#  created_at  :datetime         not null
+#  updated_at  :datetime         not null
 #  most_recent :boolean          not null
 #

data/app/views/message_templates/_form.html.erb

@@ -8,7 +8,7 @@
 
   <div class="field">
     <%= f.label :locale %><br />
-    <%= f.select(:locale, @available_languages.collect{|language| [language.display_name.localize, language.iso_639_1]}) %>
+    <%= f.select(:locale, @available_languages.collect{|language| [language.display_name, language.iso_639_1]}) %>
   </div>
 
   <div class="field">

data/app/views/messages/index.rss.builder

@@ -7,7 +7,7 @@ xml.rss('version' => "2.0",
       xml.title t('message.user_message', login_name: @user.username)
       xml.link messages_url(@user, format: :rss)
     else
-      xml.title t('message.library_group_message', library_group_name: @library_group.display_name.localize)
+      xml.title t('message.library_group_message', library_group_name: @library_group.display_name)
       xml.link messages_url(format: :rss)
     end
     xml.description "Next-L Enju, an open source integrated library system developed by Project Next-L"
@@ -16,7 +16,7 @@ xml.rss('version' => "2.0",
     xml.tag! "atom:link", rel: 'self', href: messages_url(format: :rss)
     xml.tag! "atom:link", rel: 'alternate', href: messages_url
     # xml.tag! "atom:link", rel: 'search', type: 'application/opensearchdescription+xml', href: "http://#{request.host_with_port}/page/opensearch"
-    unless params[:query].blank?
+    if params[:query].present?
       xml.tag! "opensearch:totalResults", @messages.total_entries
       xml.tag! "opensearch:startIndex", @messages.offset + 1
       xml.tag! "opensearch:itemsPerPage", @messages.per_page

data/db/migrate/149_create_message_templates.rb

@@ -1,7 +1,7 @@
-class CreateMessageTemplates < ActiveRecord::Migration[4.2]
-  def self.up
+class CreateMessageTemplates < ActiveRecord::Migration[5.2]
+  def change
     create_table :message_templates do |t|
-      t.string :status, null: false
+      t.string :status, null: false, index: {unique: true}
       t.text :title, null: false
       t.text :body, null: false
       t.integer :position
@@ -9,10 +9,5 @@ class CreateMessageTemplates < ActiveRecord::Migration[4.2]
 
       t.timestamps
     end
-    add_index :message_templates, :status, unique: true
-  end
-
-  def self.down
-    drop_table :message_templates
   end
 end

data/db/migrate/154_create_messages.rb

@@ -1,19 +1,15 @@
-class CreateMessages < ActiveRecord::Migration[4.2]
-  def self.up
-    create_table :messages, force: true do |t|
+class CreateMessages < ActiveRecord::Migration[5.2]
+  def change
+    create_table :messages do |t|
       t.datetime :read_at
       t.references :sender, index: true
       t.references :receiver, index: true
       t.string   :subject, null: false
       t.text     :body
       t.references :message_request, index: true
-      t.references :parent, index: true
+      t.references :parent, foreign_key: {to_table: :messages}
 
       t.timestamps
     end
   end
-
-  def self.down
-    drop_table :messages
-  end
 end

data/db/migrate/20080819181903_create_message_requests.rb

@@ -1,18 +1,13 @@
-class CreateMessageRequests < ActiveRecord::Migration[4.2]
-  def self.up
+class CreateMessageRequests < ActiveRecord::Migration[5.2]
+  def change
     create_table :message_requests do |t|
       t.references :sender
       t.references :receiver
       t.references :message_template
       t.datetime :sent_at
-      t.datetime :deleted_at
       t.text :body
 
       t.timestamps
     end
   end
-
-  def self.down
-    drop_table :message_requests
-  end
 end

data/db/migrate/20110913115320_add_lft_and_rgt_to_message.rb

@@ -1,11 +1,6 @@
-class AddLftAndRgtToMessage < ActiveRecord::Migration[4.2]
-  def self.up
+class AddLftAndRgtToMessage < ActiveRecord::Migration[5.2]
+  def change
     add_column :messages, :lft, :integer
     add_column :messages, :rgt, :integer
   end
-
-  def self.down
-    remove_column :messages, :rgt
-    remove_column :messages, :lft
-  end
 end

data/db/migrate/20120125050502_add_depth_to_message.rb

@@ -1,6 +1,5 @@
-class AddDepthToMessage < ActiveRecord::Migration[4.2]
+class AddDepthToMessage < ActiveRecord::Migration[5.2]
   def change
     add_column :messages, :depth, :integer
-
   end
 end

data/db/migrate/20140518111006_create_message_transitions.rb

@@ -1,18 +1,13 @@
-class CreateMessageTransitions < ActiveRecord::Migration[4.2]
+class CreateMessageTransitions < ActiveRecord::Migration[5.2]
   def change
     create_table :message_transitions do |t|
       t.string :to_state
-      if ActiveRecord::Base.configurations[Rails.env]["adapter"].try(:match, /mysql/)
-        t.text :metadata
-      else
-        t.text :metadata, default: "{}"
-      end
+      t.text :metadata, default: '{}'
       t.integer :sort_key
-      t.integer :message_id
+      t.references :message
       t.timestamps
     end
 
-    add_index :message_transitions, :message_id
     add_index :message_transitions, [:sort_key, :message_id], unique: true
   end
 end

data/db/migrate/20140518135713_create_message_request_transitions.rb

@@ -1,18 +1,13 @@
-class CreateMessageRequestTransitions < ActiveRecord::Migration[4.2]
+class CreateMessageRequestTransitions < ActiveRecord::Migration[5.2]
   def change
     create_table :message_request_transitions do |t|
       t.string :to_state
-      if ActiveRecord::Base.configurations[Rails.env]["adapter"].try(:match, /mysql/)
-        t.text :metadata
-      else
-        t.text :metadata, default: "{}"
-      end
+      t.text :metadata, default: '{}'
       t.integer :sort_key
-      t.integer :message_request_id
+      t.references :message_request
       t.timestamps
     end
 
-    add_index :message_request_transitions, :message_request_id
     add_index :message_request_transitions, [:sort_key, :message_request_id], unique: true, name: "index_message_request_transitions_on_sort_key_and_request_id"
   end
 end

data/db/migrate/20160703185015_add_most_recent_to_message_transitions.rb

@@ -1,4 +1,4 @@
-class AddMostRecentToMessageTransitions < ActiveRecord::Migration[4.2]
+class AddMostRecentToMessageTransitions < ActiveRecord::Migration[5.2]
   def up
     add_column :message_transitions, :most_recent, :boolean, null: true
   end

data/db/migrate/20160814165332_add_most_recent_to_message_request_transitions.rb

@@ -1,4 +1,4 @@
-class AddMostRecentToMessageRequestTransitions < ActiveRecord::Migration[4.2]
+class AddMostRecentToMessageRequestTransitions < ActiveRecord::Migration[5.2]
   def up
     add_column :message_request_transitions, :most_recent, :boolean, null: true
   end

data/db/migrate/20180107162659_add_constraints_to_most_recent_for_message_transitions.rb

@@ -1,4 +1,4 @@
-class AddConstraintsToMostRecentForMessageTransitions < ActiveRecord::Migration[4.2]
+class AddConstraintsToMostRecentForMessageTransitions < ActiveRecord::Migration[5.2]
   disable_ddl_transaction!
 
   def up

data/db/migrate/20180107162711_add_constraints_to_most_recent_for_message_request_transitions.rb

@@ -1,4 +1,4 @@
-class AddConstraintsToMostRecentForMessageRequestTransitions < ActiveRecord::Migration[4.2]
+class AddConstraintsToMostRecentForMessageRequestTransitions < ActiveRecord::Migration[5.2]
   disable_ddl_transaction!
 
   def up

data/lib/enju_message/version.rb

@@ -1,3 +1,3 @@
 module EnjuMessage
-  VERSION = "0.3.1"
+  VERSION = "0.3.2".freeze
 end

data/spec/controllers/messages_controller_spec.rb

@@ -448,13 +448,13 @@ describe MessagesController do
       end
 
       it 'should not update my message' do
-        put :update, params: { id: 2, message: {} }
+        put :update, params: { id: messages(:user2_to_user1_1), message: {} }
         response.should be_forbidden
       end
 
       it "should not update other user's message" do
         lambda do
-          put :update, params: { id: 1, message: {} }
+          put :update, params: { id: messages(:user1_to_user2_1), message: {} }
         end.should raise_error(ActiveRecord::RecordNotFound)
         response.should be_successful
       end
@@ -462,7 +462,7 @@ describe MessagesController do
 
     describe 'When not logged in' do
       it 'assigns the requested message as @message' do
-        put :update, params: { id: 2, message: {} }
+        put :update, params: { id: messages(:user2_to_user1_1), message: {} }
         response.should redirect_to new_user_session_url
       end
     end
@@ -482,14 +482,14 @@ describe MessagesController do
       login_fixture_user
 
       it 'should destroy own message' do
-        delete :destroy, params: { id: 2 }
+        delete :destroy, params: { id: messages(:user2_to_user1_1) }
         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, params: { id: 1 }
+          delete :destroy, params: { id: messages(:user1_to_user2_1) }
         end.should raise_error(ActiveRecord::RecordNotFound)
         response.should be_successful
       end
@@ -497,12 +497,12 @@ describe MessagesController do
 
     describe 'When not logged in' do
       it 'destroys the requested message' do
-        delete :destroy, params: { id: 1 }
+        delete :destroy, params: { id: messages(:user1_to_user2_1) }
         response.should redirect_to(new_user_session_url)
       end
 
       it 'should be redirected to new_user_session_url' do
-        delete :destroy, params: { id: 1 }
+        delete :destroy, params: { id: messages(:user1_to_user2_1) }
         response.should redirect_to(new_user_session_url)
       end
     end

data/spec/dummy/app/controllers/application_controller.rb

@@ -2,7 +2,6 @@ class ApplicationController < ActionController::Base
   protect_from_forgery
 
   include EnjuLibrary::Controller
-  before_action :set_paper_trail_whodunnit
   after_action :verify_authorized
 
   include Pundit

data/spec/dummy/app/jobs/application_job.rb

@@ -0,0 +1,7 @@
+class ApplicationJob < ActiveJob::Base
+  # Automatically retry jobs that encountered a deadlock
+  # retry_on ActiveRecord::Deadlocked
+
+  # Most jobs are safe to ignore if the underlying records are no longer available
+  # discard_on ActiveJob::DeserializationError
+end

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

@@ -0,0 +1,3 @@
+class ApplicationRecord < ActiveRecord::Base
+  self.abstract_class = true
+end

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

@@ -1,4 +1,4 @@
-class User < ActiveRecord::Base
+class User < ApplicationRecord
   # Include default devise modules. Others available are:
   # :token_authenticatable, :encryptable, :confirmable, :lockable, :timeoutable and :omniauthable
   devise :database_authenticatable, #:registerable,

data/spec/dummy/bin/bundle

@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
 load Gem.bin_path('bundler', 'bundle')

data/spec/dummy/bin/setup

@@ -1,10 +1,9 @@
 #!/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 = File.expand_path('..', __dir__)
 
 def system!(*args)
   system(*args) || abort("\n== Command #{args} failed ==")
@@ -21,7 +20,6 @@ chdir APP_ROOT do
   # Install JavaScript dependencies if using Yarn
   # system('bin/yarn')
 
-
   # puts "\n== Copying sample files =="
   # unless File.exist?('config/database.yml')
   #   cp 'config/database.yml.sample', 'config/database.yml'

data/spec/dummy/bin/update

@@ -1,10 +1,9 @@
 #!/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 = File.expand_path('..', __dir__)
 
 def system!(*args)
   system(*args) || abort("\n== Command #{args} failed ==")
@@ -18,6 +17,9 @@ chdir APP_ROOT do
   system! 'gem install bundler --conservative'
   system('bundle check') || system!('bundle install')
 
+  # Install JavaScript dependencies if using Yarn
+  # system('bin/yarn')
+
   puts "\n== Updating database =="
   system! 'bin/rails db:migrate'