enju_circulation 0.1.0.pre27 → 0.1.0.pre28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8834ec4f322b1607843bc523288d8e66b73042b1
-  data.tar.gz: 906c4b6cf13c0e5511d1dfdd9211e5083fc56783
+  metadata.gz: 7614545d4d02474d17463e6ad8ec31b633fa70b0
+  data.tar.gz: bf94c2558f49d871971c52efd33811146cc3c9f9
 SHA512:
-  metadata.gz: 58349e1775b6e5f763e34f1523dd6c370923eafc264a8eeaddd39f549c36907fb88a92b804c555f62f16e1b990b75d80a467da55fe6374a3124e136607f2e930
-  data.tar.gz: 001181fc249806aa564baeb350358936c756db061de28a4f7f887f60d1c72fb40319d2dcc05e720a7fbb4befdb5566315e99ad8e9c54e6a1941ecfe750115040
+  metadata.gz: 5654c425686b7f03368d987259de994cb145745f7037947faf02149acda54562cb34f84da81e73ff0ca45f39b84ae73962c4c4b28ed14f2d0cd874bc13f69881
+  data.tar.gz: cdb45767a7c3a473cae38ff73b41068ac0cf80525f7b8cefc796ff538c3fd2b7b26a9b4fca99ce56999b622ea95da3e8b6984d948125a7c5ef20067b1a0a6e51

data/app/controllers/lending_policies_controller.rb

@@ -4,7 +4,7 @@ class LendingPoliciesController < InheritedResources::Base
   before_filter :prepare_options, :only => [:edit, :update]
 
   def index
-    @lending_policies = @lending_policies.page(params[:page])
+    @lending_policies = LendingPolicy.page(params[:page])
   end
 
   private

data/app/models/checkin.rb

@@ -45,7 +45,7 @@ class Checkin < ActiveRecord::Base
         unless checkout.user.try(:save_checkout_history)
           checkout.user = nil
         end
-        checkout.save!
+        checkout.save(:validate => false)
         unless checkout.item.shelf.library == current_user.library
           message << I18n.t('checkin.other_library_item')
         end
@@ -95,5 +95,6 @@ end
 #  basket_id    :integer
 #  created_at   :datetime         not null
 #  updated_at   :datetime         not null
+#  lock_version :integer          default(0), not null
 #
 

data/app/models/checkout.rb

@@ -56,14 +56,24 @@ class Checkout < ActiveRecord::Base
   end
 
   def renewable?
+    return nil if checkin
+    messages = []
     if !operator and overdue?
-      errors[:base] << I18n.t('checkout.you_have_overdue_item')
+      messages << I18n.t('checkout.you_have_overdue_item')
     end
     if !operator and reserved?
-      errors[:base] << I18n.t('checkout.this_item_is_reserved')
+      messages << I18n.t('checkout.this_item_is_reserved')
     end
     if !operator and over_checkout_renewal_limit?
-      errors[:base] << I18n.t('checkout.excessed_renewal_limit')
+      messages << I18n.t('checkout.excessed_renewal_limit')
+    end
+    if messages.empty?
+      true
+    else
+      messages.each do |message|
+        errors[:base] << message
+      end
+      false
     end
   end
 

data/app/models/lending_policy.rb

@@ -24,7 +24,7 @@ end
 #  loan_period    :integer          default(0), not null
 #  fixed_due_date :datetime
 #  renewal        :integer          default(0), not null
-#  fine           :decimal(, )      default(0.0), not null
+#  fine           :integer          default(0), not null
 #  note           :text
 #  position       :integer
 #  created_at     :datetime         not null

data/app/models/reserve.rb

@@ -441,5 +441,8 @@ end
 #  state                        :string(255)
 #  expiration_notice_to_patron  :boolean          default(FALSE)
 #  expiration_notice_to_library :boolean          default(FALSE)
+#  retained_at                  :datetime
+#  postponed_at                 :datetime
+#  lock_version                 :integer          default(0), not null
 #
 

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

@@ -13,6 +13,7 @@
   </div>
 
   <div class="actions">
+    <%= f.hidden_field :lock_version %>
     <%= f.submit %>
   </div>
 <%- end -%>

data/db/migrate/20090831220301_create_lending_policies.rb

