enju_circulation 0.1.0.pre38 → 0.1.0.pre39

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a351d924a626f215711e04a84233a743723855c
-  data.tar.gz: ffd37f15ff29d2c38f2c80b238cf7e67f3866d08
+  metadata.gz: eaf9300fdaa9bc2f1f6f3fee23050f624b893b53
+  data.tar.gz: 069d5d5de77d66c9f7eda705096ff3eb8d46a019
 SHA512:
-  metadata.gz: 903430be5e4584e3cfb17e2854458d6ebf68334f7b91f42c5d12f3d2c18a5e7eade3eeb67aa877d51786785e5dad5087acf484b1233fe20ab44c911745e0613f
-  data.tar.gz: 89158339d97c670bf648d111f12aac3d3696d5922f541486f8ad20b9936686c08a5a2e49d4419ede7a414c08469468731715249f92902c085a51644c3cf8f571
+  metadata.gz: 090251723f0115166b1a8b71667f50700d6181196b6fb7afc0b490a218825bb69e2b3af7f78894c4e58554a8d159599eaf7d2f8482378c966c2866988f82eb35
+  data.tar.gz: b389ad232f0ce25a21c1977a97d3b3f3d526ea87f4bba6607f94e19053a75d4b75324d7c439d07ddc91233a78e63af23fba443b69de3f75beda6f6a1f3726df7

data/app/controllers/manifestation_checkout_stats_controller.rb

@@ -22,6 +22,9 @@ class ManifestationCheckoutStatsController < ApplicationController
       per_page = CheckoutStatHasManifestation.default_per_page
     end
     @stats = @manifestation_checkout_stat.checkout_stat_has_manifestations.order('checkouts_count DESC, manifestation_id').page(params[:page]).per(per_page)
+    @breakdown = CheckoutStatHasManifestation.joins(:manifestation).where(
+      manifestation_checkout_stat_id: @manifestation_checkout_stat.id
+    ).group(:carrier_type_id).sum(:checkouts_count)
 
     respond_to do |format|
       format.html # show.html.erb

data/app/models/carrier_type_has_checkout_type.rb

@@ -1,7 +1,7 @@
 class CarrierTypeHasCheckoutType < ActiveRecord::Base
   attr_accessible :carrier_type_id, :checkout_type_id, :note
-  scope :available_for_carrier_type, lambda {|carrier_type| {:include => :carrier_type, conditions: ['carrier_types.name = ?', carrier_type.name]}}
-  scope :available_for_user_group, lambda {|user_group| {:include => {:checkout_type => :user_groups}, conditions: ['user_groups.name = ?', user_group.name]}}
+  scope :available_for_carrier_type, lambda {|carrier_type| includes(:carrier_type).where('carrier_types.name = ?', carrier_type.name)}
+  scope :available_for_user_group, lambda {|user_group| includes(checkout_type: :user_groups).where('user_groups.name = ?', user_group.name)}
 
   belongs_to :carrier_type, validate: true
   belongs_to :checkout_type, validate: true

data/app/models/checkin.rb

@@ -1,7 +1,7 @@
 class Checkin < ActiveRecord::Base
   attr_accessible :item_identifier
-  default_scope order: 'checkins.id DESC'
-  scope :on, lambda {|date| {conditions: ['created_at >= ? AND created_at < ?', date.beginning_of_day, date.tomorrow.beginning_of_day]}}
+  default_scope { order('checkins.id DESC') }
+  scope :on, lambda {|date| where('created_at >= ? AND created_at < ?', date.beginning_of_day, date.tomorrow.beginning_of_day)}
   has_one :checkout
   belongs_to :item, touch: true
   belongs_to :librarian, class_name: 'User'
@@ -35,9 +35,11 @@ class Checkin < ActiveRecord::Base
     message = ''
     Checkin.transaction do
       item.checkin!
