enju_resource_merge 0.1.0.pre7 → 0.1.0.pre8

data/spec/fixtures/user_groups.yml

@@ -0,0 +1,45 @@
+--- 
+user_group_00001: 
+  name: (not specified)
+  display_name: (not specified)
+  updated_at: 2007-12-13 21:00:51.564542 +09:00
+  id: 1
+  note: ""
+  created_at: 2007-12-13 21:00:01.674976 +09:00
+  position: 1
+  valid_period_for_new_user: 0
+user_group_00002: 
+  name: User
+  display_name: User
+  updated_at: 2007-12-23 03:14:56.836548 +09:00
+  id: 2
+  note: ""
+  created_at: 2007-12-23 03:14:40.173954 +09:00
+  position: 2
+  valid_period_for_new_user: 365
+user_group_00003: 
+  name: Faculty
+  display_name: Faculty
+  updated_at: 2007-12-23 03:15:05.134351 +09:00
+  id: 3
+  note: ""
+  created_at: 2007-12-23 03:15:05.126457 +09:00
+  position: 3
+  valid_period_for_new_user: 730
+
+# == Schema Information
+#
+# Table name: user_groups
+#
+#  id                               :integer         not null, primary key
+#  name                             :string(255)
+#  display_name                     :text
+#  note                             :text
+#  position                         :integer
+#  created_at                       :datetime        not null
+#  updated_at                       :datetime        not null
+#  deleted_at                       :datetime
+#  valid_period_for_new_user        :integer         default(0), not null
+#  expired_at                       :datetime
+#
+

data/spec/models/{patron_merge_list_spec.rb → agent_merge_list_spec.rb}

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
 require 'spec_helper'
 
-describe PatronMergeList do
+describe AgentMergeList do
   #pending "add some examples to (or delete) #{__FILE__}"
 
 end
 
 # == Schema Information
 #
-# Table name: patron_merge_lists
+# Table name: agent_merge_lists
 #
 #  id         :integer          not null, primary key
 #  title      :string(255)

data/spec/models/agent_merge_spec.rb

@@ -0,0 +1,19 @@
+# -*- encoding: utf-8 -*-
+require 'spec_helper'
+
+describe AgentMerge do
+  #pending "add some examples to (or delete) #{__FILE__}"
+
+end
+
+# == Schema Information
+#
+# Table name: agent_merges
+#
+#  id                  :integer          not null, primary key
+#  agent_id            :integer          not null
+#  agent_merge_list_id :integer          not null
+#  created_at          :datetime         not null
+#  updated_at          :datetime         not null
+#
+

data/spec/models/series_statement_merge_list_spec.rb

@@ -5,11 +5,6 @@ describe SeriesStatementMergeList do
 
   it "should merge series_statment" do
     series_statement_merge_list = series_statement_merge_lists(:series_statement_merge_list_00001)
-    series_statement = SeriesStatement.find(2)
-    series_statement_merge_list.merge_series_statements(series_statement).should be_true
-    Manifestation.find(2).series_statement.id.should eq 2
-    Manifestation.find(3).series_statement.id.should eq 2
-    Manifestation.find(3).series_statement.original_title.should eq series_statement.original_title
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enju_resource_merge
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre7
+  version: 0.1.0.pre8
 platform: ruby
 authors:
 - Kosuke Tanabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-17 00:00:00.000000000 Z
+date: 2013-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: enju_biblio
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre31
+        version: 0.1.0.pre44
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre31
+        version: 0.1.0.pre44
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +80,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.0.0
+- !ruby/object:Gem::Dependency
+  name: enju_leaf
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.0.rc3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.0.rc3
 description: Merge resource records for Next-L Enju
 email:
 - tanabe@mwr.mediacom.keio.ac.jp
@@ -91,20 +105,20 @@ files:
 - app/controllers/patron_merges_controller.rb
 - app/controllers/series_statement_merge_lists_controller.rb
 - app/controllers/series_statement_merges_controller.rb
+- app/models/agent_merge.rb
+- app/models/agent_merge_list.rb
 - app/models/enju_resource_merge/ability.rb
-- app/models/patron_merge.rb
-- app/models/patron_merge_list.rb
 - app/models/series_statement_merge.rb
 - app/models/series_statement_merge_list.rb
