enju_circulation 0.0.27 → 0.0.28

data/app/controllers/reserves_controller.rb

@@ -104,15 +104,20 @@ class ReservesController < ApplicationController
     begin
       if params[:reserve][:user_number]
         user = User.where(:user_number => params[:reserve][:user_number]).first
+      else
+        access_denied
+        return
       end
     rescue NoMethodError
     end
 
     # 図書館員以外は自分の予約しか作成できない
     unless current_user.has_role?('Librarian')
-      if user != current_user
-        access_denied
-        return
+      if user
+        if user != current_user
+          access_denied
+          return
+        end
       end
     end
 
@@ -124,7 +129,7 @@ class ReservesController < ApplicationController
 
     respond_to do |format|
       if @reserve.save
-        @reserve.send_message('accepted')
+        @reserve.sm_request!
 
         #format.html { redirect_to reserve_url(@reserve) }
         format.html { redirect_to @reserve, :notice => t('controller.successfully_created', :model => t('activerecord.models.reserve')) }
@@ -163,7 +168,7 @@ class ReservesController < ApplicationController
       if @reserve.update_attributes(params[:reserve])
         if @reserve.state == 'canceled'
           flash[:notice] = t('reserve.reservation_was_canceled')
-          @reserve.send_message('canceled')
+          @reserve.send_message
         else
           flash[:notice] = t('controller.successfully_updated', :model => t('activerecord.models.reserve'))
         end

data/app/models/reserve.rb

@@ -2,7 +2,7 @@
 class Reserve < ActiveRecord::Base
   scope :hold, where('item_id IS NOT NULL')
   scope :not_hold, where(:item_id => nil)
-  scope :waiting, where('canceled_at IS NULL AND expired_at > ? AND state != ?', Time.zone.now, 'completed').order('id DESC')
+  scope :waiting, where('canceled_at IS NULL AND expired_at > ? AND state != ?', Time.zone.now, 'completed').order('reserves.id DESC')
   scope :completed, where('checked_out_at IS NOT NULL')
   scope :canceled, where('canceled_at IS NOT NULL')
   scope :will_expire_retained, lambda {|datetime| {:conditions => ['checked_out_at IS NULL AND canceled_at IS NULL AND expired_at <= ? AND state = ?', datetime, 'retained'], :order => 'expired_at'}}
@@ -106,55 +106,52 @@ class Reserve < ActiveRecord::Base
   end
 
   def next_reservation
-    manifestation.reserves.where('reserves.id != ?', self.id).order('reserves.created_at').first
-  end
-
-  def retain
-    # TODO: 「取り置き中」の状態を正しく表す
-    self.update_attributes!({:request_status_type => RequestStatusType.where(:name => 'In Process').first, :checked_out_at => Time.zone.now})
-  end
-
-  def expire
-    self.update_attributes!({:request_status_type => RequestStatusType.where(:name => 'Expired').first, :canceled_at => Time.zone.now})
-    logger.info "#{Time.zone.now} reserve_id #{self.id} expired!"
-  end
-
-  def cancel
-    self.update_attributes!({:request_status_type => RequestStatusType.where(:name => 'Cannot Fulfill Request').first, :canceled_at => Time.zone.now})
-  end
-
-  def checkout
-    self.update_attributes!({:request_status_type => RequestStatusType.where(:name => 'Available For Pickup').first, :checked_out_at => Time.zone.now})
+    if item
+      Reserve.waiting.where(:manifestation_id => item.manifestation.id).first
+    end
   end
 
-  def send_message(status)
-    system_user = User.find(1) # TODO: システムからのメッセージの発信者
+  def send_message(sender = nil)
+    sender = User.find(1) unless sender # TODO: システムからのメッセージの発信者
     Reserve.transaction do
-      case status
-      when 'accepted'
-        message_template_to_patron = MessageTemplate.localized_template('reservation_accepted', self.user.locale)
-        request = MessageRequest.create!(:sender => system_user, :receiver => self.user, :message_template => message_template_to_patron)
-        request.save_message_body(:manifestations => Array[self.manifestation], :user => self.user)
+      case state
+      when 'requested'
+        message_template_to_patron = MessageTemplate.localized_template('reservation_accepted_for_patron', user.locale)
+        request = MessageRequest.create!(:sender => sender, :receiver => user, :message_template => message_template_to_patron)
+        request.save_message_body(:manifestations => Array[manifestation], :user => user)
         request.sm_send_message! # 受付時は即時送信
-        message_template_to_library = MessageTemplate.localized_template('reservation_accepted', self.user.locale)
-        request = MessageRequest.create!(:sender => system_user, :receiver => system_user, :message_template => message_template_to_library)
-        request.save_message_body(:manifestations => Array[self.manifestation], :user => self.user)
+        message_template_to_library = MessageTemplate.localized_template('reservation_accepted_for_library', user.locale)
+        request = MessageRequest.create!(:sender => sender, :receiver => sender, :message_template => message_template_to_library)
+        request.save_message_body(:manifestations => Array[manifestation], :user => user)
         request.sm_send_message! # 受付時は即時送信
       when 'canceled'
