enju_bookmark 0.1.2.pre11 → 0.1.2.pre12

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 => 20121119153944) do
+ActiveRecord::Schema.define(:version => 20130221154434) do
 
   create_table "accepts", :force => true do |t|
     t.integer  "basket_id"
@@ -24,6 +24,125 @@ ActiveRecord::Schema.define(:version => 20121119153944) 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_files", :force => true do |t|
+    t.integer  "parent_id"
+    t.string   "content_type"
+    t.integer  "size"
+    t.integer  "user_id"
+    t.text     "note"
+    t.datetime "executed_at"
+    t.string   "state"
+    t.string   "agent_import_file_name"
+    t.string   "agent_import_content_type"
+    t.integer  "agent_import_file_size"
+    t.datetime "agent_import_updated_at"
+    t.datetime "created_at",                :null => false
+    t.datetime "updated_at",                :null => false
+    t.string   "agent_import_fingerprint"
+    t.text     "error_message"
+    t.string   "edit_mode"
+  end
+
+  add_index "agent_import_files", ["parent_id"], :name => "index_agent_import_files_on_parent_id"
+  add_index "agent_import_files", ["state"], :name => "index_agent_import_files_on_state"
+  add_index "agent_import_files", ["user_id"], :name => "index_agent_import_files_on_user_id"
+
+  create_table "agent_import_results", :force => true do |t|
+    t.integer  "agent_import_file_id"
+    t.integer  "agent_id"
+    t.integer  "user_id"
+    t.text     "body"
+    t.datetime "created_at",           :null => false
+    t.datetime "updated_at",           :null => false
+  end
+
+  create_table "agent_relationship_types", :force => true do |t|
+    t.string   "name",         :null => false
+    t.text     "display_name"
+    t.text     "note"
+    t.integer  "position"
+    t.datetime "created_at",   :null => false
+    t.datetime "updated_at",   :null => false
+  end
+
+  create_table "agent_relationships", :force => true do |t|
+    t.integer  "parent_id"
+    t.integer  "child_id"
+    t.integer  "agent_relationship_type_id"
+    t.datetime "created_at",                 :null => false
+    t.datetime "updated_at",                 :null => false
+    t.integer  "position"
+  end
+
+  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|
+    t.string   "name",         :null => false
+    t.text     "display_name"
+    t.text     "note"
+    t.integer  "position"
+    t.datetime "created_at",   :null => false
+    t.datetime "updated_at",   :null => false
+  end
+
+  create_table "agents", :force => true do |t|
+    t.integer  "user_id"
+    t.string   "last_name"
+    t.string   "middle_name"
+    t.string   "first_name"
+    t.string   "last_name_transcription"
+    t.string   "middle_name_transcription"
+    t.string   "first_name_transcription"
+    t.string   "corporate_name"
+    t.string   "corporate_name_transcription"
+    t.string   "full_name"
+    t.text     "full_name_transcription"
+    t.text     "full_name_alternative"
+    t.datetime "created_at",                                         :null => false
+    t.datetime "updated_at",                                         :null => false
+    t.datetime "deleted_at"
+    t.string   "zip_code_1"
+    t.string   "zip_code_2"
+    t.text     "address_1"
+    t.text     "address_2"
+    t.text     "address_1_note"
+    t.text     "address_2_note"
+    t.string   "telephone_number_1"
+    t.string   "telephone_number_2"
+    t.string   "fax_number_1"
+    t.string   "fax_number_2"
+    t.text     "other_designation"
+    t.text     "place"
+    t.string   "postal_code"
+    t.text     "street"
+    t.text     "locality"
+    t.text     "region"
+    t.datetime "date_of_birth"
+    t.datetime "date_of_death"
+    t.integer  "language_id",                         :default => 1, :null => false
+    t.integer  "country_id",                          :default => 1, :null => false
+    t.integer  "agent_type_id",                       :default => 1, :null => false
+    t.integer  "lock_version",                        :default => 0, :null => false
+    t.text     "note"
+    t.integer  "required_role_id",                    :default => 1, :null => false
+    t.integer  "required_score",                      :default => 0, :null => false
+    t.string   "state"
+    t.text     "email"
+    t.text     "url"
+    t.text     "full_name_alternative_transcription"
+    t.string   "birth_date"
+    t.string   "death_date"
+    t.string   "agent_identifier"
+  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", ["required_role_id"], :name => "index_agents_on_required_role_id"
+  add_index "agents", ["user_id"], :name => "index_agents_on_user_id", :unique => true
+
   create_table "baskets", :force => true do |t|
     t.integer  "user_id"
     t.text     "note"