-- app/views/patron_merge_lists/_form.html.erb
-- app/views/patron_merge_lists/edit.html.erb
-- app/views/patron_merge_lists/index.html.erb
-- app/views/patron_merge_lists/new.html.erb
-- app/views/patron_merge_lists/show.html.erb
-- app/views/patron_merges/edit.html.erb
-- app/views/patron_merges/index.html.erb
-- app/views/patron_merges/new.html.erb
-- app/views/patron_merges/show.html.erb
+- app/views/agent_merge_lists/_form.html.erb
+- app/views/agent_merge_lists/edit.html.erb
+- app/views/agent_merge_lists/index.html.erb
+- app/views/agent_merge_lists/new.html.erb
+- app/views/agent_merge_lists/show.html.erb
+- app/views/agent_merges/edit.html.erb
+- app/views/agent_merges/index.html.erb
+- app/views/agent_merges/new.html.erb
+- app/views/agent_merges/show.html.erb
 - app/views/series_statement_merge_lists/_form.html.erb
 - app/views/series_statement_merge_lists/edit.html.erb
 - app/views/series_statement_merge_lists/index.html.erb
@@ -118,8 +132,8 @@ files:
 - config/locales/translation_en.yml
 - config/locales/translation_ja.yml
 - config/routes.rb
-- db/migrate/133_create_patron_merges.rb
-- db/migrate/134_create_patron_merge_lists.rb
+- db/migrate/133_create_agent_merges.rb
+- db/migrate/134_create_agent_merge_lists.rb
 - db/migrate/20110627034940_create_series_statement_merge_lists.rb
 - db/migrate/20110627035057_create_series_statement_merges.rb
 - lib/enju_resource_merge/engine.rb
@@ -129,8 +143,8 @@ files:
 - MIT-LICENSE
 - Rakefile
 - README.rdoc
-- spec/controllers/patron_merge_lists_controller_spec.rb
-- spec/controllers/patron_merges_controller_spec.rb
+- spec/controllers/agent_merge_lists_controller_spec.rb
+- spec/controllers/agent_merges_controller_spec.rb
 - spec/controllers/series_statement_merge_lists_controller_spec.rb
 - spec/controllers/series_statement_merges_controller_spec.rb
 - spec/dummy/app/assets/javascripts/application.js
@@ -138,10 +152,8 @@ 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/role.rb
 - spec/dummy/app/models/setting.rb
 - spec/dummy/app/models/user.rb
-- spec/dummy/app/models/user_has_role.rb
 - spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/app/views/page/403.html.erb
 - spec/dummy/app/views/page/403.mobile.erb
@@ -168,46 +180,61 @@ files:
 - spec/dummy/config/routes.rb
 - spec/dummy/config.ru
 - spec/dummy/db/development.sqlite3
-- spec/dummy/db/migrate/001_create_patrons.rb
+- spec/dummy/db/migrate/001_create_agents.rb
 - spec/dummy/db/migrate/005_create_manifestations.rb
 - spec/dummy/db/migrate/006_create_items.rb
 - spec/dummy/db/migrate/012_create_owns.rb
 - spec/dummy/db/migrate/015_create_creates.rb
 - spec/dummy/db/migrate/047_create_produces.rb
+- spec/dummy/db/migrate/059_create_libraries.rb
+- spec/dummy/db/migrate/069_create_shelves.rb
 - spec/dummy/db/migrate/073_create_carrier_types.rb
+- spec/dummy/db/migrate/077_create_user_groups.rb
+- spec/dummy/db/migrate/080_create_library_groups.rb
 - spec/dummy/db/migrate/112_create_frequencies.rb
 - spec/dummy/db/migrate/117_create_form_of_works.rb
+- spec/dummy/db/migrate/120_create_baskets.rb
+- spec/dummy/db/migrate/124_create_bookstores.rb
 - spec/dummy/db/migrate/125_create_donates.rb
+- spec/dummy/db/migrate/130_create_request_status_types.rb
+- spec/dummy/db/migrate/131_create_request_types.rb
 - spec/dummy/db/migrate/20080830154109_create_realizes.rb
 - spec/dummy/db/migrate/20080830172106_create_exemplifies.rb