-      Checkout.not_returned.where(item_id: item_id).select(
-        [:id, :item_id, :user_id, :basket_id, :due_date, :lock_version, :created_at, :checkout_renewal_count]
-      ).each do |checkout|
+      Checkout.not_returned.where(item_id: item_id).select([
+        :id, :item_id, :user_id, :librarian_id,
+        :basket_id, :due_date, :lock_version, :created_at,
+        :checkout_renewal_count
+      ]).each do |checkout|
         # TODO: ILL時の処理
         checkout.checkin = self
         checkout.operator = current_user

data/app/models/checkout.rb

@@ -1,12 +1,12 @@
 class Checkout < ActiveRecord::Base
   attr_accessible :due_date
-  default_scope order: 'checkouts.id DESC'
-  scope :not_returned, where(:checkin_id => nil)
-  scope :returned, where('checkin_id IS NOT NULL')
-  scope :overdue, lambda {|date| {conditions: ['checkin_id IS NULL AND due_date < ?', date]}}
-  scope :due_date_on, lambda {|date| where(:checkin_id => nil, :due_date => date.beginning_of_day .. date.end_of_day)}
-  scope :completed, lambda {|start_date, end_date| {conditions: ['created_at >= ? AND created_at < ?', start_date, end_date]}}
-  scope :on, lambda {|date| {conditions: ['created_at >= ? AND created_at < ?', date.beginning_of_day, date.tomorrow.beginning_of_day]}}
+  default_scope { order('checkouts.id DESC') }
+  scope :not_returned, -> { where(checkin_id: nil) }
+  scope :returned, -> { where('checkin_id IS NOT NULL') }
+  scope :overdue, lambda {|date| where('checkin_id IS NULL AND due_date < ?', date)}
+  scope :due_date_on, lambda {|date| where(checkin_id: nil, due_date: date.beginning_of_day .. date.end_of_day)}
+  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
   delegate :username, :user_number, :to => :user, :prefix => true
@@ -148,6 +148,10 @@ class Checkout < ActiveRecord::Base
   def self.remove_all_history(user)
     user.checkouts.returned.update_all(:user_id => nil)
   end
+
+  def self.calculate_item
+    joins(item: :shelf).group(:library_id).count(:id)
+  end
 end
 
 # == Schema Information

data/app/models/checkout_type.rb

@@ -1,9 +1,9 @@
 class CheckoutType < ActiveRecord::Base
   attr_accessible :name, :display_name, :note
   include MasterModel
-  default_scope order: "checkout_types.position"
-  scope :available_for_carrier_type, lambda {|carrier_type| {:include => :carrier_types, conditions: ['carrier_types.name = ?', carrier_type.name], order: 'carrier_types.position'}}
-  scope :available_for_user_group, lambda {|user_group| {:include => :user_groups, conditions: ['user_groups.name = ?', user_group.name], order: 'user_group.position'}}
+  default_scope { order('checkout_types.position') }
+  scope :available_for_carrier_type, lambda {|carrier_type| includes(:carrier_types).where('carrier_types.name = ?', carrier_type.name).order('carrier_types.position')}
+  scope :available_for_user_group, lambda {|user_group| includes(:user_groups).where('user_groups.name = ?', user_group.name).order('user_group.position')}
 
   has_many :user_group_has_checkout_types, dependent: :destroy
   has_many :user_groups, through: :user_group_has_checkout_types

data/app/models/circulation_status.rb

@@ -1,14 +1,15 @@
 class CirculationStatus < ActiveRecord::Base
   attr_accessible :name, :display_name, :note
   include MasterModel
-  validates :name, presence: true, format: {with: /\A[0-9A-Za-z][0-9A-Za-z_\-\s,]*[0-9a-z]\Z/}
+  validates :name, presence: true, format: { with: /\A[0-9A-Za-z][0-9A-Za-z_\-\s,]*[0-9a-z]\Z/ }
 
-  default_scope order: "circulation_statuses.position"
-  scope :available_for_checkout, where(name: 'Available On Shelf')
+  default_scope { order('circulation_statuses.position') }
+  scope :available_for_checkout, -> { where(name: 'Available On Shelf') }
   has_many :items
 