-        message_template_to_patron = MessageTemplate.localized_template('reservation_canceled_for_patron', self.user.locale)
-        request = MessageRequest.create!(:sender => system_user, :receiver => self.user, :message_template => message_template_to_patron)
-        request.save_message_body(:manifestations => Array[self.manifestation], :user => self.user)
+        message_template_to_patron = MessageTemplate.localized_template('reservation_canceled_for_patron', user.locale)
+        request = MessageRequest.create!(:sender => sender, :receiver => user, :message_template => message_template_to_patron)
+        request.save_message_body(:manifestations => Array[manifestation], :user => user)
         request.sm_send_message! # キャンセル時は即時送信
-        message_template_to_library = MessageTemplate.localized_template('reservation_canceled_for_library', self.user.locale)
-        request = MessageRequest.create!(:sender => system_user, :receiver => system_user, :message_template => message_template_to_library)
-        request.save_message_body(:manifestations => Array[self.manifestation], :user => self.user)
+        message_template_to_library = MessageTemplate.localized_template('reservation_canceled_for_library', user.locale)
+        request = MessageRequest.create!(:sender => sender, :receiver => sender, :message_template => message_template_to_library)
+        request.save_message_body(:manifestations => Array[manifestation], :user => user)
         request.sm_send_message! # キャンセル時は即時送信
       when 'expired'
-        message_template_to_patron = MessageTemplate.localized_template('reservation_expired_for_patron', self.user.locale)
-        request = MessageRequest.create!(:sender => system_user, :receiver => self.user, :message_template => message_template_to_patron)
-        request.save_message_body(:manifestations => Array[self.manifestation], :user => self.user)
-        request.sm_send_message! # 期限切れ時は利用者にのみ即時送信
+        message_template_to_patron = MessageTemplate.localized_template('reservation_expired_for_patron', user.locale)
+        request = MessageRequest.create!(:sender => sender, :receiver => user, :message_template => message_template_to_patron)
+        request.save_message_body(:manifestations => Array[manifestation], :user => user)
+        request.sm_send_message!
         self.update_attribute(:expiration_notice_to_patron, true)
+        message_template_to_library = MessageTemplate.localized_template('reservation_expired_for_library', sender.locale)
+        request = MessageRequest.create!(:sender => sender, :receiver => sender, :message_template => message_template_to_library)
+        request.save_message_body(:manifestations => Array[manifestation], :user => sender)
+        request.sm_send_message!
+      when 'retained'
+        message_template_for_patron = MessageTemplate.localized_template('item_received_for_patron', user.locale)
+        request = MessageRequest.create!(:sender => sender, :receiver => user, :message_template => message_template_for_patron)
+        request.save_message_body(:manifestations => Array[item.manifestation], :user => user)
+        request.sm_send_message!
+        message_template_for_library = MessageTemplate.localized_template('item_received_for_library', user.locale)
+        request = MessageRequest.create!(:sender => sender, :receiver => sender, :message_template => message_template_for_library)
+        request.save_message_body(:manifestations => Array[item.manifestation], :user => user)
+        request.sm_send_message!
       else
         raise 'status not defined'
       end
@@ -162,18 +159,18 @@ class Reserve < ActiveRecord::Base
   end
 
   def self.send_message_to_library(status, options = {})
-    system_user = User.find(1) # TODO: システムからのメッセージの発信者
+    sender = User.find(1) # TODO: システムからのメッセージの発信者
     case status
     when 'expired'
-      message_template_to_library = MessageTemplate.localized_template('reservation_expired_for_library', system_user.locale)
-      request = MessageRequest.create!(:sender => system_user, :receiver => system_user, :message_template => message_template_to_library)
+      message_template_to_library = MessageTemplate.localized_template('reservation_expired_for_library', sender.locale)
+      request = MessageRequest.create!(:sender => sender, :receiver => sender, :message_template => message_template_to_library)
       request.save_message_body(:manifestations => options[:manifestations])
       self.not_sent_expiration_notice_to_library.each do |reserve|
         reserve.update_attribute(:expiration_notice_to_library, true)
       end
     #when 'canceled'
-    #  message_template_to_library = MessageTemplate.localized_template('reservation_canceled_for_library', system_user.locale)
-    #  request = MessageRequest.create!(:sender => system_user, :receiver => system_user, :message_template => message_template_to_library)
+    #  message_template_to_library = MessageTemplate.localized_template('reservation_canceled_for_library', sender.locale)
+    #  request = MessageRequest.create!(:sender => sender, :receiver => sender, :message_template => message_template_to_library)
     #  request.save_message_body(:manifestations => self.not_sent_expiration_notice_to_library.collect(&:manifestation))
     #  self.not_sent_cancel_notice_to_library.each do |reserve|
     #    reserve.update_attribute(:expiration_notice_to_library, true)
@@ -219,6 +216,37 @@ class Reserve < ActiveRecord::Base
       end
     end
   end
+
+  private
+  def retain
+    # TODO: 「取り置き中」の状態を正しく表す
+    self.update_attributes!({:request_status_type => RequestStatusType.where(:name => 'In Process').first, :checked_out_at => Time.zone.now})
+  end
+
+  def expire
+    self.update_attributes!({:request_status_type => RequestStatusType.where(:name => 'Expired').first, :canceled_at => Time.zone.now})
+    logger.info "#{Time.zone.now} reserve_id #{self.id} expired!"
+    reserve = next_reservation
+    if reserve
+      reserve.item = item
+      reserve.sm_retain!
+      reserve.send_message
+    end
+  end
+
+  def cancel
+    self.update_attributes!({:request_status_type => RequestStatusType.where(:name => 'Cannot Fulfill Request').first, :canceled_at => Time.zone.now})
+    reserve = next_reservation
+    if reserve
+      reserve.item = item
+      reserve.sm_retain!
+      reserve.send_message
+    end
+  end
+
+  def checkout
+    self.update_attributes!({:request_status_type => RequestStatusType.where(:name => 'Available For Pickup').first, :checked_out_at => Time.zone.now})
+  end
 end
 
 # == Schema Information