-- spec/dummy/db/migrate/20080905191442_create_patron_types.rb
+- spec/dummy/db/migrate/20080905191442_create_agent_types.rb
+- spec/dummy/db/migrate/20081006090811_create_subscriptions.rb
+- spec/dummy/db/migrate/20081006093246_create_subscribes.rb
+- spec/dummy/db/migrate/20081023092436_create_search_engines.rb
 - spec/dummy/db/migrate/20081025083323_create_countries.rb
 - spec/dummy/db/migrate/20081025083905_create_languages.rb
 - spec/dummy/db/migrate/20081027150907_create_picture_files.rb
-- spec/dummy/db/migrate/20081028083142_create_patron_import_files.rb
+- spec/dummy/db/migrate/20081028083142_create_agent_import_files.rb
 - spec/dummy/db/migrate/20081028083208_create_resource_import_files.rb
 - spec/dummy/db/migrate/20090705133942_add_attachments_picture_to_picture_file.rb
 - spec/dummy/db/migrate/20090705212043_add_attachments_attachment_to_manifestation.rb
 - spec/dummy/db/migrate/20090719201843_create_extents.rb
 - spec/dummy/db/migrate/20090720091106_create_medium_of_performances.rb
 - spec/dummy/db/migrate/20090720091429_create_content_types.rb
-- spec/dummy/db/migrate/20090812151902_create_patron_relationship_types.rb
+- spec/dummy/db/migrate/20090812151902_create_agent_relationship_types.rb
 - spec/dummy/db/migrate/20091012101112_add_dcndl_schema.rb
 - spec/dummy/db/migrate/20091025080447_create_licenses.rb
 - spec/dummy/db/migrate/20091202124834_create_versions.rb
 - spec/dummy/db/migrate/20091214131723_create_series_statements.rb
 - spec/dummy/db/migrate/20100129142347_create_import_requests.rb
+- spec/dummy/db/migrate/20100211105551_add_admin_networks_to_library_group.rb
 - spec/dummy/db/migrate/20100223121519_rename_series_statement_title_to_original_title.rb
+- spec/dummy/db/migrate/20100314190054_add_opening_hour_to_library.rb
 - spec/dummy/db/migrate/20100321235924_add_series_statement_identifier_to_series_statement.rb
 - spec/dummy/db/migrate/20100525124311_create_manifestation_relationships.rb
-- spec/dummy/db/migrate/20100606073747_create_patron_relationships.rb
+- spec/dummy/db/migrate/20100606073747_create_agent_relationships.rb
 - spec/dummy/db/migrate/20100607044753_create_manifestation_relationship_types.rb
-- spec/dummy/db/migrate/20100814091104_add_position_to_patron_relationship.rb
+- spec/dummy/db/migrate/20100814091104_add_position_to_agent_relationship.rb
 - spec/dummy/db/migrate/20100925043847_create_resource_import_results.rb
-- spec/dummy/db/migrate/20100925074559_create_patron_import_results.rb
+- spec/dummy/db/migrate/20100925074559_create_agent_import_results.rb
 - spec/dummy/db/migrate/20101212070145_add_acquired_at_to_item.rb
+- spec/dummy/db/migrate/20110222073537_add_url_to_library_group.rb
 - spec/dummy/db/migrate/20110301035123_add_pub_date_to_manifestation.rb
-- spec/dummy/db/migrate/20110301121550_add_birth_date_and_death_date_to_patron.rb
+- spec/dummy/db/migrate/20110301121550_add_birth_date_and_death_date_to_agent.rb
+- spec/dummy/db/migrate/20110318183304_add_valid_period_for_new_user_to_user_group.rb
 - spec/dummy/db/migrate/20110425133109_add_issn_to_series_statement.rb
 - spec/dummy/db/migrate/20110603184217_add_edit_mode_to_resource_import_file.rb
 - spec/dummy/db/migrate/20110618091240_add_periodical_to_series_statement.rb
@@ -217,9 +244,7 @@ files:
 - spec/dummy/db/migrate/20110916053430_rename_manifestation_number_list_to_number_string.rb
 - spec/dummy/db/migrate/20110916091020_add_volume_number_to_manifestation.rb
 - spec/dummy/db/migrate/20110916103953_add_manifestaiton_id_to_series_statement.rb
-- spec/dummy/db/migrate/20110918161853_rename_series_statement_manifestation_id_to_root_manifestation_id.rb
 - spec/dummy/db/migrate/20110918162329_add_note_to_series_statement.rb