@@ -6,7 +6,7 @@ class CreateLendingPolicies < ActiveRecord::Migration
       t.integer :loan_period, :default => 0, :null => false
       t.datetime :fixed_due_date
       t.integer :renewal, :default => 0, :null => false
-      t.decimal :fine, :default => 0, :null => false
+      t.integer :fine, :default => 0, :null => false
       t.text :note
       t.integer :position
 

data/db/migrate/20130519065638_add_lock_version_to_reserve.rb

@@ -0,0 +1,5 @@
+class AddLockVersionToReserve < ActiveRecord::Migration
+  def change
+    add_column :reserves, :lock_version, :integer, :default => 0, :null => false
+  end
+end

data/db/migrate/20130519065837_add_lock_version_to_checkin.rb

@@ -0,0 +1,5 @@
+class AddLockVersionToCheckin < ActiveRecord::Migration
+  def change
+    add_column :checkins, :lock_version, :integer, :default => 0, :null => false
+  end
+end

data/lib/enju_circulation/version.rb

@@ -1,3 +1,3 @@
 module EnjuCirculation
-  VERSION = "0.1.0.pre27"
+  VERSION = "0.1.0.pre28"
 end

data/spec/controllers/checkins_controller_spec.rb

@@ -66,11 +66,6 @@ describe CheckinsController do
         get :show, :id => checkin.id
         assigns(:checkin).should eq(checkin)
       end
-
-      it "should not show missing checkin" do
-        get :show, :id => 'missing'
-        response.should be_missing
-      end
     end
 
     describe "When logged in as Librarian" do
@@ -151,11 +146,6 @@ describe CheckinsController do
         get :edit, :id => checkin.id
         assigns(:checkin).should eq(checkin)
       end
-  
-      it "should not edit missing checkin" do
-        get :edit, :id => 'missing'
-        response.should be_missing
-      end
     end
 
     describe "When logged in as Librarian" do
@@ -213,6 +203,13 @@ describe CheckinsController do
             response.should redirect_to(basket_checkins_url(assigns(:checkin).basket))
             assigns(:checkin).item.circulation_status.name.should eq 'Available On Shelf'
           end
+
+          it "should checkin the overdue item" do
+            post :create, :checkin => {:item_identifier => '00014'}, :basket_id => 9
+            response.should redirect_to(basket_checkins_url(assigns(:checkin).basket))
+            assigns(:checkin).checkout.should be_valid
+            assigns(:checkin).item.circulation_status.name.should eq 'Available On Shelf'
+          end
         end
       end
 
@@ -347,11 +344,6 @@ describe CheckinsController do
           response.should redirect_to(@checkin)
         end
       end
-
-      it "should not update missing checkin" do
-        put :update, :id => 'missing', :checkin => { }
-        response.should be_missing
-      end
     end
 
     describe "When logged in as Librarian" do
@@ -442,11 +434,6 @@ describe CheckinsController do
         delete :destroy, :id => @checkin.id
         response.should redirect_to(checkins_url)
       end
-
-      it "should not destroy missing checkin" do
-        delete :destroy, :id => 'missing'
-        response.should be_missing
-      end
     end
 
     describe "When logged in as Librarian" do

data/spec/controllers/checkouts_controller_spec.rb

@@ -180,11 +180,6 @@ describe CheckoutsController do
         response.should be_forbidden
         assigns(:checkout).should eq checkouts(:checkout_00001)
       end
-
-      it "should not show missing checkout" do
-        get :show, :id => 'missing'
-        response.should be_missing
-      end
     end
 
     describe "When not logged in" do
@@ -273,11 +268,6 @@ describe CheckoutsController do
         end
       end
 
-      it "should not update missing checkout" do
-        put :update, :id => 'missing', :checkout => { }
-        response.should be_missing
-      end
-
       it "should remove its own checkout history" do
         put :remove_all, :user_id => users(:user1).username
         users(:user1).checkouts.returned.count.should eq 0
@@ -444,11 +434,6 @@ describe CheckoutsController do
         delete :destroy, :id => @returned_checkout.id
         response.should redirect_to(user_checkouts_url(@returned_checkout.user))
       end
-
-      it "should not destroy missing checkout" do
-        delete :destroy, :id => 'missing'
-        response.should be_missing
-      end
     end
 
     describe "When logged in as Librarian" do