-  def set_display_name
-    self.display_name = "#{I18n.locale}: #{name}" if display_name.blank?
+  private
+  def valid_name?
+    true
   end
 end
 

data/app/models/item_has_use_restriction.rb

@@ -1,5 +1,5 @@
 class ItemHasUseRestriction < ActiveRecord::Base
-  attr_accessible :item_id, :use_restriction_id
+  attr_accessible :item_id, :use_restriction_id, :use_restriction
   belongs_to :item, validate: true
   belongs_to :use_restriction, validate: true
   accepts_nested_attributes_for :use_restriction

data/app/models/lending_policy.rb

@@ -1,7 +1,7 @@
 class LendingPolicy < ActiveRecord::Base
   attr_accessible :item_id, :user_group_id, :loan_period, :fixed_due_date,
     :renewal, :fine, :note, :position
-  default_scope order: 'lending_policies.position'
+  default_scope { order('lending_policies.position') }
   belongs_to :item
   belongs_to :user_group
 

data/app/models/manifestation_checkout_stat.rb

@@ -27,7 +27,7 @@ class ManifestationCheckoutStat < ActiveRecord::Base
       #manifestation.update_attributes({:daily_checkouts_count => daily_count, :total_count => manifestation.total_count + daily_count})
       if daily_count > 0
         self.manifestations << manifestation
-        sql = ['UPDATE checkout_stat_has_manifestations SET checkouts_count = ? WHERE manifestation_checkout_stat_id = ? AND manifestation_id = ?', daily_count, self.id, manifestation.id]
+        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)
         )

data/app/models/manifestation_reserve_stat.rb

@@ -27,7 +27,7 @@ class ManifestationReserveStat < ActiveRecord::Base
       #manifestation.update_attributes({:daily_reserves_count => daily_count, :total_count => manifestation.total_count + daily_count})
       if daily_count > 0
         self.manifestations << manifestation
-        sql = ['UPDATE reserve_stat_has_manifestations SET reserves_count = ? WHERE manifestation_reserve_stat_id = ? AND manifestation_id = ?', daily_count, self.id, manifestation.id]
+        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)
         )

data/app/models/reserve.rb

@@ -8,8 +8,8 @@ class Reserve < ActiveRecord::Base
     :expiration_notice_to_patron, :expiration_notice_to_library, :item_id,
     :retained_at, :postponed_at, :force_retaining,
     as: :admin
-  scope :hold, where('item_id IS NOT NULL')
-  scope :not_hold, where(item_id: nil)
+  scope :hold, -> { where('item_id IS NOT NULL') }
+  scope :not_hold, -> { where(item_id: nil) }
   scope :waiting, -> {not_in_state(:completed, :expired).where('canceled_at IS NULL AND expired_at > ?', Time.zone.now).order('reserves.id DESC')}
   scope :retained, -> {in_state(:retained).where('retained_at IS NOT NULL')}
   scope :completed, -> {in_state(:completed).where('checked_out_at IS NOT NULL')}
@@ -17,7 +17,7 @@ class Reserve < ActiveRecord::Base
   scope :postponed, -> {in_state(:postponed).where('postponed_at IS NOT NULL')}
   scope :will_expire_retained, lambda {|datetime| in_state(:retained).where('checked_out_at IS NULL AND canceled_at IS NULL AND expired_at <= ?', datetime).order('expired_at')}
   scope :will_expire_pending, lambda {|datetime| in_state(:pending).where('checked_out_at IS NULL AND canceled_at IS NULL AND expired_at <= ?', datetime).order('expired_at')}
-  scope :created, lambda {|start_date, end_date| {conditions: ['created_at >= ? AND created_at < ?', start_date, end_date]}}
+  scope :created, lambda {|start_date, end_date| where('created_at >= ? AND created_at < ?', start_date, end_date)}
   scope :not_sent_expiration_notice_to_patron, -> {in_state(:expired).where(:expiration_notice_to_patron => false)}
   scope :not_sent_expiration_notice_to_library, -> {in_state(:expired).where(:expiration_notice_to_library => false)}
   scope :sent_expiration_notice_to_patron, -> {in_state(:expired).where(:expiration_notice_to_patron => true)}
