enju_resource_merge 0.1.0.pre7 → 0.1.0.pre8

Sign up to get free protection for your applications and to get access to all the features.
Files changed (121) hide show
  1. checksums.yaml +4 -4
  2. data/app/controllers/patron_merge_lists_controller.rb +37 -37
  3. data/app/controllers/patron_merges_controller.rb +35 -35
  4. data/app/controllers/series_statement_merge_lists_controller.rb +0 -1
  5. data/app/models/agent_merge.rb +21 -0
  6. data/app/models/agent_merge_list.rb +29 -0
  7. data/app/models/enju_resource_merge/ability.rb +4 -4
  8. data/app/models/series_statement_merge_list.rb +0 -18
  9. data/app/views/{patron_merge_lists → agent_merge_lists}/_form.html.erb +1 -1
  10. data/app/views/{patron_merge_lists → agent_merge_lists}/edit.html.erb +3 -3
  11. data/app/views/agent_merge_lists/index.html.erb +33 -0
  12. data/app/views/{patron_merge_lists → agent_merge_lists}/new.html.erb +1 -1
  13. data/app/views/agent_merge_lists/show.html.erb +31 -0
  14. data/app/views/agent_merges/edit.html.erb +31 -0
  15. data/app/views/agent_merges/index.html.erb +32 -0
  16. data/app/views/agent_merges/new.html.erb +39 -0
  17. data/app/views/agent_merges/show.html.erb +25 -0
  18. data/config/routes.rb +7 -7
  19. data/db/migrate/133_create_agent_merges.rb +15 -0
  20. data/db/migrate/134_create_agent_merge_lists.rb +13 -0
  21. data/lib/enju_resource_merge/version.rb +1 -1
  22. data/lib/enju_resource_merge.rb +2 -2
  23. data/spec/controllers/agent_merge_lists_controller_spec.rb +456 -0
  24. data/spec/controllers/agent_merges_controller_spec.rb +437 -0
  25. data/spec/dummy/app/controllers/application_controller.rb +3 -68
  26. data/spec/dummy/app/models/ability.rb +4 -4
  27. data/spec/dummy/app/models/user.rb +5 -25
  28. data/spec/dummy/config/application.rb +1 -1
  29. data/spec/dummy/db/development.sqlite3 +0 -0
  30. data/spec/dummy/db/migrate/{001_create_patrons.rb → 001_create_agents.rb} +8 -8
  31. data/spec/dummy/db/migrate/012_create_owns.rb +2 -2
  32. data/spec/dummy/db/migrate/015_create_creates.rb +2 -2
  33. data/spec/dummy/db/migrate/047_create_produces.rb +2 -2
  34. data/spec/dummy/db/migrate/059_create_libraries.rb +28 -0
  35. data/spec/dummy/db/migrate/069_create_shelves.rb +15 -0
  36. data/spec/dummy/db/migrate/077_create_user_groups.rb +16 -0
  37. data/spec/dummy/db/migrate/080_create_library_groups.rb +18 -0
  38. data/spec/dummy/db/migrate/120_create_baskets.rb +12 -0
  39. data/spec/dummy/db/migrate/124_create_bookstores.rb +17 -0
  40. data/spec/dummy/db/migrate/125_create_donates.rb +2 -2
  41. data/spec/dummy/db/migrate/{20090812151902_create_patron_relationship_types.rb → 130_create_request_status_types.rb} +2 -2
  42. data/spec/dummy/db/migrate/131_create_request_types.rb +12 -0
  43. data/spec/dummy/db/migrate/20080830154109_create_realizes.rb +2 -2
  44. data/spec/dummy/db/migrate/{20080905191442_create_patron_types.rb → 20080905191442_create_agent_types.rb} +2 -2
  45. data/spec/dummy/db/migrate/20081006090811_create_subscriptions.rb +17 -0
  46. data/spec/dummy/db/migrate/20081006093246_create_subscribes.rb +14 -0
  47. data/spec/dummy/db/migrate/20081023092436_create_search_engines.rb +17 -0
  48. data/spec/dummy/db/migrate/20081028083142_create_agent_import_files.rb +22 -0
  49. data/spec/dummy/db/migrate/20090812151902_create_agent_relationship_types.rb +12 -0
  50. data/spec/dummy/db/migrate/20091012101112_add_dcndl_schema.rb +2 -2
  51. data/spec/dummy/db/migrate/20100211105551_add_admin_networks_to_library_group.rb +9 -0
  52. data/spec/dummy/db/migrate/20100314190054_add_opening_hour_to_library.rb +9 -0
  53. data/spec/dummy/db/migrate/20100606073747_create_agent_relationships.rb +13 -0
  54. data/spec/dummy/db/migrate/20100814091104_add_position_to_agent_relationship.rb +11 -0
  55. data/spec/dummy/db/migrate/20100925074559_create_agent_import_results.rb +12 -0
  56. data/spec/dummy/db/migrate/20110222073537_add_url_to_library_group.rb +9 -0
  57. data/spec/dummy/db/migrate/20110301121550_add_birth_date_and_death_date_to_agent.rb +11 -0
  58. data/spec/dummy/db/migrate/20110318183304_add_valid_period_for_new_user_to_user_group.rb +11 -0
  59. data/spec/dummy/db/migrate/20111201155456_create_users.rb +0 -5
  60. data/spec/dummy/db/migrate/20120105074911_add_isil_to_library.rb +5 -0
  61. data/spec/dummy/db/migrate/20120129014038_create_budget_types.rb +12 -0
  62. data/spec/dummy/db/migrate/20120319173203_create_accepts.rb +14 -0
  63. data/spec/dummy/db/migrate/20120413161403_add_fingerprint_to_agent_import_file.rb +5 -0
  64. data/spec/dummy/db/migrate/20120413170720_add_error_message_to_agent_import_file.rb +5 -0
  65. data/spec/dummy/db/migrate/20120510140958_add_closed_to_shelf.rb +5 -0
  66. data/spec/dummy/db/migrate/20120511072422_add_agent_identifier_to_agent.rb +6 -0
  67. data/spec/dummy/db/migrate/20120602141129_add_edit_mode_to_agent_import_file.rb +5 -0
  68. data/spec/dummy/db/migrate/20130221154434_add_additional_attributes_to_user.rb +26 -0
  69. data/spec/dummy/db/migrate/20130412083556_add_latitude_and_longitude_to_library.rb +6 -0
  70. data/spec/dummy/db/migrate/20130421093852_add_periodical_to_manifestation.rb +5 -0
  71. data/spec/dummy/db/migrate/20130421155019_add_creator_string_to_series_statement.rb +7 -0
  72. data/spec/dummy/db/migrate/20130421164124_add_series_master_to_series_statement.rb +5 -0
  73. data/spec/dummy/db/schema.rb +352 -154
  74. data/spec/dummy/db/test.sqlite3 +0 -0
  75. data/spec/factories/{patron.rb → agent.rb} +2 -2
  76. data/spec/factories/agent_merge.rb +6 -0
  77. data/spec/factories/agent_merge_list.rb +5 -0
  78. data/spec/factories/library.rb +13 -0
  79. data/spec/factories/user.rb +34 -6
  80. data/spec/fixtures/{patron_merge_lists.yml → agent_merge_lists.yml} +4 -4
  81. data/spec/fixtures/agent_merges.yml +31 -0
  82. data/spec/fixtures/{patron_types.yml → agent_types.yml} +4 -4
  83. data/spec/fixtures/{patrons.yml → agents.yml} +46 -46
  84. data/spec/fixtures/libraries.yml +102 -0
  85. data/spec/fixtures/library_groups.yml +34 -0
  86. data/spec/fixtures/series_statements.yml +23 -22
  87. data/spec/fixtures/shelves.yml +47 -0
  88. data/spec/fixtures/user_groups.yml +45 -0
  89. data/spec/models/{patron_merge_list_spec.rb → agent_merge_list_spec.rb} +2 -2
  90. data/spec/models/agent_merge_spec.rb +19 -0
  91. data/spec/models/series_statement_merge_list_spec.rb +0 -5
  92. metadata +136 -72
  93. data/app/models/patron_merge.rb +0 -21
  94. data/app/models/patron_merge_list.rb +0 -29
  95. data/app/views/patron_merge_lists/index.html.erb +0 -33
  96. data/app/views/patron_merge_lists/show.html.erb +0 -31
  97. data/app/views/patron_merges/edit.html.erb +0 -31
  98. data/app/views/patron_merges/index.html.erb +0 -32
  99. data/app/views/patron_merges/new.html.erb +0 -39
  100. data/app/views/patron_merges/show.html.erb +0 -25
  101. data/db/migrate/133_create_patron_merges.rb +0 -15
  102. data/db/migrate/134_create_patron_merge_lists.rb +0 -13
  103. data/spec/controllers/patron_merge_lists_controller_spec.rb +0 -456
  104. data/spec/controllers/patron_merges_controller_spec.rb +0 -437
  105. data/spec/dummy/app/models/role.rb +0 -47
  106. data/spec/dummy/app/models/user_has_role.rb +0 -4
  107. data/spec/dummy/db/migrate/20081028083142_create_patron_import_files.rb +0 -22
  108. data/spec/dummy/db/migrate/20100606073747_create_patron_relationships.rb +0 -13
  109. data/spec/dummy/db/migrate/20100814091104_add_position_to_patron_relationship.rb +0 -11
  110. data/spec/dummy/db/migrate/20100925074559_create_patron_import_results.rb +0 -12
  111. data/spec/dummy/db/migrate/20110301121550_add_birth_date_and_death_date_to_patron.rb +0 -11
  112. data/spec/dummy/db/migrate/20110918161853_rename_series_statement_manifestation_id_to_root_manifestation_id.rb +0 -13
  113. data/spec/dummy/db/migrate/20111009183423_add_ndc_to_manifestation.rb +0 -9
  114. data/spec/dummy/db/migrate/20120413161403_add_fingerprint_to_patron_import_file.rb +0 -5
  115. data/spec/dummy/db/migrate/20120413170720_add_error_message_to_patron_import_file.rb +0 -5
  116. data/spec/dummy/db/migrate/20120415060323_rename_patron_import_file_imported_at_to_executed_at.rb +0 -9
  117. data/spec/dummy/db/migrate/20120602141129_add_edit_mode_to_patron_import_file.rb +0 -5
  118. data/spec/factories/patron_merge.rb +0 -6
  119. data/spec/factories/patron_merge_list.rb +0 -5
  120. data/spec/fixtures/patron_merges.yml +0 -31
  121. data/spec/models/patron_merge_spec.rb +0 -19