data/app/views/reserves/_new.html.erb

@@ -20,10 +20,14 @@
     <%= f.text_field :expired_at, :value => @reserve.expired_at.try(:strftime, "%Y-%m-%d"), :class => 'date_field', :placeholder => "#{t('page.example')}: 2011-04-12"-%>
   </div>
 
-  <div class="field">
-    <%= f.label t('activerecord.attributes.user.user_number') -%><br />
-    <%= f.text_field :user_number, :class => 'resource_user_number' -%>
-  </div>
+  <% if current_user.has_role?('Librarian') %>
+    <div class="field">
+      <%= f.label t('activerecord.attributes.user.user_number') -%><br />
+      <%= f.text_field :user_number, :class => 'resource_user_number' -%>
+    </div>
+  <% else %>
+    <%= f.hidden_field :user_number, :class => 'resource_user_number' -%>
+  <% end %>
 
   <div class="actions">
     <%= f.submit t('page.create') -%>

data/lib/enju_circulation/version.rb

@@ -1,3 +1,3 @@
 module EnjuCirculation
-  VERSION = "0.0.27"
+  VERSION = "0.0.28"
 end

data/spec/controllers/checked_items_controller_spec.rb

@@ -239,9 +239,10 @@ describe CheckedItemsController do
 
       describe "When the item is reserved" do
         it "assigns a newly created checked_item as @checked_item" do
+          old_count = items(:item_00021).manifestation.reserves.waiting.count
           post :create, :checked_item => {:item_identifier => '00021'} , :basket_id => 11
           assigns(:checked_item).should be_valid
-          assigns(:checked_item).item.manifestation.reserves.waiting.should be_empty
+          assigns(:checked_item).item.manifestation.reserves.waiting.count.should eq old_count - 1
         end
       end
 

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

@@ -2,124 +2,263 @@
 class Item < ActiveRecord::Base
   scope :on_shelf, where('shelf_id != 1')
   scope :on_web, where(:shelf_id => 1)
-
-  scope :for_checkout, where('item_identifier IS NOT NULL')
-  scope :not_for_checkout, where(:item_identifier => nil)
   has_one :exemplify
   has_one :manifestation, :through => :exemplify
-  has_many :checkouts
-  has_many :reserves
-  has_many :reserved_patrons, :through => :reserves, :class_name => 'Patron'
-  has_many :checked_items, :dependent => :destroy
-  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 :owns
+  #has_many :patrons, :through => :owns
   belongs_to :shelf, :counter_cache => true, :validate => true
+  delegate :display_name, :to => :shelf, :prefix => true
+  belongs_to :bookstore, :validate => true
+  #has_many :donates
+  #has_many :donors, :through => :donates, :source => :patron
+  belongs_to :required_role, :class_name => 'Role', :foreign_key => 'required_role_id', :validate => true
+  #has_one :resource_import_result
+  belongs_to :budget_type
+
+  validates_associated :shelf, :bookstore
+  validates :manifestation_id, :presence => true, :on => :create
+  validates :item_identifier, :allow_blank => true, :uniqueness => true,
+    :format => {:with => /\A[0-9A-Za-z_]+\Z/}
+  validates :url, :url => true, :allow_blank => true, :length => {:maximum => 255}
+  validates_date :acquired_at, :allow_blank => true
+
+  normalize_attributes :item_identifier
 
-  validates_associated :circulation_status, :checkout_type
-  validates_presence_of :circulation_status, :checkout_type
-  before_save :set_use_restriction
   searchable do
-    integer :circulation_status_id
+    text :item_identifier, :note, :title #, :creator, :contributor, :publisher
+    string :item_identifier
+    string :library do
+      shelf.library.name if shelf
+    end
+    integer :required_role_id
+    integer :manifestation_id do
+      manifestation.id if manifestation
+    end
+    integer :shelf_id
+    #integer :patron_ids, :multiple => true
+    time :created_at
+    time :updated_at
   end
-  attr_accessor :use_restriction_id
+
   attr_accessor :library_id, :manifestation_id
 
-  def set_circulation_status
-    self.circulation_status = CirculationStatus.where(:name => 'In Process').first if self.circulation_status.nil?
-  end
+  if defined?(EnjuCirculation)
+    scope :for_checkout, where('item_identifier IS NOT NULL')
+    scope :not_for_checkout, where(:item_identifier => nil)
+    has_many :checkouts
+    has_many :reserves
+    has_many :reserved_patrons, :through => :reserves, :class_name => 'Patron'
+    has_many :checked_items, :dependent => :destroy
+    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
+    validates_associated :circulation_status, :checkout_type
+    validates_presence_of :circulation_status, :checkout_type
+    before_save :set_use_restriction
+    searchable do
+      integer :circulation_status_id
+    end
+    attr_accessor :use_restriction_id
 