@@ -237,7 +356,7 @@ ActiveRecord::Schema.define(:version => 20121119153944) do
   end
 
   create_table "creates", :force => true do |t|
-    t.integer  "patron_id",      :null => false
+    t.integer  "agent_id",       :null => false
     t.integer  "work_id",        :null => false
     t.integer  "position"
     t.datetime "created_at",     :null => false
@@ -245,18 +364,18 @@ ActiveRecord::Schema.define(:version => 20121119153944) do
     t.integer  "create_type_id"
   end
 
-  add_index "creates", ["patron_id"], :name => "index_creates_on_patron_id"
+  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|
-    t.integer  "patron_id",  :null => false
+    t.integer  "agent_id",   :null => false
     t.integer  "item_id",    :null => false
     t.datetime "created_at", :null => false
     t.datetime "updated_at", :null => false
   end
 
+  add_index "donates", ["agent_id"], :name => "index_donates_on_agent_id"
   add_index "donates", ["item_id"], :name => "index_donates_on_item_id"
-  add_index "donates", ["patron_id"], :name => "index_donates_on_patron_id"
 
   create_table "exemplifies", :force => true do |t|
     t.integer  "manifestation_id", :null => false
@@ -565,134 +684,15 @@ ActiveRecord::Schema.define(:version => 20121119153944) do
   end
 
   create_table "owns", :force => true do |t|
-    t.integer  "patron_id",  :null => false
+    t.integer  "agent_id",   :null => false
     t.integer  "item_id",    :null => false
     t.integer  "position"
     t.datetime "created_at", :null => false
     t.datetime "updated_at", :null => false
   end
 
+  add_index "owns", ["agent_id"], :name => "index_owns_on_agent_id"
   add_index "owns", ["item_id"], :name => "index_owns_on_item_id"