@@ -31,31 +31,31 @@ class Reserve < ActiveRecord::Base
   belongs_to :request_status_type
 
   validates_associated :user, :librarian, :request_status_type
-  validates :manifestation, :associated => true #, on: :create
+  validates :manifestation, associated: true #, on: :create
   validates_presence_of :user, :request_status_type
-  validates :manifestation, presence: true, :unless => Proc.new{|reserve|
+  validates :manifestation, presence: true, unless: Proc.new{|reserve|
     reserve.completed?
   }
   #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|
+  validates :item_id, presence: true, if: Proc.new{|reserve|
     if item_id_changed?
       if reserve.completed? or reserve.retained?
         unless item_id_change[0]
-          return false
+          false
         else
           unless item_id_change[1]
-            return false
+            false
           else
-            return true
+            true
           end
         end
       end
     else
       if reserve.retained?
-        return true
+        true
       end
     end
   }
@@ -163,7 +163,7 @@ class Reserve < ActiveRecord::Base
 
   def next_reservation
     if item
-      Reserve.waiting.where(:manifestation_id => item.manifestation.id).readonly(false).first
+      Reserve.waiting.where(manifestation_id: item.manifestation.id).readonly(false).first
     end
   end
 
@@ -317,13 +317,13 @@ class Reserve < ActiveRecord::Base
 
   private
   def do_request
-    self.assign_attributes({:request_status_type => RequestStatusType.where(name: 'In Process').first, item_id: nil, :retained_at => nil}, as: :admin)
+    self.assign_attributes({request_status_type: RequestStatusType.where(name: 'In Process').first, item_id: nil, retained_at: nil}, as: :admin)
     save!
   end
 
   def retain
     # TODO: 「取り置き中」の状態を正しく表す
-    self.assign_attributes({:request_status_type => RequestStatusType.where(name: 'In Process').first, :retained_at => Time.zone.now}, as: :admin)
+    self.assign_attributes({request_status_type: RequestStatusType.where(name: 'In Process').first, retained_at: Time.zone.now}, as: :admin)
     Reserve.transaction do
       if item.try(:next_reservation)
         reservation = item.next_reservation
@@ -335,7 +335,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}, as: :admin)
+      self.assign_attributes({request_status_type: RequestStatusType.where(name: 'Expired').first, canceled_at: Time.zone.now}, as: :admin)
       reserve = next_reservation
       if reserve
         reserve.item = item
@@ -349,7 +349,7 @@ class Reserve < ActiveRecord::Base
 
   def cancel
     Reserve.transaction do
-      self.assign_attributes({:request_status_type => RequestStatusType.where(name: 'Cannot Fulfill Request').first, :canceled_at => Time.zone.now}, as: :admin)
+      self.assign_attributes({request_status_type: RequestStatusType.where(name: 'Cannot Fulfill Request').first, canceled_at: Time.zone.now}, as: :admin)
       save!
       reserve = next_reservation
       if reserve
@@ -362,16 +362,16 @@ 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}, as: :admin)
+    self.assign_attributes({request_status_type: RequestStatusType.where(name: 'Available For Pickup').first, checked_out_at: Time.zone.now}, as: :admin)
     save!
   end
 
   def postpone
     self.assign_attributes({
-      :request_status_type => RequestStatusType.where(name: 'In Process').first,
+      request_status_type: RequestStatusType.where(name: 'In Process').first,
       item_id: nil,
-      :retained_at => nil,
-      :postponed_at => Time.zone.now
+      retained_at: nil,
+      postponed_at: Time.zone.now
     }, as: :admin)
     save!
   end

data/app/models/use_restriction.rb

@@ -1,15 +1,16 @@
 class UseRestriction < ActiveRecord::Base
   attr_accessible :name, :display_name, :note
   include MasterModel
-  validates :name, presence: true, format: {with: /\A[0-9A-Za-z][0-9A-Za-z_\-\s,]*[0-9a-z]\Z/}
+  validates :name, presence: true, format: { with: /\A[0-9A-Za-z][0-9A-Za-z_\-\s,]*[0-9a-z]\Z/ }
 