-  def set_use_restriction
-    if self.use_restriction_id
-      self.use_restriction = UseRestriction.where(:id => self.use_restriction_id).first
-    else
-      return if use_restriction
-      self.use_restriction = UseRestriction.where(:name => 'Limited Circulation, Normal Loan Period').first
+    def set_circulation_status
+      self.circulation_status = CirculationStatus.where(:name => 'In Process').first if self.circulation_status.nil?
+    end
+
+    def set_use_restriction
+      if self.use_restriction_id
+        self.use_restriction = UseRestriction.where(:id => self.use_restriction_id).first
+      else
+        return if use_restriction
+        self.use_restriction = UseRestriction.where(:name => 'Limited Circulation, Normal Loan Period').first
+      end
+    end
+
+    def checkout_status(user)
+       user.user_group.user_group_has_checkout_types.where(:checkout_type_id => self.checkout_type.id).first
+    end
+
+    def next_reservation
+      Reserve.waiting.where(:manifestation_id => self.manifestation.id).first
+    end
+
+    def reserved?
+      return true if self.next_reservation
+      false
+    end
+
+    def rent?
+      return true if self.checkouts.not_returned.select(:item_id).detect{|checkout| checkout.item_id == self.id}
+      false
+    end
+
+    def reserved_by_user?(user)
+      if self.next_reservation
+        return true if self.next_reservation.user == user
+      end
+      false
+    end
+
+    def available_for_checkout?
+      circulation_statuses = CirculationStatus.available_for_checkout.select(:id)
+      return true if circulation_statuses.include?(self.circulation_status)
+      false
+    end
+
+    def checkout!(user)
+      self.circulation_status = CirculationStatus.where(:name => 'On Loan').first
+      if self.reserved_by_user?(user)
+        self.next_reservation.update_attributes(:checked_out_at => Time.zone.now)
+        self.next_reservation.sm_complete!
+      end
+      save!
     end
-  end
 
-  def checkout_status(user)
-     user.user_group.user_group_has_checkout_types.where(:checkout_type_id => self.checkout_type.id).first
+    def checkin!
+      self.circulation_status = CirculationStatus.where(:name => 'Available On Shelf').first
+      save(:validate => false)
+    end
+
+    def retain(librarian)
+      Item.transaction do
+        reservation = self.manifestation.next_reservation
+        unless reservation.nil?
+          reservation.item = self
+          reservation.sm_retain!
+          reservation.send_message(librarian)
+        end
+      end
+    end
+
+    def lending_rule(user)
+      lending_policies.where(:user_group_id => user.user_group.id).first
+    end
+
+    def not_for_loan?
+      if use_restriction.try(:name) == 'Not For Loan'
+        true
+      else
+        false
+      end
+    end
   end
 
-  def next_reservation
-    Reserve.waiting.where(:manifestation_id => self.manifestation.id).first
+  if defined?(EnjuInventory)
+    has_many :inventories, :dependent => :destroy
+    has_many :inventory_files, :through => :inventories
+    searchable do
+      integer :inventory_file_ids, :multiple => true
+    end
+
+    def self.inventory_items(inventory_file, mode = 'not_on_shelf')
+      item_ids = Item.select(:id).collect(&:id)
+      inventory_item_ids = inventory_file.items.select('items.id').collect(&:id)
+      case mode
+      when 'not_on_shelf'
+        Item.where(:id => (item_ids - inventory_item_ids))
+      when 'not_in_catalog'
+        Item.where(:id => (inventory_item_ids - item_ids))
+      end
+    rescue
+      nil
+    end
   end
 
-  def reserved?
-    return true if self.next_reservation
-    false
+  if defined?(EnjuQuestion)
+    has_many :answer_has_items, :dependent => :destroy
+    has_many :answers, :through => :answer_has_items
   end
 
-  def reservable_by?(user)
-    if manifestation.is_reservable_by?(user)
-      return false if ['Lost', 'Missing', 'Claimed Returned Or Never Borrowed'].include?(self.circulation_status.name)
-      return false if self.item_identifier.blank?
-      true
-    else
-      false
+  if defined?(EnjuInterLibraryLoan)
+    has_many :inter_library_loans, :dependent => :destroy
+    def inter_library_loaned?
+      true if self.inter_library_loans.size > 0
     end
   end
 
-  def rent?
-    return true if self.checkouts.not_returned.select(:item_id).detect{|checkout| checkout.item_id == self.id}
-    false
+  def self.per_page
+    10
   end
 
-  def reserved_by_user?(user)
-    if self.next_reservation
-      return true if self.next_reservation.user == user
-    end
-    false
+  def title
+    manifestation.try(:original_title)
   end
 
-  def available_for_checkout?
-    circulation_statuses = CirculationStatus.available_for_checkout.select(:id)
-    return true if circulation_statuses.include?(self.circulation_status)
-    false
+  #def creator
+  #  manifestation.try(:creator)
+  #end
+
+  #def contributor
+  #  manifestation.try(:contributor)
+  #end
+
+  #def publisher
+  #  manifestation.try(:publisher)
+  #end
+
+  def shelf_name
+    shelf.name
   end
 
-  def checkout!(user)
-    self.circulation_status = CirculationStatus.where(:name => 'On Loan').first
-    if self.reserved_by_user?(user)
-      self.next_reservation.update_attributes(:checked_out_at => Time.zone.now)
-      self.next_reservation.sm_complete!
-    end
-    save!
+  def hold?(library)
+    return true if self.shelf.library == library
+    false
   end
 