-- spec/dummy/db/migrate/20111009183423_add_ndc_to_manifestation.rb
 - spec/dummy/db/migrate/20111124110059_create_create_types.rb
 - spec/dummy/db/migrate/20111124110319_create_realize_types.rb
 - spec/dummy/db/migrate/20111124110355_create_produce_types.rb
@@ -228,22 +253,31 @@ files:
 - spec/dummy/db/migrate/20111201155456_create_users.rb
 - spec/dummy/db/migrate/20111201155513_add_devise_to_users.rb
 - spec/dummy/db/migrate/20111201163718_create_user_has_roles.rb
+- spec/dummy/db/migrate/20120105074911_add_isil_to_library.rb
 - spec/dummy/db/migrate/20120125152919_add_title_subseries_transcription_to_series_statement.rb
+- spec/dummy/db/migrate/20120129014038_create_budget_types.rb
 - spec/dummy/db/migrate/20120129020544_add_budget_type_id_to_item.rb
 - spec/dummy/db/migrate/20120319120638_add_content_type_id_to_manifestation.rb
+- spec/dummy/db/migrate/20120319173203_create_accepts.rb
 - spec/dummy/db/migrate/20120410104851_add_year_of_publication_to_manifestation.rb
 - spec/dummy/db/migrate/20120413072700_add_picture_meta_to_picture_file.rb
 - spec/dummy/db/migrate/20120413100352_add_fingerprint_to_picture_file.rb
 - spec/dummy/db/migrate/20120413161340_add_fingerprint_to_resource_import_file.rb
-- spec/dummy/db/migrate/20120413161403_add_fingerprint_to_patron_import_file.rb
+- spec/dummy/db/migrate/20120413161403_add_fingerprint_to_agent_import_file.rb
 - spec/dummy/db/migrate/20120413170705_add_error_message_to_resource_import_file.rb
-- spec/dummy/db/migrate/20120413170720_add_error_message_to_patron_import_file.rb
+- spec/dummy/db/migrate/20120413170720_add_error_message_to_agent_import_file.rb
 - spec/dummy/db/migrate/20120415060308_rename_resource_import_file_imported_at_to_executed_at.rb
-- spec/dummy/db/migrate/20120415060323_rename_patron_import_file_imported_at_to_executed_at.rb
 - spec/dummy/db/migrate/20120415164821_add_attachment_meta_to_manifestation.rb
 - spec/dummy/db/migrate/20120418081407_add_month_of_publication_to_manifestation.rb
-- spec/dummy/db/migrate/20120602141129_add_edit_mode_to_patron_import_file.rb
+- spec/dummy/db/migrate/20120510140958_add_closed_to_shelf.rb
+- spec/dummy/db/migrate/20120511072422_add_agent_identifier_to_agent.rb
+- spec/dummy/db/migrate/20120602141129_add_edit_mode_to_agent_import_file.rb
 - spec/dummy/db/migrate/20120728204337_create_series_statement_relationships.rb
+- spec/dummy/db/migrate/20130221154434_add_additional_attributes_to_user.rb
+- spec/dummy/db/migrate/20130412083556_add_latitude_and_longitude_to_library.rb
+- spec/dummy/db/migrate/20130421093852_add_periodical_to_manifestation.rb
+- spec/dummy/db/migrate/20130421155019_add_creator_string_to_series_statement.rb
+- spec/dummy/db/migrate/20130421164124_add_series_master_to_series_statement.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/db/test.sqlite3
 - spec/dummy/public/404.html
@@ -253,30 +287,35 @@ files:
 - spec/dummy/Rakefile
 - spec/dummy/script/rails
 - spec/enju_resource_merge_test.rb
-- spec/factories/patron.rb
-- spec/factories/patron_merge.rb
-- spec/factories/patron_merge_list.rb
+- spec/factories/agent.rb
+- spec/factories/agent_merge.rb
+- spec/factories/agent_merge_list.rb
+- spec/factories/library.rb
 - spec/factories/series_statement.rb
 - spec/factories/series_statement_merge.rb
 - spec/factories/series_statement_merge_list.rb
 - spec/factories/user.rb
