enju_flower 0.1.0.pre21 → 0.1.0.pre22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a29725c815c423e7e63834ee36608293da680f7
-  data.tar.gz: 5cd2c0d902c8e496e28224293fe74ca67efc3086
+  metadata.gz: 3e837a658f1318a08740d4f9d8d51bd59c378484
+  data.tar.gz: b46ba01b84cc9f686cc03d4617997c134822cd08
 SHA512:
-  metadata.gz: 51d303040a75ed74611b6c10c72df22384181bb493d33a4023fed603809db54d680d634edc42e3547d3c1235744d54cce8107f5743aa3b48468cb6ec4b2fdf6e
-  data.tar.gz: fa1bc26884469517300e527e955060e570d2647efe6e0f1af25167e5b9a7de83112865ad72e83ae919f926b8b26bbcfaf0f37702e79819e80e015ebd967a481e
+  metadata.gz: 6520336a72526f19ad58fbcf5fe3257c8f13366d924cc369ae0537fd0c3463dec150271ce3cbb4e8e88a4efbaf40c67e578987a969d1233e2f0805d68213f179
+  data.tar.gz: 21a09afd59a548cbed282501ffa9ce1cf17e32f8db227f3cd90d3726ffa0b02969970c99e3d504206e94a2b5dfff3ee657c22321327e29804343911860d3c79d

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

@@ -2,10 +2,10 @@
 <ul>
   <%- @pub_year_facet.each do |facet| -%>
     <li>
-      <%= pub_year_facet(params[:pub_date_from].to_s, params[:pub_date_to].to_s, facet) %>
+      <%= pub_year_facet(params[:pub_date_from].to_s, params[:pub_date_until].to_s, facet) %>
     </li>
   <%- end -%>
-  <%- if params[:pub_date_from] and params[:pub_date_to] -%>
-    <li><%= link_to t('page.remove_this_facet'), url_for(params.merge(pub_date_from: nil, pub_date_to: nil, page: nil, view: nil, only_path: true)) -%></li>
+  <%- if params[:pub_date_from] and params[:pub_date_until] -%>
+    <li><%= link_to t('page.remove_this_facet'), url_for(params.merge(pub_date_from: nil, pub_date_until: nil, page: nil, view: nil, only_path: true)) -%></li>
   <%- end -%>
 </ul>

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

@@ -15,3 +15,9 @@
   <%- if manifestation.pub_date.present? -%>
     (<%= manifestation.pub_date -%>)
   <%- end -%>
+  <% if defined?(EnjuSubject) %>
+    ;
+    <% manifestation.classifications.each do |classification| %>
+      <%= link_to "#{classification.classification_type.display_name.localize}: #{classification.category}", manifestations_path(query: "classification_sm:#{classification.classification_type.name}_#{classification.category}") %>
+    <% end %>
+  <% end %>

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

@@ -29,9 +29,9 @@
   <%- if @manifestations.total_count > 0 -%>
     <p>
       <%= t('page.number_of_search_results', count: @count[:query_result], numdocs: Manifestation.search.total, seconds: sprintf("%.3f", @seconds)) -%>
-      <%- if @count[:query_result] > Setting.max_number_of_results -%>
+      <% if @count[:query_result] > @max_number_of_results %>
         <br />
-        <%= t('page.limit_exceeded', count: Setting.max_number_of_results) -%>
+        <%= t('page.limit_exceeded', count: @max_number_of_results) %>
       <%- end -%>
     </p>
 

data/lib/enju_flower/version.rb

@@ -1,3 +1,3 @@
 module EnjuFlower
-  VERSION = "0.1.0.pre21"
+  VERSION = "0.1.0.pre22"
 end

data/spec/controllers/manifestations_controller_spec.rb

@@ -82,20 +82,20 @@ describe ManifestationsController do
         expect(assigns(:manifestations)).to_not be_nil
       end
 
-      it "assigns all manifestations as @manifestations when pub_date_from and pub_date_to are specified" do
-        get :index, :pub_date_from => '2000', :pub_date_to => '2007'
+      it "assigns all manifestations as @manifestations when pub_date_from and pub_date_until are specified" do
+        get :index, :pub_date_from => '2000', :pub_date_until => '2007'
         assigns(:query).should eq "date_of_publication_d:[#{Time.zone.parse('2000-01-01').utc.iso8601} TO #{Time.zone.parse('2007-12-31').end_of_year.utc.iso8601}]"
         expect(assigns(:manifestations)).to_not be_nil
       end
 
-      it "assigns all manifestations as @manifestations when acquired_from and pub_date_to are specified" do
-        get :index, :acquired_from => '2000', :acquired_to => '2007'
+      it "assigns all manifestations as @manifestations when acquired_from and pub_date_until are specified" do
+        get :index, :acquired_from => '2000', :acquired_until => '2007'
         assigns(:query).should eq "acquired_at_d:[#{Time.zone.parse('2000-01-01').utc.iso8601} TO #{Time.zone.parse('2007-12-31').end_of_day.utc.iso8601}]"
         expect(assigns(:manifestations)).to_not be_nil
       end
 
       it "assigns all manifestations as @manifestations when number_of_pages_at_least and number_of_pages_at_most are specified" do
-        get :index, :number_of_pages_at_least => '100', :number_of_pages_at_least => '200'
+        get :index, :number_of_pages_at_least => '100', :number_of_pages_at_most => '200'
         expect(assigns(:manifestations)).to_not be_nil
       end
 
@@ -137,8 +137,8 @@ describe ManifestationsController do
         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'
+      it "should get index with pub_date_until" do
+        get :index, :query => '2005', :pub_date_until => '2000'
         expect(response).to be_success
         expect(assigns(:manifestations)).to be_truthy
         assigns(:query).should eq '2005 date_of_publication_d:[* TO 2000-12-31T14:59:59Z]'

data/spec/dummy/db/migrate/20150221063719_add_settings_to_library_group.rb

@@ -0,0 +1,5 @@
+class AddSettingsToLibraryGroup < ActiveRecord::Migration
+  def change
+    add_column :library_groups, :settings, :text
+  end
+end

data/spec/dummy/db/schema.rb

@@ -11,9 +11,9 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20141014065831) do
+ActiveRecord::Schema.define(version: 20150221063719) do
 
-  create_table "accepts", force: true do |t|
+  create_table "accepts", force: :cascade do |t|
     t.integer  "basket_id"
     t.integer  "item_id"
     t.integer  "librarian_id"
@@ -24,7 +24,7 @@ ActiveRecord::Schema.define(version: 20141014065831) do
   add_index "accepts", ["basket_id"], name: "index_accepts_on_basket_id"
   add_index "accepts", ["item_id"], name: "index_accepts_on_item_id"
 
-  create_table "agent_import_file_transitions", force: true do |t|
+  create_table "agent_import_file_transitions", force: :cascade do |t|
     t.string   "to_state"
     t.text     "metadata",             default: "{}"
     t.integer  "sort_key"
@@ -36,7 +36,7 @@ ActiveRecord::Schema.define(version: 20141014065831) do
   add_index "agent_import_file_transitions", ["agent_import_file_id"], name: "index_agent_import_file_transitions_on_agent_import_file_id"
   add_index "agent_import_file_transitions", ["sort_key", "agent_import_file_id"], name: "index_agent_import_file_transitions_on_sort_key_and_file_id", unique: true
 