-  add_index "owns", ["patron_id"], :name => "index_owns_on_patron_id"
-
-  create_table "patron_import_files", :force => true do |t|
-    t.integer  "parent_id"
-    t.string   "content_type"
-    t.integer  "size"
-    t.integer  "user_id"
-    t.text     "note"
-    t.datetime "executed_at"
-    t.string   "state"
-    t.string   "patron_import_file_name"
-    t.string   "patron_import_content_type"
-    t.integer  "patron_import_file_size"
-    t.datetime "patron_import_updated_at"
-    t.datetime "created_at",                 :null => false
-    t.datetime "updated_at",                 :null => false
-    t.string   "patron_import_fingerprint"
-    t.text     "error_message"
-    t.string   "edit_mode"
-  end
-
-  add_index "patron_import_files", ["parent_id"], :name => "index_patron_import_files_on_parent_id"
-  add_index "patron_import_files", ["state"], :name => "index_patron_import_files_on_state"
-  add_index "patron_import_files", ["user_id"], :name => "index_patron_import_files_on_user_id"
-
-  create_table "patron_import_results", :force => true do |t|
-    t.integer  "patron_import_file_id"
-    t.integer  "patron_id"
-    t.integer  "user_id"
-    t.text     "body"
-    t.datetime "created_at",            :null => false
-    t.datetime "updated_at",            :null => false
-  end
-
-  create_table "patron_relationship_types", :force => true do |t|
-    t.string   "name",         :null => false
-    t.text     "display_name"
-    t.text     "note"
-    t.integer  "position"
-    t.datetime "created_at",   :null => false
-    t.datetime "updated_at",   :null => false
-  end
-
-  create_table "patron_relationships", :force => true do |t|
-    t.integer  "parent_id"
-    t.integer  "child_id"
-    t.integer  "patron_relationship_type_id"
-    t.datetime "created_at",                  :null => false
-    t.datetime "updated_at",                  :null => false
-    t.integer  "position"
-  end
-
-  add_index "patron_relationships", ["child_id"], :name => "index_patron_relationships_on_child_id"
-  add_index "patron_relationships", ["parent_id"], :name => "index_patron_relationships_on_parent_id"
-
-  create_table "patron_types", :force => true do |t|
-    t.string   "name",         :null => false
-    t.text     "display_name"
-    t.text     "note"
-    t.integer  "position"
-    t.datetime "created_at",   :null => false
-    t.datetime "updated_at",   :null => false
-  end
-
-  create_table "patrons", :force => true do |t|
-    t.integer  "user_id"
-    t.string   "last_name"
-    t.string   "middle_name"
-    t.string   "first_name"
-    t.string   "last_name_transcription"
-    t.string   "middle_name_transcription"
-    t.string   "first_name_transcription"
-    t.string   "corporate_name"
-    t.string   "corporate_name_transcription"
-    t.string   "full_name"
-    t.text     "full_name_transcription"
-    t.text     "full_name_alternative"
-    t.datetime "created_at",                                         :null => false
-    t.datetime "updated_at",                                         :null => false
-    t.datetime "deleted_at"
-    t.string   "zip_code_1"
-    t.string   "zip_code_2"
-    t.text     "address_1"
-    t.text     "address_2"
-    t.text     "address_1_note"
-    t.text     "address_2_note"
-    t.string   "telephone_number_1"
-    t.string   "telephone_number_2"
-    t.string   "fax_number_1"
-    t.string   "fax_number_2"
-    t.text     "other_designation"
-    t.text     "place"
-    t.string   "postal_code"
-    t.text     "street"
-    t.text     "locality"
-    t.text     "region"
-    t.datetime "date_of_birth"
-    t.datetime "date_of_death"
-    t.integer  "language_id",                         :default => 1, :null => false
-    t.integer  "country_id",                          :default => 1, :null => false
-    t.integer  "patron_type_id",                      :default => 1, :null => false
-    t.integer  "lock_version",                        :default => 0, :null => false
-    t.text     "note"
-    t.integer  "required_role_id",                    :default => 1, :null => false
-    t.integer  "required_score",                      :default => 0, :null => false
-    t.string   "state"
-    t.text     "email"
-    t.text     "url"
-    t.text     "full_name_alternative_transcription"
-    t.string   "birth_date"
-    t.string   "death_date"
-    t.string   "patron_identifier"
-  end
-
-  add_index "patrons", ["country_id"], :name => "index_patrons_on_country_id"
-  add_index "patrons", ["full_name"], :name => "index_patrons_on_full_name"
-  add_index "patrons", ["language_id"], :name => "index_patrons_on_language_id"
-  add_index "patrons", ["patron_identifier"], :name => "index_patrons_on_patron_identifier"
-  add_index "patrons", ["required_role_id"], :name => "index_patrons_on_required_role_id"
-  add_index "patrons", ["user_id"], :name => "index_patrons_on_user_id", :unique => true
 
   create_table "picture_files", :force => true do |t|
     t.integer  "picture_attachable_id"
@@ -723,7 +723,7 @@ ActiveRecord::Schema.define(:version => 20121119153944) do
   end
 
   create_table "produces", :force => true do |t|
-    t.integer  "patron_id",        :null => false
+    t.integer  "agent_id",         :null => false
     t.integer  "manifestation_id", :null => false
     t.integer  "position"
     t.datetime "created_at",       :null => false
@@ -731,8 +731,8 @@ ActiveRecord::Schema.define(:version => 20121119153944) do
     t.integer  "produce_type_id"
   end
 
+  add_index "produces", ["agent_id"], :name => "index_produces_on_agent_id"
   add_index "produces", ["manifestation_id"], :name => "index_produces_on_manifestation_id"
-  add_index "produces", ["patron_id"], :name => "index_produces_on_patron_id"
 
   create_table "realize_types", :force => true do |t|
     t.string   "name"
@@ -744,7 +744,7 @@ ActiveRecord::Schema.define(:version => 20121119153944) do
   end
 
   create_table "realizes", :force => true do |t|
-    t.integer  "patron_id",       :null => false
+    t.integer  "agent_id",        :null => false
     t.integer  "expression_id",   :null => false
     t.integer  "position"
     t.datetime "created_at",      :null => false