-  def checkin!
-    self.circulation_status = CirculationStatus.where(:name => 'Available On Shelf').first
-    save(:validate => false)
+  def owned(patron)
+    owns.where(:patron_id => patron.id).first
   end
 
-  def retain(librarian)
-    Item.transaction do
-      reservation = self.manifestation.next_reservation
-      unless reservation.nil?
-        reservation.item = self
-        reservation.sm_retain!
-        reservation.update_attributes({:request_status_type => RequestStatusType.where(:name => 'In Process').first})
-        request = MessageRequest.new(:sender_id => librarian.id, :receiver_id => reservation.user_id)
-        message_template = MessageTemplate.localized_template('item_received', reservation.user.locale)
-        request.message_template = message_template
-        request.save!
-      end
-    end
+  def library_url
+    "#{LibraryGroup.site_config.url}libraries/#{self.shelf.library.name}"
   end
 
-  def lending_rule(user)
-    lending_policies.where(:user_group_id => user.user_group.id).first
+  def manifestation_url
+    Addressable::URI.parse("#{LibraryGroup.site_config.url}manifestations/#{self.manifestation.id}").normalize.to_s if self.manifestation
   end
 
-  def not_for_loan?
-    if use_restriction.try(:name) == 'Not For Loan'
-      true
+  def deletable?
+    if circulation_status.name == 'Removed'
+      return false
     else
-      false
+      if defined?(EnjuCirculation)
+        checkouts.not_returned.empty?
+      else
+        true
+      end
     end
   end
 end
+
+
+# == Schema Information
+#
+# Table name: items
+#
+#  id                    :integer         not null, primary key
+#  call_number           :string(255)
+#  item_identifier       :string(255)
+#  circulation_status_id :integer         default(5), not null
+#  checkout_type_id      :integer         default(1), not null
+#  created_at            :datetime        not null
+#  updated_at            :datetime        not null
+#  deleted_at            :datetime
+#  shelf_id              :integer         default(1), not null
+#  include_supplements   :boolean         default(FALSE), not null
+#  checkouts_count       :integer         default(0), not null
+#  owns_count            :integer         default(0), not null
+#  note                  :text
+#  url                   :string(255)
+#  price                 :integer
+#  lock_version          :integer         default(0), not null
+#  required_role_id      :integer         default(1), not null
+#  state                 :string(255)
+#  required_score        :integer         default(0), not null
+#  acquired_at           :datetime
+#  bookstore_id          :integer
+#  missing_since         :datetime
+#  budget_type_id        :integer
+#
+

data/spec/dummy/db/migrate/005_create_manifestations.rb

@@ -16,9 +16,9 @@ class CreateManifestations < ActiveRecord::Migration
       t.integer :extent_id, :default => 1, :null => false
       t.integer :start_page
       t.integer :end_page
-      t.decimal :height
-      t.decimal :width
-      t.decimal :depth
+      t.integer :height
+      t.integer :width
+      t.integer :depth
       t.string :isbn
       t.string :isbn10
       t.string :wrong_isbn

data/spec/dummy/db/migrate/20101212070145_add_acquired_at_to_item.rb

@@ -0,0 +1,9 @@
+class AddAcquiredAtToItem < ActiveRecord::Migration
+  def self.up
+    add_column :items, :acquired_at, :timestamp
+  end
+
+  def self.down
+    remove_column :items, :acquired_at
+  end
+end

data/spec/dummy/db/migrate/20110916091020_add_volume_number_to_manifestation.rb

@@ -0,0 +1,13 @@
+class AddVolumeNumberToManifestation < ActiveRecord::Migration
+  def self.up
+    add_column :manifestations, :volume_number, :integer
+    add_column :manifestations, :issue_number, :integer
+    add_column :manifestations, :serial_number, :integer
+  end
+
+  def self.down
+    remove_column :manifestations, :serial_number
+    remove_column :manifestations, :issue_number
+    remove_column :manifestations, :volume_number
+  end
+end

data/spec/dummy/db/schema.rb

@@ -217,6 +217,7 @@ ActiveRecord::Schema.define(:version => 20120224094141) do
     t.integer  "required_role_id",            :default => 1,     :null => false
     t.string   "state"
     t.integer  "required_score",              :default => 0,     :null => false
+    t.datetime "acquired_at"
   end
 
   add_index "items", ["checkout_type_id"], :name => "index_items_on_checkout_type_id"
@@ -349,9 +350,9 @@ ActiveRecord::Schema.define(:version => 20120224094141) do
     t.integer  "extent_id",                :default => 1,     :null => false
     t.integer  "start_page"
     t.integer  "end_page"
-    t.decimal  "height"
-    t.decimal  "width"
-    t.decimal  "depth"
+    t.integer  "height"
+    t.integer  "width"
+    t.integer  "depth"
     t.string   "isbn"
     t.string   "isbn10"
     t.string   "wrong_isbn"
@@ -377,6 +378,9 @@ ActiveRecord::Schema.define(:version => 20120224094141) do
     t.integer  "required_score",           :default => 0,     :null => false
     t.integer  "frequency_id",             :default => 1,     :null => false
     t.boolean  "subscription_master",      :default => false, :null => false
