enju_circulation 0.2.5 → 0.3.0.beta.1

data/app/models/checkout.rb

@@ -6,20 +6,20 @@ class Checkout < ActiveRecord::Base
   scope :completed, lambda {|start_date, end_date| where('checkouts.created_at >= ? AND checkouts.created_at < ?', start_date, end_date)}
   scope :on, lambda {|date| where('created_at >= ? AND created_at < ?', date.beginning_of_day, date.tomorrow.beginning_of_day)}
 
-  belongs_to :user
+  belongs_to :user, optional: true
   delegate :username, :user_number, to: :user, prefix: true
   belongs_to :item, touch: true
-  belongs_to :checkin
+  belongs_to :checkin, optional: true
   belongs_to :librarian, class_name: 'User'
   belongs_to :basket
-  belongs_to :shelf
-  belongs_to :library
+  belongs_to :shelf, optional: true
+  belongs_to :library, optional: true
 
-  validates_associated :user, :item, :librarian, :checkin #, :basket
+  validates_associated :user, :item, :librarian, :checkin # , :basket
   # TODO: 貸出履歴を保存しない場合は、ユーザ名を削除する
-  #validates_presence_of :user, :item, :basket
-  validates_presence_of :item_id, :basket_id, :due_date
-  validates_uniqueness_of :item_id, scope: [:basket_id, :user_id]
+  # validates_presence_of :user, :item, :basket
+  validates :item_id, :basket_id, :due_date, presence: true
+  validates :item_id, uniqueness: { scope: [:basket_id, :user_id] }
   validate :is_not_checked?, on: :create
   validate :renewable?, on: :update
   validates_date :due_date
@@ -59,13 +59,13 @@ class Checkout < ActiveRecord::Base
   def renewable?
     return nil if checkin
     messages = []
-    if !operator and overdue?
+    if !operator && overdue?
       messages << I18n.t('checkout.you_have_overdue_item')
     end
-    if !operator and reserved?
+    if !operator && reserved?
       messages << I18n.t('checkout.this_item_is_reserved')
     end
-    if !operator and over_checkout_renewal_limit?
+    if !operator && over_checkout_renewal_limit?
       messages << I18n.t('checkout.excessed_renewal_limit')
     end
     if messages.empty?
@@ -121,10 +121,10 @@ class Checkout < ActiveRecord::Base
   end
 
   def self.manifestations_count(start_date, end_date, manifestation)