@@ -752,8 +752,8 @@ ActiveRecord::Schema.define(:version => 20121119153944) do
     t.integer  "realize_type_id"
   end
 
+  add_index "realizes", ["agent_id"], :name => "index_realizes_on_agent_id"
   add_index "realizes", ["expression_id"], :name => "index_realizes_on_expression_id"
-  add_index "realizes", ["patron_id"], :name => "index_realizes_on_patron_id"
 
   create_table "request_status_types", :force => true do |t|
     t.string   "name",         :null => false
@@ -807,7 +807,7 @@ ActiveRecord::Schema.define(:version => 20121119153944) do
     t.datetime "expired_at"
     t.datetime "deleted_at"
     t.string   "state"
-    t.boolean  "expiration_notice_to_patron",  :default => false
+    t.boolean  "expiration_notice_to_agent",   :default => false
     t.boolean  "expiration_notice_to_library", :default => false
   end
 
@@ -923,12 +923,12 @@ ActiveRecord::Schema.define(:version => 20121119153944) do
     t.string   "series_statement_identifier"
     t.string   "issn"
     t.boolean  "periodical"
-    t.integer  "root_manifestation_id"
+    t.integer  "manifestation_id"
     t.text     "note"
     t.text     "title_subseries_transcription"
   end
 
-  add_index "series_statements", ["root_manifestation_id"], :name => "index_series_statements_on_manifestation_id"
+  add_index "series_statements", ["manifestation_id"], :name => "index_series_statements_on_manifestation_id"
   add_index "series_statements", ["series_statement_identifier"], :name => "index_series_statements_on_series_statement_identifier"
 
   create_table "shelves", :force => true do |t|
@@ -1070,11 +1070,6 @@ ActiveRecord::Schema.define(:version => 20121119153944) do
   add_index "user_reserve_stats", ["state"], :name => "index_user_reserve_stats_on_state"
 
   create_table "users", :force => true do |t|
-    t.integer  "user_group_id"
-    t.integer  "required_role_id"
-    t.string   "username"
-    t.text     "note"
-    t.string   "locale"
     t.datetime "created_at",                                  :null => false
     t.datetime "updated_at",                                  :null => false
     t.string   "email",                    :default => "",    :null => false
@@ -1087,24 +1082,35 @@ ActiveRecord::Schema.define(:version => 20121119153944) do
     t.datetime "last_sign_in_at"
     t.string   "current_sign_in_ip"
     t.string   "last_sign_in_ip"
-    t.string   "password_salt"
-    t.string   "confirmation_token"
-    t.datetime "confirmed_at"
     t.datetime "confirmation_sent_at"
     t.string   "unconfirmed_email"
-    t.integer  "failed_attempts",          :default => 0
-    t.string   "unlock_token"
-    t.datetime "locked_at"
-    t.string   "authentication_token"
-    t.datetime "deleted_at"
     t.boolean  "save_checkout_history",    :default => false, :null => false
     t.string   "checkout_icalendar_token"
     t.boolean  "share_bookmarks"
+    t.string   "username"
+    t.string   "user_number"
+    t.string   "state"
+    t.string   "locale"
+    t.datetime "deleted_at"
+    t.datetime "expired_at"
+    t.integer  "library_id",               :default => 1,     :null => false
+    t.integer  "required_role_id",         :default => 1,     :null => false
+    t.integer  "user_group_id",            :default => 1,     :null => false
+    t.text     "note"
+    t.text     "keyword_list"
+    t.integer  "failed_attempts"
+    t.string   "unlock_token"
+    t.datetime "locked_at"
+    t.datetime "confirmed_at"
   end
 
   add_index "users", ["checkout_icalendar_token"], :name => "index_users_on_checkout_icalendar_token", :unique => true
   add_index "users", ["email"], :name => "index_users_on_email"
   add_index "users", ["reset_password_token"], :name => "index_users_on_reset_password_token", :unique => true
+  add_index "users", ["unlock_token"], :name => "index_users_on_unlock_token", :unique => true
+  add_index "users", ["user_group_id"], :name => "index_users_on_user_group_id"
+  add_index "users", ["user_number"], :name => "index_users_on_user_number", :unique => true
+  add_index "users", ["username"], :name => "index_users_on_username", :unique => true
 
   create_table "versions", :force => true do |t|
     t.string   "item_type",  :null => false