+    t.integer  "volume_number"
+    t.integer  "issue_number"
+    t.integer  "serial_number"
   end
 
   add_index "manifestations", ["access_address"], :name => "index_manifestations_on_access_address"

data/spec/fixtures/checkouts.yml

@@ -62,7 +62,6 @@ checkout_00006:
   id: 6
   librarian_id: 2
   checkout_renewal_count: 0
-  due_date: <%= 2.day.from_now.beginning_of_day %>
   due_date: 2010-09-15 00:00:00 +09:00
   created_at: 2007-09-08 01:39:03.210081 +09:00
 checkout_00007: 

data/spec/fixtures/exemplifies.yml

@@ -5,6 +5,7 @@ exemplify_00001:
   manifestation_id: 1
   id: 1
   created_at: 2008-01-11 23:28:19.277110 +09:00
+  position: 1
 exemplify_00002: 
   updated_at: 2008-01-11 23:28:57.068191 +09:00
   item_id: 2
@@ -23,6 +24,7 @@ exemplify_00004:
   manifestation_id: 1
   id: 4
   created_at: 2008-01-11 02:34:20.183962 +09:00
+  position: 2
 exemplify_00005: 
   updated_at: 2008-01-11 02:34:32.352223 +09:00
   item_id: 5
@@ -125,6 +127,12 @@ exemplify_00021:
   manifestation_id: 11
   id: 21
   created_at: 2008-01-11 02:44:37.135721 +09:00
+exemplify_00022: 
+  updated_at: 2008-01-11 02:44:37.135721 +09:00
+  item_id: 22
+  manifestation_id: 11
+  id: 22
+  created_at: 2008-01-11 02:44:37.135721 +09:00
 
 # == Schema Information
 #

data/spec/fixtures/items.yml

@@ -209,10 +209,16 @@ item_00021:
   id: 21
   include_supplements: false
   created_at: 2007-08-24 23:46:20.484813 +09:00
-
-
-
-
+item_00022: 
+  updated_at: 2007-08-24 23:46:20.484813 +09:00
+  item_identifier: '00022'
+  circulation_status_id: 2
+  checkout_type_id: 3
+  shelf_id: 1
+  call_number: 
+  id: 22
+  include_supplements: false
+  created_at: 2007-08-24 23:46:20.484813 +09:00
 
 
 # == Schema Information

data/spec/fixtures/manifestations.yml

@@ -1712,6 +1712,9 @@ manifestation_00202:
   created_at: 2007-11-19 17:55:41 UTC
   frequency_id: 3
   issn: 12345678
+  serial_number: 2
+  volume_number: 1
+  issue_number: 2
 manifestation_00203:
   carrier_type_id: 1
   language_id: 1
@@ -1958,8 +1961,8 @@ manifestation_00216:
 #  manifestation_identifier        :string(255)
 #  date_of_publication             :datetime
 #  date_copyrighted                :datetime
-#  created_at                      :datetime
-#  updated_at                      :datetime
+#  created_at                      :datetime        not null
+#  updated_at                      :datetime        not null
 #  deleted_at                      :datetime
 #  access_address                  :string(255)
 #  language_id                     :integer         default(1), not null
@@ -1967,9 +1970,9 @@ manifestation_00216:
 #  extent_id                       :integer         default(1), not null
 #  start_page                      :integer
 #  end_page                        :integer
-#  height                          :decimal(, )
-#  width                           :decimal(, )
-#  depth                           :decimal(, )
+#  height                          :integer
+#  width                           :integer
+#  depth                           :integer
 #  isbn                            :string(255)
 #  isbn10                          :string(255)
 #  wrong_isbn                      :string(255)
@@ -2006,12 +2009,16 @@ manifestation_00216:
 #  date_accepted                   :datetime
 #  date_caputured                  :datetime
 #  ndl_bib_id                      :string(255)
-#  file_hash                       :string(255)
 #  pub_date                        :string(255)
 #  edition_string                  :string(255)
 #  volume_number                   :integer
 #  issue_number                    :integer
 #  serial_number                   :integer
 #  ndc                             :string(255)
+#  content_type_id                 :integer         default(1)
+#  year_of_publication             :integer
+#  attachment_fingerprint          :string(255)
+#  attachment_meta                 :text
+#  month_of_publication            :integer
 #
 

data/spec/fixtures/message_templates.yml

@@ -1,65 +1,70 @@
 message_template_00001:
   id: 1
-  status: reservation_accepted
+  status: reservation_accepted_for_patron
   title: Reservation accepted
   body: Reservation accepted
   position: 1
+  locale: ja
 message_template_00002:
   id: 2
-  status: item_received
+  status: item_received_for_patron
   title: Item received
   body: Item received
   position: 2
+  locale: ja
 message_template_00003:
   id: 3
   status: reservation_expired_for_patron
   title: Reservation expired
   body: Reservation expired
   position: 3
+  locale: ja
 message_template_00004:
   id: 4
   status: reservation_expired_for_library
   title: Reservation expired
   body: Reservation expired
   position: 4
+  locale: ja
 message_template_00005:
   id: 5
   status: reservation_canceled_for_patron
   title: Reservation canceled
   body: Reservation canceled
   position: 5
+  locale: ja
 message_template_00006:
   id: 6
   status: reservation_canceled_for_library
   title: Reservation canceled
   body: Reservation canceled
   position: 6