-  default_scope {order('use_restrictions.position')}
+  default_scope { order('use_restrictions.position') }
   scope :available, -> {where(name: ['Not For Loan', 'Limited Circulation, Normal Loan Period'])}
   has_many :item_has_use_restrictions
   has_many :items, through: :item_has_use_restrictions
 
-  def set_display_name
-    self.display_name = "#{I18n.locale}: #{name}" if display_name.blank?
+  private
+  def valid_name?
+    true
   end
 end
 

data/app/models/user_group_has_checkout_type.rb

@@ -5,7 +5,7 @@ class UserGroupHasCheckoutType < ActiveRecord::Base
     :set_due_date_before_closing_day, :fixed_due_date, :note, :position,
     :user_group, :checkout_type
   scope :available_for_item, lambda{|item| where(:checkout_type_id => item.checkout_type.id)}
-  scope :available_for_carrier_type, lambda{|carrier_type| {:include => {:checkout_type => :carrier_types}, conditions: ['carrier_types.id = ?', carrier_type.id]}}
+  scope :available_for_carrier_type, lambda{|carrier_type| includes(:checkout_type => :carrier_types).where('carrier_types.id' => carrier_type.id)}
 
   belongs_to :user_group, validate: true
   belongs_to :checkout_type, validate: true

data/app/views/checked_items/new.html.erb

@@ -15,7 +15,7 @@
     <li><%= link_to @basket.user.username, @basket.user.profile -%></li>
   </ul>
   <ul>
-    <%- @basket.user.user_group.user_group_has_checkout_types.each do |available_checkout_type| -%>
+    <%- @basket.user.profile.user_group.user_group_has_checkout_types.each do |available_checkout_type| -%>
       <li>
         <%= available_checkout_type.checkout_type.display_name.localize -%>:
         <%= @basket.user.checked_item_count[:"#{available_checkout_type.checkout_type.name}"] -%> / <%= available_checkout_type.checkout_limit -%>

data/app/views/checkouts/_index_user.html.erb

@@ -13,7 +13,7 @@
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <%- user.user_group.user_group_has_checkout_types.each do |available_checkout_type| -%>
+    <%- user.profile.user_group.user_group_has_checkout_types.each do |available_checkout_type| -%>
       <li>
         <%= available_checkout_type.checkout_type.display_name.localize -%>:
         <%= user.checked_item_count[:"#{available_checkout_type.checkout_type.name}"] -%> / <%= available_checkout_type.checkout_limit -%>

data/app/views/manifestation_checkout_stats/show.html.erb

@@ -18,6 +18,15 @@
   <%= localized_state(@manifestation_checkout_stat.current_state) -%>
 </p>
 
+<p>
+  <strong><%= t('statistic.breakdown') -%>:</strong>
+  <ul>
+    <% @breakdown.each do |k, v| %>
+      <li><%= CarrierType.find(k).display_name.localize %>: <%= v %></li>
+    <% end %>
+  </ul>
+</p>
+
 <p>
   <strong><%= t('activerecord.attributes.manifestation_checkout_stat.note') -%>:</strong>
   <%= @manifestation_checkout_stat.note -%>

data/app/views/manifestation_checkout_stats/show.txt.erb

@@ -1,4 +1,5 @@
-<%= @manifestation_checkout_stat.start_date -%>	<%= @manifestation_checkout_stat.end_date %>
+<%= @manifestation_checkout_stat.start_date -%><%= "\t" %><%= @manifestation_checkout_stat.end_date %>
+manifestation_id<%= "\t" %>title<%= "\t" %>carrier_type<%= "\t" %>count
 <%- @stats.each do |stat| -%>
-"<%= stat.manifestation.original_title if stat.manifestation -%>"	"<%=h stat.checkouts_count -%>"<%= "\n" -%>
+<%= stat.manifestation.id if stat.manifestation %><%= "\t" %><%= stat.manifestation.original_title if stat.manifestation -%><%= "\t" %><%= stat.manifestation.carrier_type.name %><%= "\t" %><%= stat.checkouts_count -%><%= "\n" %>
 <%- end -%>