data/spec/controllers/reserves_controller_spec.rb

@@ -146,11 +146,6 @@ describe ReservesController do
         assigns(:reserve).should eq(reserve)
       end
 
-      it "should not show missing reserve" do
-        get :show, :id => 'missing'
-        response.should be_missing
-      end
-
       it "should show other user's reservation" do
         get :show, :id => 3
         response.should be_success
@@ -290,11 +285,6 @@ describe ReservesController do
         assigns(:reserve).should eq(reserve)
       end
   
-      it "should not edit missing reserve" do
-        get :edit, :id => 'missing'
-        response.should be_missing
-      end
-  
       it "should edit other user's reservation" do
         get :edit, :id => 3
         response.should be_success
@@ -667,11 +657,6 @@ describe ReservesController do
         response.should redirect_to reserve_url(assigns(:reserve))
       end
 
-      it "should not update missing reserve" do
-        put :update, :id => 'missing', :reserve => {:user_number => users(:user1).user_number}
-        response.should be_missing
-      end
-  
       it "should update my reservation" do
         put :update, :id => 3, :reserve => {:user_number => users(:user1).user_number}
         flash[:notice].should eq I18n.t('controller.successfully_updated', :model => I18n.t('activerecord.models.reserve'))
@@ -731,11 +716,6 @@ describe ReservesController do
         delete :destroy, :id => 3
         response.should redirect_to reserves_url
       end
-
-      it "should not destroy missing reserve" do
-        delete :destroy, :id => 'missing'
-        response.should be_missing
-      end
     end
 
     describe "When logged in as Librarian" do

data/spec/dummy/app/controllers/application_controller.rb

@@ -1,121 +1,8 @@
 class ApplicationController < ActionController::Base
   protect_from_forgery
 
-  rescue_from CanCan::AccessDenied, :with => :render_403
-  rescue_from ActiveRecord::RecordNotFound, :with => :render_404
-
-  before_filter :set_locale
-
+  enju_leaf
   enju_biblio
   enju_library
   enju_circulation
-
-  private
-  def render_403
-    return if performed?
-    if user_signed_in?
-      respond_to do |format|
-        format.html {render :template => 'page/403', :status => 403}
-        format.mobile {render :template => 'page/403', :status => 403}
-        format.xml {render :template => 'page/403', :status => 403}
-        format.json
-      end
-    else
-      respond_to do |format|
-        format.html {redirect_to new_user_session_url}
-        format.mobile {redirect_to new_user_session_url}
-        format.xml {render :template => 'page/403', :status => 403}
-        format.json
-      end
-    end
-  end
-
-  def render_404
-    return if performed?
-    respond_to do |format|
-      format.html {render :template => 'page/404', :status => 404}
-      format.mobile {render :template => 'page/404', :status => 404}
-      format.xml {render :template => 'page/404', :status => 404}
-      format.json
-    end
-  end
-
-  def access_denied
-    raise CanCan::AccessDenied
-  end
-
-  def get_user
-    @user = User.where(:username => params[:user_id]).first if params[:user_id]
-  end
-
-  def get_manifestation
-    @manifestation = Manifestation.find(params[:manifestation_id]) if params[:manifestation_id]
-    authorize! :show, @manifestation if @manifestation
-  end
-
-  def get_user_group
-    @user_group = UserGroup.find(params[:user_group_id]) if params[:user_group_id]
-  end
-
-  def set_locale
-    if params[:locale]
-      unless I18n.available_locales.include?(params[:locale].to_s.intern)
-        raise InvalidLocaleError
-      end
-    end
-    if user_signed_in?
-      locale = params[:locale] || session[:locale] || current_user.locale.try(:to_sym)
-    else
-      locale = params[:locale] || session[:locale]
-    end
-    if locale
-      I18n.locale = @locale = session[:locale] = locale.to_sym
-    else
-      I18n.locale = @locale = session[:locale] = I18n.default_locale
-    end
-  rescue InvalidLocaleError
-    @locale = I18n.default_locale
-  end
-
-  def solr_commit
-    Sunspot.commit
-  end
-
-  def convert_charset
-    case params[:format]
-    when 'csv'
-      return unless Setting.csv_charset_conversion
-      # TODO: 他の言語
-      if @locale.to_sym == :ja
-        headers["Content-Type"] = "text/csv; charset=Shift_JIS"
-        response.body = NKF::nkf('-Ws', response.body)
-      end
-    when 'xml'
-      if @locale.to_sym == :ja
-        headers["Content-Type"] = "application/xml; charset=Shift_JIS"
-        response.body = NKF::nkf('-Ws', response.body)
-      end
-    end
-  end
-
-  def store_page
-    flash[:page] = params[:page] if params[:page].to_i > 0
-  end
-
-  def store_location
-    if request.get? and request.format.try(:html?) and !request.xhr?
-      session[:user_return_to] = request.fullpath
-    end
-  end
-
-  def move_position(resource, direction)
-    if ['higher', 'lower'].include?(direction)
-      resource.send("move_#{direction}")
-      redirect_to url_for(:controller => resource.class.to_s.pluralize.underscore)
-      return
-    end
-  end
-end
-
-class InvalidLocaleError < StandardError
 end