-  create_table "agent_import_files", force: true do |t|
+  create_table "agent_import_files", force: :cascade do |t|
     t.integer  "parent_id"
     t.string   "content_type"
     t.integer  "size"
@@ -58,7 +58,7 @@ ActiveRecord::Schema.define(version: 20141014065831) do
   add_index "agent_import_files", ["parent_id"], name: "index_agent_import_files_on_parent_id"
   add_index "agent_import_files", ["user_id"], name: "index_agent_import_files_on_user_id"
 
-  create_table "agent_import_results", force: true do |t|
+  create_table "agent_import_results", force: :cascade do |t|
     t.integer  "agent_import_file_id"
     t.integer  "agent_id"
     t.text     "body"
@@ -66,13 +66,13 @@ ActiveRecord::Schema.define(version: 20141014065831) do
     t.datetime "updated_at"
   end
 
-  create_table "agent_merge_lists", force: true do |t|
+  create_table "agent_merge_lists", force: :cascade do |t|
     t.string   "title"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
-  create_table "agent_merges", force: true do |t|
+  create_table "agent_merges", force: :cascade do |t|
     t.integer  "agent_id",            null: false
     t.integer  "agent_merge_list_id", null: false
     t.datetime "created_at"
@@ -82,7 +82,7 @@ ActiveRecord::Schema.define(version: 20141014065831) do
   add_index "agent_merges", ["agent_id"], name: "index_agent_merges_on_agent_id"
   add_index "agent_merges", ["agent_merge_list_id"], name: "index_agent_merges_on_agent_merge_list_id"
 
-  create_table "agent_relationship_types", force: true do |t|
+  create_table "agent_relationship_types", force: :cascade do |t|
     t.string   "name",         null: false
     t.text     "display_name"
     t.text     "note"
@@ -91,7 +91,7 @@ ActiveRecord::Schema.define(version: 20141014065831) do
     t.datetime "updated_at"
   end
 
-  create_table "agent_relationships", force: true do |t|
+  create_table "agent_relationships", force: :cascade do |t|
     t.integer  "parent_id"
     t.integer  "child_id"
     t.integer  "agent_relationship_type_id"
@@ -103,7 +103,7 @@ ActiveRecord::Schema.define(version: 20141014065831) do
   add_index "agent_relationships", ["child_id"], name: "index_agent_relationships_on_child_id"
   add_index "agent_relationships", ["parent_id"], name: "index_agent_relationships_on_parent_id"
 
-  create_table "agent_types", force: true do |t|
+  create_table "agent_types", force: :cascade do |t|
     t.string   "name",         null: false
     t.text     "display_name"
     t.text     "note"
@@ -112,7 +112,7 @@ ActiveRecord::Schema.define(version: 20141014065831) do
     t.datetime "updated_at"
   end
 
-  create_table "agents", force: true do |t|
+  create_table "agents", force: :cascade do |t|
     t.string   "last_name"
     t.string   "middle_name"
     t.string   "first_name"
@@ -166,7 +166,7 @@ ActiveRecord::Schema.define(version: 20141014065831) do
   add_index "agents", ["language_id"], name: "index_agents_on_language_id"
   add_index "agents", ["required_role_id"], name: "index_agents_on_required_role_id"
 
-  create_table "baskets", force: true do |t|
+  create_table "baskets", force: :cascade do |t|
     t.integer  "user_id"
     t.text     "note"
     t.integer  "lock_version", default: 0, null: false
@@ -176,7 +176,7 @@ ActiveRecord::Schema.define(version: 20141014065831) do
 
   add_index "baskets", ["user_id"], name: "index_baskets_on_user_id"
 
-  create_table "bookmark_stat_has_manifestations", force: true do |t|
+  create_table "bookmark_stat_has_manifestations", force: :cascade do |t|
     t.integer  "bookmark_stat_id", null: false
     t.integer  "manifestation_id", null: false
     t.integer  "bookmarks_count"
@@ -187,7 +187,7 @@ ActiveRecord::Schema.define(version: 20141014065831) do
   add_index "bookmark_stat_has_manifestations", ["bookmark_stat_id"], name: "index_bookmark_stat_has_manifestations_on_bookmark_stat_id"
   add_index "bookmark_stat_has_manifestations", ["manifestation_id"], name: "index_bookmark_stat_has_manifestations_on_manifestation_id"
 
-  create_table "bookmark_stat_transitions", force: true do |t|
+  create_table "bookmark_stat_transitions", force: :cascade do |t|
     t.string   "to_state"
     t.text     "metadata",         default: "{}"
     t.integer  "sort_key"
@@ -199,7 +199,7 @@ ActiveRecord::Schema.define(version: 20141014065831) do
   add_index "bookmark_stat_transitions", ["bookmark_stat_id"], name: "index_bookmark_stat_transitions_on_bookmark_stat_id"
   add_index "bookmark_stat_transitions", ["sort_key", "bookmark_stat_id"], name: "index_bookmark_stat_transitions_on_sort_key_and_stat_id", unique: true
 
-  create_table "bookmark_stats", force: true do |t|
+  create_table "bookmark_stats", force: :cascade do |t|
     t.datetime "start_date"
     t.datetime "end_date"
     t.datetime "started_at"
@@ -209,7 +209,7 @@ ActiveRecord::Schema.define(version: 20141014065831) do
     t.datetime "updated_at"
   end
 
-  create_table "bookmarks", force: true do |t|
+  create_table "bookmarks", force: :cascade do |t|
     t.integer  "user_id",          null: false
     t.integer  "manifestation_id"
     t.text     "title"
@@ -224,7 +224,7 @@ ActiveRecord::Schema.define(version: 20141014065831) do
   add_index "bookmarks", ["url"], name: "index_bookmarks_on_url"
   add_index "bookmarks", ["user_id"], name: "index_bookmarks_on_user_id"
 
-  create_table "bookstores", force: true do |t|
+  create_table "bookstores", force: :cascade do |t|
     t.text     "name",             null: false
     t.string   "zip_code"
     t.text     "address"
@@ -238,7 +238,7 @@ ActiveRecord::Schema.define(version: 20141014065831) do
     t.datetime "updated_at"
   end
 
-  create_table "budget_types", force: true do |t|
+  create_table "budget_types", force: :cascade do |t|
     t.string   "name"
     t.text     "display_name"
     t.text     "note"
@@ -247,7 +247,7 @@ ActiveRecord::Schema.define(version: 20141014065831) do
     t.datetime "updated_at"
   end
 
-  create_table "carrier_type_has_checkout_types", force: true do |t|
+  create_table "carrier_type_has_checkout_types", force: :cascade do |t|
     t.integer  "carrier_type_id",  null: false
     t.integer  "checkout_type_id", null: false
     t.text     "note"
@@ -259,7 +259,7 @@ ActiveRecord::Schema.define(version: 20141014065831) do
   add_index "carrier_type_has_checkout_types", ["carrier_type_id"], name: "index_carrier_type_has_checkout_types_on_m_form_id"
   add_index "carrier_type_has_checkout_types", ["checkout_type_id"], name: "index_carrier_type_has_checkout_types_on_checkout_type_id"
 