data/app/views/manifestation_reserve_stats/show.txt.erb

@@ -1,4 +1,5 @@
-<%= @manifestation_reserve_stat.start_date -%>	<%= @manifestation_reserve_stat.end_date %>
+<%= @manifestation_reserve_stat.start_date -%><%= "\t" %><%= @manifestation_reserve_stat.end_date %>
+title<%= "\t" %>carrier_type<%= "\t" %>count
 <%- @stats.each do |stat| -%>
-"<%= stat.manifestation.original_title if stat.manifestation -%>"	"<%=h stat.reserves_count -%>"<%= "\n" -%>
+<%= stat.manifestation.id if stat.manifestation %><%= "\t" %><%= stat.manifestation.original_title if stat.manifestation -%><%= "\t" %><%= stat.manifestation.carrier_type.name %><%= "\t" %><%= stat.reserves_count -%><%= "\n" %>
 <%- end -%>

data/config/locales/translation_en.yml

@@ -194,3 +194,4 @@ en:
     start_counting: "Start counting"
   statistic:
     successfully_created: "%{model} task was created successfully. When the task is completed, its status on the list will be updated to 'completed' and you can check the results by following the 'show' link."
+    breakdown: Brakedown

data/config/locales/translation_ja.yml

@@ -192,3 +192,4 @@ ja:
     start_counting: "集計を開始"
   statistic:
     successfully_created: "%{model}のタスクは正常に作成されました。タスクが完了すると「%{model}の一覧」の状態が「完了」となり、「表示」リンクをたどることで結果を確認できるようになります。"
+    breakdown: 内訳

data/lib/enju_circulation/item.rb

@@ -27,11 +27,11 @@ module EnjuCirculation
         include InstanceMethods
         has_many :reserves, :foreign_key => :manifestation_id
 
-        scope :for_checkout, includes(:circulation_status, :use_restriction).where(
+        scope :for_checkout, -> { includes(:circulation_status, :use_restriction).where(
             'circulation_statuses.name' => FOR_CHECKOUT_CIRCULATION_STATUS,
             'use_restrictions.name' => FOR_CHECKOUT_USE_RESTRICTION
-          ).where('item_identifier IS NOT NULL')
-        scope :removed, includes(:circulation_status).where('circulation_statuses.name' => 'Removed')
+          ).where('item_identifier IS NOT NULL') }
+        scope :removed, -> { includes(:circulation_status).where('circulation_statuses.name' => 'Removed') }
         has_many :checkouts
         has_many :reserves
         has_many :checked_items

data/lib/enju_circulation/user_group.rb

@@ -6,8 +6,8 @@ module EnjuCirculation
 
     module ClassMethods
       def enju_circulation_user_group_model
-        has_many :user_group_has_checkout_types, :dependent => :destroy
-        has_many :checkout_types, :through => :user_group_has_checkout_types, :order => :position
+        has_many :user_group_has_checkout_types, dependent: :destroy
+        has_many :checkout_types, through: :user_group_has_checkout_types
         has_many :lending_policies
         attr_accessible :user_group_has_checkout_types_attributes
         accepts_nested_attributes_for :user_group_has_checkout_types, :allow_destroy => true, :reject_if => :all_blank

data/lib/enju_circulation/version.rb

@@ -1,3 +1,3 @@
 module EnjuCirculation
-  VERSION = "0.1.0.pre38"
+  VERSION = "0.1.0.pre39"
 end

data/spec/controllers/checkout_types_controller_spec.rb

@@ -13,7 +13,7 @@ describe CheckoutTypesController do
 
       it "assigns all checkout_types as @checkout_types" do
         get :index
-        assigns(:checkout_types).should eq(CheckoutType.all)
+        assigns(:checkout_types).should eq(CheckoutType.order(:position))
       end
     end
 