data/spec/dummy/config/application.rb

@@ -3,7 +3,7 @@ require File.expand_path('../boot', __FILE__)
 require 'rails/all'
 
 Bundler.require
-require "enju_circulation"
+require 'enju_circulation'
 
 module Dummy
   class Application < Rails::Application
@@ -55,6 +55,5 @@ module Dummy
 end
 
 require 'nkf'
-require 'enju_biblio'
-require 'enju_library'
+require 'enju_leaf'
 require 'mobylette'

data/spec/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20130509185724) do
+ActiveRecord::Schema.define(:version => 20130519065837) do
 
   create_table "baskets", :force => true do |t|
     t.integer  "user_id"
@@ -57,11 +57,12 @@ ActiveRecord::Schema.define(:version => 20130509185724) do
   add_index "checked_items", ["item_id"], :name => "index_checked_items_on_item_id"
 
   create_table "checkins", :force => true do |t|
-    t.integer  "item_id",      :null => false
+    t.integer  "item_id",                     :null => false
     t.integer  "librarian_id"
     t.integer  "basket_id"
-    t.datetime "created_at",   :null => false
-    t.datetime "updated_at",   :null => false
+    t.datetime "created_at",                  :null => false
+    t.datetime "updated_at",                  :null => false
+    t.integer  "lock_version", :default => 0, :null => false
   end
 
   add_index "checkins", ["basket_id"], :name => "index_checkins_on_basket_id"
@@ -307,16 +308,16 @@ ActiveRecord::Schema.define(:version => 20130509185724) do
   add_index "languages", ["name"], :name => "index_languages_on_name", :unique => true
 
   create_table "lending_policies", :force => true do |t|
-    t.integer  "item_id",                         :null => false
-    t.integer  "user_group_id",                   :null => false
-    t.integer  "loan_period",    :default => 0,   :null => false
+    t.integer  "item_id",                       :null => false
+    t.integer  "user_group_id",                 :null => false
+    t.integer  "loan_period",    :default => 0, :null => false
     t.datetime "fixed_due_date"
-    t.integer  "renewal",        :default => 0,   :null => false
-    t.decimal  "fine",           :default => 0.0, :null => false
+    t.integer  "renewal",        :default => 0, :null => false
+    t.integer  "fine",           :default => 0, :null => false
     t.text     "note"
     t.integer  "position"
-    t.datetime "created_at",                      :null => false
-    t.datetime "updated_at",                      :null => false
+    t.datetime "created_at",                    :null => false
+    t.datetime "updated_at",                    :null => false
   end
 
   add_index "lending_policies", ["item_id", "user_group_id"], :name => "index_lending_policies_on_item_id_and_user_group_id", :unique => true
@@ -751,6 +752,7 @@ ActiveRecord::Schema.define(:version => 20130509185724) do
     t.boolean  "expiration_notice_to_library", :default => false
     t.datetime "retained_at"
     t.datetime "postponed_at"
+    t.integer  "lock_version",                 :default => 0,     :null => false
   end
 
   add_index "reserves", ["item_id"], :name => "index_reserves_on_item_id"

data/spec/fixtures/checkins.yml

@@ -6,6 +6,7 @@ checkin_00001:
   librarian_id: 1
   created_at: 2008-01-22 12:58:54.347742 +09:00
   basket_id: 9