-  create_table "carrier_types", force: true do |t|
+  create_table "carrier_types", force: :cascade do |t|
     t.string   "name",         null: false
     t.text     "display_name"
     t.text     "note"
@@ -268,7 +268,7 @@ ActiveRecord::Schema.define(version: 20141014065831) do
     t.datetime "updated_at"
   end
 
-  create_table "checked_items", force: true do |t|
+  create_table "checked_items", force: :cascade do |t|
     t.integer  "item_id",      null: false
     t.integer  "basket_id",    null: false
     t.datetime "due_date",     null: false
@@ -280,7 +280,7 @@ ActiveRecord::Schema.define(version: 20141014065831) do
   add_index "checked_items", ["basket_id"], name: "index_checked_items_on_basket_id"
   add_index "checked_items", ["item_id"], name: "index_checked_items_on_item_id"
 
-  create_table "checkins", force: true do |t|
+  create_table "checkins", force: :cascade do |t|
     t.integer  "item_id",                  null: false
     t.integer  "librarian_id"
     t.integer  "basket_id"
@@ -293,7 +293,7 @@ ActiveRecord::Schema.define(version: 20141014065831) do
   add_index "checkins", ["item_id"], name: "index_checkins_on_item_id"
   add_index "checkins", ["librarian_id"], name: "index_checkins_on_librarian_id"
 
-  create_table "checkout_stat_has_manifestations", force: true do |t|
+  create_table "checkout_stat_has_manifestations", force: :cascade do |t|
     t.integer  "manifestation_checkout_stat_id", null: false
     t.integer  "manifestation_id",               null: false
     t.integer  "checkouts_count"
@@ -304,7 +304,7 @@ ActiveRecord::Schema.define(version: 20141014065831) do
   add_index "checkout_stat_has_manifestations", ["manifestation_checkout_stat_id"], name: "index_checkout_stat_has_manifestations_on_checkout_stat_id"
   add_index "checkout_stat_has_manifestations", ["manifestation_id"], name: "index_checkout_stat_has_manifestations_on_manifestation_id"
 
-  create_table "checkout_stat_has_users", force: true do |t|
+  create_table "checkout_stat_has_users", force: :cascade do |t|
     t.integer  "user_checkout_stat_id",             null: false
     t.integer  "user_id",                           null: false
     t.integer  "checkouts_count",       default: 0, null: false
@@ -315,7 +315,7 @@ ActiveRecord::Schema.define(version: 20141014065831) do
   add_index "checkout_stat_has_users", ["user_checkout_stat_id"], name: "index_checkout_stat_has_users_on_user_checkout_stat_id"
   add_index "checkout_stat_has_users", ["user_id"], name: "index_checkout_stat_has_users_on_user_id"
 
-  create_table "checkout_types", force: true do |t|
+  create_table "checkout_types", force: :cascade do |t|
     t.string   "name",         null: false
     t.text     "display_name"
     t.text     "note"
@@ -326,7 +326,7 @@ ActiveRecord::Schema.define(version: 20141014065831) do
 
   add_index "checkout_types", ["name"], name: "index_checkout_types_on_name"
 
-  create_table "checkouts", force: true do |t|
+  create_table "checkouts", force: :cascade do |t|
     t.integer  "user_id"
     t.integer  "item_id",                            null: false
     t.integer  "checkin_id"
@@ -348,7 +348,7 @@ ActiveRecord::Schema.define(version: 20141014065831) do
   add_index "checkouts", ["shelf_id"], name: "index_checkouts_on_shelf_id"
   add_index "checkouts", ["user_id"], name: "index_checkouts_on_user_id"
 
-  create_table "circulation_statuses", force: true do |t|
+  create_table "circulation_statuses", force: :cascade do |t|
     t.string   "name",         null: false
     t.text     "display_name"
     t.text     "note"
@@ -357,7 +357,7 @@ ActiveRecord::Schema.define(version: 20141014065831) do
     t.datetime "updated_at"
   end
 
-  create_table "classification_types", force: true do |t|
+  create_table "classification_types", force: :cascade do |t|
     t.string   "name",         null: false
     t.text     "display_name"
     t.text     "note"
@@ -366,7 +366,7 @@ ActiveRecord::Schema.define(version: 20141014065831) do
     t.datetime "updated_at"
   end
 
-  create_table "classifications", force: true do |t|
+  create_table "classifications", force: :cascade do |t|
     t.integer  "parent_id"
     t.string   "category",               null: false
     t.text     "note"
@@ -383,7 +383,7 @@ ActiveRecord::Schema.define(version: 20141014065831) do
   add_index "classifications", ["manifestation_id"], name: "index_classifications_on_manifestation_id"
   add_index "classifications", ["parent_id"], name: "index_classifications_on_parent_id"
 
-  create_table "colors", force: true do |t|
+  create_table "colors", force: :cascade do |t|
     t.integer  "library_group_id"
     t.string   "property"
     t.string   "code"
@@ -394,7 +394,7 @@ ActiveRecord::Schema.define(version: 20141014065831) do
 
   add_index "colors", ["library_group_id"], name: "index_colors_on_library_group_id"
 
-  create_table "content_types", force: true do |t|
+  create_table "content_types", force: :cascade do |t|
     t.string   "name",         null: false
     t.text     "display_name"
     t.text     "note"
@@ -403,7 +403,7 @@ ActiveRecord::Schema.define(version: 20141014065831) do
     t.datetime "updated_at"
   end
 
-  create_table "countries", force: true do |t|
+  create_table "countries", force: :cascade do |t|
     t.string  "name",         null: false
     t.text    "display_name"
     t.string  "alpha_2"
@@ -418,7 +418,7 @@ ActiveRecord::Schema.define(version: 20141014065831) do
   add_index "countries", ["name"], name: "index_countries_on_name"
   add_index "countries", ["numeric_3"], name: "index_countries_on_numeric_3"
 
-  create_table "create_types", force: true do |t|
+  create_table "create_types", force: :cascade do |t|
     t.string   "name"
     t.text     "display_name"
     t.text     "note"
@@ -427,7 +427,7 @@ ActiveRecord::Schema.define(version: 20141014065831) do
     t.datetime "updated_at"
   end
 
-  create_table "creates", force: true do |t|
+  create_table "creates", force: :cascade do |t|
     t.integer  "agent_id",       null: false
     t.integer  "work_id",        null: false
     t.integer  "position"
@@ -439,7 +439,7 @@ ActiveRecord::Schema.define(version: 20141014065831) do
   add_index "creates", ["agent_id"], name: "index_creates_on_agent_id"
   add_index "creates", ["work_id"], name: "index_creates_on_work_id"
 
-  create_table "donates", force: true do |t|
+  create_table "donates", force: :cascade do |t|
     t.integer  "agent_id",   null: false
     t.integer  "item_id",    null: false
     t.datetime "created_at"
@@ -449,7 +449,7 @@ ActiveRecord::Schema.define(version: 20141014065831) do
   add_index "donates", ["agent_id"], name: "index_donates_on_agent_id"
   add_index "donates", ["item_id"], name: "index_donates_on_item_id"
 