+  locale: ja
 message_template_00007:
   id: 7
   status: recall_item
   title: Recall item
   body: Recall item
   position: 7
+  locale: ja
 message_template_00008:
   id: 8
   status: recall_overdue_item
   title: Recall overdue item
   body: Recall overdue item
   position: 8
-
-
-
-# == Schema Information
-#
-# Table name: message_templates
-#
-#  id         :integer         not null, primary key
-#  status     :string(255)     not null
-#  title      :text            not null
-#  body       :text            not null
-#  position   :integer
-#  created_at :datetime
-#  updated_at :datetime
-#  locale     :string(255)     default("ja")
-#
-
+  locale: ja
+message_template_00009:
+  id: 9
+  status: reservation_accepted_for_library
+  title: Reservation accepted
+  body: Reservation accepted
+  position: 9
+  locale: ja
+message_template_00010:
+  id: 10
+  status: item_received_for_library
+  title: Item received
+  body: Item received
+  position: 10
+  locale: ja

data/spec/fixtures/reserves.yml

@@ -117,6 +117,25 @@ reserve_00013:
   created_at: 2007-09-01 14:20:05.530854 +09:00
   expired_at: <%= 1.day.ago %>
   state: requested
+reserve_00014: 
+  updated_at: 2007-09-01 14:20:05.530854 +09:00
+  manifestation_id: 11
+  user_id: 4
+  request_status_type_id: 3
+  id: 14
+  created_at: 2007-09-01 14:20:05.530854 +09:00
+  expired_at: <%= 1.day.from_now %>
+  state: retained
+  item_id: 21
+reserve_00015: 
+  updated_at: 2007-09-01 14:20:05.530854 +09:00
+  manifestation_id: 11
+  user_id: 4
+  request_status_type_id: 3
+  id: 15
+  created_at: 2007-09-01 14:20:05.530854 +09:00
+  expired_at: <%= 1.day.from_now %>
+  state: requested
 
 # == Schema Information
 #

data/spec/models/reserve_spec.rb

@@ -5,16 +5,25 @@ describe Reserve do
   fixtures :all
 
   it "should have next reservation" do
-    reserves(:reserve_00001).next_reservation.should be_true
+    reserves(:reserve_00014).next_reservation.should be_true
+  end
+
+  it "should notify a next reservation" do
+    old_count = Message.count
+    reserve = reserves(:reserve_00014)
+    reserve.sm_expire!
+    reserve.state.should eq 'expired'
+    reserve.next_reservation.item.should eq reserve.item
+    Message.count.should eq old_count + 2
   end
 
   it "should expire reservation" do
-    reserves(:reserve_00001).expire
+    reserves(:reserve_00001).sm_expire!
     reserves(:reserve_00001).request_status_type.name.should eq 'Expired'
   end
 
   it "should cancel reservation" do
-    reserves(:reserve_00001).cancel
+    reserves(:reserve_00001).sm_cancel!
     reserves(:reserve_00001).canceled_at.should be_true
     reserves(:reserve_00001).request_status_type.name.should eq 'Cannot Fulfill Request'
   end
@@ -26,7 +35,7 @@ describe Reserve do
   it "should send accepted message" do
     old_admin_count = User.find('admin').received_messages.count
     old_user_count = reserves(:reserve_00002).user.received_messages.count
-    reserves(:reserve_00002).send_message('accepted').should be_true
+    reserves(:reserve_00002).send_message.should be_true
     # 予約者と図書館の両方に送られる
     User.find('admin').received_messages.count.should eq old_admin_count + 1
     reserves(:reserve_00002).user.received_messages.count.should eq old_user_count + 1
@@ -34,8 +43,8 @@ describe Reserve do
 
   it "should send expired message" do
     old_count = MessageRequest.count
-    reserves(:reserve_00002).send_message('expired').should be_true
-    MessageRequest.count.should eq old_count + 1
+    reserves(:reserve_00006).send_message.should be_true
+    MessageRequest.count.should eq old_count + 2
   end
 
   it "should send message to library" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enju_circulation
 version: !ruby/object:Gem::Version
-  version: 0.0.27
+  version: 0.0.28
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-20 00:00:00.000000000 Z
+date: 2012-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70223734698380 !ruby/object:Gem::Requirement
+  requirement: &70274896189320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70223734698380
+  version_requirements: *70274896189320
 - !ruby/object:Gem::Dependency
   name: simple_form
-  requirement: &70223734697500 !ruby/object:Gem::Requirement
+  requirement: &70274896188900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70223734697500
+  version_requirements: *70274896188900
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &70223734696600 !ruby/object:Gem::Requirement
+  requirement: &70274896188380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70223734696600
+  version_requirements: *70274896188380
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &70223734695740 !ruby/object:Gem::Requirement
+  requirement: &70274896187860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70223734695740
+  version_requirements: *70274896187860
 - !ruby/object:Gem::Dependency
   name: validates_timeliness
-  requirement: &70223734694480 !ruby/object:Gem::Requirement
+  requirement: &70274896187300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70223734694480
+  version_requirements: *70274896187300
 - !ruby/object:Gem::Dependency
   name: attribute_normalizer
-  requirement: &70223734709580 !ruby/object:Gem::Requirement
+  requirement: &70274896186560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70223734709580
+  version_requirements: *70274896186560
 - !ruby/object:Gem::Dependency
   name: inherited_resources