+  lock_version: 0
 checkin_00002: 
   item_id: 9
   updated_at: 2007-12-14 00:28:41.854022 +09:00
@@ -13,6 +14,7 @@ checkin_00002:
   librarian_id: 2
   created_at: 2007-12-14 00:28:41.854022 +09:00
   basket_id: 10
+  lock_version: 0
 checkin_00003: 
   item_id: 8
   updated_at: 2007-12-20 21:24:18.729192 +09:00
@@ -20,6 +22,7 @@ checkin_00003:
   librarian_id: 1
   created_at: 2007-12-20 21:24:18.729192 +09:00
   basket_id: 10
+  lock_version: 0
 checkin_00004: 
   item_id: 7
   updated_at: 2008-01-23 00:39:27.785676 +09:00
@@ -27,6 +30,7 @@ checkin_00004:
   librarian_id: 2
   created_at: 2008-01-23 00:39:27.785676 +09:00
   basket_id: 10
+  lock_version: 0
 checkin_00005: 
   item_id: 6
   updated_at: 2007-12-20 21:25:04.619479 +09:00
@@ -34,6 +38,7 @@ checkin_00005:
   librarian_id: 1
   created_at: 2007-12-20 21:25:04.619479 +09:00
   basket_id: 10
+  lock_version: 0
 
 # == Schema Information
 #
@@ -45,5 +50,6 @@ checkin_00005:
 #  basket_id    :integer
 #  created_at   :datetime         not null
 #  updated_at   :datetime         not null
+#  lock_version :integer          default(0), not null
 #
 

data/spec/fixtures/circulation_statuses.yml

@@ -104,3 +104,17 @@ circulation_status_00016:
   id: 16
   note: ""
   position: 16
+
+# == Schema Information
+#
+# Table name: circulation_statuses
+#
+#  id           :integer          not null, primary key
+#  name         :string(255)      not null
+#  display_name :text
+#  note         :text
+#  position     :integer
+#  created_at   :datetime         not null
+#  updated_at   :datetime         not null
+#
+

data/spec/fixtures/lending_policies.yml

@@ -90,7 +90,7 @@ lending_policy_00009:
 #  loan_period    :integer          default(0), not null
 #  fixed_due_date :datetime
 #  renewal        :integer          default(0), not null
-#  fine           :decimal(, )      default(0.0), not null
+#  fine           :integer          default(0), not null
 #  note           :text
 #  position       :integer
 #  created_at     :datetime         not null

data/spec/fixtures/reserves.yml

@@ -8,6 +8,7 @@ reserve_00001:
   created_at: 2007-09-01 14:14:52.356803 +09:00
   expired_at: <%= 1.week.from_now %>
   state: requested
+  lock_version: 0
 reserve_00002: 
   updated_at: 2007-09-01 14:20:05.530854 +09:00
   manifestation_id: 5
@@ -17,6 +18,7 @@ reserve_00002:
   created_at: 2007-09-01 14:20:05.530854 +09:00
   expired_at: <%= 1.week.from_now %>
   state: requested
+  lock_version: 0
 reserve_00003: 
   updated_at: 2007-09-02 17:46:52.791614 +09:00
   manifestation_id: 6
@@ -26,6 +28,7 @@ reserve_00003:
   created_at: 2007-09-02 17:46:52.791614 +09:00
   expired_at: <%= 1.week.from_now %>
   state: requested
+  lock_version: 0
 reserve_00004: 
   updated_at: 2007-09-02 18:37:25.576087 +09:00
   manifestation_id: 7
@@ -35,6 +38,7 @@ reserve_00004:
   created_at: 2007-09-02 18:37:25.576087 +09:00
   expired_at: <%= 1.week.from_now %>
   state: requested
+  lock_version: 0
 reserve_00005: 
   updated_at: 2007-09-02 19:16:55.714812 +09:00
   manifestation_id: 8
@@ -44,6 +48,7 @@ reserve_00005:
   created_at: 2007-09-02 19:16:55.714812 +09:00
   expired_at: <%= 1.week.from_now %>
   state: requested
+  lock_version: 0
 reserve_00006: 
   updated_at: 2007-09-02 19:20:06.530854 +09:00
   manifestation_id: 4