-  create_table "exemplifies", force: true do |t|
+  create_table "exemplifies", force: :cascade do |t|
     t.integer  "manifestation_id", null: false
     t.integer  "item_id",          null: false
     t.integer  "position"
@@ -460,7 +460,7 @@ ActiveRecord::Schema.define(version: 20141014065831) do
   add_index "exemplifies", ["item_id"], name: "index_exemplifies_on_item_id", unique: true
   add_index "exemplifies", ["manifestation_id"], name: "index_exemplifies_on_manifestation_id"
 
-  create_table "form_of_works", force: true do |t|
+  create_table "form_of_works", force: :cascade do |t|
     t.string   "name",         null: false
     t.text     "display_name"
     t.text     "note"
@@ -469,7 +469,7 @@ ActiveRecord::Schema.define(version: 20141014065831) do
     t.datetime "updated_at"
   end
 
-  create_table "frequencies", force: true do |t|
+  create_table "frequencies", force: :cascade do |t|
     t.string   "name",         null: false
     t.text     "display_name"
     t.text     "note"
@@ -478,7 +478,7 @@ ActiveRecord::Schema.define(version: 20141014065831) do
     t.datetime "updated_at"
   end
 
-  create_table "identifier_types", force: true do |t|
+  create_table "identifier_types", force: :cascade do |t|
     t.string   "name"
     t.text     "display_name"
     t.text     "note"
@@ -487,7 +487,7 @@ ActiveRecord::Schema.define(version: 20141014065831) do
     t.datetime "updated_at"
   end
 
-  create_table "identifiers", force: true do |t|
+  create_table "identifiers", force: :cascade do |t|
     t.string   "body",               null: false
     t.integer  "identifier_type_id", null: false
     t.integer  "manifestation_id"
@@ -500,7 +500,7 @@ ActiveRecord::Schema.define(version: 20141014065831) do
   add_index "identifiers", ["body", "identifier_type_id"], name: "index_identifiers_on_body_and_identifier_type_id"
   add_index "identifiers", ["manifestation_id"], name: "index_identifiers_on_manifestation_id"
 
-  create_table "import_request_transitions", force: true do |t|
+  create_table "import_request_transitions", force: :cascade do |t|
     t.string   "to_state"
     t.text     "metadata",          default: "{}"
     t.integer  "sort_key"
@@ -512,7 +512,7 @@ ActiveRecord::Schema.define(version: 20141014065831) do
   add_index "import_request_transitions", ["import_request_id"], name: "index_import_request_transitions_on_import_request_id"
   add_index "import_request_transitions", ["sort_key", "import_request_id"], name: "index_import_request_transitions_on_sort_key_and_request_id", unique: true
 
-  create_table "import_requests", force: true do |t|
+  create_table "import_requests", force: :cascade do |t|
     t.string   "isbn"
     t.integer  "manifestation_id"
     t.integer  "user_id"
@@ -524,7 +524,7 @@ ActiveRecord::Schema.define(version: 20141014065831) do
   add_index "import_requests", ["manifestation_id"], name: "index_import_requests_on_manifestation_id"
   add_index "import_requests", ["user_id"], name: "index_import_requests_on_user_id"
 
-  create_table "item_has_use_restrictions", force: true do |t|
+  create_table "item_has_use_restrictions", force: :cascade do |t|
     t.integer  "item_id",            null: false
     t.integer  "use_restriction_id", null: false
     t.datetime "created_at"
@@ -534,7 +534,7 @@ ActiveRecord::Schema.define(version: 20141014065831) 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 "items", force: true do |t|
+  create_table "items", force: :cascade do |t|
     t.string   "call_number"
     t.string   "item_identifier"
     t.datetime "created_at"
@@ -568,7 +568,7 @@ ActiveRecord::Schema.define(version: 20141014065831) do
   add_index "items", ["required_role_id"], name: "index_items_on_required_role_id"
   add_index "items", ["shelf_id"], name: "index_items_on_shelf_id"
 
-  create_table "languages", force: true do |t|
+  create_table "languages", force: :cascade do |t|
     t.string  "name",         null: false
     t.string  "native_name"
     t.text    "display_name"
@@ -584,7 +584,7 @@ ActiveRecord::Schema.define(version: 20141014065831) do
   add_index "languages", ["iso_639_3"], name: "index_languages_on_iso_639_3"
   add_index "languages", ["name"], name: "index_languages_on_name", unique: true
 
-  create_table "lending_policies", force: true do |t|
+  create_table "lending_policies", force: :cascade do |t|
     t.integer  "item_id",                    null: false
     t.integer  "user_group_id",              null: false
     t.integer  "loan_period",    default: 0, null: false
@@ -599,7 +599,7 @@ ActiveRecord::Schema.define(version: 20141014065831) do
 
   add_index "lending_policies", ["item_id", "user_group_id"], name: "index_lending_policies_on_item_id_and_user_group_id", unique: true
 
-  create_table "libraries", force: true do |t|
+  create_table "libraries", force: :cascade do |t|
     t.string   "name",                                null: false
     t.text     "display_name"
     t.string   "short_display_name",                  null: false
@@ -629,7 +629,7 @@ ActiveRecord::Schema.define(version: 20141014065831) do
   add_index "libraries", ["library_group_id"], name: "index_libraries_on_library_group_id"
   add_index "libraries", ["name"], name: "index_libraries_on_name", unique: true
 
-  create_table "library_groups", force: true do |t|
+  create_table "library_groups", force: :cascade do |t|
     t.string   "name",                                                           null: false
     t.text     "display_name"
     t.string   "short_name",                                                     null: false
@@ -643,11 +643,12 @@ ActiveRecord::Schema.define(version: 20141014065831) do
     t.text     "admin_networks"
     t.boolean  "allow_bookmark_external_url", default: false,                    null: false
     t.string   "url",                         default: "http://localhost:3000/"
+    t.text     "settings"
   end
 
   add_index "library_groups", ["short_name"], name: "index_library_groups_on_short_name"
 
-  create_table "licenses", force: true do |t|
+  create_table "licenses", force: :cascade do |t|
     t.string   "name",         null: false
     t.string   "display_name"
     t.text     "note"
@@ -656,7 +657,7 @@ ActiveRecord::Schema.define(version: 20141014065831) do
     t.datetime "updated_at"
   end
 
-  create_table "manifestation_checkout_stat_transitions", force: true do |t|
+  create_table "manifestation_checkout_stat_transitions", force: :cascade do |t|
     t.string   "to_state"
     t.text     "metadata",                       default: "{}"
     t.integer  "sort_key"
@@ -668,7 +669,7 @@ ActiveRecord::Schema.define(version: 20141014065831) do
   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|
+  create_table "manifestation_checkout_stats", force: :cascade do |t|
     t.datetime "start_date"
     t.datetime "end_date"
     t.text     "note"
@@ -681,7 +682,7 @@ ActiveRecord::Schema.define(version: 20141014065831) do
 
   add_index "manifestation_checkout_stats", ["user_id"], name: "index_manifestation_checkout_stats_on_user_id"
 
-  create_table "manifestation_relationship_types", force: true do |t|
+  create_table "manifestation_relationship_types", force: :cascade do |t|
     t.string   "name",         null: false
     t.text     "display_name"
     t.text     "note"