@@ -11,7 +11,186 @@
11
11
  #
12
12
  # It's strongly recommended to check this file into your version control system.
13
13
 
14
- ActiveRecord::Schema.define(:version => 20120728204337) do
14
+ ActiveRecord::Schema.define(:version => 20130421164124) do
15
+
16
+ create_table "accepts", :force => true do |t|
17
+ t.integer "basket_id"
18
+ t.integer "item_id"
19
+ t.integer "librarian_id"
20
+ t.datetime "created_at", :null => false
21
+ t.datetime "updated_at", :null => false
22
+ end
23
+
24
+ add_index "accepts", ["basket_id"], :name => "index_accepts_on_basket_id"
25
+ add_index "accepts", ["item_id"], :name => "index_accepts_on_item_id"
26
+
27
+ create_table "agent_import_files", :force => true do |t|
28
+ t.integer "parent_id"
29
+ t.string "content_type"
30
+ t.integer "size"
31
+ t.integer "user_id"
32
+ t.text "note"
33
+ t.datetime "executed_at"
34
+ t.string "state"
35
+ t.string "agent_import_file_name"
36
+ t.string "agent_import_content_type"
37
+ t.integer "agent_import_file_size"
38
+ t.datetime "agent_import_updated_at"
39
+ t.datetime "created_at", :null => false
40
+ t.datetime "updated_at", :null => false
41
+ t.string "agent_import_fingerprint"
42
+ t.text "error_message"
43
+ t.string "edit_mode"
44
+ end
45
+
46
+ add_index "agent_import_files", ["parent_id"], :name => "index_agent_import_files_on_parent_id"
47
+ add_index "agent_import_files", ["state"], :name => "index_agent_import_files_on_state"
48
+ add_index "agent_import_files", ["user_id"], :name => "index_agent_import_files_on_user_id"
49
+
50
+ create_table "agent_import_results", :force => true do |t|
51
+ t.integer "agent_import_file_id"
52
+ t.integer "agent_id"
53
+ t.integer "user_id"
54
+ t.text "body"
55
+ t.datetime "created_at", :null => false
56
+ t.datetime "updated_at", :null => false
57
+ end
58
+
59
+ create_table "agent_merge_lists", :force => true do |t|
60
+ t.string "title"
61
+ t.datetime "created_at", :null => false
62
+ t.datetime "updated_at", :null => false
63
+ end
64
+
65
+ create_table "agent_merges", :force => true do |t|
66
+ t.integer "agent_id", :null => false
67
+ t.integer "agent_merge_list_id", :null => false
68
+ t.datetime "created_at", :null => false
69
+ t.datetime "updated_at", :null => false
70
+ end
71
+
72
+ add_index "agent_merges", ["agent_id"], :name => "index_agent_merges_on_agent_id"
73
+ add_index "agent_merges", ["agent_merge_list_id"], :name => "index_agent_merges_on_agent_merge_list_id"
74
+
75
+ create_table "agent_relationship_types", :force => true do |t|
76
+ t.string "name", :null => false
77
+ t.text "display_name"
78
+ t.text "note"
79
+ t.integer "position"
80
+ t.datetime "created_at", :null => false
81
+ t.datetime "updated_at", :null => false
82
+ end
83
+
84
+ create_table "agent_relationships", :force => true do |t|
85
+ t.integer "parent_id"
86
+ t.integer "child_id"
87
+ t.integer "agent_relationship_type_id"
88
+ t.datetime "created_at", :null => false
89
+ t.datetime "updated_at", :null => false
90
+ t.integer "position"
91
+ end
92
+
93
+ add_index "agent_relationships", ["child_id"], :name => "index_agent_relationships_on_child_id"
94
+ add_index "agent_relationships", ["parent_id"], :name => "index_agent_relationships_on_parent_id"
95
+
96
+ create_table "agent_types", :force => true do |t|
97
+ t.string "name", :null => false
98
+ t.text "display_name"
99
+ t.text "note"
100
+ t.integer "position"
101
+ t.datetime "created_at", :null => false
102
+ t.datetime "updated_at", :null => false
103
+ end
104
+
105
+ create_table "agents", :force => true do |t|
106
+ t.integer "user_id"
107
+ t.string "last_name"
108
+ t.string "middle_name"
109
+ t.string "first_name"
110
+ t.string "last_name_transcription"
111
+ t.string "middle_name_transcription"
112
+ t.string "first_name_transcription"
113
+ t.string "corporate_name"
114
+ t.string "corporate_name_transcription"
115
+ t.string "full_name"
116
+ t.text "full_name_transcription"
117
+ t.text "full_name_alternative"
118
+ t.datetime "created_at", :null => false
119
+ t.datetime "updated_at", :null => false
120
+ t.datetime "deleted_at"
121
+ t.string "zip_code_1"
122
+ t.string "zip_code_2"
123
+ t.text "address_1"
124
+ t.text "address_2"
125
+ t.text "address_1_note"
126
+ t.text "address_2_note"
127
+ t.string "telephone_number_1"
128
+ t.string "telephone_number_2"
129
+ t.string "fax_number_1"
130
+ t.string "fax_number_2"
131
+ t.text "other_designation"
132
+ t.text "place"
133
+ t.string "postal_code"
134
+ t.text "street"
135
+ t.text "locality"
136
+ t.text "region"
137
+ t.datetime "date_of_birth"
138
+ t.datetime "date_of_death"
139
+ t.integer "language_id", :default => 1, :null => false
140
+ t.integer "country_id", :default => 1, :null => false
141
+ t.integer "agent_type_id", :default => 1, :null => false
142
+ t.integer "lock_version", :default => 0, :null => false
143
+ t.text "note"
144
+ t.integer "required_role_id", :default => 1, :null => false
145
+ t.integer "required_score", :default => 0, :null => false
146
+ t.string "state"
147
+ t.text "email"
148
+ t.text "url"
149
+ t.text "full_name_alternative_transcription"
150
+ t.string "birth_date"
151
+ t.string "death_date"
152
+ t.string "agent_identifier"
153
+ end
154
+
155
+ add_index "agents", ["agent_identifier"], :name => "index_agents_on_agent_identifier"
156
+ add_index "agents", ["country_id"], :name => "index_agents_on_country_id"
157
+ add_index "agents", ["full_name"], :name => "index_agents_on_full_name"
158
+ add_index "agents", ["language_id"], :name => "index_agents_on_language_id"
159
+ add_index "agents", ["required_role_id"], :name => "index_agents_on_required_role_id"
160
+ add_index "agents", ["user_id"], :name => "index_agents_on_user_id", :unique => true
161
+
162
+ create_table "baskets", :force => true do |t|
163
+ t.integer "user_id"
164
+ t.text "note"
165
+ t.integer "lock_version", :default => 0, :null => false
166
+ t.datetime "created_at", :null => false
167
+ t.datetime "updated_at", :null => false
168
+ end
169
+
170
+ add_index "baskets", ["user_id"], :name => "index_baskets_on_user_id"
171
+
172
+ create_table "bookstores", :force => true do |t|
173
+ t.text "name", :null => false
174
+ t.string "zip_code"
175
+ t.text "address"
176
+ t.text "note"
177
+ t.string "telephone_number"
178
+ t.string "fax_number"
179
+ t.string "url"
180
+ t.integer "position"
181
+ t.datetime "deleted_at"
182
+ t.datetime "created_at", :null => false
183
+ t.datetime "updated_at", :null => false
184
+ end
185
+
186
+ create_table "budget_types", :force => true do |t|
187
+ t.string "name"
188
+ t.text "display_name"
189
+ t.text "note"
190
+ t.integer "position"
191
+ t.datetime "created_at", :null => false
192
+ t.datetime "updated_at", :null => false
193
+ end
15
194
 
