enju_circulation 0.1.0.pre12 → 0.1.0.pre13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bfd5c7351216dfcfe77a9f0633f7f5a87468263d
-  data.tar.gz: 30b2ead9534a1a72aefcaafbe9aa1296a49e3844
+  metadata.gz: 5845944eef1f0c2d1777fe6ba7df3fd6f2e377f9
+  data.tar.gz: f5c62000d43b8ed38a57bbd1ecc09ef11248300b
 SHA512:
-  metadata.gz: 46fc0a5edfe11edb9262fba52a01e2ea43c43e0c0d016430eb5a9d7b8d5914e8a1429ebca6962e7472b485ed39681cc65d5a0cb1d5ba99dd43674610b1e04448
-  data.tar.gz: 94d674c0ef4142a6a2a624d9febf0efa0a695dc6ba0a70f1ecc9100680aa79a201d47ca7fb9d1928cd2770bbcf36fd120e6d4ab3f638faebd7c877e449e2061d
+  metadata.gz: 770526489dcf4b8292fe358f400edb66528c31851ece78572c00a05045bf8ca0d2b80eec80973f54898075aed3e19d8a074f752458a08361103ba67d27d68e14
+  data.tar.gz: fd05f0a45c2b765b1c387dce82a4c6286ec4ba45beb0311da096e1c48d19b6cb7abbe13a6e68c11334e9a1342dce68a7a897506dbda8a26d90a23a565429c68f

data/app/controllers/reserves_controller.rb

@@ -25,6 +25,16 @@ class ReservesController < ApplicationController
 
     search = Reserve.search
     query = @query = params[:query].to_s.strip
+    sort_by = params[:sort_by].to_s.downcase
+    if sort_by == 'title'
+      @sort_by = :title
+      sort_column = :title_transcription
+      order = :asc
+    else
+      @sort_by = :created_at
+      sort_column = :created_at
+      order = :desc
+    end
     if params[:format].to_s.downcase == 'csv'
       page = 1
       per_page = 65534
@@ -82,7 +92,7 @@ class ReservesController < ApplicationController
       if reserved_to
         with(:created_at).less_than reserved_to.tomorrow.beginning_of_day
       end
-      order_by :created_at, :desc
+      order_by sort_column, order
       with(:state).equal_to state if state
       facet :state
       paginate :page => page.to_i, :per_page => per_page
@@ -191,10 +201,12 @@ class ReservesController < ApplicationController
       if params[:mode] == 'cancel'
         @reserve.sm_cancel!
       else
-        unless @reserve.retained?
-          if @reserve.item and @reserve.force_retaining == '1'
+        if @reserve.retained?
+          if @reserve.item_identifier and @reserve.force_retaining == '1'
             @reserve.sm_retain!
           end
+        else
+          @reserve.sm_retain! if @reserve.item_identifier
         end
       end
     end

data/app/models/reserve.rb

@@ -24,14 +24,18 @@ class Reserve < ActiveRecord::Base
   scope :not_sent_cancel_notice_to_patron, 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
-  belongs_to :manifestation, :validate => true
-  belongs_to :librarian, :class_name => 'User', :validate => true
-  belongs_to :item, :validate => true
+  belongs_to :user #, :validate => true
+  belongs_to :manifestation #, :validate => true
+  belongs_to :librarian, :class_name => 'User' #, :validate => true
+  belongs_to :item #, :validate => true
   belongs_to :request_status_type
 
-  validates_associated :user, :librarian, :item, :request_status_type, :manifestation
-  validates_presence_of :user, :manifestation, :request_status_type #, :expired_at
+  validates_associated :user, :librarian, :request_status_type
+  validates :manifestation, :associated => true #, :on => :create
+  validates_presence_of :user, :request_status_type
+  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
@@ -70,7 +74,7 @@ class Reserve < ActiveRecord::Base
   attr_accessor :user_number, :item_identifier, :force_retaining
 
   state_machine :initial => :pending do
-    before_transition :pending => :requested, :do => :do_request
+    before_transition [:pending, :postponed] => :requested, :do => :do_request
     before_transition :retained => :postponed, :do => :postpone
     before_transition [:pending, :requested, :retained, :postponed] => :retained, :do => :retain
     before_transition [:pending ,:requested, :retained, :postponed] => :canceled, :do => :cancel