@@ -53,6 +58,7 @@ reserve_00006:
   created_at: 2007-09-02 19:20:06.530854 +09:00
   expired_at: <%= 1.week.from_now %>
   state: requested
+  lock_version: 0
 reserve_00007: 
   updated_at: 2007-09-02 19:20:07.530854 +09:00
   manifestation_id: 2
@@ -62,6 +68,7 @@ reserve_00007:
   created_at: 2007-09-02 19:20:07.530854 +09:00
   expired_at: <%= 1.week.from_now %>
   state: requested
+  lock_version: 0
 reserve_00008: 
   updated_at: 2007-09-02 19:46:53.791614 +09:00
   manifestation_id: 6
@@ -71,6 +78,7 @@ reserve_00008:
   created_at: 2007-09-02 19:46:53.791614 +09:00
   expired_at: <%= 1.week.ago %>
   state: expired
+  lock_version: 0
 reserve_00009: 
   updated_at: 2007-09-02 19:46:54.791614 +09:00
   manifestation_id: 7
@@ -80,6 +88,7 @@ reserve_00009:
   created_at: 2007-09-02 19:46:54.791614 +09:00
   expired_at: <%= 1.day.ago %>
   state: requested
+  lock_version: 0
 reserve_00010: 
   updated_at: 2007-09-02 19:46:55.791614 +09:00
   manifestation_id: 8
@@ -91,6 +100,7 @@ reserve_00010:
   checked_out_at: <%= 1.week.ago %>
   state: completed
   item_id: 25
+  lock_version: 0
 reserve_00011: 
   updated_at: 2007-09-03 14:20:05.530854 +09:00
   manifestation_id: 7
@@ -100,6 +110,7 @@ reserve_00011:
   created_at: 2007-09-03 14:20:05.530854 +09:00
   expired_at: <%= 1.day.ago %>
   state: expired
+  lock_version: 0
 reserve_00012: 
   updated_at: 2007-09-03 14:20:06.530854 +09:00
   manifestation_id: 8
@@ -109,6 +120,7 @@ reserve_00012:
   created_at: 2007-09-03 14:20:06.530854 +09:00
   expired_at: <%= 1.day.ago %>
   state: retained
+  lock_version: 0
 reserve_00013: 
   updated_at: 2007-09-03 14:20:07.530854 +09:00
   manifestation_id: 11
@@ -118,6 +130,7 @@ reserve_00013:
   created_at: 2007-09-03 14:20:07.530854 +09:00
   expired_at: <%= 1.day.ago %>
   state: requested
+  lock_version: 0
 reserve_00014: 
   updated_at: 2007-09-03 14:20:08.530854 +09:00
   manifestation_id: 11
@@ -129,6 +142,7 @@ reserve_00014:
   expired_at: <%= 1.day.from_now %>
   state: retained
   item_id: 21
+  lock_version: 0
 reserve_00015: 
   updated_at: 2007-09-03 14:20:09.530854 +09:00
   manifestation_id: 11
@@ -138,7 +152,7 @@ reserve_00015:
   created_at: 2007-09-03 14:20:09.530854 +09:00
   expired_at: <%= 1.day.from_now %>
   state: requested
-
+  lock_version: 0
 
 # == Schema Information
 #
@@ -158,5 +172,8 @@ reserve_00015:
 #  state                        :string(255)
 #  expiration_notice_to_patron  :boolean          default(FALSE)
 #  expiration_notice_to_library :boolean          default(FALSE)
+#  retained_at                  :datetime
+#  postponed_at                 :datetime
+#  lock_version                 :integer          default(0), not null
 #
 

data/spec/models/checkin_spec.rb

@@ -44,5 +44,6 @@ end
 #  basket_id    :integer
 #  created_at   :datetime         not null
 #  updated_at   :datetime         not null
+#  lock_version :integer          default(0), not null
 #
 

data/spec/models/lending_policy_spec.rb

@@ -16,7 +16,7 @@ end
 #  loan_period    :integer          default(0), not null
 #  fixed_due_date :datetime
 #  renewal        :integer          default(0), not null
-#  fine           :decimal(, )      default(0.0), not null
+#  fine           :integer          default(0), not null
 #  note           :text
 #  position       :integer
 #  created_at     :datetime         not null

