enju_flower 0.1.0.pre15 → 0.1.0.pre16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2823668d0878e6623fae70d25f01341ae9ab62f0
-  data.tar.gz: 2737e4bc2de2affd0d11c6e2417cdd55475ce204
+  metadata.gz: 1bde6cb170d186ff7704b504b226d11add963357
+  data.tar.gz: a3d1d54f28bb280616c7a293b366c3dc66b43209
 SHA512:
-  metadata.gz: 4973b1fb214f1cc2163344be3e3f7f4746d7644915a8ba08493c2c32f94e8e6caf00c03857aa87a3018b9cb06fcf86335ca38a28d40d174bb69630bbd1077173
-  data.tar.gz: 7495ac070988b200e24b3bc6bd1acf24b9f373460da64fafcbabdd4b3c7a877095e1ae09300c0bd150f8cbb3ba68ebe4d2837e0adb4f901ccd37c656389bb180
+  metadata.gz: 1f79043997dcb5b7fd870b0c212c7cb3cd03e01885c141feeec76d8a2d2a16e0ae07d8d1dda311c9a2956d694bbd0a06310fe6479c0ec87656fb216fbddb7274
+  data.tar.gz: 09fc6adab782515eea1e76c5e8dfbbb2036eb82cfe880a1443fb3b298f2bf6aeee82cf80ae8247780b5d07bcd4ddb014f9810b9bad9e189148e747db83eb6ebd

data/app/views/manifestations/_manifestation.html.erb

@@ -1,7 +1,6 @@
         <tr class="line<%= cycle("0", "1") -%>">
           <td style="width: 30px"><%= @manifestations.offset_value + 1 + manifestation_counter -%></td>
           <td style="480px">
-            <% cache([:manifestation => manifestation.id, :fragment => 'manifestation_html', :role => current_user_role_name, :locale => @locale]) do %>
               <% if manifestation.root_series_statement %>
                 <%= render 'manifestations/show_series_index', :manifestation => manifestation, :series_statement => manifestation.root_series_statement -%>
               <% else %>
@@ -9,8 +8,14 @@
                 <div class="access_address">
                   <%= link_to manifestation.access_address, manifestation.access_address if manifestation.access_address.present? -%>
                 </div>
-                <%- unless manifestation.items.on_shelf.empty? -%>
-                  (<%= link_to_function t('page.holding'), "$('#holding_#{manifestation.id}').toggle()" -%>)
+                <% if current_user.try(:has_role?, 'Librarian') %>
+                  <%- unless manifestation.items.on_shelf.empty? -%>
+                    (<%= link_to_function t('page.holding'), "$('#holding_#{manifestation.id}').toggle()" -%>)
+                  <% end %>
+                <% else %>
+                  <%- unless manifestation.items.for_checkout.on_shelf.empty? -%>
+                    (<%= link_to_function t('page.holding'), "$('#holding_#{manifestation.id}').toggle()" -%>)
+                  <%- end -%>
                 <%- end -%>
                 <% if defined?(EnjuBookmark) %>
                   <%- if manifestation.tags.first -%>
@@ -20,7 +25,6 @@
                 <% end %>
               <% end %>
               <%= render 'manifestations/holding', :manifestation => manifestation -%>
-            <% end %>
           </td>
             <% if signed_in? %>
               <td id="edit_icons">

data/app/views/manifestations/_pickup.html.erb

@@ -1,5 +1,5 @@
 <% if manifestation %>
-  <% cache([:manifestation => manifestation.id, :fragment => 'pickup_html', :role => current_user_role_name, :locale => @locale]) do %>
+  <% cache(:manifestation => manifestation.id, :fragment => 'pickup_html', :role => current_user_role_name, :locale => @locale) do %>
     <div id="pickup_book_jacket">
       <%= book_jacket(manifestation) -%>
     </div>

data/app/views/manifestations/_show_detail_librarian.html.erb

@@ -1,7 +1,7 @@
   <div id="tabs">
     <%= render 'manifestations/tab_menu', :manifestation => manifestation %>
     <div id="detail">
-    <% cache([:manifestation => manifestation.id, :fragment => 'show_detail_librarian_html', :role => current_user_role_name, :locale => @locale]) do %>
+    <% cache(:manifestation => manifestation.id, :fragment => 'show_detail_librarian_html', :role => current_user_role_name, :locale => @locale) do %>
       <table class="table table-striped" id="resource_detail">
         <%= embed_content(manifestation) -%>
         <% if manifestation.title_alternative? %>