@@ -690,7 +691,7 @@ ActiveRecord::Schema.define(version: 20141014065831) do
     t.datetime "updated_at"
   end
 
-  create_table "manifestation_relationships", force: true do |t|
+  create_table "manifestation_relationships", force: :cascade do |t|
     t.integer  "parent_id"
     t.integer  "child_id"
     t.integer  "manifestation_relationship_type_id"
@@ -702,7 +703,7 @@ ActiveRecord::Schema.define(version: 20141014065831) 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|
+  create_table "manifestation_reserve_stat_transitions", force: :cascade do |t|
     t.string   "to_state"
     t.text     "metadata",                      default: "{}"
     t.integer  "sort_key"
@@ -714,7 +715,7 @@ ActiveRecord::Schema.define(version: 20141014065831) do
   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|
+  create_table "manifestation_reserve_stats", force: :cascade do |t|
     t.datetime "start_date"
     t.datetime "end_date"
     t.text     "note"
@@ -727,7 +728,7 @@ ActiveRecord::Schema.define(version: 20141014065831) do
 
   add_index "manifestation_reserve_stats", ["user_id"], name: "index_manifestation_reserve_stats_on_user_id"
 
-  create_table "manifestations", force: true do |t|
+  create_table "manifestations", force: :cascade do |t|
     t.text     "original_title",                                  null: false
     t.text     "title_alternative"
     t.text     "title_transcription"
@@ -793,7 +794,7 @@ ActiveRecord::Schema.define(version: 20141014065831) do
   add_index "manifestations", ["manifestation_identifier"], name: "index_manifestations_on_manifestation_identifier"
   add_index "manifestations", ["updated_at"], name: "index_manifestations_on_updated_at"
 
-  create_table "medium_of_performances", force: true do |t|
+  create_table "medium_of_performances", force: :cascade do |t|
     t.string   "name",         null: false
     t.text     "display_name"
     t.text     "note"
@@ -802,7 +803,7 @@ ActiveRecord::Schema.define(version: 20141014065831) do
     t.datetime "updated_at"
   end
 
-  create_table "owns", force: true do |t|
+  create_table "owns", force: :cascade do |t|
     t.integer  "agent_id",   null: false
     t.integer  "item_id",    null: false
     t.integer  "position"
@@ -813,7 +814,7 @@ ActiveRecord::Schema.define(version: 20141014065831) do
   add_index "owns", ["agent_id"], name: "index_owns_on_agent_id"
   add_index "owns", ["item_id"], name: "index_owns_on_item_id"
 
-  create_table "picture_files", force: true do |t|
+  create_table "picture_files", force: :cascade do |t|
     t.integer  "picture_attachable_id"
     t.string   "picture_attachable_type"
     t.string   "content_type"
@@ -832,7 +833,7 @@ ActiveRecord::Schema.define(version: 20141014065831) do
 
   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|
+  create_table "produce_types", force: :cascade do |t|
     t.string   "name"
     t.text     "display_name"
     t.text     "note"
@@ -841,7 +842,7 @@ ActiveRecord::Schema.define(version: 20141014065831) do
     t.datetime "updated_at"
   end
 
-  create_table "produces", force: true do |t|
+  create_table "produces", force: :cascade do |t|
     t.integer  "agent_id",         null: false
     t.integer  "manifestation_id", null: false
     t.integer  "position"
@@ -853,7 +854,7 @@ ActiveRecord::Schema.define(version: 20141014065831) do
   add_index "produces", ["agent_id"], name: "index_produces_on_agent_id"
   add_index "produces", ["manifestation_id"], name: "index_produces_on_manifestation_id"
 
-  create_table "profiles", force: true do |t|
+  create_table "profiles", force: :cascade do |t|
     t.integer  "user_id"
     t.integer  "user_group_id"
     t.integer  "library_id"
@@ -877,7 +878,7 @@ ActiveRecord::Schema.define(version: 20141014065831) do
   add_index "profiles", ["user_id"], name: "index_profiles_on_user_id"
   add_index "profiles", ["user_number"], name: "index_profiles_on_user_number", unique: true
 
-  create_table "realize_types", force: true do |t|
+  create_table "realize_types", force: :cascade do |t|
     t.string   "name"
     t.text     "display_name"
     t.text     "note"
@@ -886,7 +887,7 @@ ActiveRecord::Schema.define(version: 20141014065831) do
     t.datetime "updated_at"
   end
 
-  create_table "realizes", force: true do |t|
+  create_table "realizes", force: :cascade do |t|
     t.integer  "agent_id",        null: false
     t.integer  "expression_id",   null: false
     t.integer  "position"
@@ -898,7 +899,7 @@ ActiveRecord::Schema.define(version: 20141014065831) do
   add_index "realizes", ["agent_id"], name: "index_realizes_on_agent_id"
   add_index "realizes", ["expression_id"], name: "index_realizes_on_expression_id"
 
-  create_table "request_status_types", force: true do |t|
+  create_table "request_status_types", force: :cascade do |t|
     t.string   "name",         null: false
     t.text     "display_name"
     t.text     "note"
@@ -907,7 +908,7 @@ ActiveRecord::Schema.define(version: 20141014065831) do
     t.datetime "updated_at"
   end
 
-  create_table "request_types", force: true do |t|
+  create_table "request_types", force: :cascade do |t|
     t.string   "name",         null: false
     t.text     "display_name"
     t.text     "note"
@@ -916,7 +917,7 @@ ActiveRecord::Schema.define(version: 20141014065831) do
     t.datetime "updated_at"
   end
 
-  create_table "reserve_stat_has_manifestations", force: true do |t|
+  create_table "reserve_stat_has_manifestations", force: :cascade do |t|
     t.integer  "manifestation_reserve_stat_id", null: false
     t.integer  "manifestation_id",              null: false
     t.integer  "reserves_count"
@@ -927,7 +928,7 @@ ActiveRecord::Schema.define(version: 20141014065831) do
   add_index "reserve_stat_has_manifestations", ["manifestation_id"], name: "index_reserve_stat_has_manifestations_on_manifestation_id"
   add_index "reserve_stat_has_manifestations", ["manifestation_reserve_stat_id"], name: "index_reserve_stat_has_manifestations_on_m_reserve_stat_id"
 
-  create_table "reserve_stat_has_users", force: true do |t|
+  create_table "reserve_stat_has_users", force: :cascade do |t|
     t.integer  "user_reserve_stat_id", null: false
     t.integer  "user_id",              null: false
     t.integer  "reserves_count"
@@ -938,7 +939,7 @@ ActiveRecord::Schema.define(version: 20141014065831) 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|
+  create_table "reserve_transitions", force: :cascade do |t|
     t.string   "to_state"
     t.text     "metadata",   default: "{}"
     t.integer  "sort_key"
@@ -950,7 +951,7 @@ ActiveRecord::Schema.define(version: 20141014065831) do
   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|
+  create_table "reserves", force: :cascade do |t|
     t.integer  "user_id",                                      null: false
     t.integer  "manifestation_id",                             null: false
     t.integer  "item_id"