16
195
  create_table "carrier_types", :force => true do |t|
17
196
  t.string "name", :null => false
@@ -56,7 +235,7 @@ ActiveRecord::Schema.define(:version => 20120728204337) do
56
235
  end
57
236
 
58
237
  create_table "creates", :force => true do |t|
59
- t.integer "patron_id", :null => false
238
+ t.integer "agent_id", :null => false
60
239
  t.integer "work_id", :null => false
61
240
  t.integer "position"
62
241
  t.datetime "created_at", :null => false
@@ -64,18 +243,18 @@ ActiveRecord::Schema.define(:version => 20120728204337) do
64
243
  t.integer "create_type_id"
65
244
  end
66
245
 
67
- add_index "creates", ["patron_id"], :name => "index_creates_on_patron_id"
246
+ add_index "creates", ["agent_id"], :name => "index_creates_on_agent_id"
68
247
  add_index "creates", ["work_id"], :name => "index_creates_on_work_id"
69
248
 
70
249
  create_table "donates", :force => true do |t|
71
- t.integer "patron_id", :null => false
250
+ t.integer "agent_id", :null => false
72
251
  t.integer "item_id", :null => false
73
252
  t.datetime "created_at", :null => false
74
253
  t.datetime "updated_at", :null => false
75
254
  end