data/app/views/manifestations/_show_detail_user.html.erb

@@ -1,7 +1,7 @@
   <div id="tabs">
     <%= render 'manifestations/tab_menu', :manifestation => manifestation %>
     <div id="detail">
-    <% cache([:manifestation => manifestation.id, :fragment => 'show_detail_user_html', :role => current_user_role_name, :locale => @locale]) do %>
+    <% cache(:manifestation => manifestation.id, :fragment => 'show_detail_user_html', :role => current_user_role_name, :locale => @locale) do %>
       <table class="table table-striped" id="resource_detail">
         <%= embed_content(manifestation) -%>
         <% if manifestation.title_alternative? %>
@@ -103,7 +103,7 @@
         <% end %>
       </table>
     <% end %>
-      <%- if manifestation.items.on_shelf.exists? -%>
+      <%- if manifestation.items.for_checkout.on_shelf.exists? -%>
         <%= render 'manifestations/show_holding', :manifestation => manifestation -%>
       <%- end -%>
     </div>

data/app/views/manifestations/_show_holding.html.erb

@@ -9,7 +9,12 @@
       <th><%= t('activerecord.models.circulation_status') -%></th>
     <% end %>
   </tr>
-  <%- manifestation.items.on_shelf.each do |item| -%>
+  <% if current_user.try(:has_role?, 'Librarian') %>
+    <% items = manifestation.items.on_shelf %>
+  <% else %>
+    <% items = manifestation.items.for_checkout.on_shelf %>
+  <% end %>
+  <%- items.each do |item| -%>
     <tr>
       <td>
         <%- if item.item_identifier? -%>

data/app/views/manifestations/_show_reservation.html.erb

@@ -9,7 +9,6 @@
                     <% end %>
                     <br />
                   <% end %>
-              <% cache([current_user_role_name, @locale, manifestation]) do %>
                 <%- if can? :update, manifestation -%>
                   <% unless params[:mode] == 'add' %>
                     <%= link_to image_tag('icons/book_edit.png', :size => '16x16', :alt => t('page.edit')), edit_manifestation_path(manifestation) -%>
@@ -24,4 +23,3 @@
                     <% end %>
                   <%- end -%>
                 <% end %>
-              <% end %>

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

@@ -1,4 +1,4 @@
-<% cache([:manifestation => manifestation.id, :fragment => 'title_html', :role => current_user_role_name, :locale => @locale]) do %>
+<% cache(:manifestation => manifestation.id, :fragment => 'title_html', :role => current_user_role_name, :locale => @locale) do %>
   <h2 class="resource_title">
     [M]
     <%= link_to title_with_volume_number(manifestation), manifestation, :itemprop => 'name' -%>

data/app/views/manifestations/_title.mobile.erb

@@ -1,4 +1,4 @@
-<% cache([:manifestation => manifestation.id, :fragment => 'title_mobile', :role => current_user_role_name, :locale => @locale]) do %>
+<% cache(:manifestation => manifestation.id, :fragment => 'title_mobile', :role => current_user_role_name, :locale => @locale) do %>
   <h2 class="resource_title">
     [M]
     <%= link_to title_with_volume_number(manifestation), manifestation, :itemprop => 'name' -%>

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

@@ -1,4 +1,4 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.search_resource', :model => t('page.resource')) -%></h1>
 <div id="content_list">
   <%= render 'manifestations/title', :manifestation => @manifestation if @manifestation -%>
@@ -74,7 +74,7 @@
   </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <% if @parent and can?(:update, @parent) %>
     <%= render 'submenu_parent' %>
   <% end %>

data/app/views/manifestations/index.sru.builder

@@ -69,7 +69,7 @@ def get_record(manifestation)
     'xmlns:srw_dc' => "info:srw/schema/1/dc-v1.1",
     'xmlns:xsi' => "http://www.w3.org/2001/XMLSchema-instance",
     'xsi:schemaLocation' => "info:srw/schema/1/dc-v1.1 http://www.loc.gov/standards/sru/dc-schema.xsd" do