@@ -973,7 +974,7 @@ ActiveRecord::Schema.define(version: 20141014065831) do
   add_index "reserves", ["request_status_type_id"], name: "index_reserves_on_request_status_type_id"
   add_index "reserves", ["user_id"], name: "index_reserves_on_user_id"
 
-  create_table "resource_export_file_transitions", force: true do |t|
+  create_table "resource_export_file_transitions", force: :cascade do |t|
     t.string   "to_state"
     t.text     "metadata",                default: "{}"
     t.integer  "sort_key"
@@ -985,7 +986,7 @@ ActiveRecord::Schema.define(version: 20141014065831) do
   add_index "resource_export_file_transitions", ["resource_export_file_id"], name: "index_resource_export_file_transitions_on_file_id"
   add_index "resource_export_file_transitions", ["sort_key", "resource_export_file_id"], name: "index_resource_export_file_transitions_on_sort_key_and_file_id", unique: true
 
-  create_table "resource_export_files", force: true do |t|
+  create_table "resource_export_files", force: :cascade do |t|
     t.integer  "user_id"
     t.string   "resource_export_file_name"
     t.string   "resource_export_content_type"
@@ -996,7 +997,7 @@ ActiveRecord::Schema.define(version: 20141014065831) do
     t.datetime "updated_at"
   end
 
-  create_table "resource_import_file_transitions", force: true do |t|
+  create_table "resource_import_file_transitions", force: :cascade do |t|
     t.string   "to_state"
     t.text     "metadata",                default: "{}"
     t.integer  "sort_key"
@@ -1008,7 +1009,7 @@ ActiveRecord::Schema.define(version: 20141014065831) do
   add_index "resource_import_file_transitions", ["resource_import_file_id"], name: "index_resource_import_file_transitions_on_file_id"
   add_index "resource_import_file_transitions", ["sort_key", "resource_import_file_id"], name: "index_resource_import_file_transitions_on_sort_key_and_file_id", unique: true
 
-  create_table "resource_import_files", force: true do |t|
+  create_table "resource_import_files", force: :cascade do |t|
     t.integer  "parent_id"
     t.string   "content_type"
     t.integer  "size"
@@ -1031,7 +1032,7 @@ ActiveRecord::Schema.define(version: 20141014065831) do
   add_index "resource_import_files", ["parent_id"], name: "index_resource_import_files_on_parent_id"
   add_index "resource_import_files", ["user_id"], name: "index_resource_import_files_on_user_id"
 
-  create_table "resource_import_results", force: true do |t|
+  create_table "resource_import_results", force: :cascade do |t|
     t.integer  "resource_import_file_id"
     t.integer  "manifestation_id"
     t.integer  "item_id"
@@ -1045,7 +1046,7 @@ ActiveRecord::Schema.define(version: 20141014065831) do
   add_index "resource_import_results", ["manifestation_id"], name: "index_resource_import_results_on_manifestation_id"
   add_index "resource_import_results", ["resource_import_file_id"], name: "index_resource_import_results_on_resource_import_file_id"
 
-  create_table "roles", force: true do |t|
+  create_table "roles", force: :cascade do |t|
     t.string   "name",                     null: false
     t.string   "display_name"
     t.text     "note"
@@ -1055,7 +1056,7 @@ ActiveRecord::Schema.define(version: 20141014065831) do
     t.integer  "position"
   end
 
-  create_table "search_engines", force: true do |t|
+  create_table "search_engines", force: :cascade do |t|
     t.string   "name",             null: false
     t.text     "display_name"
     t.string   "url",              null: false
@@ -1069,13 +1070,13 @@ ActiveRecord::Schema.define(version: 20141014065831) do
     t.datetime "updated_at"
   end
 
-  create_table "series_statement_merge_lists", force: true do |t|
+  create_table "series_statement_merge_lists", force: :cascade do |t|
     t.string   "title"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
-  create_table "series_statement_merges", force: true do |t|
+  create_table "series_statement_merges", force: :cascade do |t|
     t.integer  "series_statement_id",            null: false
     t.integer  "series_statement_merge_list_id", null: false
     t.datetime "created_at"
@@ -1085,7 +1086,7 @@ ActiveRecord::Schema.define(version: 20141014065831) do
   add_index "series_statement_merges", ["series_statement_id"], name: "index_series_statement_merges_on_series_statement_id"
   add_index "series_statement_merges", ["series_statement_merge_list_id"], name: "index_series_statement_merges_on_list_id"
 
-  create_table "series_statements", force: true do |t|
+  create_table "series_statements", force: :cascade do |t|
     t.text     "original_title"
     t.text     "numbering"
     t.text     "title_subseries"
@@ -1110,7 +1111,7 @@ ActiveRecord::Schema.define(version: 20141014065831) do
   add_index "series_statements", ["root_manifestation_id"], name: "index_series_statements_on_root_manifestation_id"
   add_index "series_statements", ["series_statement_identifier"], name: "index_series_statements_on_series_statement_identifier"
 
-  create_table "shelves", force: true do |t|
+  create_table "shelves", force: :cascade do |t|
     t.string   "name",                         null: false
     t.text     "display_name"
     t.text     "note"
@@ -1125,7 +1126,7 @@ ActiveRecord::Schema.define(version: 20141014065831) do
 
   add_index "shelves", ["library_id"], name: "index_shelves_on_library_id"
 
-  create_table "subject_heading_types", force: true do |t|
+  create_table "subject_heading_types", force: :cascade do |t|
     t.string   "name",         null: false
     t.text     "display_name"
     t.text     "note"
@@ -1134,7 +1135,7 @@ ActiveRecord::Schema.define(version: 20141014065831) do
     t.datetime "updated_at"
   end
 
-  create_table "subject_types", force: true do |t|
+  create_table "subject_types", force: :cascade do |t|
     t.string   "name",         null: false
     t.text     "display_name"
     t.text     "note"
@@ -1143,7 +1144,7 @@ ActiveRecord::Schema.define(version: 20141014065831) do
     t.datetime "updated_at"
   end
 
-  create_table "subjects", force: true do |t|
+  create_table "subjects", force: :cascade do |t|
     t.integer  "parent_id"
     t.integer  "use_term_id"
     t.string   "term"
@@ -1168,7 +1169,7 @@ ActiveRecord::Schema.define(version: 20141014065831) do
   add_index "subjects", ["term"], name: "index_subjects_on_term"
   add_index "subjects", ["use_term_id"], name: "index_subjects_on_use_term_id"
 
-  create_table "subscribes", force: true do |t|
+  create_table "subscribes", force: :cascade do |t|
     t.integer  "subscription_id", null: false
     t.integer  "work_id",         null: false
     t.datetime "start_at",        null: false
@@ -1180,7 +1181,7 @@ ActiveRecord::Schema.define(version: 20141014065831) do
   add_index "subscribes", ["subscription_id"], name: "index_subscribes_on_subscription_id"
   add_index "subscribes", ["work_id"], name: "index_subscribes_on_work_id"
 
-  create_table "subscriptions", force: true do |t|
+  create_table "subscriptions", force: :cascade do |t|
     t.text     "title",                        null: false
     t.text     "note"
     t.integer  "user_id"
