enju_circulation 0.2.5 → 0.3.0.beta.1

data/app/models/reserve_stat_has_manifestation.rb

@@ -2,8 +2,8 @@ class ReserveStatHasManifestation < ActiveRecord::Base
   belongs_to :manifestation_reserve_stat
   belongs_to :manifestation
 
-  validates_uniqueness_of :manifestation_id, scope: :manifestation_reserve_stat_id
-  validates_presence_of :manifestation_reserve_stat_id, :manifestation_id
+  validates :manifestation_id, uniqueness: { scope: :manifestation_reserve_stat_id }
+  validates :manifestation_reserve_stat_id, :manifestation_id, presence: true
 
   paginates_per 10
 end

data/app/models/reserve_stat_has_user.rb

@@ -1,12 +1,12 @@
 class ReserveStatHasUser < ActiveRecord::Base
-  #attr_accessible
-  #attr_accessible :user_reserve_stat_id, :user_id,
+  # attr_accessible
+  # attr_accessible :user_reserve_stat_id, :user_id,
   #  as: :admin
   belongs_to :user_reserve_stat
   belongs_to :user
 
-  validates_uniqueness_of :user_id, scope: :user_reserve_stat_id
-  validates_presence_of :user_reserve_stat_id, :user_id
+  validates :user_id, uniqueness: { scope: :user_reserve_stat_id }
+  validates :user_reserve_stat_id, :user_id, presence: true
 
   paginates_per 10
 end

data/app/models/reserve_state_machine.rb

@@ -14,12 +14,12 @@ class ReserveStateMachine
   transition from: :requested, to: [:retained, :canceled, :expired, :completed]
 
   after_transition(to: :requested) do |reserve|
-    reserve.update_attributes({request_status_type: RequestStatusType.where(name: 'In Process').first, item_id: nil, retained_at: nil})
+    reserve.update(request_status_type: RequestStatusType.where(name: 'In Process').first, item_id: nil, retained_at: nil)
   end
 
   after_transition(to: :retained) do |reserve|
     # TODO: 「取り置き中」の状態を正しく表す
-    reserve.update_attributes({request_status_type: RequestStatusType.where(name: 'In Process').first, retained_at: Time.zone.now})
+    reserve.update(request_status_type: RequestStatusType.where(name: 'In Process').first, retained_at: Time.zone.now)
     Reserve.transaction do
       if reserve.item
         other_reserves = reserve.item.reserves.waiting
@@ -37,7 +37,7 @@ class ReserveStateMachine
 
   after_transition(to: :canceled) do |reserve|
     Reserve.transaction do
-      reserve.update_attributes({request_status_type: RequestStatusType.where(name: 'Cannot Fulfill Request').first, canceled_at: Time.zone.now})
+      reserve.update(request_status_type: RequestStatusType.where(name: 'Cannot Fulfill Request').first, canceled_at: Time.zone.now)
       next_reserve = reserve.next_reservation
       if next_reserve
         next_reserve.item = reserve.item
@@ -50,7 +50,7 @@ class ReserveStateMachine
 
   after_transition(to: :expired) do |reserve|
     Reserve.transaction do
-      reserve.update_attributes({request_status_type: RequestStatusType.where(name: 'Expired').first, canceled_at: Time.zone.now})
+      reserve.update(request_status_type: RequestStatusType.where(name: 'Expired').first, canceled_at: Time.zone.now)
       next_reserve = reserve.next_reservation
       if next_reserve
         next_reserve.item = reserve.item
@@ -63,11 +63,11 @@ class ReserveStateMachine
   end
 
   after_transition(to: :postponed) do |reserve|
-    reserve.update_attributes(item_id: nil, retained_at: nil, postponed_at: Time.zone.now, force_retaining: "1")
+    reserve.update(item_id: nil, retained_at: nil, postponed_at: Time.zone.now, force_retaining: "1")
   end
 
   after_transition(to: :completed) do |reserve|
