enju_circulation 0.1.0.pre29 → 0.1.0.pre30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f818abc7b9566cdf39f95005c822f9895ae70a4
-  data.tar.gz: 1c6fd9aa80c1631f0c9f21a28168e277a821f1bd
+  metadata.gz: 8dbf3fb60c92de38186b82e95b2ea02ff3a112d1
+  data.tar.gz: 31b6b46ac20f36492f6bdb762d8eadb86e3e63ed
 SHA512:
-  metadata.gz: 1e767dba30b7f1168927a819a2f1dabc7ce7a6170017768ecec84442b487f05d5dfa387a6dbfc05495efcb02cb3fd560ad1b039afdb356d0238ab257741ea570
-  data.tar.gz: 27f19d72a3818702207bdafaa4537d2ec75c9a49a35328b6f9d4ebb83811418e16b6a614e308e925b047c4f40c0fb503485e97295120725fe17710931626f0c7
+  metadata.gz: bf67fb8f4655461cdd989df7fd2c59c786ea40f7a27d3afcdf53f15b8adaa76ad7801dcdf29a05a5dddd861a9349a7a89fac3c427538bebb39ba9c1b64728ae3
+  data.tar.gz: 1e183fb62ca465171cc45208e82b1d0e37681af276cb37dc42e066db054f4707aae494287234433262b239090be017fe232e0b0099a0bfffec7122780690c4cf

data/app/models/checked_item.rb

@@ -1,5 +1,5 @@
 class CheckedItem < ActiveRecord::Base
-  attr_accessible :item_identifier, :ignore_restriction
+  attr_accessible :item_identifier, :ignore_restriction, :due_date_string
   belongs_to :item #, :validate => true
   belongs_to :basket #, :validate => true
   belongs_to :librarian, :class_name => 'User' #, :validate => true
@@ -8,13 +8,15 @@ class CheckedItem < ActiveRecord::Base
   validates_presence_of :item, :basket, :due_date, :on => :update
   validates_uniqueness_of :item_id, :scope => :basket_id
   validate :available_for_checkout?, :on => :create
+  validates :due_date_string, :format => {:with => /\A\[{0,1}\d+([\/-]\d{0,2}){0,2}\]{0,1}\z/}, :allow_blank => true
+  validate :check_due_date
  
   before_validation :set_item
   before_validation :set_due_date, :on => :create
   normalize_attributes :item_identifier
 
   attr_protected :user_id
-  attr_accessor :item_identifier, :ignore_restriction
+  attr_accessor :item_identifier, :ignore_restriction, :due_date_string
 
   def available_for_checkout?
     if self.item.blank?
@@ -80,27 +82,30 @@ class CheckedItem < ActiveRecord::Base
   end
 
   def set_due_date
-    return nil unless self.item_checkout_type
-
-    lending_rule = self.item.lending_rule(self.basket.user)
-    return nil if lending_rule.nil?
-
-    if lending_rule.fixed_due_date.blank?
-      #self.due_date = item_checkout_type.checkout_period.days.since Time.zone.today
-      self.due_date = lending_rule.loan_period.days.since(Time.zone.now).end_of_day
+    return nil unless item_checkout_type
+    if due_date_string.present?
+      self.due_date = Time.zone.parse(due_date_string).try(:end_of_day)
     else
-      #self.due_date = item_checkout_type.fixed_due_date
-      self.due_date = lending_rule.fixed_due_date.tomorrow.end_of_day
-    end
-    # 返却期限日が閉館日の場合
-    while item.shelf.library.closed?(due_date)
-      if item_checkout_type.set_due_date_before_closing_day
-        self.due_date = due_date.yesterday.end_of_day
+      lending_rule = item.lending_rule(basket.user)
+      return nil if lending_rule.nil?
+
+      if lending_rule.fixed_due_date.blank?
+        #self.due_date = item_checkout_type.checkout_period.days.since Time.zone.today
+        self.due_date = lending_rule.loan_period.days.since(Time.zone.now).end_of_day
       else
