enju_message 0.2.4 → 0.3.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3331d61ef8da31c2128f7686a3cdcc9c5103ac1
-  data.tar.gz: 413ff20e2bc783aeeda56c4bd310a747c1aafc41
+  metadata.gz: e75af30f09ac93f59585860221a94ba9236b3e2d
+  data.tar.gz: 9d3eb4ac9e0ea0bf7703e4d7c170747827739ae9
 SHA512:
-  metadata.gz: de8c7f3430f71773fcd2fd1bc6ad2abf92fcb6a6eb5678748b782c9e96005831a13350c4057a435164e1b6909d66f47c7d299d0a8236fbb59d5153281a6b5626
-  data.tar.gz: 6412dd23c146ab481a3a7a28e8152b947876477233fbca37826a3ef686a2d4e66f6a476f8807af0671ccc2bd7df7797355515e1715b899a0d7048a3744b18b2e
+  metadata.gz: 207d25d934a7d825adb0e2ed0c2b0ecc0e9116b934e24523ca6e5b0c27945861b97687a18f846094dbecfc3b7df51da4b16c1c8acc55b13660df874ef7e650cc
+  data.tar.gz: c7222db7109beb1c3f3cfc6ab2b92f58fd8a9b2c254c0b5dc90483ba299230a9a6dddd85129604328f158a2a5294913a2b8f6392e23da1676f278300651e65d6

data/README.rdoc

@@ -1,10 +1,10 @@
 = EnjuMessage