76
255
 
256
+ add_index "donates", ["agent_id"], :name => "index_donates_on_agent_id"
77
257
  add_index "donates", ["item_id"], :name => "index_donates_on_item_id"
78
- add_index "donates", ["patron_id"], :name => "index_donates_on_patron_id"
79
258
 
80
259
  create_table "exemplifies", :force => true do |t|
81
260
  t.integer "manifestation_id", :null => false
@@ -169,6 +348,54 @@ ActiveRecord::Schema.define(:version => 20120728204337) do
169
348
  add_index "languages", ["iso_639_3"], :name => "index_languages_on_iso_639_3"
170
349
  add_index "languages", ["name"], :name => "index_languages_on_name", :unique => true
171
350
 
351
+ create_table "libraries", :force => true do |t|
352
+ t.string "name", :null => false
353
+ t.text "display_name"
354
+ t.string "short_display_name", :null => false
355
+ t.string "zip_code"
356
+ t.text "street"
357
+ t.text "locality"
358
+ t.text "region"
359
+ t.string "telephone_number_1"
360
+ t.string "telephone_number_2"
361
+ t.string "fax_number"
362
+ t.text "note"
363
+ t.integer "call_number_rows", :default => 1, :null => false
364
+ t.string "call_number_delimiter", :default => "|", :null => false
365
+ t.integer "library_group_id", :default => 1, :null => false
366
+ t.integer "users_count", :default => 0, :null => false
367
+ t.integer "position"
368
+ t.integer "country_id"
369
+ t.datetime "created_at", :null => false
370
+ t.datetime "updated_at", :null => false
371
+ t.datetime "deleted_at"
372
+ t.string "isil"
373
+ t.text "opening_hour"
374
+ t.float "latitude"
375
+ t.float "longitude"
376
+ end
377
+
378
+ add_index "libraries", ["library_group_id"], :name => "index_libraries_on_library_group_id"
379
+ add_index "libraries", ["name"], :name => "index_libraries_on_name", :unique => true
380
+
381
+ create_table "library_groups", :force => true do |t|
382
+ t.string "name", :null => false
383
+ t.text "display_name"
384
+ t.string "short_name", :null => false
385
+ t.string "email"
386
+ t.text "my_networks"
387
+ t.text "login_banner"
388
+ t.text "note"
389
+ t.integer "country_id"
390
+ t.integer "position"
391
+ t.datetime "created_at", :null => false
392
+ t.datetime "updated_at", :null => false
393
+ t.text "admin_networks"
394
+ t.string "url", :default => "http://localhost:3000/"
395
+ end
396
+
397
+ add_index "library_groups", ["short_name"], :name => "index_library_groups_on_short_name"
398
+
172
399
  create_table "licenses", :force => true do |t|