@@ -1194,7 +1195,7 @@ ActiveRecord::Schema.define(version: 20141014065831) do
   add_index "subscriptions", ["order_list_id"], name: "index_subscriptions_on_order_list_id"
   add_index "subscriptions", ["user_id"], name: "index_subscriptions_on_user_id"
 
-  create_table "taggings", force: true do |t|
+  create_table "taggings", force: :cascade do |t|
     t.integer  "tag_id"
     t.integer  "taggable_id"
     t.string   "taggable_type"
@@ -1207,7 +1208,7 @@ ActiveRecord::Schema.define(version: 20141014065831) do
   add_index "taggings", ["tag_id"], name: "index_taggings_on_tag_id"
   add_index "taggings", ["taggable_id", "taggable_type", "context"], name: "index_taggings_on_taggable_id_and_taggable_type_and_context"
 
-  create_table "tags", force: true do |t|
+  create_table "tags", force: :cascade do |t|
     t.string   "name"
     t.string   "name_transcription"
     t.datetime "created_at"
@@ -1215,7 +1216,7 @@ ActiveRecord::Schema.define(version: 20141014065831) do
     t.integer  "taggings_count",     default: 0
   end
 
-  create_table "use_restrictions", force: true do |t|
+  create_table "use_restrictions", force: :cascade do |t|
     t.string   "name",         null: false
     t.text     "display_name"
     t.text     "note"
@@ -1224,7 +1225,7 @@ ActiveRecord::Schema.define(version: 20141014065831) do
     t.datetime "updated_at"
   end
 
-  create_table "user_checkout_stat_transitions", force: true do |t|
+  create_table "user_checkout_stat_transitions", force: :cascade do |t|
     t.string   "to_state"
     t.text     "metadata",              default: "{}"
     t.integer  "sort_key"
@@ -1236,7 +1237,7 @@ ActiveRecord::Schema.define(version: 20141014065831) do
   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|
+  create_table "user_checkout_stats", force: :cascade do |t|
     t.datetime "start_date"
     t.datetime "end_date"
     t.text     "note"
@@ -1249,7 +1250,7 @@ ActiveRecord::Schema.define(version: 20141014065831) do
 
   add_index "user_checkout_stats", ["user_id"], name: "index_user_checkout_stats_on_user_id"
 
-  create_table "user_export_file_transitions", force: true do |t|
+  create_table "user_export_file_transitions", force: :cascade do |t|
     t.string   "to_state"
     t.text     "metadata",            default: "{}"
     t.integer  "sort_key"
@@ -1261,7 +1262,7 @@ ActiveRecord::Schema.define(version: 20141014065831) do
   add_index "user_export_file_transitions", ["sort_key", "user_export_file_id"], name: "index_user_export_file_transitions_on_sort_key_and_file_id", unique: true
   add_index "user_export_file_transitions", ["user_export_file_id"], name: "index_user_export_file_transitions_on_file_id"
 
-  create_table "user_export_files", force: true do |t|
+  create_table "user_export_files", force: :cascade do |t|
     t.integer  "user_id"
     t.string   "user_export_file_name"
     t.string   "user_export_content_type"
@@ -1272,7 +1273,7 @@ ActiveRecord::Schema.define(version: 20141014065831) do
     t.datetime "updated_at"
   end
 
-  create_table "user_group_has_checkout_types", force: true do |t|
+  create_table "user_group_has_checkout_types", force: :cascade do |t|
     t.integer  "user_group_id",                                   null: false
     t.integer  "checkout_type_id",                                null: false
     t.integer  "checkout_limit",                  default: 0,     null: false
@@ -1292,7 +1293,7 @@ ActiveRecord::Schema.define(version: 20141014065831) do
   add_index "user_group_has_checkout_types", ["checkout_type_id"], name: "index_user_group_has_checkout_types_on_checkout_type_id"
   add_index "user_group_has_checkout_types", ["user_group_id"], name: "index_user_group_has_checkout_types_on_user_group_id"
 
-  create_table "user_groups", force: true do |t|
+  create_table "user_groups", force: :cascade do |t|
     t.string   "name"
     t.text     "display_name"
     t.text     "note"
@@ -1307,7 +1308,7 @@ ActiveRecord::Schema.define(version: 20141014065831) do
     t.integer  "number_of_time_to_notify_overdue", default: 3, null: false
   end
 
-  create_table "user_has_roles", force: true do |t|
+  create_table "user_has_roles", force: :cascade do |t|
     t.integer  "user_id"
     t.integer  "role_id"
     t.datetime "created_at"
@@ -1317,7 +1318,7 @@ ActiveRecord::Schema.define(version: 20141014065831) do
   add_index "user_has_roles", ["role_id"], name: "index_user_has_roles_on_role_id"
   add_index "user_has_roles", ["user_id"], name: "index_user_has_roles_on_user_id"
 
-  create_table "user_import_file_transitions", force: true do |t|
+  create_table "user_import_file_transitions", force: :cascade do |t|
     t.string   "to_state"
     t.text     "metadata",            default: "{}"
     t.integer  "sort_key"
@@ -1329,7 +1330,7 @@ ActiveRecord::Schema.define(version: 20141014065831) do
   add_index "user_import_file_transitions", ["sort_key", "user_import_file_id"], name: "index_user_import_file_transitions_on_sort_key_and_file_id", unique: true
   add_index "user_import_file_transitions", ["user_import_file_id"], name: "index_user_import_file_transitions_on_user_import_file_id"
 
-  create_table "user_import_files", force: true do |t|
+  create_table "user_import_files", force: :cascade do |t|
     t.integer  "user_id"
     t.text     "note"
     t.datetime "executed_at"
@@ -1347,7 +1348,7 @@ ActiveRecord::Schema.define(version: 20141014065831) do
     t.integer  "default_user_group_id"
   end
 
-  create_table "user_import_results", force: true do |t|
+  create_table "user_import_results", force: :cascade do |t|
     t.integer  "user_import_file_id"
     t.integer  "user_id"
     t.text     "body"
@@ -1355,7 +1356,7 @@ ActiveRecord::Schema.define(version: 20141014065831) do
     t.datetime "updated_at"
   end
 
-  create_table "user_reserve_stat_transitions", force: true do |t|
+  create_table "user_reserve_stat_transitions", force: :cascade do |t|
     t.string   "to_state"
     t.text     "metadata",             default: "{}"
     t.integer  "sort_key"
@@ -1367,7 +1368,7 @@ ActiveRecord::Schema.define(version: 20141014065831) do
   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|
+  create_table "user_reserve_stats", force: :cascade do |t|
     t.datetime "start_date"
     t.datetime "end_date"
     t.text     "note"
@@ -1380,7 +1381,7 @@ ActiveRecord::Schema.define(version: 20141014065831) do
 
   add_index "user_reserve_stats", ["user_id"], name: "index_user_reserve_stats_on_user_id"
 
-  create_table "users", force: true do |t|
+  create_table "users", force: :cascade do |t|
     t.string   "email",                    default: "",    null: false
     t.string   "encrypted_password",       default: "",    null: false
     t.string   "reset_password_token"
@@ -1411,7 +1412,7 @@ ActiveRecord::Schema.define(version: 20141014065831) do
   add_index "users", ["unlock_token"], name: "index_users_on_unlock_token", unique: true
   add_index "users", ["username"], name: "index_users_on_username", unique: true
 