-{<img src="https://travis-ci.org/next-l/enju_message.svg?branch=1.2" alt="Build Status" />}[https://travis-ci.org/next-l/enju_message]
-{<img src="https://coveralls.io/repos/next-l/enju_message/badge.svg?branch=1.2&service=github" alt="Coverage Status" />}[https://coveralls.io/github/next-l/enju_message?branch=1.2]
-{<img src="https://hakiri.io/github/next-l/enju_message/1.2.svg" alt="security" />}[https://hakiri.io/github/next-l/enju_message/1.2]
+{<img src="https://travis-ci.org/next-l/enju_message.svg?branch=1.3" alt="Build Status" />}[https://travis-ci.org/next-l/enju_message]
+{<img src="https://coveralls.io/repos/next-l/enju_message/badge.svg?branch=1.3&service=github" alt="Coverage Status" />}[https://coveralls.io/github/next-l/enju_message?branch=1.3]
+{<img src="https://hakiri.io/github/next-l/enju_message/1.3.svg" alt="security" />}[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}[http://www.next-l.jp] ({@ProjectNextL}[https://twitter.com/ProjectNextL])
+* {Project Next-L}[https://www.next-l.jp] ({@ProjectNextL}[https://twitter.com/ProjectNextL])

data/Rakefile

@@ -39,8 +39,8 @@ require 'rspec/core'
 require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec) do |spec|
-    spec.pattern = FileList['spec/**/*_spec.rb']
+  spec.pattern = FileList['spec/**/*_spec.rb']
 end
 
 
-task :default => :spec
+task default: :spec

data/app/controllers/message_requests_controller.rb

@@ -38,7 +38,7 @@ class MessageRequestsController < ApplicationController
   # PUT /message_requests/1.json
   def update
     respond_to do |format|
-      if @message_request.update_attributes(message_request_params)
+      if @message_request.update(message_request_params)
         flash[:notice] = t('controller.successfully_updated', model: t('activerecord.models.message_request'))
         format.html { redirect_to(@message_request) }
         format.json { head :no_content }
@@ -62,6 +62,7 @@ class MessageRequestsController < ApplicationController
   end
 
   private
+
   def set_message_request
     @message_request = MessageRequest.find(params[:id])
     authorize @message_request
@@ -74,7 +75,7 @@ class MessageRequestsController < ApplicationController
   def message_request_params
     params.require(:message_request).permit(
       :body,
-      :sender, :receiver, :message_template, :body #, as: :admin
+      :sender, :receiver, :message_template, :body # , as: :admin
     )
   end
 end

data/app/controllers/message_templates_controller.rb

@@ -44,7 +44,7 @@ class MessageTemplatesController < ApplicationController
 
     respond_to do |format|
       if @message_template.save
-        format.html { redirect_to @message_template, notice:  t('controller.successfully_created', model:  t('activerecord.models.message_template')) }
+        format.html { redirect_to @message_template, notice:  t('controller.successfully_created', model: t('activerecord.models.message_template')) }
         format.json { render json: @message_template, status: :created, location: @message_template }
       else
         format.html { render action: "new" }
@@ -62,8 +62,8 @@ class MessageTemplatesController < ApplicationController
     end
 
     respond_to do |format|
-      if @message_template.update_attributes(message_template_params)
-        format.html { redirect_to @message_template, notice:  t('controller.successfully_updated', model:  t('activerecord.models.message_template')) }
+      if @message_template.update(message_template_params)
+        format.html { redirect_to @message_template, notice:  t('controller.successfully_updated', model: t('activerecord.models.message_template')) }
         format.json { head :no_content }
       else
         format.html { render action: "edit" }
@@ -84,6 +84,7 @@ class MessageTemplatesController < ApplicationController
   end
 
   private
+
   def set_message_template
     @message_template = MessageTemplate.find(params[:id])
     authorize @message_template

data/app/controllers/messages_controller.rb

@@ -23,7 +23,7 @@ class MessagesController < ApplicationController
       with(:receiver_id).equal_to user.id
       facet(:is_read)
     end
-    @message_facet =  Hash[*search.execute!.facet_response['facet_fields']['is_read_b']]
+    @message_facet = Hash[*search.execute!.facet_response['facet_fields']['is_read_b']]
     search.build do
       with(:is_read).equal_to is_read unless is_read.nil?
     end
@@ -97,7 +97,7 @@ class MessagesController < ApplicationController
   def update
     @message = current_user.received_messages.find(params[:id])
 
-    if @message.update_attributes(message_params)
+    if @message.update(message_params)
       format.html { redirect_to @message, notice: t('controller.successfully_updated', model: t('activerecord.models.message')) }
       format.json { head :no_content }
     else
@@ -141,6 +141,7 @@ class MessagesController < ApplicationController
   end
 
   private
+
   def set_message
     if current_user
       @message = current_user.received_messages.find(params[:id])

data/app/models/concerns/enju_message/enju_user.rb

@@ -3,8 +3,8 @@ module EnjuMessage
     extend ActiveSupport::Concern
 
     included do
-      has_many :sent_messages, :foreign_key => 'sender_id', :class_name => 'Message'
-      has_many :received_messages, :foreign_key => 'receiver_id', :class_name => 'Message'
+      has_many :sent_messages, foreign_key: 'sender_id', class_name: 'Message'
+      has_many :received_messages, foreign_key: 'receiver_id', class_name: 'Message'
     end
 
     def send_message(status, options = {})

data/app/models/message.rb

@@ -1,12 +1,11 @@
-# -*- encoding: utf-8 -*-
 class Message < ActiveRecord::Base
   include Statesman::Adapters::ActiveRecordQueries
   scope :unread, -> {in_state('unread')}
-  belongs_to :message_request
+  belongs_to :message_request, optional: true
   belongs_to :sender, class_name: 'User'
   belongs_to :receiver, class_name: 'User'
-  validates_presence_of :subject, :body #, :sender
-  validates_presence_of :receiver, message: :invalid
+  validates :subject, :body, presence: true # , :sender
+  validates :receiver, presence: { message: :invalid }
   before_validation :set_receiver
   after_save :index
   after_destroy :remove_from_index
@@ -61,6 +60,7 @@ class Message < ActiveRecord::Base
   end
 
   private
+
   def self.transition_class
     MessageTransition
   end

data/app/models/message_request.rb

@@ -1,4 +1,3 @@
-require 'erubis'
 class MessageRequest < ActiveRecord::Base
   include Statesman::Adapters::ActiveRecordQueries
   scope :not_sent, -> {in_state(:pending).where('sent_at IS NULL')}
@@ -9,8 +8,8 @@ class MessageRequest < ActiveRecord::Base
   has_many :messages
 
   validates_associated :sender, :receiver, :message_template
-  validates_presence_of :sender, :receiver, :message_template
-  validates_presence_of :body, on: :update
+  validates :sender, :receiver, :message_template, presence: true
+  validates :body, presence: { on: :update }
 
   paginates_per 10
 
@@ -26,15 +25,14 @@ class MessageRequest < ActiveRecord::Base
   def send_message
     message = nil
     MessageRequest.transaction do
-      message = Message.new
-      message.sender = sender
-      message.recipient  = receiver.username
-      message.subject = subject
-      message.body = body
-      message.body = 'test'
-      message.save!
-      self.sent_at = Time.zone.now
-      save(validate: false)
+      message = Message.create!(
+        sender: sender,
+        recipient: receiver.username,
+        subject: subject,
+        body: body,
+        message_request: self
+      )
+      update!(sent_at: Time.zone.now)
       if ['reservation_expired_for_patron', 'reservation_expired_for_patron'].include?(message_template.status)
         self.receiver.reserves.each do |reserve|
           reserve.expiration_notice_to_patron = true
@@ -54,7 +52,7 @@ class MessageRequest < ActiveRecord::Base
       receiver: receiver,
       locale: receiver.profile.locale
     }.merge(options)
-    update_attributes!({body: message_template.embed_body(options)})
+    update!({body: message_template.embed_body(options)})
   end
 
   def self.send_messages
@@ -66,6 +64,7 @@ class MessageRequest < ActiveRecord::Base
   end
 
   private
+
   def self.transition_class
     MessageRequestTransition
   end

data/app/models/message_request_transition.rb

@@ -3,7 +3,7 @@ class MessageRequestTransition < ActiveRecord::Base
 
   
   belongs_to :message_request, inverse_of: :message_request_transitions
-  #attr_accessible :to_state, :sort_key, :metadata
+  # attr_accessible :to_state, :sort_key, :metadata
 end
 
 # == Schema Information

data/app/models/message_template.rb

@@ -1,8 +1,8 @@
 class MessageTemplate < ActiveRecord::Base
   has_many :message_requests
 
-  validates_uniqueness_of :status
-  validates_presence_of :status, :title, :body
+  validates :status, uniqueness: true
+  validates :status, :title, :body, presence: true
 
   acts_as_list
 

data/app/models/message_transition.rb

@@ -3,7 +3,7 @@ class MessageTransition < ActiveRecord::Base
 
   
   belongs_to :message, inverse_of: :message_transitions
-  #attr_accessible :to_state, :sort_key, :metadata
+  # attr_accessible :to_state, :sort_key, :metadata
 end
 
 # == Schema Information

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

@@ -4,7 +4,7 @@ atom_feed do |feed|
 
   @messages.each do |message|
     feed.entry(message, url: message_url(message)) do |entry|
-     entry.title   message.subject
+      entry.title message.subject
       entry.content message.body, type: 'html'
 
       entry.author do |author|

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

@@ -1,4 +1,4 @@
-xml.instruct! :xml, :version=>"1.0"
+xml.instruct! :xml, version: "1.0"
 xml.rss('version' => "2.0",
   'xmlns:opensearch' => "http://a9.com/-/spec/opensearch/1.1/",
   'xmlns:atom' => "http://www.w3.org/2005/Atom"){
@@ -13,28 +13,23 @@ xml.rss('version' => "2.0",
     xml.description "Next-L Enju, an open source integrated library system developed by Project Next-L"
     xml.language @locale.to_s
     xml.ttl "60"
-    if @user
-      xml.tag! "atom:link", rel: 'self', href: messages_url(format: :rss)
-      xml.tag! "atom:link", rel: 'alternate', href: messages_url(format: :rss)
-    else
-      xml.tag! "atom:link", rel: 'self', href: messages_url(format: :rss)
-      xml.tag! "atom:link", rel: 'alternate', href: messages_url
-    end
-    #xml.tag! "atom:link", rel: 'search', type: 'application/opensearchdescription+xml', href: "http://#{request.host_with_port}/page/opensearch"
+    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?
       xml.tag! "opensearch:totalResults", @messages.total_entries
       xml.tag! "opensearch:startIndex", @messages.offset + 1
       xml.tag! "opensearch:itemsPerPage", @messages.per_page
-      #xml.tag! "opensearch:Query", :role => 'request', :searchTerms => params[:query], :startPage => (params[:page] || 1)
+      # xml.tag! "opensearch:Query", :role => 'request', :searchTerms => params[:query], :startPage => (params[:page] || 1)
     end
     @messages.each do |message|
       xml.item do
         xml.title message.subject
-        #xml.description(message.title)
+        # xml.description(message.title)
         # rfc822
         xml.pubDate message.created_at.utc.rfc822
         xml.link message_url(message)
-        xml.guid message_url(message), :isPermaLink => "true"
+        xml.guid message_url(message), isPermaLink: "true"
       end
     end
   }

data/config/routes.rb

@@ -1,5 +1,5 @@
 Rails.application.routes.draw do
-  resources :message_requests, :except => [:new, :create]
+  resources :message_requests, except: [:new, :create]
   resources :message_templates
   resources :messages do
     collection do

data/db/migrate/149_create_message_templates.rb

@@ -1,15 +1,15 @@
-class CreateMessageTemplates < ActiveRecord::Migration
+class CreateMessageTemplates < ActiveRecord::Migration[4.2]
   def self.up
     create_table :message_templates do |t|
-      t.string :status, :null => false
-      t.text :title, :null => false
-      t.text :body, :null => false
+      t.string :status, null: false
+      t.text :title, null: false
+      t.text :body, null: false
       t.integer :position
-      t.string :locale, :default => I18n.default_locale.to_s
+      t.string :locale, default: I18n.default_locale.to_s
 
       t.timestamps
     end
-    add_index :message_templates, :status, :unique => true
+    add_index :message_templates, :status, unique: true
   end
 
   def self.down

data/db/migrate/154_create_messages.rb

@@ -1,4 +1,4 @@
-class CreateMessages < ActiveRecord::Migration
+class CreateMessages < ActiveRecord::Migration[4.2]
   def self.up
     create_table :messages, force: true do |t|
       t.datetime :read_at

data/db/migrate/20080819181903_create_message_requests.rb

@@ -1,4 +1,4 @@
-class CreateMessageRequests < ActiveRecord::Migration
+class CreateMessageRequests < ActiveRecord::Migration[4.2]
   def self.up
     create_table :message_requests do |t|
       t.references :sender

data/db/migrate/20110913115320_add_lft_and_rgt_to_message.rb

@@ -1,4 +1,4 @@
-class AddLftAndRgtToMessage < ActiveRecord::Migration
+class AddLftAndRgtToMessage < ActiveRecord::Migration[4.2]
   def self.up
     add_column :messages, :lft, :integer
     add_column :messages, :rgt, :integer

data/db/migrate/20120125050502_add_depth_to_message.rb

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

data/db/migrate/20140518111006_create_message_transitions.rb

@@ -1,4 +1,4 @@
-class CreateMessageTransitions < ActiveRecord::Migration
+class CreateMessageTransitions < ActiveRecord::Migration[4.2]
   def change
     create_table :message_transitions do |t|
       t.string :to_state

data/db/migrate/20140518135713_create_message_request_transitions.rb

@@ -1,4 +1,4 @@
-class CreateMessageRequestTransitions < ActiveRecord::Migration
+class CreateMessageRequestTransitions < ActiveRecord::Migration[4.2]
   def change
     create_table :message_request_transitions do |t|
       t.string :to_state

data/db/migrate/20160703185015_add_most_recent_to_message_transitions.rb

@@ -1,4 +1,4 @@
-class AddMostRecentToMessageTransitions < ActiveRecord::Migration
+class AddMostRecentToMessageTransitions < ActiveRecord::Migration[4.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
+class AddMostRecentToMessageRequestTransitions < ActiveRecord::Migration[4.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,8 +1,8 @@
-class AddConstraintsToMostRecentForMessageTransitions < ActiveRecord::Migration
+class AddConstraintsToMostRecentForMessageTransitions < ActiveRecord::Migration[4.2]
   disable_ddl_transaction!
 
   def up
-    add_index :message_transitions, [:message_id, :most_recent], unique: true, where: "most_recent", name: "index_message_transitions_parent_most_recent" #, algorithm: :concurrently
+    add_index :message_transitions, [:message_id, :most_recent], unique: true, where: "most_recent", name: "index_message_transitions_parent_most_recent" # , algorithm: :concurrently
     change_column_null :message_transitions, :most_recent, false
   end
 

data/db/migrate/20180107162711_add_constraints_to_most_recent_for_message_request_transitions.rb

@@ -1,8 +1,8 @@
-class AddConstraintsToMostRecentForMessageRequestTransitions < ActiveRecord::Migration
+class AddConstraintsToMostRecentForMessageRequestTransitions < ActiveRecord::Migration[4.2]
   disable_ddl_transaction!
 
   def up
-    add_index :message_request_transitions, [:message_request_id, :most_recent], unique: true, where: "most_recent", name: "index_message_request_transitions_parent_most_recent" #, algorithm: :concurrently
+    add_index :message_request_transitions, [:message_request_id, :most_recent], unique: true, where: "most_recent", name: "index_message_request_transitions_parent_most_recent" # , algorithm: :concurrently
     change_column_null :message_request_transitions, :most_recent, false
   end
 

data/lib/enju_message/engine.rb

@@ -1,5 +1,6 @@
 require 'enju_library'
 require 'awesome_nested_set'
+require 'erubis'
 
 module EnjuMessage
   class Engine < ::Rails::Engine

data/lib/enju_message/version.rb

@@ -1,3 +1,3 @@
 module EnjuMessage
-  VERSION = "0.2.4"
+  VERSION = "0.3.0.beta.1"
 end

data/lib/generators/enju_message/setup/setup_generator.rb

@@ -1,6 +1,6 @@
 class EnjuMessage::SetupGenerator < Rails::Generators::Base
   source_root File.expand_path('../templates', __FILE__)
-  argument :file, :type => :string, :default => "all"
+  argument :file, type: :string, default: "all"
 
   def copy_setup_files
     directory("db/fixtures", "db/fixtures/enju_message")

data/lib/tasks/enju_message_tasks.rake

@@ -3,19 +3,19 @@ require 'tasks/message_template'
 
 namespace :enju_message do
   desc "create initial records for enju_message"
-  task :setup => :environment do
+  task setup: :environment do
     Dir.glob(Rails.root.to_s + '/db/fixtures/enju_message/*.yml').each do |file|
       ActiveRecord::FixtureSet.create_fixtures('db/fixtures/enju_message', File.basename(file, '.*'))
     end
   end
 
   desc "Send messages"
-  task :send => :environment do
+  task send: :environment do
     MessageRequest.send_messages if defined?(EnjuMessage)
   end
 
   desc "upgrade enju_message"
-  task :upgrade => :environment do
+  task upgrade: :environment do
     Rake::Task['statesman:backfill_most_recent'].invoke('Message')
     Rake::Task['statesman:backfill_most_recent'].invoke('MessageRequest')
     puts 'enju_message: The upgrade completed successfully.'

data/lib/tasks/message_template.rb

@@ -5,7 +5,7 @@ def update_message_template
       status: l["status"], locale: l["locale"]
     ).first
     if template
-      template.update_attributes!(l)
+      template.update!(l)
     else
       MessageTemplate.create!(l)
     end