173
400
  t.string "name", :null => false
174
401
  t.string "display_name"
@@ -257,11 +484,11 @@ ActiveRecord::Schema.define(:version => 20120728204337) do
257
484
  t.integer "volume_number"
258
485
  t.integer "issue_number"
259
486
  t.integer "serial_number"
260
- t.string "ndc"
261
487
  t.integer "content_type_id", :default => 1
262
488
  t.integer "year_of_publication"
263
489
  t.text "attachment_meta"
264
490
  t.integer "month_of_publication"
491
+ t.boolean "periodical"
265
492
  end
266
493
 
267
494
  add_index "manifestations", ["access_address"], :name => "index_manifestations_on_access_address"
@@ -286,148 +513,15 @@ ActiveRecord::Schema.define(:version => 20120728204337) do
286
513
  end
287
514
 
288
515
  create_table "owns", :force => true do |t|
289
- t.integer "patron_id", :null => false
516
+ t.integer "agent_id", :null => false
290
517
  t.integer "item_id", :null => false
291
518
  t.integer "position"
292
519
  t.datetime "created_at", :null => false
293
520
  t.datetime "updated_at", :null => false
294
521
  end
295
522
 
523
+ add_index "owns", ["agent_id"], :name => "index_owns_on_agent_id"
296
524
  add_index "owns", ["item_id"], :name => "index_owns_on_item_id"