-    reserve.update_attributes(
+    reserve.update(
       request_status_type: RequestStatusType.where(name: 'Available For Pickup').first,
       checked_out_at: Time.zone.now
     )

data/app/models/reserve_transition.rb

@@ -3,7 +3,7 @@ class ReserveTransition < ActiveRecord::Base
 
   
   belongs_to :reserve, inverse_of: :reserve_transitions
-  #attr_accessible :to_state, :sort_key, :metadata
+  # attr_accessible :to_state, :sort_key, :metadata
 end
 
 # == Schema Information

data/app/models/use_restriction.rb

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

data/app/models/user_checkout_stat.rb

@@ -17,14 +17,14 @@ class UserCheckoutStat < 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
     User.find_each do |user|
       daily_count = user.checkouts.completed(start_date.beginning_of_day, end_date.tomorrow.beginning_of_day).size
       if daily_count > 0
-        self.users << user
+        users << user
         sql = ['UPDATE checkout_stat_has_users SET checkouts_count = ? WHERE user_checkout_stat_id = ? AND user_id = ?', daily_count, id, user.id]
         UserCheckoutStat.connection.execute(
           self.class.send(:sanitize_sql_array, sql)
@@ -37,6 +37,7 @@ class UserCheckoutStat < ActiveRecord::Base
   end
 
   private
+
   def self.transition_class
     UserCheckoutStatTransition
   end

data/app/models/user_checkout_stat_transition.rb

@@ -3,7 +3,7 @@ class UserCheckoutStatTransition < ActiveRecord::Base
 
   
   belongs_to :user_checkout_stat, inverse_of: :user_checkout_stat_transitions
-  #attr_accessible :to_state, :sort_key, :metadata
+  # attr_accessible :to_state, :sort_key, :metadata
 end
 
 # == Schema Information

data/app/models/user_group_has_checkout_type.rb

@@ -5,9 +5,9 @@ class UserGroupHasCheckoutType < ActiveRecord::Base
   belongs_to :user_group, validate: true
   belongs_to :checkout_type, validate: true
 
-  validates_presence_of :user_group, :checkout_type
+  validates :user_group, :checkout_type, presence: true
   validates_associated :user_group, :checkout_type
-  validates_uniqueness_of :checkout_type_id, scope: :user_group_id
+  validates :checkout_type_id, uniqueness: { scope: :user_group_id }
   validates :checkout_limit, numericality: {only_integer: true, greater_than_or_equal_to: 0}
   validates :checkout_period, numericality: {only_integer: true, greater_than_or_equal_to: 0}
   validates :checkout_renewal_limit, numericality: {only_integer: true, greater_than_or_equal_to: 0}
@@ -18,7 +18,7 @@ class UserGroupHasCheckoutType < ActiveRecord::Base
   acts_as_list scope: :user_group_id
 
   def create_lending_policy
-    self.checkout_type.items.find_each do |item|
+    checkout_type.items.find_each do |item|
       policy = LendingPolicy.where(item_id: item.id, user_group_id: user_group_id).select(:id).first
       unless policy
         sql = ['INSERT INTO lending_policies (item_id, user_group_id, loan_period, renewal, created_at, updated_at) VALUES (?, ?, ?, ?, ?, ?)', item.id, user_group_id, checkout_period, checkout_renewal_limit, Time.zone.now, Time.zone.now]
@@ -30,8 +30,8 @@ class UserGroupHasCheckoutType < ActiveRecord::Base
   end
 
   def update_lending_policy
-    self.checkout_type.items.each do |item|
-      sql = ['UPDATE lending_policies SET loan_period = ?, renewal = ?, updated_at = ? WHERE user_group_id = ? AND item_id = ?', self.checkout_period, self.checkout_renewal_limit, Time.zone.now, self.user_group_id, item.id]
+    checkout_type.items.each do |item|
+      sql = ['UPDATE lending_policies SET loan_period = ?, renewal = ?, updated_at = ? WHERE user_group_id = ? AND item_id = ?', checkout_period, checkout_renewal_limit, Time.zone.now, user_group_id, item.id]
       ActiveRecord::Base.connection.execute(
         self.class.send(:sanitize_sql_array, sql)
       )
@@ -58,7 +58,7 @@ class UserGroupHasCheckoutType < ActiveRecord::Base
           result.current_checkout_count, result.user_group_id, result.checkout_type_id
       ]
       ActiveRecord::Base.connection.execute(
-        self.send(:sanitize_sql_array, update_sql)
+        send(:sanitize_sql_array, update_sql)
       )
     end
   end

data/app/models/user_reserve_stat.rb

@@ -17,14 +17,14 @@ class UserReserveStat < 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
     User.find_each do |user|
       daily_count = user.reserves.created(start_date.beginning_of_day, end_date.tomorrow.beginning_of_day).size
       if daily_count > 0
-        self.users << user
+        users << user
         sql = ['UPDATE reserve_stat_has_users SET reserves_count = ? WHERE user_reserve_stat_id = ? AND user_id = ?', daily_count, id, user.id]
         UserReserveStat.connection.execute(
           self.class.send(:sanitize_sql_array, sql)
@@ -37,6 +37,7 @@ class UserReserveStat < ActiveRecord::Base
   end
 
   private
+
   def self.transition_class
     UserReserveStatTransition
   end

data/app/models/user_reserve_stat_transition.rb

@@ -3,7 +3,7 @@ class UserReserveStatTransition < ActiveRecord::Base
 
   
   belongs_to :user_reserve_stat, inverse_of: :user_reserve_stat_transitions
-  #attr_accessible :to_state, :sort_key, :metadata
+  # attr_accessible :to_state, :sort_key, :metadata
 end
 
 # == Schema Information

data/app/policies/checkout_policy.rb

@@ -6,7 +6,7 @@ class CheckoutPolicy < ApplicationPolicy
   def show?
     if user.try(:has_role?, 'Librarian')
       true
-    elsif user and user == record.user
+    elsif user && (user == record.user)
       true
     end
   end
@@ -18,7 +18,7 @@ class CheckoutPolicy < ApplicationPolicy
   def update?
     if user.try(:has_role?, 'Librarian')
       true
-    elsif user and user == record.user
+    elsif user && (user == record.user)
       true
     end
   end
@@ -27,7 +27,7 @@ class CheckoutPolicy < ApplicationPolicy
     if record.checkin
       if user.try(:has_role?, 'Librarian')
         true
-      elsif user and user == record.user
+      elsif user && (user == record.user)
         true
       end
     end

data/app/policies/reserve_policy.rb

@@ -6,7 +6,7 @@ class ReservePolicy < ApplicationPolicy
   def show?
     if user.try(:has_role?, 'Librarian')
       true
-    elsif user and user == record.user
+    elsif user && (user == record.user)
       true
     end
   end
@@ -22,7 +22,7 @@ class ReservePolicy < ApplicationPolicy
   def update?
     if user.try(:has_role?, 'Librarian')
       true
-    elsif user and user == record.user
+    elsif user && (user == record.user)
       true
     end
   end
@@ -30,7 +30,7 @@ class ReservePolicy < ApplicationPolicy
   def destroy?
     if user.try(:has_role?, 'Librarian')
       true
-    elsif user and user == record.user
+    elsif user && (user == record.user)
       true
     end
   end

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

@@ -17,17 +17,17 @@ 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"
-    #xml.tag! "atom:link", rel: 'search', type: 'application/opensearchdescription+xml', href: "http://#{request.host_with_port}/page/opensearch"
-    unless params[:query].blank?
+    # xml.tag! "atom:link", rel: 'search', type: 'application/opensearchdescription+xml', href: "http://#{request.host_with_port}/page/opensearch"
+    if params[:query].present?
       xml.tag! "opensearch:totalResults", @count[:query_result]
       xml.tag! "opensearch:startIndex", @checkouts.offset + 1
       xml.tag! "opensearch:itemsPerPage", @checkouts.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
     @checkouts.each do |checkout|
       xml.item do
         xml.title checkout.item.manifestation.original_title
-        #xml.description(checkout.title)
+        # xml.description(checkout.title)
         # rfc822
         xml.pubDate checkout.created_at.utc.rfc822
         xml.link checkout_url(checkout)

data/app/views/checkouts/index.txt.ruby

@@ -0,0 +1,13 @@
+CSV.generate(col_sep: "\t", row_sep: "\r\n") do |csv|
+  csv << (%w(username item_identifier title checked_out_at due_date checked_in_at) << "(created_at: #{Time.zone.now})").flatten
+  @checkouts.each do |checkout|
+    csv << [
+      checkout.try(:username),
+      checkout.item.item_identifier,
+      checkout.item.manifestation.original_title,
+      checkout.created_at,
+      checkout.due_date,
+      checkout.checkin.try(:created_at)
+    ]
+  end
+end

data/app/views/reserves/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"){
@@ -20,17 +20,17 @@ xml.rss('version' => "2.0",
       xml.tag! "atom:link", rel: 'self', href: reserves_url(format: :rss)
       xml.tag! "atom:link", rel: 'alternate', href: reserves_url
     end
-    #xml.tag! "atom:link", rel: 'search', type: 'application/opensearchdescription+xml', href: "http://#{request.host_with_port}/page/opensearch"
-    unless params[:query].blank?
+    # xml.tag! "atom:link", rel: 'search', type: 'application/opensearchdescription+xml', href: "http://#{request.host_with_port}/page/opensearch"
+    if params[:query].present?
       xml.tag! "opensearch:totalResults", @count[:query_result]
       xml.tag! "opensearch:startIndex", @reserves.offset + 1
       xml.tag! "opensearch:itemsPerPage", @reserves.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
     @reserves.each do |reserve|
       xml.item do
         xml.title reserve.manifestation.original_title
-        #xml.description(reserve.title)
+        # xml.description(reserve.title)
         # rfc822
         xml.pubDate reserve.created_at.utc.rfc822
         xml.link reserve_url(reserve)

data/db/migrate/032_create_checkins.rb

@@ -1,4 +1,4 @@
-class CreateCheckins < ActiveRecord::Migration
+class CreateCheckins < ActiveRecord::Migration[4.2]
   def self.up
     create_table :checkins do |t|
       t.references :item, index: true, foreign_key: true, null: false

data/db/migrate/033_create_checkouts.rb

@@ -1,4 +1,4 @@
-class CreateCheckouts < ActiveRecord::Migration
+class CreateCheckouts < ActiveRecord::Migration[4.2]
   def self.up
     create_table :checkouts do |t|
       t.references :user, index: true, foreign_key: true

data/db/migrate/035_create_reserves.rb

@@ -1,4 +1,4 @@
-class CreateReserves < ActiveRecord::Migration
+class CreateReserves < ActiveRecord::Migration[4.2]
   def self.up
     create_table :reserves do |t|
       t.references :user, index: true, foreign_key: true, null: false

data/db/migrate/121_create_checked_items.rb

@@ -1,4 +1,4 @@
-class CreateCheckedItems < ActiveRecord::Migration
+class CreateCheckedItems < ActiveRecord::Migration[4.2]
   def self.up
     create_table :checked_items do |t|
       t.references :item, index: true, foreign_key: true, null: false

data/db/migrate/127_create_use_restrictions.rb

@@ -1,4 +1,4 @@
-class CreateUseRestrictions < ActiveRecord::Migration
+class CreateUseRestrictions < ActiveRecord::Migration[4.2]
   def self.up
     create_table :use_restrictions do |t|
       t.string :name, null: false

data/db/migrate/129_create_item_has_use_restrictions.rb

@@ -1,4 +1,4 @@
-class CreateItemHasUseRestrictions < ActiveRecord::Migration
+class CreateItemHasUseRestrictions < ActiveRecord::Migration[4.2]
   def self.up
     create_table :item_has_use_restrictions do |t|
       t.references :item, index: true, foreign_key: true, null: false

data/db/migrate/132_create_circulation_statuses.rb

@@ -1,4 +1,4 @@
-class CreateCirculationStatuses < ActiveRecord::Migration
+class CreateCirculationStatuses < ActiveRecord::Migration[4.2]
   def self.up
     create_table :circulation_statuses do |t|
       t.string :name, null: false

data/db/migrate/20081030023412_create_checkout_types.rb

@@ -1,7 +1,7 @@
-class CreateCheckoutTypes < ActiveRecord::Migration
+class CreateCheckoutTypes < ActiveRecord::Migration[4.2]
   def self.up
     create_table :checkout_types do |t|
-      t.string :name, :null => false
+      t.string :name, null: false
       t.text :display_name
       t.text :note
       t.integer :position

data/db/migrate/20081030023518_create_user_group_has_checkout_types.rb

@@ -1,4 +1,4 @@
-class CreateUserGroupHasCheckoutTypes < ActiveRecord::Migration
+class CreateUserGroupHasCheckoutTypes < ActiveRecord::Migration[4.2]
   def self.up
     create_table :user_group_has_checkout_types do |t|
       t.references :user_group, index: true, foreign_key: true, null: false

data/db/migrate/20081030023615_create_carrier_type_has_checkout_types.rb

@@ -1,4 +1,4 @@
-class CreateCarrierTypeHasCheckoutTypes < ActiveRecord::Migration
+class CreateCarrierTypeHasCheckoutTypes < ActiveRecord::Migration[4.2]
   def self.up
     create_table :carrier_type_has_checkout_types do |t|
       t.references :carrier_type, index: false, foreign_key: true, null: false

data/db/migrate/20081212075554_create_checkout_stat_has_manifestations.rb

@@ -1,4 +1,4 @@
-class CreateCheckoutStatHasManifestations < ActiveRecord::Migration
+class CreateCheckoutStatHasManifestations < ActiveRecord::Migration[4.2]
   def self.up
     create_table :checkout_stat_has_manifestations do |t|
       t.references :manifestation_checkout_stat, index: false, null: false

data/db/migrate/20081212080038_create_manifestation_checkout_stats.rb

@@ -1,4 +1,4 @@
-class CreateManifestationCheckoutStats < ActiveRecord::Migration
+class CreateManifestationCheckoutStats < ActiveRecord::Migration[4.2]
   def self.up
     create_table :manifestation_checkout_stats do |t|
       t.datetime :start_date

data/db/migrate/20081215094302_create_user_checkout_stats.rb

@@ -1,4 +1,4 @@
-class CreateUserCheckoutStats < ActiveRecord::Migration
+class CreateUserCheckoutStats < ActiveRecord::Migration[4.2]
   def self.up
     create_table :user_checkout_stats do |t|
       t.datetime :start_date

data/db/migrate/20081215094955_create_checkout_stat_has_users.rb

@@ -1,4 +1,4 @@
-class CreateCheckoutStatHasUsers < ActiveRecord::Migration
+class CreateCheckoutStatHasUsers < ActiveRecord::Migration[4.2]
   def self.up
     create_table :checkout_stat_has_users do |t|
       t.references :user_checkout_stat, index: true, foreign_key: true, null: false

data/db/migrate/20081216190517_create_reserve_stat_has_manifestations.rb

@@ -1,4 +1,4 @@
-class CreateReserveStatHasManifestations < ActiveRecord::Migration
+class CreateReserveStatHasManifestations < ActiveRecord::Migration[4.2]
   def self.up
     create_table :reserve_stat_has_manifestations do |t|
       t.references :manifestation_reserve_stat, index: false, null: false

data/db/migrate/20081216190724_create_manifestation_reserve_stats.rb

@@ -1,4 +1,4 @@
-class CreateManifestationReserveStats < ActiveRecord::Migration
+class CreateManifestationReserveStats < ActiveRecord::Migration[4.2]
   def self.up
     create_table :manifestation_reserve_stats do |t|
       t.datetime :start_date

data/db/migrate/20081220023628_create_user_reserve_stats.rb

@@ -1,4 +1,4 @@
-class CreateUserReserveStats < ActiveRecord::Migration
+class CreateUserReserveStats < ActiveRecord::Migration[4.2]
   def self.up
     create_table :user_reserve_stats do |t|
       t.datetime :start_date

data/db/migrate/20081220034117_create_reserve_stat_has_users.rb

@@ -1,4 +1,4 @@
-class CreateReserveStatHasUsers < ActiveRecord::Migration
+class CreateReserveStatHasUsers < ActiveRecord::Migration[4.2]
   def self.up
     create_table :reserve_stat_has_users do |t|
       t.references :user_reserve_stat, index: true, foreign_key: true, null: false