@@ -134,6 +138,9 @@ class Reserve < ActiveRecord::Base
       self.hold.include?(reserve)
     end
     string :state
+    string :title_transcription do
+      manifestation.try(:title_transcription)
+    end
   end
 
   def set_manifestation
@@ -165,8 +172,8 @@ class Reserve < ActiveRecord::Base
 
   def retained_by_other_user?
     return nil if force_retaining == '1'
-    if item
-      if Reserve.retained.where(:item_id => item.item_identifier).first
+    if item and !retained?
+      if Reserve.retained.where(:item_id => item.item_identifier).count > 0
         errors[:base] << I18n.t('reserve.attempt_to_update_retained_reservation')
       end
     end
@@ -182,8 +189,10 @@ class Reserve < ActiveRecord::Base
         if self.expired_at.blank?
           expired_period = self.manifestation.reservation_expired_period(self.user)
           self.expired_at = (expired_period + 1).days.from_now.beginning_of_day
-        elsif self.expired_at.beginning_of_day < Time.zone.now
-          errors[:base] << I18n.t('reserve.invalid_date')
+        elsif !completed?
+          if self.expired_at.beginning_of_day < Time.zone.now
+            errors[:base] << I18n.t('reserve.invalid_date')
+          end
         end
       end
     end
@@ -404,7 +413,7 @@ class Reserve < ActiveRecord::Base
   end
 
   def manifestation_must_include_item
-    unless item_id.blank?
+    if item_id.present? and !completed?
       errors[:base] << I18n.t('reserve.invalid_item') unless manifestation.items.include?(item)
     end
   end

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

@@ -1,5 +1,6 @@
-<strong><%= link_to title_with_volume_number(reserve.manifestation), reserve -%></strong>
-(<%= link_to t('reserve.bibliographic_detail'), reserve.manifestation %>)
+<% if reserve.manifestation %>
+  <strong><%= link_to title_with_volume_number(reserve.manifestation), reserve -%></strong>
+  (<%= 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)) -%>
@@ -18,3 +19,4 @@
       <%= link_to reserve.manifestation.access_address, reserve.manifestation.access_address -%>
       <%= link_to image_tag('icons/world_go.png', :size => '16x16', :alt => 'Web'), reserve.manifestation.access_address -%>
     <%- end -%>
+<% end %>

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

@@ -33,6 +33,11 @@
     <%= 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>
 
+  <p>
+    <strong><%= t('activerecord.attributes.reserve.state') -%>:</strong>
+    <%= i18n_state(@reserve.state) -%>
+  </p>
+
   <% unless @reserve.errors[:base].empty? %>
     <div class="field">
       <%= f.label :force_retaining %><br />

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

@@ -16,6 +16,20 @@
 <%- end -%>
 </div>
 
+<p>
+  <%= t('page.sort_by') -%>:
+  <%- if @sort_by == :created_at -%>
+    <strong><%= t('activerecord.attributes.reserve.created_at') -%></strong>
+  <%- else -%>
+    <%= link_to t('activerecord.attributes.reserve.created_at'), url_for(params.merge(:sort_by => nil, :only_path => true)) -%>
+  <% end %>
+  <%- if @sort_by == :title -%>
+    <strong><%= t('page.title') -%></strong>
+  <%- else -%>
+    <%= link_to t('page.title'), url_for(params.merge(:sort_by => 'title', :only_path => true)) -%>
+  <%- end -%>
+</p>
+
 <table class="table table-striped index">
   <tr>
     <th style="width: 30px">ID</th>

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

@@ -3,11 +3,11 @@
 <div id="content_list">
 <p id="notice"><%= notice %></p>
 
-<%= render 'manifestations/title', :manifestation => @reserve.manifestation -%>
+<%= render 'manifestations/title', :manifestation => @reserve.manifestation if @reserve.manifestation -%>
 
 <p>
   <strong><%= t('activerecord.models.manifestation') -%>:</strong>
-  <%= link_to @reserve.manifestation.original_title, @reserve.manifestation -%>
+  <%= link_to @reserve.manifestation.original_title, @reserve.manifestation if @reserve.manifestation -%>
 </p>
 
 <p>