297
- add_index "owns", ["patron_id"], :name => "index_owns_on_patron_id"
298
-
299
- create_table "patron_import_files", :force => true do |t|
300
- t.integer "parent_id"
301
- t.string "content_type"
302
- t.integer "size"
303
- t.integer "user_id"
304
- t.text "note"
305
- t.datetime "executed_at"
306
- t.string "state"
307
- t.string "patron_import_file_name"
308
- t.string "patron_import_content_type"
309
- t.integer "patron_import_file_size"
310
- t.datetime "patron_import_updated_at"
311
- t.datetime "created_at", :null => false
312
- t.datetime "updated_at", :null => false
313
- t.string "patron_import_fingerprint"
314
- t.text "error_message"
315
- t.string "edit_mode"
316
- end
317
-
318
- add_index "patron_import_files", ["parent_id"], :name => "index_patron_import_files_on_parent_id"
319
- add_index "patron_import_files", ["state"], :name => "index_patron_import_files_on_state"
320
- add_index "patron_import_files", ["user_id"], :name => "index_patron_import_files_on_user_id"
321
-
322
- create_table "patron_import_results", :force => true do |t|
323
- t.integer "patron_import_file_id"
324
- t.integer "patron_id"
325
- t.integer "user_id"
326
- t.text "body"
327
- t.datetime "created_at", :null => false
328
- t.datetime "updated_at", :null => false
329
- end
330
-
331
- create_table "patron_merge_lists", :force => true do |t|
332
- t.string "title"
333
- t.datetime "created_at", :null => false
334
- t.datetime "updated_at", :null => false
335
- end
336
-
337
- create_table "patron_merges", :force => true do |t|
338
- t.integer "patron_id", :null => false
339
- t.integer "patron_merge_list_id", :null => false
340
- t.datetime "created_at", :null => false
341
- t.datetime "updated_at", :null => false
342
- end
343
-
344
- add_index "patron_merges", ["patron_id"], :name => "index_patron_merges_on_patron_id"
345
- add_index "patron_merges", ["patron_merge_list_id"], :name => "index_patron_merges_on_patron_merge_list_id"
346
-
347
- create_table "patron_relationship_types", :force => true do |t|
348
- t.string "name", :null => false
349
- t.text "display_name"
350
- t.text "note"
351
- t.integer "position"
352
- t.datetime "created_at", :null => false
353
- t.datetime "updated_at", :null => false
354
- end
355
-
356
- create_table "patron_relationships", :force => true do |t|
357
- t.integer "parent_id"
358
- t.integer "child_id"
359
- t.integer "patron_relationship_type_id"
360
- t.datetime "created_at", :null => false
361
- t.datetime "updated_at", :null => false
362
- t.integer "position"
363
- end
364
-
365
- add_index "patron_relationships", ["child_id"], :name => "index_patron_relationships_on_child_id"
366
- add_index "patron_relationships", ["parent_id"], :name => "index_patron_relationships_on_parent_id"
367
-
368
- create_table "patron_types", :force => true do |t|
369
- t.string "name", :null => false
370
- t.text "display_name"
371
- t.text "note"
372
- t.integer "position"
373
- t.datetime "created_at", :null => false
374
- t.datetime "updated_at", :null => false
375
- end
376
-
377
- create_table "patrons", :force => true do |t|
378
- t.integer "user_id"
379
- t.string "last_name"
380
- t.string "middle_name"
381
- t.string "first_name"
382
- t.string "last_name_transcription"
383
- t.string "middle_name_transcription"
384
- t.string "first_name_transcription"
385
- t.string "corporate_name"
386
- t.string "corporate_name_transcription"
387
- t.string "full_name"
388
- t.text "full_name_transcription"
389
- t.text "full_name_alternative"
390
- t.datetime "created_at", :null => false
391
- t.datetime "updated_at", :null => false
392
- t.datetime "deleted_at"
393
- t.string "zip_code_1"
394
- t.string "zip_code_2"
395
- t.text "address_1"
396
- t.text "address_2"
397
- t.text "address_1_note"
398
- t.text "address_2_note"
399
- t.string "telephone_number_1"
400
- t.string "telephone_number_2"
401
- t.string "fax_number_1"
402
- t.string "fax_number_2"
403
- t.text "other_designation"
404
- t.text "place"
405
- t.string "postal_code"
406
- t.text "street"
407
- t.text "locality"
408
- t.text "region"
409
- t.datetime "date_of_birth"
410
- t.datetime "date_of_death"
411
- t.integer "language_id", :default => 1, :null => false
412
- t.integer "country_id", :default => 1, :null => false
413
- t.integer "patron_type_id", :default => 1, :null => false
414
- t.integer "lock_version", :default => 0, :null => false
415
- t.text "note"
416
- t.integer "required_role_id", :default => 1, :null => false
417
- t.integer "required_score", :default => 0, :null => false
418
- t.string "state"
419
- t.text "email"
420
- t.text "url"
421
- t.text "full_name_alternative_transcription"
422
- t.string "birth_date"
423
- t.string "death_date"
424
- end
425
-
426
- add_index "patrons", ["country_id"], :name => "index_patrons_on_country_id"
427
- add_index "patrons", ["full_name"], :name => "index_patrons_on_full_name"
428
- add_index "patrons", ["language_id"], :name => "index_patrons_on_language_id"
429
- add_index "patrons", ["required_role_id"], :name => "index_patrons_on_required_role_id"
430
- add_index "patrons", ["user_id"], :name => "index_patrons_on_user_id", :unique => true
431
525
 
432
526
  create_table "picture_files", :force => true do |t|
433
527
  t.integer "picture_attachable_id"
@@ -458,7 +552,7 @@ ActiveRecord::Schema.define(:version => 20120728204337) do
458
552
  end
459
553
 
460
554
  create_table "produces", :force => true do |t|
461
- t.integer "patron_id", :null => false
555
+ t.integer "agent_id", :null => false
462
556
  t.integer "manifestation_id", :null => false
463
557
  t.integer "position"
464
558
  t.datetime "created_at", :null => false
@@ -466,8 +560,8 @@ ActiveRecord::Schema.define(:version => 20120728204337) do
466
560
  t.integer "produce_type_id"
467
561
  end
468
562
 
563
+ add_index "produces", ["agent_id"], :name => "index_produces_on_agent_id"
469
564
  add_index "produces", ["manifestation_id"], :name => "index_produces_on_manifestation_id"