-    self.where(
-      self.arel_table[:created_at].gteq start_date
+    where(
+      arel_table[:created_at].gteq start_date
     ).where(
-      self.arel_table[:created_at].lt end_date
+      arel_table[:created_at].lt end_date
     )
     .where(
       item_id: manifestation.items.pluck('items.id')

data/app/models/checkout_stat_has_manifestation.rb

@@ -1,11 +1,11 @@
 class CheckoutStatHasManifestation < ActiveRecord::Base
-  #attr_accessible :manifestation_checkout_stat_id, :manifestation_id,
+  # attr_accessible :manifestation_checkout_stat_id, :manifestation_id,
   #  as: :admin
   belongs_to :manifestation_checkout_stat
   belongs_to :manifestation
 
-  validates_uniqueness_of :manifestation_id, scope: :manifestation_checkout_stat_id
-  validates_presence_of :manifestation_checkout_stat_id, :manifestation_id
+  validates :manifestation_id, uniqueness: { scope: :manifestation_checkout_stat_id }
+  validates :manifestation_checkout_stat_id, :manifestation_id, presence: true
 
   paginates_per 10
 end

data/app/models/checkout_stat_has_user.rb

@@ -1,11 +1,11 @@
 class CheckoutStatHasUser < ActiveRecord::Base
-  #attr_accessible :user_checkout_stat_id, :user_id,
+  # attr_accessible :user_checkout_stat_id, :user_id,
   #  as: :admin
   belongs_to :user_checkout_stat
   belongs_to :user
 
-  validates_uniqueness_of :user_id, scope: :user_checkout_stat_id
-  validates_presence_of :user_checkout_stat_id, :user_id
+  validates :user_id, uniqueness: { scope: :user_checkout_stat_id }
+  validates :user_checkout_stat_id, :user_id, presence: true
 
   paginates_per 10
 end

data/app/models/checkout_type.rb

@@ -7,8 +7,8 @@ class CheckoutType < ActiveRecord::Base
   has_many :user_groups, through: :user_group_has_checkout_types
   has_many :carrier_type_has_checkout_types, dependent: :destroy
   has_many :carrier_types, through: :carrier_type_has_checkout_types
-  #has_many :item_has_checkout_types, dependent: :destroy
-  #has_many :items, through: :item_has_checkout_types
+  # has_many :item_has_checkout_types, dependent: :destroy
+  # has_many :items, through: :item_has_checkout_types
   has_many :items
 
   paginates_per 10

data/app/models/circulation_status.rb

@@ -7,6 +7,7 @@ class CirculationStatus < ActiveRecord::Base
   has_many :items
 
   private
+
   def valid_name?
     true
   end

data/app/models/concerns/enju_circulation/enju_basket.rb

@@ -23,7 +23,7 @@ module EnjuCirculation
           checked_item.item.checkout!(user)
           checkout.save!
         end
-        CheckedItem.destroy_all(basket_id: id)
+        CheckedItem.where(basket_id: id).destroy_all
       end
     end
   end

data/app/models/concerns/enju_circulation/enju_item.rb

@@ -31,14 +31,14 @@ module EnjuCirculation
       has_many :checkouts
       has_many :reserves
       has_many :checked_items
-      has_many :baskets, :through => :checked_items
-      belongs_to :circulation_status, :validate => true
+      has_many :baskets, through: :checked_items
+      belongs_to :circulation_status, validate: true
       belongs_to :checkout_type
-      has_many :lending_policies, :dependent => :destroy
-      has_one :item_has_use_restriction, :dependent => :destroy
-      has_one :use_restriction, :through => :item_has_use_restriction
+      has_many :lending_policies, dependent: :destroy
+      has_one :item_has_use_restriction, dependent: :destroy
+      has_one :use_restriction, through: :item_has_use_restriction
       validates_associated :circulation_status, :checkout_type
-      validates_presence_of :circulation_status, :checkout_type
+      validates :circulation_status, :checkout_type, presence: true
       searchable do
         string :circulation_status do
           circulation_status.name
@@ -50,12 +50,12 @@ module EnjuCirculation
     end
 
     def set_circulation_status
-      self.circulation_status = CirculationStatus.where(:name => 'In Process').first if self.circulation_status.nil?
+      self.circulation_status = CirculationStatus.find_by(name: 'In Process') if circulation_status.nil?
     end
 
     def checkout_status(user)
       return nil unless user
-       user.profile.user_group.user_group_has_checkout_types.where(:checkout_type_id => self.checkout_type.id).first
+       user.profile.user_group.user_group_has_checkout_types.find_by(checkout_type_id: checkout_type.id)
     end
 
     def reserved?
@@ -64,7 +64,7 @@ module EnjuCirculation
     end
 
     def rent?
-      return true if self.checkouts.not_returned.select(:item_id).detect{|checkout| checkout.item_id == self.id}
+      return true if checkouts.not_returned.select(:item_id).detect{|checkout| checkout.item_id == id}
       false
     end
 
@@ -84,17 +84,17 @@ module EnjuCirculation
     end
 
     def checkout!(user)
-      self.circulation_status = CirculationStatus.where(name: 'On Loan').first
       if reserved_by_user?(user)
-        manifestation.next_reservation.update_attributes(checked_out_at: Time.zone.now)
+        manifestation.next_reservation.update(checked_out_at: Time.zone.now)
         manifestation.next_reservation.transition_to!(:completed)
+        manifestation.reload
       end
-      save!
+      update!(circulation_status: CirculationStatus.find_by(name: 'On Loan'))
     end
 
     def checkin!
-      self.circulation_status = CirculationStatus.where(name: 'Available On Shelf').first
-      save(validate: false)
+      self.circulation_status = CirculationStatus.find_by(name: 'Available On Shelf')
+      save!
     end
 
     def retain(librarian)
@@ -118,7 +118,7 @@ module EnjuCirculation
     end
 
     def lending_rule(user)
-      policy = lending_policies.where(user_group_id: user.profile.user_group.id).first
+      policy = lending_policies.find_by(user_group_id: user.profile.user_group.id)
       if policy
         policy
       else
@@ -131,7 +131,7 @@ module EnjuCirculation
     end
 
     def create_lending_policy(user)
-      rule = user.profile.user_group.user_group_has_checkout_types.where(checkout_type_id: checkout_type_id).first
+      rule = user.profile.user_group.user_group_has_checkout_types.find_by(checkout_type_id: checkout_type_id)
       return nil unless rule
       LendingPolicy.create!(
         item_id: id,
@@ -148,7 +148,7 @@ module EnjuCirculation
     end
 
     def next_reservation
-      Reserve.waiting.where(:item_id => id).first
+      Reserve.waiting.find_by(item_id: id)
     end
 
     def latest_checkout

data/app/models/concerns/enju_circulation/enju_manifestation.rb

@@ -3,7 +3,7 @@ module EnjuCirculation
     extend ActiveSupport::Concern
 
     included do
-      has_many :reserves, :foreign_key => :manifestation_id
+      has_many :reserves, foreign_key: :manifestation_id
 
       searchable do
         boolean :reservable do
@@ -13,12 +13,12 @@ module EnjuCirculation
     end
 
     def next_reservation
-      self.reserves.waiting.order('reserves.created_at ASC').readonly(false).first
+      reserves.waiting.order('reserves.created_at ASC').readonly(false).first
     end
 
     def available_checkout_types(user)
       if user
-        user.profile.user_group.user_group_has_checkout_types.available_for_carrier_type(self.carrier_type)
+        user.profile.user_group.user_group_has_checkout_types.available_for_carrier_type(carrier_type)
       end
     end
 
@@ -34,7 +34,7 @@ module EnjuCirculation
 
     def is_reserved_by?(user)
       return nil unless user
-      reserve = Reserve.waiting.where(:user_id => user.id, :manifestation_id => id).first
+      reserve = Reserve.waiting.where(user_id: user.id, manifestation_id: id).first
       if reserve
         reserve
       else
@@ -43,7 +43,7 @@ module EnjuCirculation
     end
 
     def is_reserved?
-      if self.reserves.present?
+      if reserves.present?
         true
       else
         false
@@ -51,7 +51,7 @@ module EnjuCirculation
     end
 
     def checkouts(start_date, end_date)
-      Checkout.completed(start_date, end_date).where(:item_id => self.items.collect(&:id))
+      Checkout.completed(start_date, end_date).where(item_id: items.collect(&:id))
     end
 
     def checkout_period(user)

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

@@ -3,14 +3,14 @@ module EnjuCirculation
     extend ActiveSupport::Concern
 
     included do
-      has_many :checkouts, :dependent => :nullify
-      has_many :reserves, :dependent => :destroy
-      has_many :reserved_manifestations, :through => :reserves, :source => :manifestation
+      has_many :checkouts, dependent: :nullify
+      has_many :reserves, dependent: :destroy
+      has_many :reserved_manifestations, through: :reserves, source: :manifestation
       has_many :checkout_stat_has_users
-      has_many :user_checkout_stats, :through => :checkout_stat_has_users
+      has_many :user_checkout_stats, through: :checkout_stat_has_users
       has_many :reserve_stat_has_users
-      has_many :user_reserve_stats, :through => :reserve_stat_has_users
-      has_many :baskets, :dependent => :destroy
+      has_many :user_reserve_stats, through: :reserve_stat_has_users
+      has_many :baskets, dependent: :destroy
 
       before_destroy :check_item_before_destroy
     end
@@ -26,20 +26,20 @@ module EnjuCirculation
       checkout_count = {}
       CheckoutType.all.each do |checkout_type|
         # 資料種別ごとの貸出中の冊数を計算
-        checkout_count[:"#{checkout_type.name}"] = self.checkouts.count_by_sql(["
+        checkout_count[:"#{checkout_type.name}"] = checkouts.count_by_sql(["
           SELECT count(item_id) FROM checkouts
             WHERE item_id IN (
               SELECT id FROM items
                 WHERE checkout_type_id = ?
             )
-            AND user_id = ? AND checkin_id IS NULL", checkout_type.id, self.id]
+            AND user_id = ? AND checkin_id IS NULL", checkout_type.id, id]
         )
       end
       checkout_count
     end
 
     def reached_reservation_limit?(manifestation)
-      return true if profile.user_group.user_group_has_checkout_types.available_for_carrier_type(manifestation.carrier_type).where(:user_group_id => profile.user_group.id).collect(&:reservation_limit).max.to_i <= reserves.waiting.size
+      return true if profile.user_group.user_group_has_checkout_types.available_for_carrier_type(manifestation.carrier_type).where(user_group_id: profile.user_group.id).collect(&:reservation_limit).max.to_i <= reserves.waiting.size
       false
     end
 

data/app/models/concerns/enju_circulation/enju_user_group.rb

@@ -6,12 +6,12 @@ module EnjuCirculation
       has_many :user_group_has_checkout_types, dependent: :destroy
       has_many :checkout_types, through: :user_group_has_checkout_types
       has_many :lending_policies
-      accepts_nested_attributes_for :user_group_has_checkout_types, :allow_destroy => true, :reject_if => :all_blank
+      accepts_nested_attributes_for :user_group_has_checkout_types, allow_destroy: true, reject_if: :all_blank
 
-      validates_numericality_of :number_of_day_to_notify_due_date,
-        :number_of_day_to_notify_overdue,
-        :number_of_time_to_notify_overdue,
-        :greater_than_or_equal_to => 0
+      validates :number_of_day_to_notify_due_date,
+                :number_of_day_to_notify_overdue,
+                :number_of_time_to_notify_overdue,
+                numericality: { greater_than_or_equal_to: 0 }
     end
   end
 end

data/app/models/item_has_use_restriction.rb

@@ -4,8 +4,8 @@ class ItemHasUseRestriction < ActiveRecord::Base
   accepts_nested_attributes_for :use_restriction
 
   validates_associated :item, :use_restriction
-  validates_presence_of :use_restriction
-  validates_presence_of :item, on: :update
+  validates :use_restriction, presence: true
+  validates :item, presence: { on: :update }
 
   paginates_per 10
 end

data/app/models/lending_policy.rb

@@ -3,8 +3,8 @@ class LendingPolicy < ActiveRecord::Base
   belongs_to :item
   belongs_to :user_group
 
-  validates_presence_of :item, :user_group
-  validates_uniqueness_of :user_group_id, scope: :item_id
+  validates :item, :user_group, presence: true
+  validates :user_group_id, uniqueness: { scope: :item_id }
   validates_date :fixed_due_date, allow_blank: true
 
   paginates_per 10

data/app/models/manifestation_checkout_stat.rb

@@ -17,15 +17,15 @@ class ManifestationCheckoutStat < ActiveRecord::Base
   end
 
   delegate :can_transition_to?, :transition_to!, :transition_to, :current_state,
-    to: :state_machine
+           to: :state_machine
 
   def calculate_count!
     self.started_at = Time.zone.now
     Manifestation.find_each do |manifestation|
       daily_count = Checkout.manifestations_count(start_date.beginning_of_day, end_date.tomorrow.beginning_of_day, manifestation)
-      #manifestation.update_attributes({daily_checkouts_count: daily_count, total_count: manifestation.total_count + daily_count})
+      # manifestation.update_attributes({daily_checkouts_count: daily_count, total_count: manifestation.total_count + daily_count})
       if daily_count > 0
-        self.manifestations << manifestation
+        manifestations << manifestation
         sql = ['UPDATE checkout_stat_has_manifestations SET checkouts_count = ? WHERE manifestation_checkout_stat_id = ? AND manifestation_id = ?', daily_count, id, manifestation.id]
         ManifestationCheckoutStat.connection.execute(
           self.class.send(:sanitize_sql_array, sql)
@@ -38,6 +38,7 @@ class ManifestationCheckoutStat < ActiveRecord::Base
   end
 
   private
+
   def self.transition_class
     ManifestationCheckoutStatTransition
   end

data/app/models/manifestation_checkout_stat_transition.rb

@@ -2,8 +2,8 @@ class ManifestationCheckoutStatTransition < ActiveRecord::Base
   include Statesman::Adapters::ActiveRecordTransition
 
   
-  belongs_to :manifestation_cehckout_stat, inverse_of: :manifestation_checkout_stat_transitions
-  #attr_accessible :to_state, :sort_key, :metadata
+  belongs_to :manifestation_checkout_stat, inverse_of: :manifestation_checkout_stat_transitions
+  # attr_accessible :to_state, :sort_key, :metadata
 end
 
 # == Schema Information

data/app/models/manifestation_reserve_stat.rb

@@ -17,15 +17,15 @@ class ManifestationReserveStat < ActiveRecord::Base
   end
 
   delegate :can_transition_to?, :transition_to!, :transition_to, :current_state,
-    to: :state_machine
+           to: :state_machine
 
   def calculate_count!
     self.started_at = Time.zone.now
     Manifestation.find_each do |manifestation|
       daily_count = manifestation.reserves.created(start_date.beginning_of_day, end_date.tomorrow.beginning_of_day).size
-      #manifestation.update_attributes({daily_reserves_count: daily_count, total_count: manifestation.total_count + daily_count})
+      # manifestation.update_attributes({daily_reserves_count: daily_count, total_count: manifestation.total_count + daily_count})
       if daily_count > 0
-        self.manifestations << manifestation
+        manifestations << manifestation
         sql = ['UPDATE reserve_stat_has_manifestations SET reserves_count = ? WHERE manifestation_reserve_stat_id = ? AND manifestation_id = ?', daily_count, id, manifestation.id]
         ManifestationReserveStat.connection.execute(
           self.class.send(:sanitize_sql_array, sql)
@@ -38,6 +38,7 @@ class ManifestationReserveStat < ActiveRecord::Base
   end
 
   private
+
   def self.transition_class
     ManifestationReserveStatTransition
   end

data/app/models/manifestation_reserve_stat_transition.rb

@@ -3,7 +3,7 @@ class ManifestationReserveStatTransition < ActiveRecord::Base
 
   
   belongs_to :manifestation_reserve_stat, inverse_of: :manifestation_reserve_stat_transitions
-  #attr_accessible :to_state, :sort_key, :metadata
+  # attr_accessible :to_state, :sort_key, :metadata
 end
 
 # == Schema Information

data/app/models/reserve.rb

@@ -18,32 +18,32 @@ class Reserve < ActiveRecord::Base
   scope :not_sent_cancel_notice_to_library, -> {in_state(:canceled).where(expiration_notice_to_library: false)}
   belongs_to :user
   belongs_to :manifestation, touch: true
-  belongs_to :librarian, class_name: 'User'
-  belongs_to :item, touch: true
+  belongs_to :librarian, class_name: 'User', optional: true
+  belongs_to :item, touch: true, optional: true
   belongs_to :request_status_type
-  belongs_to :pickup_location, :class_name => 'Library'
+  belongs_to :pickup_location, class_name: 'Library', optional: true
 
   validates_associated :user, :librarian, :request_status_type
-  validates :manifestation, associated: true #, on: :create
-  validates_presence_of :user, :request_status_type
+  validates :manifestation, associated: true # , on: :create
+  validates :user, :request_status_type, presence: true
   validates :manifestation, presence: true, unless: Proc.new{|reserve|
     reserve.completed?
   }
-  #validates_uniqueness_of :manifestation_id, scope: :user_id
+  # validates_uniqueness_of :manifestation_id, scope: :user_id
   validates_date :expired_at, allow_blank: true
   validate :manifestation_must_include_item
   validate :available_for_reservation?, on: :create
   validates :item_id, presence: true, if: Proc.new{|reserve|
     if item_id_changed?
-      if reserve.completed? or reserve.retained?
-        unless item_id_change[0]
-          false
-        else
-          unless item_id_change[1]
-            false
-          else
+      if reserve.completed? || reserve.retained?
+        if item_id_change[0]
+          if item_id_change[1]
             true
+          else
+            false
           end
+        else
+          false
         end
       end
     else
@@ -77,7 +77,7 @@ class Reserve < ActiveRecord::Base
   has_many :reserve_transitions, autosave: false
 
   delegate :can_transition_to?, :transition_to!, :transition_to, :current_state,
-    to: :state_machine
+           to: :state_machine
 
   searchable do
     text :username do
@@ -97,7 +97,7 @@ class Reserve < ActiveRecord::Base
       manifestation.try(:titles)
     end
     boolean :hold do |reserve|
-      self.hold.include?(reserve)
+      hold.include?(reserve)
     end
     string :state do
       current_state
@@ -136,7 +136,7 @@ class Reserve < ActiveRecord::Base
 
   def retained_by_other_user?
     return nil if force_retaining == '1'
-    if item and !retained?
+    if item && !retained?
       if Reserve.retained.where(item_id: item.item_identifier).count > 0
         errors[:base] << I18n.t('reserve.attempt_to_update_retained_reservation')
       end
@@ -148,7 +148,7 @@ class Reserve < ActiveRecord::Base
   end
 
   def check_expired_at
-    if canceled_at.blank? and expired_at?
+    if canceled_at.blank? && expired_at?
       if !completed?
         if expired_at.beginning_of_day < Time.zone.now
           errors[:base] << I18n.t('reserve.invalid_date')
@@ -164,64 +164,64 @@ class Reserve < ActiveRecord::Base
   end
 
   def send_message(sender = nil)
-    sender = User.find(1) unless sender # TODO: システムからのメッセージの発信者
+    sender ||= User.find(1) # TODO: システムからのメッセージの発信者
     Reserve.transaction do
       case current_state
       when 'requested'
         message_template_to_patron = MessageTemplate.localized_template('reservation_accepted_for_patron', user.profile.locale)
         request = MessageRequest.new
-        request.assign_attributes({sender: sender, receiver: user, message_template: message_template_to_patron})
+        request.assign_attributes(sender: sender, receiver: user, message_template: message_template_to_patron)
         request.save_message_body(manifestations: Array[manifestation], user: user)
         request.transition_to!(:sent) # 受付時は即時送信
         message_template_to_library = MessageTemplate.localized_template('reservation_accepted_for_library', user.profile.locale)
         request = MessageRequest.new
-        request.assign_attributes({sender: sender, receiver: sender, message_template: message_template_to_library})
+        request.assign_attributes(sender: sender, receiver: sender, message_template: message_template_to_library)
         request.save_message_body(manifestations: Array[manifestation], user: user)
         request.transition_to!(:sent) # 受付時は即時送信
       when 'canceled'
         message_template_to_patron = MessageTemplate.localized_template('reservation_canceled_for_patron', user.profile.locale)
         request = MessageRequest.new
-        request.assign_attributes({sender: sender, receiver: user, message_template: message_template_to_patron})
+        request.assign_attributes(sender: sender, receiver: user, message_template: message_template_to_patron)
         request.save_message_body(manifestations: Array[manifestation], user: user)
         request.transition_to!(:sent) # キャンセル時は即時送信
         message_template_to_library = MessageTemplate.localized_template('reservation_canceled_for_library', user.profile.locale)
         request = MessageRequest.new
-        request.assign_attributes({sender: sender, receiver: sender, message_template: message_template_to_library})
+        request.assign_attributes(sender: sender, receiver: sender, message_template: message_template_to_library)
         request.save_message_body(manifestations: Array[manifestation], user: user)
         request.transition_to!(:sent) # キャンセル時は即時送信
       when 'expired'
         message_template_to_patron = MessageTemplate.localized_template('reservation_expired_for_patron', user.profile.locale)
         request = MessageRequest.new
-        request.assign_attributes({sender: sender, receiver: user, message_template: message_template_to_patron})
+        request.assign_attributes(sender: sender, receiver: user, message_template: message_template_to_patron)
         request.save_message_body(manifestations: Array[manifestation], user: user)
         request.transition_to!(:sent)
         reload
-        self.update_attribute(:expiration_notice_to_patron, true)
+        update_attribute(:expiration_notice_to_patron, true)
         message_template_to_library = MessageTemplate.localized_template('reservation_expired_for_library', sender.profile.locale)
         request = MessageRequest.new
-        request.assign_attributes({sender: sender, receiver: sender, message_template: message_template_to_library})
+        request.assign_attributes(sender: sender, receiver: sender, message_template: message_template_to_library)
         request.save_message_body(manifestations: Array[manifestation], user: sender)
         request.transition_to!(:sent)
       when 'retained'
         message_template_for_patron = MessageTemplate.localized_template('item_received_for_patron', user.profile.locale)
         request = MessageRequest.new
-        request.assign_attributes({sender: sender, receiver: user, message_template: message_template_for_patron})
+        request.assign_attributes(sender: sender, receiver: user, message_template: message_template_for_patron)
         request.save_message_body(manifestations: Array[item.manifestation], user: user)
         request.transition_to!(:sent)
         message_template_for_library = MessageTemplate.localized_template('item_received_for_library', user.profile.locale)
         request = MessageRequest.new
-        request.assign_attributes({sender: sender, receiver: sender, message_template: message_template_for_library})
+        request.assign_attributes(sender: sender, receiver: sender, message_template: message_template_for_library)
         request.save_message_body(manifestations: Array[item.manifestation], user: user)
         request.transition_to!(:sent)
       when 'postponed'
         message_template_for_patron = MessageTemplate.localized_template('reservation_postponed_for_patron', user.profile.locale)
         request = MessageRequest.new
-        request.assign_attributes({sender: sender, receiver: user, message_template: message_template_for_patron})
+        request.assign_attributes(sender: sender, receiver: user, message_template: message_template_for_patron)
         request.save_message_body(manifestations: Array[manifestation], user: user)
         request.transition_to!(:sent)
         message_template_for_library = MessageTemplate.localized_template('reservation_postponed_for_library', user.profile.locale)
         request = MessageRequest.new
-        request.assign_attributes({sender: sender, receiver: sender, message_template: message_template_for_library})
+        request.assign_attributes(sender: sender, receiver: sender, message_template: message_template_for_library)
         request.save_message_body(manifestations: Array[manifestation], user: user)
         request.transition_to!(:sent)
       else
@@ -236,13 +236,13 @@ class Reserve < ActiveRecord::Base
     when 'expired'
       message_template_to_library = MessageTemplate.localized_template('reservation_expired_for_library', sender.profile.locale)
       request = MessageRequest.new
-      request.assign_attributes({sender: sender, receiver: sender, message_template: message_template_to_library})
+      request.assign_attributes(sender: sender, receiver: sender, message_template: message_template_to_library)
       request.save_message_body(manifestations: options[:manifestations])
-      self.not_sent_expiration_notice_to_library.readonly(false).each do |reserve|
+      not_sent_expiration_notice_to_library.readonly(false).each do |reserve|
         reserve.expiration_notice_to_library = true
         reserve.save(validate: false)
       end
-    #when 'canceled'
+    # when 'canceled'
     #  message_template_to_library = MessageTemplate.localized_template('reservation_canceled_for_library', sender.locale)
     #  request = MessageRequest.new
     #  request.assign_attributes({sender: sender, receiver: sender, message_template: message_template_to_library})
@@ -257,8 +257,8 @@ class Reserve < ActiveRecord::Base
 
   def self.expire
     Reserve.transaction do
-      self.will_expire_retained(Time.zone.now.beginning_of_day).readonly(false).map{|r| r.transition_to!(:expired)}
-      self.will_expire_pending(Time.zone.now.beginning_of_day).readonly(false).map{|r| r.transition_to!(:expired)}
+      will_expire_retained(Time.zone.now.beginning_of_day).readonly(false).map{|r| r.transition_to!(:expired)}
+      will_expire_pending(Time.zone.now.beginning_of_day).readonly(false).map{|r| r.transition_to!(:expired)}
 
       # キューに登録した時点では本文は作られないので
       # 予約の連絡をすませたかどうかを識別できるようにしなければならない
@@ -272,12 +272,12 @@ class Reserve < ActiveRecord::Base
         Reserve.send_message_to_library('expired', manifestations: Reserve.not_sent_expiration_notice_to_library.collect(&:manifestation))
       end
     end
-  #rescue
+  # rescue
   #  logger.info "#{Time.zone.now} expiring reservations failed!"
   end
 
   def checked_out_now?
-    if user and manifestation
+    if user && manifestation
       true if !(user.checkouts.not_returned.pluck(:item_id) & manifestation.items.pluck('items.id')).empty?
     end
   end
@@ -312,14 +312,15 @@ class Reserve < ActiveRecord::Base
   end
 
   private
+
   def do_request
-    self.assign_attributes({request_status_type: RequestStatusType.where(name: 'In Process').first, item_id: nil, retained_at: nil})
+    assign_attributes(request_status_type: RequestStatusType.where(name: 'In Process').first, item_id: nil, retained_at: nil)
     save!
   end
 
   def retain
     # TODO: 「取り置き中」の状態を正しく表す
-    self.assign_attributes({request_status_type: RequestStatusType.where(name: 'In Process').first, retained_at: Time.zone.now})
+    assign_attributes(request_status_type: RequestStatusType.where(name: 'In Process').first, retained_at: Time.zone.now)
     Reserve.transaction do
       item.next_reservation.try(:transition_to!, :postponed)
       save!
@@ -328,7 +329,7 @@ class Reserve < ActiveRecord::Base
 
   def expire
     Reserve.transaction do
-      self.assign_attributes({request_status_type: RequestStatusType.where(name: 'Expired').first, canceled_at: Time.zone.now})
+      assign_attributes(request_status_type: RequestStatusType.where(name: 'Expired').first, canceled_at: Time.zone.now)
       reserve = next_reservation
       if reserve
         reserve.item = item
@@ -337,12 +338,12 @@ class Reserve < ActiveRecord::Base
         reserve.transition_to!(:retained)
       end
     end
-    logger.info "#{Time.zone.now} reserve_id #{self.id} expired!"
+    logger.info "#{Time.zone.now} reserve_id #{id} expired!"
   end
 
   def cancel
     Reserve.transaction do
-      self.assign_attributes({request_status_type: RequestStatusType.where(name: 'Cannot Fulfill Request').first, canceled_at: Time.zone.now})
+      assign_attributes(request_status_type: RequestStatusType.where(name: 'Cannot Fulfill Request').first, canceled_at: Time.zone.now)
       save!
       reserve = next_reservation
       if reserve
@@ -355,22 +356,22 @@ class Reserve < ActiveRecord::Base
   end
 
   def checkout
-    self.assign_attributes({request_status_type: RequestStatusType.where(name: 'Available For Pickup').first, checked_out_at: Time.zone.now})
+    assign_attributes(request_status_type: RequestStatusType.where(name: 'Available For Pickup').first, checked_out_at: Time.zone.now)
     save!
   end
 
   def postpone
-    self.assign_attributes({
+    assign_attributes(
       request_status_type: RequestStatusType.where(name: 'In Process').first,
       item_id: nil,
       retained_at: nil,
       postponed_at: Time.zone.now
-    })
+    )
     save!
   end
 
   def manifestation_must_include_item
-    if item_id.present? and !completed?
+    if item_id.present? && !completed?
       errors[:base] << I18n.t('reserve.invalid_item') unless manifestation.items.include?(item)
     end
   end