-        self.due_date = due_date.tomorrow.end_of_day
+        #self.due_date = item_checkout_type.fixed_due_date
+        self.due_date = lending_rule.fixed_due_date.tomorrow.end_of_day
+      end
+      # 返却期限日が閉館日の場合
+      while item.shelf.library.closed?(due_date)
+        if item_checkout_type.set_due_date_before_closing_day
+          self.due_date = due_date.yesterday.end_of_day
+        else
+          self.due_date = due_date.tomorrow.end_of_day
+        end
       end
     end
-    return self.due_date
+    return due_date
   end
 
   def set_item
@@ -110,6 +115,14 @@ class CheckedItem < ActiveRecord::Base
       self.item = item
     end
   end
+
+  private
+  def check_due_date
+    return nil unless due_date
+    if due_date <= Time.zone.now
+      errors.add(:due_date)
+    end
+  end
 end
 
 # == Schema Information

data/app/models/reserve.rb

@@ -21,7 +21,7 @@ class Reserve < ActiveRecord::Base
   scope :not_sent_expiration_notice_to_library, where(:state => 'expired', :expiration_notice_to_library => false)
   scope :sent_expiration_notice_to_patron, where(:state => 'expired', :expiration_notice_to_patron => true)
   scope :sent_expiration_notice_to_library, where(:state => 'expired', :expiration_notice_to_library => true)
-  scope :not_sent_cancel_notice_to_patron, where(:state => 'canceled', :expiration_notice_to_patron => false)
+  scope :not_sent_cancel_notice_to_agent, where(:state => 'canceled', :expiration_notice_to_patron => false)
   scope :not_sent_cancel_notice_to_library, where(:state => 'canceled', :expiration_notice_to_library => false)
 
   belongs_to :user #, :validate => true
@@ -209,9 +209,9 @@ class Reserve < ActiveRecord::Base
     Reserve.transaction do
       case state
       when 'requested'
-        message_template_to_patron = MessageTemplate.localized_template('reservation_accepted_for_patron', user.locale)
+        message_template_to_agent = MessageTemplate.localized_template('reservation_accepted_for_patron', user.locale)
         request = MessageRequest.new
-        request.assign_attributes({:sender => sender, :receiver => user, :message_template => message_template_to_patron}, :as => :admin)
+        request.assign_attributes({:sender => sender, :receiver => user, :message_template => message_template_to_agent}, :as => :admin)
         request.save_message_body(:manifestations => Array[manifestation], :user => user)
         request.sm_send_message! # 受付時は即時送信
         message_template_to_library = MessageTemplate.localized_template('reservation_accepted_for_library', user.locale)
@@ -220,9 +220,9 @@ class Reserve < ActiveRecord::Base
         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', user.locale)
+        message_template_to_agent = MessageTemplate.localized_template('reservation_canceled_for_patron', user.locale)
         request = MessageRequest.new
-        request.assign_attributes({:sender => sender, :receiver => user, :message_template => message_template_to_patron}, :as => :admin)
+        request.assign_attributes({:sender => sender, :receiver => user, :message_template => message_template_to_agent}, :as => :admin)
         request.save_message_body(:manifestations => Array[manifestation], :user => user)
         request.sm_send_message! # キャンセル時は即時送信
         message_template_to_library = MessageTemplate.localized_template('reservation_canceled_for_library', user.locale)
@@ -231,9 +231,9 @@ class Reserve < ActiveRecord::Base
         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', user.locale)
+        message_template_to_agent = MessageTemplate.localized_template('reservation_expired_for_patron', user.locale)
         request = MessageRequest.new
-        request.assign_attributes({:sender => sender, :receiver => user, :message_template => message_template_to_patron}, :as => :admin)
+        request.assign_attributes({:sender => sender, :receiver => user, :message_template => message_template_to_agent}, :as => :admin)
         request.save_message_body(:manifestations => Array[manifestation], :user => user)
         request.sm_send_message!
         self.update_attribute(:expiration_notice_to_patron, true)
@@ -337,7 +337,7 @@ class Reserve < ActiveRecord::Base
 
       expired_period = manifestation.try(:reservation_expired_period, user)
       if expired_period.nil?
-        errors[:base] << I18n.t('reserve.this_patron_cannot_reserve')
+        errors[:base] << I18n.t('reserve.this_agent_cannot_reserve')
       end
     end
   end

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

@@ -4,9 +4,11 @@
 <%= form_for :checked_item, :html => {:method => :post}, :url => basket_checked_items_path(@basket), :remote => true do |f| -%>
   <%= f.error_messages -%>
   <p>