+- spec/fixtures/agent_merge_lists.yml
+- spec/fixtures/agent_merges.yml
+- spec/fixtures/agent_types.yml
+- spec/fixtures/agents.yml
 - spec/fixtures/carrier_types.yml
 - spec/fixtures/countries.yml
 - spec/fixtures/languages.yml
+- spec/fixtures/libraries.yml
+- spec/fixtures/library_groups.yml
 - spec/fixtures/manifestations.yml
-- spec/fixtures/patron_merge_lists.yml
-- spec/fixtures/patron_merges.yml
-- spec/fixtures/patron_types.yml
-- spec/fixtures/patrons.yml
 - spec/fixtures/roles.yml
 - spec/fixtures/series_has_manifestations.yml
 - spec/fixtures/series_statement_merge_lists.yml
 - spec/fixtures/series_statement_merges.yml
 - spec/fixtures/series_statements.yml
+- spec/fixtures/shelves.yml
+- spec/fixtures/user_groups.yml
 - spec/fixtures/user_has_roles.yml
 - spec/fixtures/users.yml
-- spec/models/patron_merge_list_spec.rb
-- spec/models/patron_merge_spec.rb
+- spec/models/agent_merge_list_spec.rb
+- spec/models/agent_merge_spec.rb
 - spec/models/series_statement_merge_list_spec.rb
 - spec/models/series_statement_merge_spec.rb
 - spec/requests/series_statement_merge_lists_spec.rb
@@ -313,13 +352,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: enju_resource_merge plugin
 test_files:
-- spec/controllers/patron_merge_lists_controller_spec.rb
-- spec/controllers/patron_merges_controller_spec.rb
+- spec/controllers/agent_merge_lists_controller_spec.rb
+- spec/controllers/agent_merges_controller_spec.rb
 - spec/controllers/series_statement_merge_lists_controller_spec.rb
 - spec/controllers/series_statement_merges_controller_spec.rb
 - spec/dummy/app/assets/javascripts/application.js
@@ -327,10 +366,8 @@ 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/role.rb
 - spec/dummy/app/models/setting.rb
 - spec/dummy/app/models/user.rb
-- spec/dummy/app/models/user_has_role.rb
 - spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/app/views/page/403.html.erb
 - spec/dummy/app/views/page/403.mobile.erb
@@ -357,46 +394,61 @@ test_files:
 - spec/dummy/config/routes.rb
 - spec/dummy/config.ru
 - spec/dummy/db/development.sqlite3
-- spec/dummy/db/migrate/001_create_patrons.rb
+- spec/dummy/db/migrate/001_create_agents.rb
 - spec/dummy/db/migrate/005_create_manifestations.rb
 - spec/dummy/db/migrate/006_create_items.rb
 - spec/dummy/db/migrate/012_create_owns.rb
 - spec/dummy/db/migrate/015_create_creates.rb
 - spec/dummy/db/migrate/047_create_produces.rb
+- spec/dummy/db/migrate/059_create_libraries.rb
+- spec/dummy/db/migrate/069_create_shelves.rb
 - spec/dummy/db/migrate/073_create_carrier_types.rb
+- spec/dummy/db/migrate/077_create_user_groups.rb
+- spec/dummy/db/migrate/080_create_library_groups.rb
 - spec/dummy/db/migrate/112_create_frequencies.rb
 - spec/dummy/db/migrate/117_create_form_of_works.rb
+- spec/dummy/db/migrate/120_create_baskets.rb
+- spec/dummy/db/migrate/124_create_bookstores.rb
 - spec/dummy/db/migrate/125_create_donates.rb
+- spec/dummy/db/migrate/130_create_request_status_types.rb
+- spec/dummy/db/migrate/131_create_request_types.rb
 - spec/dummy/db/migrate/20080830154109_create_realizes.rb
 - spec/dummy/db/migrate/20080830172106_create_exemplifies.rb
-- spec/dummy/db/migrate/20080905191442_create_patron_types.rb
+- spec/dummy/db/migrate/20080905191442_create_agent_types.rb
+- spec/dummy/db/migrate/20081006090811_create_subscriptions.rb
+- spec/dummy/db/migrate/20081006093246_create_subscribes.rb
+- spec/dummy/db/migrate/20081023092436_create_search_engines.rb
 - spec/dummy/db/migrate/20081025083323_create_countries.rb
 - spec/dummy/db/migrate/20081025083905_create_languages.rb
 - spec/dummy/db/migrate/20081027150907_create_picture_files.rb