470
- add_index "produces", ["patron_id"], :name => "index_produces_on_patron_id"
471
565
 
472
566
  create_table "realize_types", :force => true do |t|
473
567
  t.string "name"
@@ -479,7 +573,7 @@ ActiveRecord::Schema.define(:version => 20120728204337) do
479
573
  end
480
574
 
481
575
  create_table "realizes", :force => true do |t|
482
- t.integer "patron_id", :null => false
576
+ t.integer "agent_id", :null => false
483
577
  t.integer "expression_id", :null => false
484
578
  t.integer "position"
485
579
  t.datetime "created_at", :null => false
@@ -487,8 +581,26 @@ ActiveRecord::Schema.define(:version => 20120728204337) do
487
581
  t.integer "realize_type_id"
488
582
  end
489
583
 
584
+ add_index "realizes", ["agent_id"], :name => "index_realizes_on_agent_id"
490
585
  add_index "realizes", ["expression_id"], :name => "index_realizes_on_expression_id"
491
- add_index "realizes", ["patron_id"], :name => "index_realizes_on_patron_id"
586
+
587
+ create_table "request_status_types", :force => true do |t|
588
+ t.string "name", :null => false
589
+ t.text "display_name"
590
+ t.text "note"
591
+ t.integer "position"
592
+ t.datetime "created_at", :null => false
593
+ t.datetime "updated_at", :null => false
594
+ end
595
+
596
+ create_table "request_types", :force => true do |t|
597
+ t.string "name", :null => false
598
+ t.text "display_name"
599
+ t.text "note"
600
+ t.integer "position"
601
+ t.datetime "created_at", :null => false
602
+ t.datetime "updated_at", :null => false
603
+ end
492
604
 
493
605
  create_table "resource_import_files", :force => true do |t|
494
606
  t.integer "parent_id"
@@ -535,6 +647,20 @@ ActiveRecord::Schema.define(:version => 20120728204337) do
535
647
  t.datetime "updated_at", :null => false
536
648
  end
537
649
 
650
+ create_table "search_engines", :force => true do |t|
651
+ t.string "name", :null => false
652
+ t.text "display_name"
653
+ t.string "url", :null => false
654
+ t.text "base_url", :null => false
655
+ t.text "http_method", :null => false
656
+ t.text "query_param", :null => false
657
+ t.text "additional_param"
658
+ t.text "note"
659
+ t.integer "position"
660
+ t.datetime "created_at", :null => false
661
+ t.datetime "updated_at", :null => false
662
+ end
663
+
538
664
  create_table "series_has_manifestations", :force => true do |t|
539
665
  t.integer "series_statement_id"
540
666
  t.integer "manifestation_id"
@@ -576,21 +702,79 @@ ActiveRecord::Schema.define(:version => 20120728204337) do
576
702
  t.text "title_subseries"
577
703
  t.text "numbering_subseries"
578
704
  t.integer "position"
579
- t.datetime "created_at", :null => false
580
- t.datetime "updated_at", :null => false
705
+ t.datetime "created_at", :null => false
706
+ t.datetime "updated_at", :null => false
581
707
  t.text "title_transcription"
582
708
  t.text "title_alternative"
583
709
  t.string "series_statement_identifier"
584
710
  t.string "issn"
585
711
  t.boolean "periodical"
586
- t.integer "root_manifestation_id"
712
+ t.integer "manifestation_id"
587
713
  t.text "note"
588
714
  t.text "title_subseries_transcription"
715
+ t.text "creator_string"
716
+ t.text "volume_number_string"
717
+ t.text "volume_number_transcription_string"
718
+ t.boolean "series_master"
589
719
  end
590
720
 
591
- add_index "series_statements", ["root_manifestation_id"], :name => "index_series_statements_on_manifestation_id"
721
+ add_index "series_statements", ["manifestation_id"], :name => "index_series_statements_on_manifestation_id"
592
722
  add_index "series_statements", ["series_statement_identifier"], :name => "index_series_statements_on_series_statement_identifier"
593
723
 