data/spec/models/reserve_spec.rb

@@ -117,5 +117,8 @@ end
 #  state                        :string(255)
 #  expiration_notice_to_patron  :boolean          default(FALSE)
 #  expiration_notice_to_library :boolean          default(FALSE)
+#  retained_at                  :datetime
+#  postponed_at                 :datetime
+#  lock_version                 :integer          default(0), not null
 #
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enju_circulation
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre27
+  version: 0.1.0.pre28
 platform: ruby
 authors:
 - Kosuke Tanabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-16 00:00:00.000000000 Z
+date: 2013-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: enju_biblio
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre40
+        version: 0.1.0.pre41
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre40
+        version: 0.1.0.pre41
 - !ruby/object:Gem::Dependency
   name: enju_library
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +66,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.1.17.pre12
+- !ruby/object:Gem::Dependency
+  name: enju_leaf
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.0.rc2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.0.rc2
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -395,6 +409,8 @@ files:
 - db/migrate/20130303124821_add_retained_at_to_reserve.rb
 - db/migrate/20130304015019_add_postponed_at_to_reserve.rb
 - db/migrate/20130416054135_add_circulation_status_id_to_item.rb
+- db/migrate/20130519065638_add_lock_version_to_reserve.rb
+- db/migrate/20130519065837_add_lock_version_to_checkin.rb
 - lib/enju_circulation/controller.rb
 - lib/enju_circulation/engine.rb
 - lib/enju_circulation/helper.rb
@@ -570,16 +586,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/_22w.fdt
-- spec/dummy/solr/data/test/index/_22w.fdx
-- spec/dummy/solr/data/test/index/_22w.fnm
-- spec/dummy/solr/data/test/index/_22w.frq
-- spec/dummy/solr/data/test/index/_22w.nrm
-- spec/dummy/solr/data/test/index/_22w.prx
-- spec/dummy/solr/data/test/index/_22w.tii
-- spec/dummy/solr/data/test/index/_22w.tis
+- spec/dummy/solr/data/test/index/_2fp.fdt
+- spec/dummy/solr/data/test/index/_2fp.fdx
+- spec/dummy/solr/data/test/index/_2fp.fnm
+- spec/dummy/solr/data/test/index/_2fp.frq
+- spec/dummy/solr/data/test/index/_2fp.nrm
+- spec/dummy/solr/data/test/index/_2fp.prx
+- spec/dummy/solr/data/test/index/_2fp.tii
+- spec/dummy/solr/data/test/index/_2fp.tis
 - spec/dummy/solr/data/test/index/segments.gen
-- spec/dummy/solr/data/test/index/segments_45l
+- spec/dummy/solr/data/test/index/segments_4v7
 - spec/dummy/solr/data/test/spellchecker/segments.gen
 - spec/dummy/solr/data/test/spellchecker/segments_1
 - spec/factories/basket.rb
@@ -848,16 +864,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/_22w.fdt
-- spec/dummy/solr/data/test/index/_22w.fdx
-- spec/dummy/solr/data/test/index/_22w.fnm
-- spec/dummy/solr/data/test/index/_22w.frq
-- spec/dummy/solr/data/test/index/_22w.nrm
-- spec/dummy/solr/data/test/index/_22w.prx
-- spec/dummy/solr/data/test/index/_22w.tii
-- spec/dummy/solr/data/test/index/_22w.tis
+- spec/dummy/solr/data/test/index/_2fp.fdt
+- spec/dummy/solr/data/test/index/_2fp.fdx
+- spec/dummy/solr/data/test/index/_2fp.fnm
+- spec/dummy/solr/data/test/index/_2fp.frq
+- spec/dummy/solr/data/test/index/_2fp.nrm
+- spec/dummy/solr/data/test/index/_2fp.prx
+- spec/dummy/solr/data/test/index/_2fp.tii
+- spec/dummy/solr/data/test/index/_2fp.tis
 - spec/dummy/solr/data/test/index/segments.gen
-- spec/dummy/solr/data/test/index/segments_45l
+- spec/dummy/solr/data/test/index/segments_4v7
 - spec/dummy/solr/data/test/spellchecker/segments.gen
 - spec/dummy/solr/data/test/spellchecker/segments_1
 - spec/factories/basket.rb