-    cache([:manifestation => manifestation.id, :fragment => 'index_sru', :role => current_user_role_name, :locale => @locale]) do
+    cache(:manifestation => manifestation.id, :fragment => 'index_sru', :role => current_user_role_name, :locale => @locale) do
       xml.tag! 'dc:title', manifestation.original_title
       manifestation.creators.readable_by(current_user).each do |agent|
         xml.tag! 'dc:creator', agent.full_name

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

@@ -1,4 +1,4 @@
-<div id="content_detail" class="ui-corner-all" itemscope="itemscope" itemtype="http://schema.org/Book">
+<div id="content_detail" class="ui-corner-all ui-widget-content" itemscope="itemscope" itemtype="http://schema.org/Book">
   <h1 class="title"><%= t('page.showing', :model => t('activerecord.models.manifestation')) -%></h1>
   <div id="content_list">
     <p id="notice"><%= notice %></p>
@@ -16,7 +16,7 @@
   </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <%= render 'manifestations/book_jacket', :manifestation => @manifestation -%>
   <ul>
     <%- if @manifestation.picture_files.exists? -%>
@@ -34,7 +34,7 @@
   </script>
   <%- if user_signed_in? -%>
     <div id="call_number_content">
-      <%- @manifestation.items.on_shelf.each do |item| -%>
+      <%- @manifestation.items.for_checkout.on_shelf.each do |item| -%>
         <%- if item.hold?(current_user.library) -%>
           <%= call_number_label(item) -%>
         <%- end -%>

data/lib/enju_flower/version.rb

@@ -1,3 +1,3 @@
 module EnjuFlower
-  VERSION = "0.1.0.pre15"
+  VERSION = "0.1.0.pre16"
 end

data/spec/controllers/manifestations_controller_spec.rb

@@ -139,14 +139,14 @@ describe ManifestationsController do
       it "should get index with pub_date_from" do
         get :index, :query => '2005', :pub_date_from => '2000'
         response.should be_success
-        assigns(:manifestations).should be_true
+        assigns(:manifestations).should be_truthy
         assigns(:query).should eq '2005 date_of_publication_d:[1999-12-31T15:00:00Z TO *]'
       end
 
       it "should get index with pub_date_to" do
         get :index, :query => '2005', :pub_date_to => '2000'
         response.should be_success
-        assigns(:manifestations).should be_true
+        assigns(:manifestations).should be_truthy
         assigns(:query).should eq '2005 date_of_publication_d:[* TO 2000-12-31T14:59:59Z]'
       end
 
@@ -389,7 +389,7 @@ describe ManifestationsController do
         it "assigns a series_statement" do
           post :create, :manifestation => @attrs.merge(:series_statements_attributes => {[0] => {:original_title => SeriesStatement.find(1).original_title}})
           assigns(:manifestation).reload
-          assigns(:manifestation).series_statements.pluck(:original_title).include?(series_statements(:one).original_title).should be_true
+          assigns(:manifestation).series_statements.pluck(:original_title).include?(series_statements(:one).original_title).should be_truthy
         end
 
         it "redirects to the created manifestation" do
@@ -513,7 +513,7 @@ describe ManifestationsController do
         it "assigns a series_statement" do
           put :update, :id => @manifestation.id, :manifestation => @attrs.merge(:series_statements_attributes => {[0] => {:original_title => series_statements(:two).original_title, "_destroy"=>"false"}})
           assigns(:manifestation).reload
-          assigns(:manifestation).series_statements.pluck(:original_title).include?(series_statements(:two).original_title).should be_true
+          assigns(:manifestation).series_statements.pluck(:original_title).include?(series_statements(:two).original_title).should be_truthy
         end
 
         it "assigns the requested manifestation as @manifestation" do

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

@@ -5,4 +5,5 @@ class User < ActiveRecord::Base
     :lockable, :lock_strategy => :none, :unlock_strategy => :none
 
   enju_leaf_user_model
+  enju_circulation_user_model
 end

data/spec/dummy/config/application.rb

@@ -58,4 +58,5 @@ module Dummy
 end
 
 require 'enju_leaf'
+require 'enju_circulation'
 require 'enju_bookmark'

data/spec/dummy/config/initializers/inflections.rb

@@ -8,3 +8,11 @@
 #   inflect.irregular 'person', 'people'
 #   inflect.uncountable %w( fish sheep )
 # end
+#
+# These inflection rules are supported but not enabled by default:
+# ActiveSupport::Inflector.inflections do |inflect|
+#   inflect.acronym 'RESTful'
+# end
+ActiveSupport::Inflector.inflections do |inflect|
+  inflect.irregular 'reserve', 'reserves'
+end