724
+ create_table "shelves", :force => true do |t|
725
+ t.string "name", :null => false
726
+ t.text "display_name"
727
+ t.text "note"
728
+ t.integer "library_id", :default => 1, :null => false
729
+ t.integer "items_count", :default => 0, :null => false
730
+ t.integer "position"
731
+ t.datetime "created_at", :null => false
732
+ t.datetime "updated_at", :null => false
733
+ t.datetime "deleted_at"
734
+ t.boolean "closed", :default => false, :null => false
735
+ end
736
+
737
+ add_index "shelves", ["library_id"], :name => "index_shelves_on_library_id"
738
+
739
+ create_table "subscribes", :force => true do |t|
740
+ t.integer "subscription_id", :null => false
741
+ t.integer "work_id", :null => false
742
+ t.datetime "start_at", :null => false
743
+ t.datetime "end_at", :null => false
744
+ t.datetime "created_at", :null => false
745
+ t.datetime "updated_at", :null => false
746
+ end
747
+
748
+ add_index "subscribes", ["subscription_id"], :name => "index_subscribes_on_subscription_id"
749
+ add_index "subscribes", ["work_id"], :name => "index_subscribes_on_work_id"
750
+
751
+ create_table "subscriptions", :force => true do |t|
752
+ t.text "title", :null => false
753
+ t.text "note"
754
+ t.integer "user_id"
755
+ t.integer "order_list_id"
756
+ t.datetime "deleted_at"
757
+ t.integer "subscribes_count", :default => 0, :null => false
758
+ t.datetime "created_at", :null => false
759
+ t.datetime "updated_at", :null => false
760
+ end
761
+
762
+ add_index "subscriptions", ["order_list_id"], :name => "index_subscriptions_on_order_list_id"
763
+ add_index "subscriptions", ["user_id"], :name => "index_subscriptions_on_user_id"
764
+
765
+ create_table "user_groups", :force => true do |t|
766
+ t.string "name"
767
+ t.string "string"
768
+ t.text "display_name"
769
+ t.text "note"
770
+ t.integer "position"
771
+ t.datetime "created_at", :null => false
772
+ t.datetime "updated_at", :null => false
773
+ t.datetime "deleted_at"
774
+ t.integer "valid_period_for_new_user", :default => 0, :null => false
775
+ t.datetime "expired_at"
776
+ end
777
+
594
778
  create_table "user_has_roles", :force => true do |t|
595
779
  t.integer "user_id"
596
780
  t.integer "role_id"
@@ -599,11 +783,6 @@ ActiveRecord::Schema.define(:version => 20120728204337) do
599
783
  end
600
784
 
601
785
  create_table "users", :force => true do |t|
602
- t.integer "user_group_id"
603
- t.integer "required_role_id"
604
- t.string "username"
605
- t.text "note"
606
- t.string "locale"
607
786
  t.datetime "created_at", :null => false
608
787
  t.datetime "updated_at", :null => false
609
788
  t.string "email", :default => "", :null => false
@@ -616,10 +795,29 @@ ActiveRecord::Schema.define(:version => 20120728204337) do
616
795
  t.datetime "last_sign_in_at"
617
796
  t.string "current_sign_in_ip"
618
797
  t.string "last_sign_in_ip"
798
+ t.string "username"
799
+ t.string "user_number"
800
+ t.string "state"
801
+ t.string "locale"
802
+ t.datetime "deleted_at"
803
+ t.datetime "expired_at"
804
+ t.integer "library_id", :default => 1, :null => false
805
+ t.integer "required_role_id", :default => 1, :null => false
806
+ t.integer "user_group_id", :default => 1, :null => false
807
+ t.text "note"
808
+ t.text "keyword_list"
809
+ t.integer "failed_attempts"
810
+ t.string "unlock_token"
811
+ t.datetime "locked_at"
812
+ t.datetime "confirmed_at"
619
813
  end
620
814
 
621
815
  add_index "users", ["email"], :name => "index_users_on_email"
622
816
  add_index "users", ["reset_password_token"], :name => "index_users_on_reset_password_token", :unique => true
817
+ add_index "users", ["unlock_token"], :name => "index_users_on_unlock_token", :unique => true
818
+ add_index "users", ["user_group_id"], :name => "index_users_on_user_group_id"
819
+ add_index "users", ["user_number"], :name => "index_users_on_user_number", :unique => true
820
+ add_index "users", ["username"], :name => "index_users_on_username", :unique => true
623
821
 
624
822
  create_table "versions", :force => true do |t|
625
823
  t.string "item_type", :null => false
Binary file
@@ -1,10 +1,10 @@
1
1
  FactoryGirl.define do
2
- factory :patron do |f|
2
+ factory :agent do |f|
3
3
  f.sequence(:full_name){|n| "full_name_#{n}"}
4
4
  end
5
5
  end
6
6
 
7
7
  FactoryGirl.define do
8
- factory :invalid_patron, :class => Patron do |f|
8
+ factory :invalid_agent, :class => Agent do |f|
9
9
  end
10
10
  end
@@ -0,0 +1,6 @@
1
+ FactoryGirl.define do
2
+ factory :agent_merge do |f|
3
+ f.agent_merge_list_id{FactoryGirl.create(:agent_merge_list).id}
4
+ f.agent_id{FactoryGirl.create(:agent).id}
5
+ end
6
+ end
@@ -0,0 +1,5 @@
1
+ FactoryGirl.define do
2
+ factory :agent_merge_list do |f|
3
+ f.sequence(:title){|n| "agent_merge_list_#{n}"}
4
+ end
5
+ end
@@ -0,0 +1,13 @@
1
+ FactoryGirl.define do
2
+ factory :library do |f|
3
+ f.sequence(:name){|n| "library#{n}"}
4
+ f.sequence(:short_display_name){|n| "library_#{n}"}
5
+ f.library_group_id{LibraryGroup.first.id}
6
+ end
7
+ end
8
+
9
+ FactoryGirl.define do
10
+ factory :invalid_library, :class => Library do |f|
11
+ f.library_group_id{LibraryGroup.first.id}
12
+ end
13
+ end