data/spec/factories/library.rb

@@ -0,0 +1,13 @@
+FactoryGirl.define do
+  factory :library do |f|
+    f.sequence(:name){|n| "library#{n}"}
+    f.sequence(:short_display_name){|n| "library_#{n}"}
+    f.library_group_id{LibraryGroup.first.id}
+  end
+end
+
+FactoryGirl.define do
+  factory :invalid_library, :class => Library do |f|
+    f.library_group_id{LibraryGroup.first.id}
+  end
+end

data/spec/factories/user.rb

@@ -2,28 +2,56 @@ FactoryGirl.define do
   factory :admin, :class => User do |f|
     f.sequence(:username){|n| "admin_#{n}"}
     f.sequence(:email){|n| "admin_#{n}@example.jp"}
-    f.role {Role.find_by_name('Administrator')}
+    f.email_confirmation{|u| u.email}
+    f.library_id{FactoryGirl.create(:library).id}
     f.password 'adminpassword'
     f.password_confirmation 'adminpassword'
-    f.required_role {Role.find_by_name('User')}
+    f.user_group_id{UserGroup.where(:name => 'User').first.id}
+    f.required_role_id{Role.find_by_name('User').id}
+    f.locale 'ja'
+    f.after(:create) do |user|
+      user_has_role = UserHasRole.new
+      user_has_role.assign_attributes({:user_id => user.id, :role_id => Role.find_by_name('Administrator').id})
+      user_has_role.save
+      user.reload
+    end
   end
 
   factory :librarian, :class => User do |f|
     f.sequence(:username){|n| "librarian_#{n}"}
     f.sequence(:email){|n| "librarian_#{n}@example.jp"}
-    f.role {Role.find_by_name('Librarian')}
+    f.email_confirmation{|u| u.email}
+    f.library_id{FactoryGirl.create(:library).id}
     f.password 'librarianpassword'
     f.password_confirmation 'librarianpassword'
-    f.required_role {Role.find_by_name('User')}
+    f.user_group_id{UserGroup.where(:name => 'User').first.id}
+    f.required_role_id{Role.find_by_name('User').id}
+    f.locale 'ja'
+    f.after(:create) do |user|
+      user_has_role = UserHasRole.new
+      user_has_role.assign_attributes({:user_id => user.id, :role_id => Role.find_by_name('Librarian').id})
+      user_has_role.save
+      user.reload
+    end
   end
 
   factory :user, :class => User do |f|
     f.sequence(:username){|n| "user_#{n}"}
     f.sequence(:email){|n| "user_#{n}@example.jp"}
-    f.role {Role.find_by_name('User')}
+    f.email_confirmation{|u| u.email}
+    f.library_id{FactoryGirl.create(:library).id}
     f.password 'userpassword'
     f.password_confirmation 'userpassword'
-    f.required_role {Role.find_by_name('User')}
+    f.user_group_id{UserGroup.where(:name => '(not specified)').first.id}
+    f.required_role_id{Role.find_by_name('User').id}
+    f.locale 'ja'
+    f.sequence(:user_number){|n| "user_number_#{n}"}
+    f.after(:create) do |user|
+      user_has_role = UserHasRole.new
+      user_has_role.assign_attributes({:user_id => user.id, :role_id => Role.find_by_name('User').id})
+      user_has_role.save
+      user.reload
+    end
   end
 
   factory :invalid_user, :class => User do |f|

data/spec/fixtures/{patron_types.yml → agent_types.yml}

@@ -1,19 +1,19 @@
 --- 
-patron_type_00001:
+agent_type_00001:
   id: 1
   name: Person
   display_name: Person
   note: 
   position: 1
 
-patron_type_00002:
+agent_type_00002:
   id: 2
   name: CorporateBody
   display_name: CorporateBody
   note: 
   position: 2
 
-patron_type_00003:
+agent_type_00003:
   id: 3
   name: Conference
   display_name: Conference
@@ -22,7 +22,7 @@ patron_type_00003:
 
 # == Schema Information
 #
-# Table name: patron_types
+# Table name: agent_types
 #
 #  id           :integer         not null, primary key
 #  name         :string(255)     not null