enju_library 0.2.0.beta.9 → 0.2.0.beta.10

data/spec/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20160814165332) do
+ActiveRecord::Schema.define(version: 20160820004638) do
 
   create_table "accepts", force: :cascade do |t|
     t.integer  "basket_id"
@@ -23,6 +23,7 @@ ActiveRecord::Schema.define(version: 20160814165332) do
 
   add_index "accepts", ["basket_id"], name: "index_accepts_on_basket_id"
   add_index "accepts", ["item_id"], name: "index_accepts_on_item_id"
+  add_index "accepts", ["librarian_id"], name: "index_accepts_on_librarian_id"
 
   create_table "agent_import_file_transitions", force: :cascade do |t|
     t.string   "to_state"
@@ -31,6 +32,7 @@ ActiveRecord::Schema.define(version: 20160814165332) do
     t.integer  "agent_import_file_id"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.boolean  "most_recent"
   end
 
   add_index "agent_import_file_transitions", ["agent_import_file_id"], name: "index_agent_import_file_transitions_on_agent_import_file_id"
@@ -158,12 +160,14 @@ ActiveRecord::Schema.define(version: 20160814165332) do
     t.string   "birth_date"
     t.string   "death_date"
     t.string   "agent_identifier"
+    t.integer  "profile_id"
   end
 
   add_index "agents", ["agent_identifier"], name: "index_agents_on_agent_identifier"
   add_index "agents", ["country_id"], name: "index_agents_on_country_id"
   add_index "agents", ["full_name"], name: "index_agents_on_full_name"
   add_index "agents", ["language_id"], name: "index_agents_on_language_id"
+  add_index "agents", ["profile_id"], name: "index_agents_on_profile_id"
   add_index "agents", ["required_role_id"], name: "index_agents_on_required_role_id"
 
   create_table "baskets", force: :cascade do |t|
@@ -260,12 +264,16 @@ ActiveRecord::Schema.define(version: 20160814165332) do
   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: :cascade do |t|
-    t.string   "name",         null: false
+    t.string   "name",                    null: false
     t.text     "display_name"
     t.text     "note"
     t.integer  "position"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.string   "attachment_file_name"
+    t.string   "attachment_content_type"
+    t.integer  "attachment_file_size"
+    t.datetime "attachment_updated_at"
   end
 
   create_table "checked_items", force: :cascade do |t|
@@ -611,6 +619,7 @@ ActiveRecord::Schema.define(version: 20160814165332) do
     t.integer  "import_request_id"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.boolean  "most_recent"
   end
 
   add_index "import_request_transitions", ["import_request_id"], name: "index_import_request_transitions_on_import_request_id"
@@ -717,7 +726,7 @@ ActiveRecord::Schema.define(version: 20160814165332) do
     t.text     "note"
     t.integer  "call_number_rows",      default: 1,   null: false
     t.string   "call_number_delimiter", default: "|", null: false
-    t.integer  "library_group_id",      default: 1,   null: false
+    t.integer  "library_group_id",                    null: false
     t.integer  "users_count",           default: 0,   null: false
     t.integer  "position"
     t.integer  "country_id"
@@ -731,7 +740,7 @@ ActiveRecord::Schema.define(version: 20160814165332) do
   end
 
   add_index "libraries", ["library_group_id"], name: "index_libraries_on_library_group_id"
-  add_index "libraries", ["name"], name: "index_libraries_on_name", unique: true
+  add_index "libraries", ["name"], name: "index_libraries_on_name"
 
   create_table "library_group_translations", force: :cascade do |t|
     t.integer  "library_group_id", null: false
@@ -897,7 +906,7 @@ ActiveRecord::Schema.define(version: 20160814165332) do
     t.datetime "valid_until"
     t.datetime "date_submitted"
     t.datetime "date_accepted"
-    t.datetime "date_caputured"
+    t.datetime "date_captured"
     t.string   "pub_date"
     t.string   "edition_string"
     t.integer  "volume_number"
@@ -1037,6 +1046,8 @@ ActiveRecord::Schema.define(version: 20160814165332) do
     t.datetime "picture_updated_at"
     t.text     "picture_meta"
     t.string   "picture_fingerprint"
+    t.integer  "picture_width"
+    t.integer  "picture_height"
   end
 
   add_index "picture_files", ["picture_attachable_id", "picture_attachable_type"], name: "index_picture_files_on_picture_attachable_id_and_type"