data/spec/dummy/db/migrate/035_create_reserves.rb

@@ -11,7 +11,7 @@ class CreateReserves < ActiveRecord::Migration
       t.datetime :expired_at
       t.datetime :deleted_at
       t.string :state
-      t.boolean :expiration_notice_to_agent, :default => false
+      t.boolean :expiration_notice_to_patron, :default => false
       t.boolean :expiration_notice_to_library, :default => false
     end
 

data/spec/dummy/db/migrate/20130303104849_add_state_index_to_reserve.rb

@@ -0,0 +1,5 @@
+class AddStateIndexToReserve < ActiveRecord::Migration
+  def change
+    add_index :reserves, :state
+  end
+end

data/spec/dummy/db/migrate/20130303124821_add_retained_at_to_reserve.rb

@@ -0,0 +1,5 @@
+class AddRetainedAtToReserve < ActiveRecord::Migration
+  def change
+    add_column :reserves, :retained_at, :datetime
+  end
+end

data/spec/dummy/db/migrate/20130304015019_add_postponed_at_to_reserve.rb

@@ -0,0 +1,5 @@
+class AddPostponedAtToReserve < ActiveRecord::Migration
+  def change
+    add_column :reserves, :postponed_at, :datetime
+  end
+end

data/spec/dummy/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/spec/dummy/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/spec/dummy/db/migrate/20140518050147_create_reserve_transitions.rb

@@ -0,0 +1,14 @@
+class CreateReserveTransitions < ActiveRecord::Migration
+  def change
+    create_table :reserve_transitions do |t|
+      t.string :to_state
+      t.text :metadata, default: "{}"
+      t.integer :sort_key
+      t.integer :reserve_id
+      t.timestamps
+    end
+
+    add_index :reserve_transitions, :reserve_id
+    add_index :reserve_transitions, [:sort_key, :reserve_id], unique: true
+  end
+end

data/spec/dummy/db/migrate/20140528045518_create_user_checkout_stat_transitions.rb

@@ -0,0 +1,14 @@
+class CreateUserCheckoutStatTransitions < ActiveRecord::Migration
+  def change
+    create_table :user_checkout_stat_transitions do |t|
+      t.string :to_state
+      t.text :metadata, default: "{}"
+      t.integer :sort_key
+      t.integer :user_checkout_stat_id
+      t.timestamps
+    end
+
+    add_index :user_checkout_stat_transitions, :user_checkout_stat_id
+    add_index :user_checkout_stat_transitions, [:sort_key, :user_checkout_stat_id], unique: true, name: "index_user_checkout_stat_transitions_on_sort_key_and_stat_id"
+  end
+end

data/spec/dummy/db/migrate/20140528045539_create_user_reserve_stat_transitions.rb

@@ -0,0 +1,14 @@
+class CreateUserReserveStatTransitions < ActiveRecord::Migration
+  def change
+    create_table :user_reserve_stat_transitions do |t|
+      t.string :to_state
+      t.text :metadata, default: "{}"
+      t.integer :sort_key
+      t.integer :user_reserve_stat_id
+      t.timestamps
+    end
+
+    add_index :user_reserve_stat_transitions, :user_reserve_stat_id
+    add_index :user_reserve_stat_transitions, [:sort_key, :user_reserve_stat_id], unique: true, name: "index_user_reserve_stat_transitions_on_sort_key_and_stat_id"
+  end
+end

data/spec/dummy/db/migrate/20140528045600_create_manifestation_checkout_stat_transitions.rb

@@ -0,0 +1,14 @@
+class CreateManifestationCheckoutStatTransitions < ActiveRecord::Migration
+  def change
+    create_table :manifestation_checkout_stat_transitions do |t|
+      t.string :to_state
+      t.text :metadata, default: "{}"
+      t.integer :sort_key
+      t.integer :manifestation_checkout_stat_id
+      t.timestamps
+    end
+
+    add_index :manifestation_checkout_stat_transitions, :manifestation_checkout_stat_id, name: "index_manifestation_checkout_stat_transitions_on_stat_id"
+    add_index :manifestation_checkout_stat_transitions, [:sort_key, :manifestation_checkout_stat_id], unique: true, name: "index_manifestation_checkout_stat_transitions_on_transition"
+  end
+end