-- spec/dummy/db/migrate/20081028083142_create_patron_import_files.rb
+- spec/dummy/db/migrate/20081028083142_create_agent_import_files.rb
 - spec/dummy/db/migrate/20081028083208_create_resource_import_files.rb
 - spec/dummy/db/migrate/20090705133942_add_attachments_picture_to_picture_file.rb
 - spec/dummy/db/migrate/20090705212043_add_attachments_attachment_to_manifestation.rb
 - spec/dummy/db/migrate/20090719201843_create_extents.rb
 - spec/dummy/db/migrate/20090720091106_create_medium_of_performances.rb
 - spec/dummy/db/migrate/20090720091429_create_content_types.rb
-- spec/dummy/db/migrate/20090812151902_create_patron_relationship_types.rb
+- spec/dummy/db/migrate/20090812151902_create_agent_relationship_types.rb
 - spec/dummy/db/migrate/20091012101112_add_dcndl_schema.rb
 - spec/dummy/db/migrate/20091025080447_create_licenses.rb
 - spec/dummy/db/migrate/20091202124834_create_versions.rb
 - spec/dummy/db/migrate/20091214131723_create_series_statements.rb
 - spec/dummy/db/migrate/20100129142347_create_import_requests.rb
+- spec/dummy/db/migrate/20100211105551_add_admin_networks_to_library_group.rb
 - spec/dummy/db/migrate/20100223121519_rename_series_statement_title_to_original_title.rb
+- spec/dummy/db/migrate/20100314190054_add_opening_hour_to_library.rb
 - spec/dummy/db/migrate/20100321235924_add_series_statement_identifier_to_series_statement.rb
 - spec/dummy/db/migrate/20100525124311_create_manifestation_relationships.rb
-- spec/dummy/db/migrate/20100606073747_create_patron_relationships.rb
+- spec/dummy/db/migrate/20100606073747_create_agent_relationships.rb
 - spec/dummy/db/migrate/20100607044753_create_manifestation_relationship_types.rb
-- spec/dummy/db/migrate/20100814091104_add_position_to_patron_relationship.rb
+- spec/dummy/db/migrate/20100814091104_add_position_to_agent_relationship.rb
 - spec/dummy/db/migrate/20100925043847_create_resource_import_results.rb
-- spec/dummy/db/migrate/20100925074559_create_patron_import_results.rb
+- spec/dummy/db/migrate/20100925074559_create_agent_import_results.rb
 - spec/dummy/db/migrate/20101212070145_add_acquired_at_to_item.rb
+- spec/dummy/db/migrate/20110222073537_add_url_to_library_group.rb
 - spec/dummy/db/migrate/20110301035123_add_pub_date_to_manifestation.rb
-- spec/dummy/db/migrate/20110301121550_add_birth_date_and_death_date_to_patron.rb
+- spec/dummy/db/migrate/20110301121550_add_birth_date_and_death_date_to_agent.rb
+- spec/dummy/db/migrate/20110318183304_add_valid_period_for_new_user_to_user_group.rb
 - spec/dummy/db/migrate/20110425133109_add_issn_to_series_statement.rb
 - spec/dummy/db/migrate/20110603184217_add_edit_mode_to_resource_import_file.rb
 - spec/dummy/db/migrate/20110618091240_add_periodical_to_series_statement.rb
@@ -406,9 +458,7 @@ test_files:
 - spec/dummy/db/migrate/20110916053430_rename_manifestation_number_list_to_number_string.rb
 - spec/dummy/db/migrate/20110916091020_add_volume_number_to_manifestation.rb
 - spec/dummy/db/migrate/20110916103953_add_manifestaiton_id_to_series_statement.rb
-- spec/dummy/db/migrate/20110918161853_rename_series_statement_manifestation_id_to_root_manifestation_id.rb
 - spec/dummy/db/migrate/20110918162329_add_note_to_series_statement.rb
-- spec/dummy/db/migrate/20111009183423_add_ndc_to_manifestation.rb
 - spec/dummy/db/migrate/20111124110059_create_create_types.rb
 - spec/dummy/db/migrate/20111124110319_create_realize_types.rb
 - spec/dummy/db/migrate/20111124110355_create_produce_types.rb