-    <%= label_tag :item_identifier, t('activerecord.attributes.item.item_identifier') -%>: <%= f.search_field :item_identifier -%>
+    <%= f.label :item_identifier, t('activerecord.attributes.item.item_identifier') -%>: <%= f.search_field :item_identifier -%>
+    <%= f.submit t('page.read'), 'data-disable-with' => t('page.saving') -%><br />
+    <%= f.label :due_date %>
+    <%= f.text_field :due_date_string, :class => 'date_text_field', :placeholder => "#{t('page.example')}: #{1.month.from_now.strftime('%Y-%m-%d')}" %>
     <%= t('checked_item.ignore_restriction') -%>: <%= f.check_box :ignore_restriction -%>
-    <%= f.submit t('page.read'), 'data-disable-with' => t('page.saving') -%>
   </p>
 <%- end -%>
 

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

@@ -3,13 +3,13 @@
   (<%= link_to t('reserve.bibliographic_detail'), reserve.manifestation %>)
     <br />
     <%- if reserve.manifestation.creators.readable_by(current_user).exists? -%>
-      <%= t('patron.creator') -%>: <%= patrons_list(reserve.manifestation.creators.readable_by(current_user)) -%>
+      <%= t('agent.creator') -%>: <%= agents_list(reserve.manifestation.creators.readable_by(current_user)) -%>
     <%- end -%>
     <%- if reserve.manifestation.contributors.readable_by(current_user).exists? -%>
-      <%= t('patron.contributor') -%>: <%= patrons_list(reserve.manifestation.contributors.readable_by(current_user)) -%>
+      <%= t('agent.contributor') -%>: <%= agents_list(reserve.manifestation.contributors.readable_by(current_user)) -%>
     <%- end -%>
     <%- if reserve.manifestation.publishers.readable_by(current_user).exists? -%>
-      <%= t('patron.publisher') -%>: <%= patrons_list(reserve.manifestation.publishers.readable_by(current_user)) -%>
+      <%= t('agent.publisher') -%>: <%= agents_list(reserve.manifestation.publishers.readable_by(current_user)) -%>
       <%- if reserve.manifestation.pub_date.present? -%>
         (<%= reserve.manifestation.pub_date -%>)
       <%- end -%>

data/lib/enju_circulation/version.rb

@@ -1,3 +1,3 @@
 module EnjuCirculation
-  VERSION = "0.1.0.pre29"
+  VERSION = "0.1.0.pre30"
 end

data/spec/controllers/checked_items_controller_spec.rb

@@ -258,13 +258,27 @@ describe CheckedItemsController do
         response.should redirect_to basket_checked_items_url(assigns(:checked_item).basket)
       end
 
-      it "should create checked_item" do
+      it "should create checked_item with item_identifier" do
         post :create, :checked_item => {:item_identifier => '00011'}, :basket_id => 3
         assigns(:checked_item).should be_true
         assigns(:checked_item).due_date.should_not be_nil
         response.should redirect_to basket_checked_items_url(assigns(:checked_item).basket)
       end 
 
+      it "should override due_date" do
+        post :create, :checked_item => {:item_identifier => '00011', :due_date_string => 1.year.from_now.strftime('%Y-%m-%d')}, :basket_id => 3
+        assigns(:checked_item).should be_true
+        assigns(:checked_item).due_date.should eq 1.year.from_now.end_of_day
+        response.should redirect_to basket_checked_items_url(assigns(:checked_item).basket)
+      end 
+
+      it "should not create checked_item with an invalid due_date" do
+        post :create, :checked_item => {:item_identifier => '00011', :due_date_string => "invalid"}, :basket_id => 3
+        assigns(:checked_item).should_not be_valid
+        assigns(:checked_item).due_date.should be_nil
+        response.should be_success
+      end 
+
       it "should not create checked_item if excessed checkout_limit" do
         post :create, :checked_item => {:item_identifier => '00011'}, :basket_id => 1
         response.should be_success

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

@@ -1,4 +1,4 @@
-class LocalPatron
+class LocalAgent
   def initialize(user)
     @user = user
   end

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

@@ -48,7 +48,7 @@ class User < ActiveRecord::Base
   end
 
   def patron