data/spec/dummy/db/migrate/20140528045617_create_manifestation_reserve_stat_transitions.rb

@@ -0,0 +1,14 @@
+class CreateManifestationReserveStatTransitions < ActiveRecord::Migration
+  def change
+    create_table :manifestation_reserve_stat_transitions do |t|
+      t.string :to_state
+      t.text :metadata, default: "{}"
+      t.integer :sort_key
+      t.integer :manifestation_reserve_stat_id
+      t.timestamps
+    end
+
+    add_index :manifestation_reserve_stat_transitions, :manifestation_reserve_stat_id, name: "index_manifestation_reserve_stat_transitions_on_stat_id"
+    add_index :manifestation_reserve_stat_transitions, [:sort_key, :manifestation_reserve_stat_id], unique: true, name: "index_manifestation_reserve_stat_transitions_on_transition"
+  end
+end

data/spec/dummy/db/migrate/20140529014410_create_item_transitions.rb

@@ -0,0 +1,14 @@
+class CreateItemTransitions < ActiveRecord::Migration
+  def change
+    create_table :item_transitions do |t|
+      t.string :to_state
+      t.text :metadata, default: "{}"
+      t.integer :sort_key
+      t.integer :item_id
+      t.timestamps
+    end
+
+    add_index :item_transitions, :item_id
+    add_index :item_transitions, [:sort_key, :item_id], unique: true
+  end
+end

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 => 20140529014410) do
 
   create_table "agent_import_files", :force => true do |t|
     t.integer  "parent_id"
@@ -238,11 +238,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"
@@ -550,6 +551,18 @@ ActiveRecord::Schema.define(:version => 20130509185724) do
   add_index "item_has_use_restrictions", ["item_id"], :name => "index_item_has_use_restrictions_on_item_id"
   add_index "item_has_use_restrictions", ["use_restriction_id"], :name => "index_item_has_use_restrictions_on_use_restriction_id"
 
+  create_table "item_transitions", :force => true do |t|
+    t.string   "to_state"
+    t.text     "metadata",   :default => "{}"
+    t.integer  "sort_key"
+    t.integer  "item_id"
+    t.datetime "created_at",                   :null => false
+    t.datetime "updated_at",                   :null => false
+  end
+
+  add_index "item_transitions", ["item_id"], :name => "index_item_transitions_on_item_id"
+  add_index "item_transitions", ["sort_key", "item_id"], :name => "index_item_transitions_on_sort_key_and_item_id", :unique => true
+
   create_table "items", :force => true do |t|
     t.string   "call_number"
     t.string   "item_identifier"
@@ -665,6 +678,18 @@ ActiveRecord::Schema.define(:version => 20130509185724) do
     t.datetime "updated_at",   :null => false
   end
 
+  create_table "manifestation_checkout_stat_transitions", :force => true do |t|
+    t.string   "to_state"
+    t.text     "metadata",                       :default => "{}"
+    t.integer  "sort_key"
+    t.integer  "manifestation_checkout_stat_id"
+    t.datetime "created_at",                                       :null => false
+    t.datetime "updated_at",                                       :null => false
+  end
+
+  add_index "manifestation_checkout_stat_transitions", ["manifestation_checkout_stat_id"], :name => "index_manifestation_checkout_stat_transitions_on_stat_id"
+  add_index "manifestation_checkout_stat_transitions", ["sort_key", "manifestation_checkout_stat_id"], :name => "index_manifestation_checkout_stat_transitions_on_transition", :unique => true
+
   create_table "manifestation_checkout_stats", :force => true do |t|
     t.datetime "start_date"
     t.datetime "end_date"
@@ -699,6 +724,18 @@ ActiveRecord::Schema.define(:version => 20130509185724) do
   add_index "manifestation_relationships", ["child_id"], :name => "index_manifestation_relationships_on_child_id"
   add_index "manifestation_relationships", ["parent_id"], :name => "index_manifestation_relationships_on_parent_id"
 