-  requirement: &70223734709060 !ruby/object:Gem::Requirement
+  requirement: &70274896185940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70223734709060
+  version_requirements: *70274896185940
 - !ruby/object:Gem::Dependency
   name: state_machine
-  requirement: &70223734708200 !ruby/object:Gem::Requirement
+  requirement: &70274896185480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70223734708200
+  version_requirements: *70274896185480
 - !ruby/object:Gem::Dependency
   name: friendly_id
-  requirement: &70223734706920 !ruby/object:Gem::Requirement
+  requirement: &70274896184820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: '4.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70223734706920
+  version_requirements: *70274896184820
 - !ruby/object:Gem::Dependency
   name: sunspot_rails
-  requirement: &70223734706280 !ruby/object:Gem::Requirement
+  requirement: &70274896184220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70223734706280
+  version_requirements: *70274896184220
 - !ruby/object:Gem::Dependency
   name: sunspot_solr
-  requirement: &70223734705400 !ruby/object:Gem::Requirement
+  requirement: &70274896183620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70223734705400
+  version_requirements: *70274896183620
 - !ruby/object:Gem::Dependency
   name: will_paginate
-  requirement: &70223734704900 !ruby/object:Gem::Requirement
+  requirement: &70274896199100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,32 +142,32 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70223734704900
+  version_requirements: *70274896199100
 - !ruby/object:Gem::Dependency
   name: acts_as_list
-  requirement: &70223734704380 !ruby/object:Gem::Requirement
+  requirement: &70274896198540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.5
+        version: 0.1.6
   type: :runtime
   prerelease: false
-  version_requirements: *70223734704380
+  version_requirements: *70274896198540
 - !ruby/object:Gem::Dependency
   name: enju_message
-  requirement: &70223734703800 !ruby/object:Gem::Requirement
+  requirement: &70274896198040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.13
+        version: 0.0.17
   type: :runtime
   prerelease: false
-  version_requirements: *70223734703800
+  version_requirements: *70274896198040
 - !ruby/object:Gem::Dependency
   name: enju_event
-  requirement: &70223734703160 !ruby/object:Gem::Requirement
+  requirement: &70274896197380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,10 +175,10 @@ dependencies:
         version: 0.0.12
   type: :runtime
   prerelease: false
-  version_requirements: *70223734703160
+  version_requirements: *70274896197380
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70223734702660 !ruby/object:Gem::Requirement
+  requirement: &70274896196820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,10 +186,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70223734702660
+  version_requirements: *70274896196820
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70223734726340 !ruby/object:Gem::Requirement
+  requirement: &70274896196140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -197,10 +197,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70223734726340
+  version_requirements: *70274896196140
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
-  requirement: &70223734725500 !ruby/object:Gem::Requirement
+  requirement: &70274896195360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -208,10 +208,10 @@ dependencies:
         version: '3.1'
   type: :development
   prerelease: false
-  version_requirements: *70223734725500
+  version_requirements: *70274896195360
 - !ruby/object:Gem::Dependency
   name: sunspot-rails-tester
-  requirement: &70223734723740 !ruby/object:Gem::Requirement
+  requirement: &70274896194720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -219,7 +219,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70223734723740
+  version_requirements: *70274896194720
 description: Circulation management for Next-L Enju
 email:
 - tanabe@mwr.mediacom.keio.ac.jp
@@ -525,9 +525,11 @@ files:
 - spec/dummy/db/migrate/20081025083905_create_languages.rb
 - spec/dummy/db/migrate/20100211105551_add_admin_networks_to_library_group.rb
 - spec/dummy/db/migrate/20100222124420_add_allow_bookmark_external_url_to_library_group.rb
+- spec/dummy/db/migrate/20101212070145_add_acquired_at_to_item.rb
 - spec/dummy/db/migrate/20110115022329_add_position_to_library_group.rb
 - spec/dummy/db/migrate/20110222073537_add_url_to_library_group.rb
 - spec/dummy/db/migrate/20110913115320_add_lft_and_rgt_to_message.rb
+- spec/dummy/db/migrate/20110916091020_add_volume_number_to_manifestation.rb
 - spec/dummy/db/migrate/20111020063828_remove_dsbl_from_library_group.rb
 - spec/dummy/db/migrate/20111201121844_create_roles.rb
 - spec/dummy/db/migrate/20111201155456_create_users.rb
@@ -755,9 +757,11 @@ test_files:
 - spec/dummy/db/migrate/20081025083905_create_languages.rb
 - spec/dummy/db/migrate/20100211105551_add_admin_networks_to_library_group.rb
 - spec/dummy/db/migrate/20100222124420_add_allow_bookmark_external_url_to_library_group.rb
+- spec/dummy/db/migrate/20101212070145_add_acquired_at_to_item.rb
 - spec/dummy/db/migrate/20110115022329_add_position_to_library_group.rb
 - spec/dummy/db/migrate/20110222073537_add_url_to_library_group.rb
 - spec/dummy/db/migrate/20110913115320_add_lft_and_rgt_to_message.rb
+- spec/dummy/db/migrate/20110916091020_add_volume_number_to_manifestation.rb
 - spec/dummy/db/migrate/20111020063828_remove_dsbl_from_library_group.rb
 - spec/dummy/db/migrate/20111201121844_create_roles.rb
 - spec/dummy/db/migrate/20111201155456_create_users.rb