-  create_table "versions", force: true do |t|
+  create_table "versions", force: :cascade do |t|
     t.string   "item_type",  null: false
     t.integer  "item_id",    null: false
     t.string   "event",      null: false

data/spec/fixtures/library_groups.yml

@@ -1,31 +1,38 @@
 # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
 one:
   id: 1
-  name: enju_library
-  display_name: "<%= I18n.locale %>: Enju Library"
-  short_name: enju
+  name: unknown
+  display_name: unknown
+  short_name: unknown
   note: 
-  my_networks: 0.0.0.0/0
+  my_networks: "0.0.0.0/0\r\n\
+    ::/0"
   url: "http://localhost:3000/"
-
+  position: 1
+  login_banner: "*Next-L Enju*"
+  admin_networks: "0.0.0.0/0\r\n\
+    ::/0"
+  settings: <% if Rails::VERSION::MAJOR > 3 %>
+    "{\"max_number_of_results\":200,\"family_name_first\":true,\"book_jacket_source\":\"google\",\"screenshot_generator\":\"mozshot\"}"
+  <% else %>
+    "---\n:max_number_of_results: 200\n:family_name_first: true\n:book_jacket_source: \"google\"\n:screenshot_generator: \"mozshot\""
+  <% end %>
 
 # == Schema Information
 #
 # Table name: library_groups
 #
-#  id                          :integer         not null, primary key
-#  name                        :string(255)     not null
-#  display_name                :text
-#  short_name                  :string(255)     not null
-#  my_networks                 :text
-#  login_banner                :text
-#  note                        :text
-#  country_id                  :integer
-#  created_at                  :datetime        not null
-#  updated_at                  :datetime        not null
-#  admin_networks              :text
-#  allow_bookmark_external_url :boolean         default(FALSE), not null
-#  position                    :integer
-#  url                         :string(255)     default("http://localhost:3000/")
+#  id             :integer          not null, primary key
+#  name           :string(255)      not null
+#  display_name   :text
+#  short_name     :string(255)      not null
+#  my_networks    :text
+#  login_banner   :text
+#  note           :text
+#  country_id     :integer
+#  position       :integer
+#  created_at     :datetime         not null
+#  updated_at     :datetime         not null
+#  admin_networks :text
+#  url            :string(255)      default("http://localhost:3000/")
 #
-

data/spec/views/manifestations/index.html.erb_spec.rb

@@ -13,6 +13,7 @@ describe "manifestations/index" do
     @reservable_facet = @carrier_type_facet = @language_facet = @library_facet = @pub_year_facet = [] 
     @index_agent = {}
     @seconds = 0
+    @max_number_of_results = 500
 
     @ability = Object.new
     @ability.extend(CanCan::Ability)
@@ -41,7 +42,7 @@ describe "manifestations/index" do
     item2 = FactoryGirl.create( :item_for_checkout, shelf_id: 4 )
     @manifestations.first.items = [ item1, item2 ]
     render
-    #expect( rendered ).to have_selector( "div.holding_index tr td:first-child a", visible: false, text: item1.item_identifier )
+    expect( rendered ).to have_selector( "div.holding_index tr td:first-child a", visible: false, text: item1.item_identifier )
   end
 
   it "render items with sort order to prefer user's library" do
@@ -54,6 +55,19 @@ describe "manifestations/index" do
     item2 = FactoryGirl.create( :item_for_checkout, shelf_id: 4 )
     @manifestations.first.items = [ item1, item2 ]
     render
-    #expect( rendered ).to have_selector( "div.holding_index tr:nth-child(2) td:first-child a", visible: false, text: item1.item_identifier )
+    expect( rendered ).to have_selector( "div.holding_index tr:nth-child(2) td:first-child a", visible: false )
+  end
+
+  it "render items with sort order to prefer user's library for a different user" do
+    allow(view).to receive(:policy).and_return double(create?: true, update?: true)
+    user = FactoryGirl.create(:user)
+    user.profile = FactoryGirl.create(:profile, library_id: 2)
+    sign_in( user )
+
+    item1 = FactoryGirl.create( :item_for_checkout, shelf_id: 2 )
+    item2 = FactoryGirl.create( :item_for_checkout, shelf_id: 4 )
+    @manifestations.first.items = [ item2, item1 ]
+    render
+    expect( rendered ).to have_selector( "div.holding_index tr:nth-child(2) td:first-child a", visible: false, text: item1.item_identifier )
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enju_flower
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre21
+  version: 0.1.0.pre22
 platform: ruby
 authors:
 - Kosuke Tanabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-12 00:00:00.000000000 Z
+date: 2015-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
@@ -114,84 +114,84 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: enju_leaf
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0.rc17
+        version: 1.1.0.rc18
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0.rc17
+        version: 1.1.0.rc18
 - !ruby/object:Gem::Dependency
   name: enju_manifestation_viewer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre17
+        version: 0.1.0.pre18
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre17
+        version: 0.1.0.pre18
 - !ruby/object:Gem::Dependency
   name: enju_circulation
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre42
+        version: 0.1.0.pre44
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre42
+        version: 0.1.0.pre44
 - !ruby/object:Gem::Dependency
   name: enju_bookmark
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.2.pre21
+        version: 0.1.2.pre22
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.2.pre21
+        version: 0.1.2.pre22
 - !ruby/object:Gem::Dependency
   name: enju_subject
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre29
+        version: 0.1.0.pre30
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre29
+        version: 0.1.0.pre30
 - !ruby/object:Gem::Dependency
   name: mobylette
   requirement: !ruby/object:Gem::Requirement
@@ -248,6 +248,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: User interface for Next-L Enju
 email:
 - nabeta@fastmail.fm
@@ -333,7 +347,6 @@ files:
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/models/ability.rb
-- spec/dummy/app/models/setting.rb
 - spec/dummy/app/models/user.rb
 - spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/app/views/page/403.html.erb
@@ -557,6 +570,7 @@ files:
 - spec/dummy/db/migrate/20141003181336_add_full_name_transcription_to_profile.rb
 - spec/dummy/db/migrate/20141003182825_add_date_of_birth_to_profile.rb
 - spec/dummy/db/migrate/20141014065831_add_shelf_id_to_checkout.rb
+- spec/dummy/db/migrate/20150221063719_add_settings_to_library_group.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
@@ -685,7 +699,6 @@ test_files:
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/models/ability.rb
-- spec/dummy/app/models/setting.rb
 - spec/dummy/app/models/user.rb
 - spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/app/views/page/403.html.erb
@@ -909,6 +922,7 @@ test_files:
 - spec/dummy/db/migrate/20141003181336_add_full_name_transcription_to_profile.rb
 - spec/dummy/db/migrate/20141003182825_add_date_of_birth_to_profile.rb
 - spec/dummy/db/migrate/20141014065831_add_shelf_id_to_checkout.rb
+- spec/dummy/db/migrate/20150221063719_add_settings_to_library_group.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html

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

@@ -1,4 +0,0 @@
-class Setting < Settingslogic
-  source "#{Rails.root}/config/application.yml"
-  namespace Rails.env
-end