+  create_table "manifestation_reserve_stat_transitions", :force => true do |t|
+    t.string   "to_state"
+    t.text     "metadata",                      :default => "{}"
+    t.integer  "sort_key"
+    t.integer  "manifestation_reserve_stat_id"
+    t.datetime "created_at",                                      :null => false
+    t.datetime "updated_at",                                      :null => false
+  end
+
+  add_index "manifestation_reserve_stat_transitions", ["manifestation_reserve_stat_id"], :name => "index_manifestation_reserve_stat_transitions_on_stat_id"
+  add_index "manifestation_reserve_stat_transitions", ["sort_key", "manifestation_reserve_stat_id"], :name => "index_manifestation_reserve_stat_transitions_on_transition", :unique => true
+
   create_table "manifestation_reserve_stats", :force => true do |t|
     t.datetime "start_date"
     t.datetime "end_date"
@@ -970,6 +1007,18 @@ ActiveRecord::Schema.define(:version => 20130509185724) do
   add_index "reserve_stat_has_users", ["user_id"], :name => "index_reserve_stat_has_users_on_user_id"
   add_index "reserve_stat_has_users", ["user_reserve_stat_id"], :name => "index_reserve_stat_has_users_on_user_reserve_stat_id"
 
+  create_table "reserve_transitions", :force => true do |t|
+    t.string   "to_state"
+    t.text     "metadata",   :default => "{}"
+    t.integer  "sort_key"
+    t.integer  "reserve_id"
+    t.datetime "created_at",                   :null => false
+    t.datetime "updated_at",                   :null => false
+  end
+
+  add_index "reserve_transitions", ["reserve_id"], :name => "index_reserve_transitions_on_reserve_id"
+  add_index "reserve_transitions", ["sort_key", "reserve_id"], :name => "index_reserve_transitions_on_sort_key_and_reserve_id", :unique => true
+
   create_table "reserves", :force => true do |t|
     t.integer  "user_id",                                         :null => false
     t.integer  "manifestation_id",                                :null => false
@@ -982,13 +1031,17 @@ ActiveRecord::Schema.define(:version => 20130509185724) do
     t.datetime "expired_at"
     t.datetime "deleted_at"
     t.string   "state"
-    t.boolean  "expiration_notice_to_agent",   :default => false
+    t.boolean  "expiration_notice_to_patron",  :default => false
     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"
   add_index "reserves", ["manifestation_id"], :name => "index_reserves_on_manifestation_id"
   add_index "reserves", ["request_status_type_id"], :name => "index_reserves_on_request_status_type_id"
+  add_index "reserves", ["state"], :name => "index_reserves_on_state"
   add_index "reserves", ["user_id"], :name => "index_reserves_on_user_id"
 
   create_table "resource_import_files", :force => true do |t|
@@ -1140,6 +1193,18 @@ ActiveRecord::Schema.define(:version => 20130509185724) do
     t.datetime "updated_at",   :null => false
   end
 
+  create_table "user_checkout_stat_transitions", :force => true do |t|
+    t.string   "to_state"
+    t.text     "metadata",              :default => "{}"
+    t.integer  "sort_key"
+    t.integer  "user_checkout_stat_id"
+    t.datetime "created_at",                              :null => false
+    t.datetime "updated_at",                              :null => false
+  end
+
+  add_index "user_checkout_stat_transitions", ["sort_key", "user_checkout_stat_id"], :name => "index_user_checkout_stat_transitions_on_sort_key_and_stat_id", :unique => true
+  add_index "user_checkout_stat_transitions", ["user_checkout_stat_id"], :name => "index_user_checkout_stat_transitions_on_user_checkout_stat_id"
+
   create_table "user_checkout_stats", :force => true do |t|
     t.datetime "start_date"
     t.datetime "end_date"
@@ -1196,6 +1261,18 @@ ActiveRecord::Schema.define(:version => 20130509185724) do
     t.datetime "updated_at", :null => false
   end
 
+  create_table "user_reserve_stat_transitions", :force => true do |t|
+    t.string   "to_state"
+    t.text     "metadata",             :default => "{}"
+    t.integer  "sort_key"
+    t.integer  "user_reserve_stat_id"
+    t.datetime "created_at",                             :null => false
+    t.datetime "updated_at",                             :null => false
+  end
+
+  add_index "user_reserve_stat_transitions", ["sort_key", "user_reserve_stat_id"], :name => "index_user_reserve_stat_transitions_on_sort_key_and_stat_id", :unique => true
+  add_index "user_reserve_stat_transitions", ["user_reserve_stat_id"], :name => "index_user_reserve_stat_transitions_on_user_reserve_stat_id"
+
   create_table "user_reserve_stats", :force => true do |t|
     t.datetime "start_date"
     t.datetime "end_date"