@@ -1193,6 +1204,7 @@ ActiveRecord::Schema.define(version: 20160814165332) do
     t.integer  "resource_export_file_id"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.boolean  "most_recent"
   end
 
   add_index "resource_export_file_transitions", ["resource_export_file_id"], name: "index_resource_export_file_transitions_on_file_id"
@@ -1216,6 +1228,7 @@ ActiveRecord::Schema.define(version: 20160814165332) do
     t.integer  "resource_import_file_id"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.boolean  "most_recent"
   end
 
   add_index "resource_import_file_transitions", ["resource_import_file_id"], name: "index_resource_import_file_transitions_on_file_id"
@@ -1353,7 +1366,7 @@ ActiveRecord::Schema.define(version: 20160814165332) do
     t.string   "name",                         null: false
     t.text     "display_name"
     t.text     "note"
-    t.integer  "library_id",   default: 1,     null: false
+    t.integer  "library_id",                   null: false
     t.integer  "items_count",  default: 0,     null: false
     t.integer  "position"
     t.datetime "created_at"
@@ -1457,6 +1470,7 @@ ActiveRecord::Schema.define(version: 20160814165332) 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"
+  add_index "user_export_file_transitions", ["user_export_file_id"], name: "index_user_export_file_transitions_on_user_export_file_id"
 
   create_table "user_export_files", force: :cascade do |t|
     t.integer  "user_id"
@@ -1469,6 +1483,8 @@ ActiveRecord::Schema.define(version: 20160814165332) do
     t.datetime "updated_at"
   end
 
+  add_index "user_export_files", ["user_id"], name: "index_user_export_files_on_user_id"
+
   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
@@ -1545,6 +1561,8 @@ ActiveRecord::Schema.define(version: 20160814165332) do
     t.integer  "default_user_group_id"
   end
 
+  add_index "user_import_files", ["user_id"], name: "index_user_import_files_on_user_id"
+
   create_table "user_import_results", force: :cascade do |t|
     t.integer  "user_import_file_id"
     t.integer  "user_id"
@@ -1554,6 +1572,9 @@ ActiveRecord::Schema.define(version: 20160814165332) do
     t.text     "error_message"
   end
 
+  add_index "user_import_results", ["user_id"], name: "index_user_import_results_on_user_id"
+  add_index "user_import_results", ["user_import_file_id"], name: "index_user_import_results_on_user_import_file_id"
+
   create_table "user_reserve_stat_transitions", force: :cascade do |t|
     t.string   "to_state"
     t.text     "metadata",             default: "{}"
@@ -1632,5 +1653,6 @@ ActiveRecord::Schema.define(version: 20160814165332) do
 
   add_index "withdraws", ["basket_id"], name: "index_withdraws_on_basket_id"
   add_index "withdraws", ["item_id"], name: "index_withdraws_on_item_id"
+  add_index "withdraws", ["librarian_id"], name: "index_withdraws_on_librarian_id"
 
 end

data/spec/models/user_import_file_spec.rb

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 require 'rails_helper'
 
 describe UserImportFile do

data/spec/models/withdraw_spec.rb

@@ -8,6 +8,12 @@ RSpec.describe Withdraw, type: :model do
     withdraw.item.circulation_status.name.should eq 'Removed'
     withdraw.item.use_restriction.name.should eq 'Not For Loan'
   end
+
+  it "should not withdraw rented item" do
+    withdraw = Withdraw.new(librarian: users(:librarian1))
+    withdraw.item = items(:item_00013)
+    withdraw.valid?.should be_falsy
+  end
 end
 
 # == Schema Information

data/spec/views/library_groups/edit.html.erb_spec.rb

@@ -7,7 +7,11 @@ describe "library_groups/edit" do
     @countries = Country.all
   end
 
-  it "renders attributes in <p>" do
+  it "renders selector for multilpe book jacket sources." do
     render
+    expect(rendered).to have_css "select#library_group_book_jacket_source"
+    expect(rendered).to have_css "select#library_group_book_jacket_source option", minimum: 2
+    expect(rendered).to have_css 'select#library_group_book_jacket_source option[value="google"]'
+    expect(rendered).to have_css 'select#library_group_book_jacket_source option[value="hanmotocom"]'
   end
 end