@@ -22,7 +22,7 @@ describe CheckoutTypesController do
 
       it "assigns all checkout_types as @checkout_types" do
         get :index
-        assigns(:checkout_types).should eq(CheckoutType.all)
+        assigns(:checkout_types).should eq(CheckoutType.order(:position))
       end
     end
 

data/spec/controllers/circulation_statuses_controller_spec.rb

@@ -19,7 +19,7 @@ describe CirculationStatusesController do
 
       it "assigns all circulation_statuses as @circulation_statuses" do
         get :index
-        assigns(:circulation_statuses).should eq(CirculationStatus.all)
+        assigns(:circulation_statuses).should eq(CirculationStatus.order(:position))
       end
     end
 
@@ -28,7 +28,7 @@ describe CirculationStatusesController do
 
       it "assigns all circulation_statuses as @circulation_statuses" do
         get :index
-        assigns(:circulation_statuses).should eq(CirculationStatus.all)
+        assigns(:circulation_statuses).should eq(CirculationStatus.order(:position))
       end
     end
 
@@ -37,14 +37,14 @@ describe CirculationStatusesController do
 
       it "assigns all circulation_statuses as @circulation_statuses" do
         get :index
-        assigns(:circulation_statuses).should eq(CirculationStatus.all)
+        assigns(:circulation_statuses).should eq(CirculationStatus.order(:position))
       end
     end
 
     describe "When not logged in" do
       it "assigns all circulation_statuses as @circulation_statuses" do
         get :index
-        assigns(:circulation_statuses).should eq(CirculationStatus.all)
+        assigns(:circulation_statuses).should eq(CirculationStatus.order(:position))
       end
     end
   end

data/spec/controllers/item_has_use_restrictions_controller_spec.rb

@@ -19,7 +19,7 @@ describe ItemHasUseRestrictionsController do
 
       it "assigns all item_has_use_restrictions as @item_has_use_restrictions" do
         get :index
-        assigns(:item_has_use_restrictions).should eq(ItemHasUseRestriction.all(:order => 'id DESC'))
+        assigns(:item_has_use_restrictions).should eq(ItemHasUseRestriction.order('id DESC').page(1))
       end
     end
 
@@ -28,7 +28,7 @@ describe ItemHasUseRestrictionsController do
 
       it "assigns all item_has_use_restrictions as @item_has_use_restrictions" do
         get :index
-        assigns(:item_has_use_restrictions).should eq(ItemHasUseRestriction.all(:order => 'id DESC'))
+        assigns(:item_has_use_restrictions).should eq(ItemHasUseRestriction.order('id DESC').page(1))
       end
     end
 

data/spec/controllers/manifestation_checkout_stats_controller_spec.rb

@@ -13,7 +13,7 @@ describe ManifestationCheckoutStatsController do
 
       it "assigns all manifestation_checkout_stats as @manifestation_checkout_stats" do
         get :index
-        assigns(:manifestation_checkout_stats).should eq(ManifestationCheckoutStat.all)
+        assigns(:manifestation_checkout_stats).should eq(ManifestationCheckoutStat.page(1))
       end
     end
 
@@ -22,7 +22,7 @@ describe ManifestationCheckoutStatsController do
 
       it "assigns all manifestation_checkout_stats as @manifestation_checkout_stats" do
         get :index
-        assigns(:manifestation_checkout_stats).should eq(ManifestationCheckoutStat.all)
+        assigns(:manifestation_checkout_stats).should eq(ManifestationCheckoutStat.page(1))
       end
     end
 
@@ -31,14 +31,14 @@ describe ManifestationCheckoutStatsController do
 
       it "assigns all manifestation_checkout_stats as @manifestation_checkout_stats" do
         get :index
-        assigns(:manifestation_checkout_stats).should eq(ManifestationCheckoutStat.all)
+        assigns(:manifestation_checkout_stats).should eq(ManifestationCheckoutStat.page(1))
       end
     end
 
     describe "When not logged in" do
       it "should not assign manifestation_checkout_stats as @manifestation_checkout_stats" do
         get :index