-    LocalPatron.new(self)
+    LocalAgent.new(self)
   end
 
   def full_name

data/spec/dummy/db/migrate/001_create_agents.rb

@@ -1,6 +1,6 @@
-class CreatePatrons < ActiveRecord::Migration
+class CreateAgents < ActiveRecord::Migration
   def change
-    create_table :patrons do |t|
+    create_table :agents do |t|
       t.integer :user_id
       t.string :last_name
       t.string :middle_name
@@ -35,7 +35,7 @@ class CreatePatrons < ActiveRecord::Migration
       t.datetime :date_of_death
       t.integer :language_id, :default => 1, :null => false
       t.integer :country_id, :default => 1, :null => false
-      t.integer :patron_type_id, :default => 1, :null => false
+      t.integer :agent_type_id, :default => 1, :null => false
       t.integer :lock_version, :default => 0, :null => false
       t.text :note
       t.integer :creates_count, :default => 0, :null => false
@@ -49,10 +49,10 @@ class CreatePatrons < ActiveRecord::Migration
       t.text :email
       t.text :url
     end
-    add_index :patrons, :user_id, :unique => true
-    add_index :patrons, :language_id
-    add_index :patrons, :country_id
-    add_index :patrons, :required_role_id
-    add_index :patrons, :full_name
+    add_index :agents, :user_id, :unique => true
+    add_index :agents, :language_id
+    add_index :agents, :country_id
+    add_index :agents, :required_role_id
+    add_index :agents, :full_name
   end
 end

data/spec/dummy/db/migrate/012_create_owns.rb

@@ -1,12 +1,12 @@
 class CreateOwns < ActiveRecord::Migration
   def change
     create_table :owns do |t|
-      t.references :patron, :null => false
+      t.references :agent, :null => false
       t.references :item, :null => false
       t.integer :position
       t.timestamps
     end
-    add_index :owns, :patron_id
+    add_index :owns, :agent_id
     add_index :owns, :item_id
   end
 end

data/spec/dummy/db/migrate/015_create_creates.rb

@@ -1,12 +1,12 @@
 class CreateCreates < ActiveRecord::Migration
   def change
     create_table :creates do |t|
-      t.references :patron, :null => false
+      t.references :agent, :null => false
       t.references :work, :null => false
       t.integer :position
       t.timestamps
     end
-    add_index :creates, :patron_id
+    add_index :creates, :agent_id
     add_index :creates, :work_id
   end
 end

data/spec/dummy/db/migrate/047_create_produces.rb

@@ -1,12 +1,12 @@
 class CreateProduces < ActiveRecord::Migration
   def change
     create_table :produces do |t|
-      t.references :patron, :null => false
+      t.references :agent, :null => false
       t.references :manifestation, :null => false
       t.integer :position
       t.timestamps
     end
-    add_index :produces, :patron_id
+    add_index :produces, :agent_id
     add_index :produces, :manifestation_id
   end
 end

data/spec/dummy/db/migrate/059_create_libraries.rb

@@ -1,7 +1,7 @@
 class CreateLibraries < ActiveRecord::Migration
   def self.up
     create_table :libraries do |t|
-      t.references :patron, :polymorphic => true
+      t.references :agent, :polymorphic => true
       t.string :name, :null => false
       t.text :display_name
       t.string :short_display_name, :null => false
@@ -23,7 +23,7 @@ class CreateLibraries < ActiveRecord::Migration
       t.timestamps
       t.datetime :deleted_at
     end
-    add_index :libraries, :patron_id, :unique => true
+    add_index :libraries, :agent_id, :unique => true
     add_index :libraries, :library_group_id
     add_index :libraries, :name, :unique => true
   end

data/spec/dummy/db/migrate/125_create_donates.rb

@@ -1,12 +1,12 @@
 class CreateDonates < ActiveRecord::Migration
   def change
     create_table :donates do |t|
-      t.integer :patron_id, :null => false
+      t.integer :agent_id, :null => false
       t.integer :item_id, :null => false
 
       t.timestamps
     end
-    add_index :donates, :patron_id
+    add_index :donates, :agent_id
     add_index :donates, :item_id
   end
 end

data/spec/dummy/db/migrate/20080830154109_create_realizes.rb