@@ -60,7 +60,7 @@
 </div>
 
 <div id="submenu" class="ui-corner-all">
-  <%= render 'manifestations/book_jacket', :manifestation => @reserve.manifestation -%>
+  <%= render 'manifestations/book_jacket', :manifestation => @reserve.manifestation if @reserve.manifestation -%>
   <ul>
     <li><%= link_to t('page.edit'), edit_reserve_path(@reserve) -%></li>
     <%- if @reserve.user.reserves.waiting.include?(@reserve) -%>

data/lib/enju_circulation/version.rb

@@ -1,3 +1,3 @@
 module EnjuCirculation
-  VERSION = "0.1.0.pre12"
+  VERSION = "0.1.0.pre13"
 end

data/spec/controllers/reserves_controller_spec.rb

@@ -574,12 +574,14 @@ describe ReservesController do
         put :update, :id => 15, :reserve => {:item_identifier => '00021'}
         assigns(:reserve).should_not be_valid
         response.should be_success
+        assigns(:reserve).state.should eq 'requested'
         reserves(:reserve_00014).state.should eq 'retained'
       end
 
       it "should update retained reservations if force_retaining is enabled" do
         put :update, :id => 15, :reserve => {:item_identifier => '00021', :force_retaining => '1'}
         assigns(:reserve).should be_valid
+        assigns(:reserve).state.should eq 'retained'
         response.should redirect_to reserve_url(assigns(:reserve))
         reserves(:reserve_00014).state.should eq 'postponed'
       end

data/spec/dummy/db/migrate/20081027150907_create_picture_files.rb

@@ -0,0 +1,15 @@
+class CreatePictureFiles < ActiveRecord::Migration
+  def change
+    create_table :picture_files do |t|
+      t.integer :picture_attachable_id
+      t.string :picture_attachable_type
+      t.string :content_type
+      t.text :title
+      t.string :thumbnail
+      t.integer :position
+
+      t.timestamps
+    end
+    add_index :picture_files, [:picture_attachable_id, :picture_attachable_type], :name => "index_picture_files_on_picture_attachable_id_and_type"
+  end
+end

data/spec/dummy/db/schema.rb

@@ -260,7 +260,6 @@ ActiveRecord::Schema.define(:version => 20130304015019) do
     t.string   "state"
     t.integer  "required_score",              :default => 0,     :null => false
     t.datetime "acquired_at"
-    t.integer  "manifestation_id"
   end
 
   add_index "items", ["checkout_type_id"], :name => "index_items_on_checkout_type_id"
@@ -617,6 +616,19 @@ ActiveRecord::Schema.define(:version => 20130304015019) do
   add_index "patrons", ["required_role_id"], :name => "index_patrons_on_required_role_id"
   add_index "patrons", ["user_id"], :name => "index_patrons_on_user_id", :unique => true
 
+  create_table "picture_files", :force => true do |t|
+    t.integer  "picture_attachable_id"
+    t.string   "picture_attachable_type"
+    t.string   "content_type"
+    t.text     "title"
+    t.string   "thumbnail"
+    t.integer  "position"
+    t.datetime "created_at",              :null => false
+    t.datetime "updated_at",              :null => false
+  end
+
+  add_index "picture_files", ["picture_attachable_id", "picture_attachable_type"], :name => "index_picture_files_on_picture_attachable_id_and_type"
+
   create_table "produce_types", :force => true do |t|
     t.string   "name"
     t.text     "display_name"

data/spec/dummy/solr/data/test/index/_lj.frq

@@ -0,0 +1 @@
+

	

data/spec/fixtures/exemplifies.yml

@@ -145,6 +145,12 @@ exemplify_00024:
   manifestation_id: 3
   id: 24
   created_at: 2008-01-11 02:44:37.135721 +09:00
+exemplify_00025: 
+  updated_at: 2008-01-11 02:44:37.135721 +09:00
+  item_id: 25
+  manifestation_id: 8
+  id: 25
+  created_at: 2008-01-11 02:44:37.135721 +09:00
 
 
 # == Schema Information

data/spec/fixtures/items.yml