-        assigns(:manifestation_checkout_stats).should eq(ManifestationCheckoutStat.all)
+        assigns(:manifestation_checkout_stats).should eq(ManifestationCheckoutStat.page(1))
       end
     end
   end

data/spec/controllers/manifestation_reserve_stats_controller_spec.rb

@@ -13,7 +13,7 @@ describe ManifestationReserveStatsController do
 
       it "assigns all manifestation_reserve_stats as @manifestation_reserve_stats" do
         get :index
-        assigns(:manifestation_reserve_stats).should eq(ManifestationReserveStat.all)
+        assigns(:manifestation_reserve_stats).should eq(ManifestationReserveStat.page(1))
       end
     end
 
@@ -22,7 +22,7 @@ describe ManifestationReserveStatsController do
 
       it "assigns all manifestation_reserve_stats as @manifestation_reserve_stats" do
         get :index
-        assigns(:manifestation_reserve_stats).should eq(ManifestationReserveStat.all)
+        assigns(:manifestation_reserve_stats).should eq(ManifestationReserveStat.page(1))
       end
     end
 
@@ -31,14 +31,14 @@ describe ManifestationReserveStatsController do
 
       it "assigns all manifestation_reserve_stats as @manifestation_reserve_stats" do
         get :index
-        assigns(:manifestation_reserve_stats).should eq(ManifestationReserveStat.all)
+        assigns(:manifestation_reserve_stats).should eq(ManifestationReserveStat.page(1))
       end
     end
 
     describe "When not logged in" do
       it "should not assign manifestation_reserve_stats as @manifestation_reserve_stats" do
         get :index
-        assigns(:manifestation_reserve_stats).should eq(ManifestationReserveStat.all)
+        assigns(:manifestation_reserve_stats).should eq(ManifestationReserveStat.page(1))
       end
     end
   end

data/spec/controllers/use_restrictions_controller_spec.rb

@@ -19,7 +19,7 @@ describe UseRestrictionsController do
 
       it "assigns all use_restrictions as @use_restrictions" do
         get :index
-        assigns(:use_restrictions).should eq(UseRestriction.all)
+        assigns(:use_restrictions).should eq(UseRestriction.order(:position))
       end
     end
 
@@ -28,7 +28,7 @@ describe UseRestrictionsController do
 
       it "assigns all use_restrictions as @use_restrictions" do
         get :index
-        assigns(:use_restrictions).should eq(UseRestriction.all)
+        assigns(:use_restrictions).should eq(UseRestriction.order(:position))
       end
     end
 

data/spec/controllers/user_checkout_stats_controller_spec.rb

@@ -13,7 +13,7 @@ describe UserCheckoutStatsController do
 
       it "assigns all user_checkout_stats as @user_checkout_stats" do
         get :index
-        assigns(:user_checkout_stats).should eq(UserCheckoutStat.all)
+        assigns(:user_checkout_stats).should eq(UserCheckoutStat.order('id DESC').page(1))
       end
     end
 
@@ -22,7 +22,7 @@ describe UserCheckoutStatsController do
 
       it "assigns all user_checkout_stats as @user_checkout_stats" do
         get :index
-        assigns(:user_checkout_stats).should eq(UserCheckoutStat.all)
+        assigns(:user_checkout_stats).should eq(UserCheckoutStat.order('id DESC').page(1))
       end
     end
 
@@ -31,14 +31,14 @@ describe UserCheckoutStatsController do
 
       it "assigns all user_checkout_stats as @user_checkout_stats" do
         get :index
-        assigns(:user_checkout_stats).should eq(UserCheckoutStat.all)
+        assigns(:user_checkout_stats).should eq(UserCheckoutStat.order('id DESC').page(1))
       end
     end
 
     describe "When not logged in" do
       it "should not assign user_checkout_stats as @user_checkout_stats" do
         get :index
-        assigns(:user_checkout_stats).should eq(UserCheckoutStat.all)
+        assigns(:user_checkout_stats).should eq(UserCheckoutStat.order('id DESC').page(1))
       end
     end
   end