@@ -1,13 +1,13 @@
 class CreateRealizes < ActiveRecord::Migration
   def change
     create_table :realizes do |t|
-      t.references :patron, :null => false
+      t.references :agent, :null => false
       t.references :expression, :null => false
       t.integer :position
 
       t.timestamps
     end
-    add_index :realizes, :patron_id
+    add_index :realizes, :agent_id
     add_index :realizes, :expression_id
   end
 end

data/spec/dummy/db/migrate/20080905191442_create_agent_types.rb

@@ -1,6 +1,6 @@
-class CreatePatronTypes < ActiveRecord::Migration
+class CreateAgentTypes < ActiveRecord::Migration
   def change
-    create_table :patron_types do |t|
+    create_table :agent_types do |t|
       t.string :name, :null => false
       t.text :display_name
       t.text :note

data/spec/dummy/db/migrate/20090812151902_create_agent_relationship_types.rb

@@ -1,6 +1,6 @@
-class CreatePatronRelationshipTypes < ActiveRecord::Migration
+class CreateAgentRelationshipTypes < ActiveRecord::Migration
   def change
-    create_table :patron_relationship_types do |t|
+    create_table :agent_relationship_types do |t|
       t.string :name, :null => false
       t.text :display_name
       t.text :note

data/spec/dummy/db/migrate/20091012101112_add_dcndl_schema.rb

@@ -1,7 +1,7 @@
 class AddDcndlSchema < ActiveRecord::Migration
   def self.up
     add_column :manifestations, :title_alternative_transcription, :text
-    add_column :patrons, :full_name_alternative_transcription, :text
+    add_column :agents, :full_name_alternative_transcription, :text
     add_column :manifestations, :description, :text
     add_column :manifestations, :abstract, :text
     add_column :manifestations, :available_at, :timestamp
@@ -14,7 +14,7 @@ class AddDcndlSchema < ActiveRecord::Migration
 
   def self.down
     remove_column :manifestations, :title_alternative_transcription
-    remove_column :patrons, :full_name_alternative_transcription
+    remove_column :agents, :full_name_alternative_transcription
     remove_column :manifestations, :description
     remove_column :manifestations, :abstract
     remove_column :manifestations, :available_at

data/spec/dummy/db/migrate/20100606073747_create_agent_relationships.rb

@@ -1,13 +1,13 @@
-class CreatePatronRelationships < ActiveRecord::Migration
+class CreateAgentRelationships < ActiveRecord::Migration
   def change
-    create_table :patron_relationships do |t|
+    create_table :agent_relationships do |t|
       t.integer :parent_id
       t.integer :child_id
-      t.integer :patron_relationship_type_id
+      t.integer :agent_relationship_type_id
 
       t.timestamps
     end
-    add_index :patron_relationships, :parent_id
-    add_index :patron_relationships, :child_id
+    add_index :agent_relationships, :parent_id
+    add_index :agent_relationships, :child_id
   end
 end

data/spec/dummy/db/migrate/20100814091104_add_position_to_agent_relationship.rb

@@ -1,11 +1,11 @@
-class AddPositionToPatronRelationship < ActiveRecord::Migration
+class AddPositionToAgentRelationship < ActiveRecord::Migration
   def self.up
     add_column :manifestation_relationships, :position, :integer
-    add_column :patron_relationships, :position, :integer
+    add_column :agent_relationships, :position, :integer
   end
 
   def self.down
-    remove_column :patron_relationships, :position
+    remove_column :agent_relationships, :position
     remove_column :manifestation_relationships, :position
   end
 end

data/spec/dummy/db/migrate/20110301121550_add_birth_date_and_death_date_to_agent.rb

@@ -1,11 +1,11 @@
-class AddBirthDateAndDeathDateToPatron < ActiveRecord::Migration
+class AddBirthDateAndDeathDateToAgent < ActiveRecord::Migration
   def self.up
-    add_column :patrons, :birth_date, :string
-    add_column :patrons, :death_date, :string
+    add_column :agents, :birth_date, :string
+    add_column :agents, :death_date, :string
   end
 
   def self.down
-    remove_column :patrons, :death_date
-    remove_column :patrons, :birth_date
+    remove_column :agents, :death_date
+    remove_column :agents, :birth_date
   end
 end