@@ -417,22 +467,31 @@ test_files:
 - spec/dummy/db/migrate/20111201155456_create_users.rb
 - spec/dummy/db/migrate/20111201155513_add_devise_to_users.rb
 - spec/dummy/db/migrate/20111201163718_create_user_has_roles.rb
+- spec/dummy/db/migrate/20120105074911_add_isil_to_library.rb
 - spec/dummy/db/migrate/20120125152919_add_title_subseries_transcription_to_series_statement.rb
+- spec/dummy/db/migrate/20120129014038_create_budget_types.rb
 - spec/dummy/db/migrate/20120129020544_add_budget_type_id_to_item.rb
 - spec/dummy/db/migrate/20120319120638_add_content_type_id_to_manifestation.rb
+- spec/dummy/db/migrate/20120319173203_create_accepts.rb
 - spec/dummy/db/migrate/20120410104851_add_year_of_publication_to_manifestation.rb
 - spec/dummy/db/migrate/20120413072700_add_picture_meta_to_picture_file.rb
 - spec/dummy/db/migrate/20120413100352_add_fingerprint_to_picture_file.rb
 - spec/dummy/db/migrate/20120413161340_add_fingerprint_to_resource_import_file.rb
-- spec/dummy/db/migrate/20120413161403_add_fingerprint_to_patron_import_file.rb
+- spec/dummy/db/migrate/20120413161403_add_fingerprint_to_agent_import_file.rb
 - spec/dummy/db/migrate/20120413170705_add_error_message_to_resource_import_file.rb
-- spec/dummy/db/migrate/20120413170720_add_error_message_to_patron_import_file.rb
+- spec/dummy/db/migrate/20120413170720_add_error_message_to_agent_import_file.rb
 - spec/dummy/db/migrate/20120415060308_rename_resource_import_file_imported_at_to_executed_at.rb
-- spec/dummy/db/migrate/20120415060323_rename_patron_import_file_imported_at_to_executed_at.rb
 - spec/dummy/db/migrate/20120415164821_add_attachment_meta_to_manifestation.rb
 - spec/dummy/db/migrate/20120418081407_add_month_of_publication_to_manifestation.rb
-- spec/dummy/db/migrate/20120602141129_add_edit_mode_to_patron_import_file.rb
+- spec/dummy/db/migrate/20120510140958_add_closed_to_shelf.rb
+- spec/dummy/db/migrate/20120511072422_add_agent_identifier_to_agent.rb
+- spec/dummy/db/migrate/20120602141129_add_edit_mode_to_agent_import_file.rb
 - spec/dummy/db/migrate/20120728204337_create_series_statement_relationships.rb
+- spec/dummy/db/migrate/20130221154434_add_additional_attributes_to_user.rb
+- spec/dummy/db/migrate/20130412083556_add_latitude_and_longitude_to_library.rb
+- spec/dummy/db/migrate/20130421093852_add_periodical_to_manifestation.rb
+- spec/dummy/db/migrate/20130421155019_add_creator_string_to_series_statement.rb
+- spec/dummy/db/migrate/20130421164124_add_series_master_to_series_statement.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/db/test.sqlite3
 - spec/dummy/public/404.html
@@ -442,30 +501,35 @@ test_files:
 - spec/dummy/Rakefile
 - spec/dummy/script/rails
 - spec/enju_resource_merge_test.rb
-- spec/factories/patron.rb
-- spec/factories/patron_merge.rb
-- spec/factories/patron_merge_list.rb
+- spec/factories/agent.rb
+- spec/factories/agent_merge.rb
+- spec/factories/agent_merge_list.rb
+- spec/factories/library.rb
 - spec/factories/series_statement.rb
 - spec/factories/series_statement_merge.rb
 - spec/factories/series_statement_merge_list.rb
 - spec/factories/user.rb
+- spec/fixtures/agent_merge_lists.yml
+- spec/fixtures/agent_merges.yml
+- spec/fixtures/agent_types.yml
+- spec/fixtures/agents.yml
 - spec/fixtures/carrier_types.yml
 - spec/fixtures/countries.yml
 - spec/fixtures/languages.yml
+- spec/fixtures/libraries.yml
+- spec/fixtures/library_groups.yml
 - spec/fixtures/manifestations.yml