@@ -239,6 +239,16 @@ item_00024:
   id: 24
   include_supplements: false
   created_at: 2007-08-24 23:46:20.484813 +09:00
+item_00025: 
+  updated_at: 2007-08-24 23:46:20.484813 +09:00
+  item_identifier: '00025'
+  circulation_status_id: 8
+  checkout_type_id: 3
+  shelf_id: 2
+  call_number: 
+  id: 25
+  include_supplements: false
+  created_at: 2007-08-24 23:46:20.484813 +09:00
 
 
 # == Schema Information

data/spec/fixtures/reserves.yml

@@ -90,6 +90,7 @@ reserve_00010:
   expired_at: <%= 1.hour.ago %>
   checked_out_at: <%= 1.week.ago %>
   state: completed
+  item_id: 25
 reserve_00011: 
   updated_at: 2007-09-03 14:20:05.530854 +09:00
   manifestation_id: 7

data/spec/models/reserve_spec.rb

@@ -90,6 +90,13 @@ describe Reserve do
     reservation.save
     assert reservation.valid?.should eq false
   end
+
+  it "should be valid if the reservation is completed and its item is destroyed" do
+    reservation = reserves(:reserve_00010)
+    reservation.item.destroy
+    reservation.reload
+    assert reservation.should be_valid
+  end
 end
 
 # == Schema Information

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enju_circulation
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre12
+  version: 0.1.0.pre13
 platform: ruby
 authors:
 - Kosuke Tanabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-04 00:00:00.000000000 Z
+date: 2013-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -170,28 +170,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre21
+        version: 0.1.0.pre22
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre21
+        version: 0.1.0.pre22
 - !ruby/object:Gem::Dependency
   name: enju_library
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre9
+        version: 0.1.0.pre11
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre9
+        version: 0.1.0.pre11
 - !ruby/object:Gem::Dependency
   name: enju_export
   requirement: !ruby/object:Gem::Requirement
@@ -523,7 +523,6 @@ files:
 - spec/dummy/config/locales/ja.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/config.ru
-- spec/dummy/db/development.sqlite3
 - spec/dummy/db/migrate/001_create_patrons.rb
 - spec/dummy/db/migrate/005_create_manifestations.rb
 - spec/dummy/db/migrate/006_create_items.rb
@@ -548,6 +547,7 @@ files:
 - spec/dummy/db/migrate/20080905191442_create_patron_types.rb
 - spec/dummy/db/migrate/20081025083323_create_countries.rb
 - spec/dummy/db/migrate/20081025083905_create_languages.rb
+- spec/dummy/db/migrate/20081027150907_create_picture_files.rb
 - spec/dummy/db/migrate/20090812151902_create_patron_relationship_types.rb
 - spec/dummy/db/migrate/20091012101112_add_dcndl_schema.rb
 - spec/dummy/db/migrate/20091202124834_create_versions.rb
@@ -590,7 +590,6 @@ files:
 - spec/dummy/db/migrate/20120125152919_add_title_subseries_transcription_to_series_statement.rb
 - spec/dummy/db/migrate/20120224094141_create_delayed_jobs.rb
 - spec/dummy/db/migrate/20121116033446_add_doi_to_manifestation.rb
-- spec/dummy/db/migrate/20121119153944_add_manifestation_id_to_item.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/db/test.sqlite3
 - spec/dummy/public/404.html
@@ -611,16 +610,16 @@ files:
 - spec/dummy/solr/conf/spellings.txt
 - spec/dummy/solr/conf/stopwords.txt
 - spec/dummy/solr/conf/synonyms.txt
-- spec/dummy/solr/data/test/index/_5d.fdt
-- spec/dummy/solr/data/test/index/_5d.fdx
-- spec/dummy/solr/data/test/index/_5d.fnm
-- spec/dummy/solr/data/test/index/_5d.frq
-- spec/dummy/solr/data/test/index/_5d.nrm
-- spec/dummy/solr/data/test/index/_5d.prx
-- spec/dummy/solr/data/test/index/_5d.tii
-- spec/dummy/solr/data/test/index/_5d.tis
+- spec/dummy/solr/data/test/index/_lj.fdt
+- spec/dummy/solr/data/test/index/_lj.fdx
+- spec/dummy/solr/data/test/index/_lj.fnm
+- spec/dummy/solr/data/test/index/_lj.frq
+- spec/dummy/solr/data/test/index/_lj.nrm
+- spec/dummy/solr/data/test/index/_lj.prx
+- spec/dummy/solr/data/test/index/_lj.tii
+- spec/dummy/solr/data/test/index/_lj.tis
 - spec/dummy/solr/data/test/index/segments.gen