-- spec/fixtures/patron_merge_lists.yml
-- spec/fixtures/patron_merges.yml
-- spec/fixtures/patron_types.yml
-- spec/fixtures/patrons.yml
 - spec/fixtures/roles.yml
 - spec/fixtures/series_has_manifestations.yml
 - spec/fixtures/series_statement_merge_lists.yml
 - spec/fixtures/series_statement_merges.yml
 - spec/fixtures/series_statements.yml
+- spec/fixtures/shelves.yml
+- spec/fixtures/user_groups.yml
 - spec/fixtures/user_has_roles.yml
 - spec/fixtures/users.yml
-- spec/models/patron_merge_list_spec.rb
-- spec/models/patron_merge_spec.rb
+- spec/models/agent_merge_list_spec.rb
+- spec/models/agent_merge_spec.rb
 - spec/models/series_statement_merge_list_spec.rb
 - spec/models/series_statement_merge_spec.rb
 - spec/requests/series_statement_merge_lists_spec.rb

data/app/models/patron_merge.rb

@@ -1,21 +0,0 @@
-class PatronMerge < ActiveRecord::Base
-  attr_accessible :patron_id, :patron_merge_list_id
-  belongs_to :patron, :validate => true
-  belongs_to :patron_merge_list, :validate => true
-  validates_presence_of :patron, :patron_merge_list
-  validates_associated :patron, :patron_merge_list
-
-  paginates_per 10
-end
-
-# == Schema Information
-#
-# Table name: patron_merges
-#
-#  id                   :integer          not null, primary key
-#  patron_id            :integer          not null
-#  patron_merge_list_id :integer          not null
-#  created_at           :datetime         not null
-#  updated_at           :datetime         not null
-#
-

data/app/models/patron_merge_list.rb

@@ -1,29 +0,0 @@
-class PatronMergeList < ActiveRecord::Base
-  attr_accessible :title
-  has_many :patron_merges, :dependent => :destroy
-  has_many :patrons, :through => :patron_merges
-  validates_presence_of :title
-
-  paginates_per 10
-
-  def merge_patrons(selected_patron)
-    self.patrons.each do |patron|
-      Create.update_all(['patron_id = ?', selected_patron.id], ['patron_id = ?', patron.id])
-      Produce.update_all(['patron_id = ?', selected_patron.id], ['patron_id = ?', patron.id])
-      Own.update_all(['patron_id = ?', selected_patron.id], ['patron_id = ?', patron.id])
-      Donate.update_all(['patron_id = ?', selected_patron.id], ['patron_id = ?', patron.id])
-      patron.destroy unless patron == selected_patron
-    end
-  end
-end
-
-# == Schema Information
-#
-# Table name: patron_merge_lists
-#
-#  id         :integer          not null, primary key
-#  title      :string(255)
-#  created_at :datetime         not null
-#  updated_at :datetime         not null
-#
-

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

@@ -1,33 +0,0 @@
-<div id="content_detail" class="ui-corner-all">
-<h1 class="title"><%= t('page.listing', :model => t('activerecord.models.patron_merge_list')) -%></h1>
-<div id="content_list">
-
-<table class="table table-striped index">
-  <tr>
-    <th><%= t('activerecord.attributes.patron_merge_list.title') -%></th>
-    <th><%= t('page.created_at') -%></th>
-    <th></th>
-  </tr>
-
-<%- @patron_merge_lists.each do |patron_merge_list| -%>
-  <tr class="line<%= cycle("0", "1") -%>">
-    <td><%= link_to patron_merge_list.title, patron_merge_list -%></td>
-    <td><%= l(patron_merge_list.created_at) -%></td>
-    <td>
-      <%= link_to t('page.show'), patron_merge_list -%>
-      <%= link_to t('page.edit'), edit_patron_merge_list_path(patron_merge_list) -%>
-      <%= link_to t('page.destroy'), patron_merge_list, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
-  </td>
-  </tr>
-<%- end -%>
-</table>
-
-<%= paginate(@patron_merge_lists) -%>
-</div>
-</div>
-
-<div id="submenu" class="ui-corner-all">
-  <ul>
-    <li><%= link_to t('page.new', :model => t('activerecord.models.patron_merge_list')), new_patron_merge_list_path -%></li>
-  </ul>
-</div>