-- spec/dummy/solr/data/test/index/segments_at
+- spec/dummy/solr/data/test/index/segments_175
 - spec/dummy/solr/data/test/spellchecker/segments.gen
 - spec/dummy/solr/data/test/spellchecker/segments_1
 - spec/factories/basket.rb
@@ -797,7 +796,6 @@ test_files:
 - spec/dummy/config/locales/ja.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/config.ru
-- spec/dummy/db/development.sqlite3
 - spec/dummy/db/migrate/001_create_patrons.rb
 - spec/dummy/db/migrate/005_create_manifestations.rb
 - spec/dummy/db/migrate/006_create_items.rb
@@ -822,6 +820,7 @@ test_files:
 - spec/dummy/db/migrate/20080905191442_create_patron_types.rb
 - spec/dummy/db/migrate/20081025083323_create_countries.rb
 - spec/dummy/db/migrate/20081025083905_create_languages.rb
+- spec/dummy/db/migrate/20081027150907_create_picture_files.rb
 - spec/dummy/db/migrate/20090812151902_create_patron_relationship_types.rb
 - spec/dummy/db/migrate/20091012101112_add_dcndl_schema.rb
 - spec/dummy/db/migrate/20091202124834_create_versions.rb
@@ -864,7 +863,6 @@ test_files:
 - spec/dummy/db/migrate/20120125152919_add_title_subseries_transcription_to_series_statement.rb
 - spec/dummy/db/migrate/20120224094141_create_delayed_jobs.rb
 - spec/dummy/db/migrate/20121116033446_add_doi_to_manifestation.rb
-- spec/dummy/db/migrate/20121119153944_add_manifestation_id_to_item.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/db/test.sqlite3
 - spec/dummy/public/404.html
@@ -885,16 +883,16 @@ test_files:
 - spec/dummy/solr/conf/spellings.txt
 - spec/dummy/solr/conf/stopwords.txt
 - spec/dummy/solr/conf/synonyms.txt
-- spec/dummy/solr/data/test/index/_5d.fdt
-- spec/dummy/solr/data/test/index/_5d.fdx
-- spec/dummy/solr/data/test/index/_5d.fnm
-- spec/dummy/solr/data/test/index/_5d.frq
-- spec/dummy/solr/data/test/index/_5d.nrm
-- spec/dummy/solr/data/test/index/_5d.prx
-- spec/dummy/solr/data/test/index/_5d.tii
-- spec/dummy/solr/data/test/index/_5d.tis
+- spec/dummy/solr/data/test/index/_lj.fdt
+- spec/dummy/solr/data/test/index/_lj.fdx
+- spec/dummy/solr/data/test/index/_lj.fnm
+- spec/dummy/solr/data/test/index/_lj.frq
+- spec/dummy/solr/data/test/index/_lj.nrm
+- spec/dummy/solr/data/test/index/_lj.prx
+- spec/dummy/solr/data/test/index/_lj.tii
+- spec/dummy/solr/data/test/index/_lj.tis
 - spec/dummy/solr/data/test/index/segments.gen
-- spec/dummy/solr/data/test/index/segments_at
+- spec/dummy/solr/data/test/index/segments_175
 - spec/dummy/solr/data/test/spellchecker/segments.gen
 - spec/dummy/solr/data/test/spellchecker/segments_1
 - spec/factories/basket.rb

data/spec/dummy/db/migrate/20121119153944_add_manifestation_id_to_item.rb

@@ -1,5 +0,0 @@
-class AddManifestationIdToItem < ActiveRecord::Migration
-  def change
-    add_column :items, :manifestation_id, :integer
-  end
-end

data/spec/dummy/solr/data/test/index/_5d.frq

@@ -1 +0,0 @@
-