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
@@ -0,0 +1,437 @@
1
+ require 'spec_helper'
2
+
3
+ describe AgentMergesController do
4
+ fixtures :all
5
+
6
+ describe "GET index" do
7
+ before(:each) do
8
+ FactoryGirl.create(:agent_merge)
9
+ end
10
+
11
+ describe "When logged in as Administrator" do
12
+ login_admin
13
+
14
+ it "assigns all agent_merges as @agent_merges" do
15
+ get :index
16
+ assigns(:agent_merges).should eq(AgentMerge.all)
17
+ end
18
+ end
19
+
20
+ describe "When logged in as Librarian" do
21
+ login_librarian
22
+
23
+ it "assigns all agent_merges as @agent_merges" do
24
+ get :index
25
+ assigns(:agent_merges).should eq(AgentMerge.all)
26
+ end
27
+ end
28
+
29
+ describe "When logged in as User" do
30
+ login_user
31
+
32
+ it "should be forbidden" do
33
+ get :index
34
+ assigns(:agent_merges).should be_empty
35
+ response.should be_forbidden
36
+ end
37
+ end
38
+
39
+ describe "When not logged in" do
40
+ it "should be forbidden" do
41
+ get :index
42
+ assigns(:agent_merges).should be_empty
43
+ response.should redirect_to(new_user_session_url)
44
+ end
45
+ end
46
+ end
47
+
48
+ describe "GET show" do
49
+ describe "When logged in as Administrator" do
50
+ login_admin
51
+
52
+ it "assigns the requested agent_merge as @agent_merge" do
53
+ agent_merge = FactoryGirl.create(:agent_merge)
54
+ get :show, :id => agent_merge.id
55
+ assigns(:agent_merge).should eq(agent_merge)
56
+ end
57
+ end
58
+
59
+ describe "When logged in as Librarian" do
60
+ login_librarian
61
+
62
+ it "assigns the requested agent_merge as @agent_merge" do
63
+ agent_merge = FactoryGirl.create(:agent_merge)
64
+ get :show, :id => agent_merge.id
65
+ assigns(:agent_merge).should eq(agent_merge)
66
+ end
67
+ end
68
+
69
+ describe "When logged in as User" do
70
+ login_user
71
+
72
+ it "assigns the requested agent_merge as @agent_merge" do
73
+ agent_merge = FactoryGirl.create(:agent_merge)
74
+ get :show, :id => agent_merge.id
75
+ assigns(:agent_merge).should eq(agent_merge)
76
+ end
77
+ end
78
+
79
+ describe "When not logged in" do
80
+ it "assigns the requested agent_merge as @agent_merge" do
81
+ agent_merge = FactoryGirl.create(:agent_merge)
82
+ get :show, :id => agent_merge.id
83
+ assigns(:agent_merge).should eq(agent_merge)
84
+ end
85
+ end
86
+ end
87
+
88
+ describe "GET new" do
89
+ describe "When logged in as Administrator" do
90
+ login_admin
91
+
92
+ it "assigns the requested agent_merge as @agent_merge" do
93
+ get :new
94
+ assigns(:agent_merge).should_not be_valid
95
+ response.should be_success
96
+ end
97
+ end
98
+
99
+ describe "When logged in as Librarian" do
100
+ login_librarian
101
+
102
+ it "assigns the requested agent_merge as @agent_merge" do
103
+ get :new
104
+ assigns(:agent_merge).should_not be_valid
105
+ response.should be_success
106
+ end
107
+ end
108
+
109
+ describe "When logged in as User" do
110
+ login_user
111
+
112
+ it "should not assign the requested agent_merge as @agent_merge" do
113
+ get :new
114
+ assigns(:agent_merge).should_not be_valid
115
+ response.should be_forbidden
116
+ end
117
+ end
118
+
119
+ describe "When not logged in" do
120
+ it "should not assign the requested agent_merge as @agent_merge" do
121
+ get :new
122
+ assigns(:agent_merge).should_not be_valid
123
+ response.should redirect_to(new_user_session_url)
124
+ end
125
+ end
126
+ end
127
+
128
+ describe "GET edit" do
129
+ describe "When logged in as Administrator" do
130
+ login_admin
131
+
132
+ it "assigns the requested agent_merge as @agent_merge" do
133
+ agent_merge = FactoryGirl.create(:agent_merge)
134
+ get :edit, :id => agent_merge.id
135
+ assigns(:agent_merge).should eq(agent_merge)
136
+ end
137
+ end
138
+
139
+ describe "When logged in as Librarian" do
140
+ login_librarian
141
+
142
+ it "assigns the requested agent_merge as @agent_merge" do
143
+ agent_merge = FactoryGirl.create(:agent_merge)
144
+ get :edit, :id => agent_merge.id
145
+ assigns(:agent_merge).should eq(agent_merge)
146
+ end
147
+ end
148
+
149
+ describe "When logged in as User" do
150
+ login_user
151
+
152
+ it "assigns the requested agent_merge as @agent_merge" do
153
+ agent_merge = FactoryGirl.create(:agent_merge)
154
+ get :edit, :id => agent_merge.id
155
+ response.should be_forbidden
156
+ end
157
+ end
158
+
159
+ describe "When not logged in" do
160
+ it "should not assign the requested agent_merge as @agent_merge" do
161
+ agent_merge = FactoryGirl.create(:agent_merge)
162
+ get :edit, :id => agent_merge.id
163
+ response.should redirect_to(new_user_session_url)
164
+ end
165
+ end
166
+ end
167
+
168
+ describe "POST create" do
169
+ before(:each) do
170
+ @attrs = FactoryGirl.attributes_for(:agent_merge)
171
+ @invalid_attrs = {:agent_merge_list_id => ''}
172
+ end
173
+
174
+ describe "When logged in as Administrator" do
175
+ login_admin
176
+
177
+ describe "with valid params" do
178
+ it "assigns a newly created agent_merge as @agent_merge" do
179
+ post :create, :agent_merge => @attrs
180
+ assigns(:agent_merge).should be_valid
181
+ end
182
+
183
+ it "redirects to the created agent" do
184
+ post :create, :agent_merge => @attrs
185
+ response.should redirect_to(assigns(:agent_merge))
186
+ end
187
+ end
188
+
189
+ describe "with invalid params" do
190
+ it "assigns a newly created but unsaved agent_merge as @agent_merge" do
191
+ post :create, :agent_merge => @invalid_attrs
192
+ assigns(:agent_merge).should_not be_valid
193
+ end
194
+
195
+ it "re-renders the 'new' template" do
196
+ post :create, :agent_merge => @invalid_attrs
197
+ response.should render_template("new")
198
+ end
199
+ end
200
+ end
201
+
202
+ describe "When logged in as Librarian" do
203
+ login_librarian
204
+
205
+ describe "with valid params" do
206
+ it "assigns a newly created agent_merge as @agent_merge" do
207
+ post :create, :agent_merge => @attrs
208
+ assigns(:agent_merge).should be_valid
209
+ end
210
+
211
+ it "redirects to the created agent" do
212
+ post :create, :agent_merge => @attrs
213
+ response.should redirect_to(assigns(:agent_merge))
214
+ end
215
+ end
216
+
217
+ describe "with invalid params" do
218
+ it "assigns a newly created but unsaved agent_merge as @agent_merge" do
219
+ post :create, :agent_merge => @invalid_attrs
220
+ assigns(:agent_merge).should_not be_valid
221
+ end
222
+
223
+ it "re-renders the 'new' template" do
224
+ post :create, :agent_merge => @invalid_attrs
225
+ response.should render_template("new")
226
+ end
227
+ end
228
+ end
229
+
230
+ describe "When logged in as User" do
231
+ login_user
232
+
233
+ describe "with valid params" do
234
+ it "assigns a newly created agent_merge as @agent_merge" do
235
+ post :create, :agent_merge => @attrs
236
+ assigns(:agent_merge).should be_valid
237
+ end
238
+
239
+ it "should be forbidden" do
240
+ post :create, :agent_merge => @attrs
241
+ response.should be_forbidden
242
+ end
243
+ end
244
+
245
+ describe "with invalid params" do
246
+ it "assigns a newly created but unsaved agent_merge as @agent_merge" do
247
+ post :create, :agent_merge => @invalid_attrs
248
+ assigns(:agent_merge).should_not be_valid
249
+ end
250
+
251
+ it "should be forbidden" do
252
+ post :create, :agent_merge => @invalid_attrs
253
+ response.should be_forbidden
254
+ end
255
+ end
256
+ end
257
+
258
+ describe "When not logged in" do
259
+ describe "with valid params" do
260
+ it "assigns a newly created agent_merge as @agent_merge" do
261
+ post :create, :agent_merge => @attrs
262
+ assigns(:agent_merge).should be_valid
263
+ end
264
+
265
+ it "should be forbidden" do
266
+ post :create, :agent_merge => @attrs
267
+ response.should redirect_to(new_user_session_url)
268
+ end
269
+ end
270
+
271
+ describe "with invalid params" do
272
+ it "assigns a newly created but unsaved agent_merge as @agent_merge" do
273
+ post :create, :agent_merge => @invalid_attrs
274
+ assigns(:agent_merge).should_not be_valid
275
+ end
276
+
277
+ it "should be forbidden" do
278
+ post :create, :agent_merge => @invalid_attrs
279
+ response.should redirect_to(new_user_session_url)
280
+ end
281
+ end
282
+ end
283
+ end
284
+
285
+ describe "PUT update" do
286
+ before(:each) do
287
+ @agent_merge = FactoryGirl.create(:agent_merge)
288
+ @attrs = FactoryGirl.attributes_for(:agent_merge)
289
+ @invalid_attrs = {:agent_merge_list_id => ''}
290
+ end
291
+
292
+ describe "When logged in as Administrator" do
293
+ login_admin
294
+
295
+ describe "with valid params" do
296
+ it "updates the requested agent_merge" do
297
+ put :update, :id => @agent_merge.id, :agent_merge => @attrs
298
+ end
299
+
300
+ it "assigns the requested agent_merge as @agent_merge" do
301
+ put :update, :id => @agent_merge.id, :agent_merge => @attrs
302
+ assigns(:agent_merge).should eq(@agent_merge)
303
+ response.should redirect_to(@agent_merge)
304
+ end
305
+ end
306
+
307
+ describe "with invalid params" do
308
+ it "assigns the requested agent_merge as @agent_merge" do
309
+ put :update, :id => @agent_merge.id, :agent_merge => @invalid_attrs
310
+ response.should render_template("edit")
311
+ end
312
+ end
313
+ end
314
+
315
+ describe "When logged in as Librarian" do
316
+ login_librarian
317
+
318
+ describe "with valid params" do
319
+ it "updates the requested agent_merge" do
320
+ put :update, :id => @agent_merge.id, :agent_merge => @attrs
321
+ end
322
+
323
+ it "assigns the requested agent_merge as @agent_merge" do
324
+ put :update, :id => @agent_merge.id, :agent_merge => @attrs
325
+ assigns(:agent_merge).should eq(@agent_merge)
326
+ response.should redirect_to(@agent_merge)
327
+ end
328
+ end
329
+
330
+ describe "with invalid params" do
331
+ it "assigns the requested agent_merge as @agent_merge" do
332
+ put :update, :id => @agent_merge.id, :agent_merge => @invalid_attrs
333
+ response.should render_template("edit")
334
+ end
335
+ end
336
+ end
337
+
338
+ describe "When logged in as User" do
339
+ login_user
340
+
341
+ describe "with valid params" do
342
+ it "updates the requested agent_merge" do
343
+ put :update, :id => @agent_merge.id, :agent_merge => @attrs
344
+ end
345
+
346
+ it "assigns the requested agent_merge as @agent_merge" do
347
+ put :update, :id => @agent_merge.id, :agent_merge => @attrs
348
+ assigns(:agent_merge).should eq(@agent_merge)
349
+ response.should be_forbidden
350
+ end
351
+ end
352
+
353
+ describe "with invalid params" do
354
+ it "assigns the requested agent_merge as @agent_merge" do
355
+ put :update, :id => @agent_merge.id, :agent_merge => @invalid_attrs
356
+ response.should be_forbidden
357
+ end
358
+ end
359
+ end
360
+
361
+ describe "When not logged in" do
362
+ describe "with valid params" do
363
+ it "updates the requested agent_merge" do
364
+ put :update, :id => @agent_merge.id, :agent_merge => @attrs
365
+ end
366
+
367
+ it "should be forbidden" do
368
+ put :update, :id => @agent_merge.id, :agent_merge => @attrs
369
+ response.should redirect_to(new_user_session_url)
370
+ end
371
+ end
372
+
373
+ describe "with invalid params" do
374
+ it "assigns the requested agent_merge as @agent_merge" do
375
+ put :update, :id => @agent_merge.id, :agent_merge => @invalid_attrs
376
+ response.should redirect_to(new_user_session_url)
377
+ end
378
+ end
379
+ end
380
+ end
381
+
382
+ describe "DELETE destroy" do
383
+ before(:each) do
384
+ @agent_merge = FactoryGirl.create(:agent_merge)
385
+ end
386
+
387
+ describe "When logged in as Administrator" do
388
+ login_admin
389
+
390
+ it "destroys the requested agent_merge" do
391
+ delete :destroy, :id => @agent_merge.id
392
+ end
393
+
394
+ it "redirects to the agent_merges list" do
395
+ delete :destroy, :id => @agent_merge.id
396
+ response.should redirect_to(agent_merges_url)
397
+ end
398
+ end
399
+
400
+ describe "When logged in as Librarian" do
401
+ login_librarian
402
+
403
+ it "destroys the requested agent_merge" do
404
+ delete :destroy, :id => @agent_merge.id
405
+ end
406
+
407
+ it "redirects to the agent_merges list" do
408
+ delete :destroy, :id => @agent_merge.id
409
+ response.should redirect_to(agent_merges_url)
410
+ end
411
+ end
412
+
413
+ describe "When logged in as User" do
414
+ login_user
415
+
416
+ it "destroys the requested agent_merge" do
417
+ delete :destroy, :id => @agent_merge.id
418
+ end
419
+
420
+ it "should be forbidden" do
421
+ delete :destroy, :id => @agent_merge.id
422
+ response.should be_forbidden
423
+ end
424
+ end
425
+
426
+ describe "When not logged in" do
427
+ it "destroys the requested agent_merge" do
428
+ delete :destroy, :id => @agent_merge.id
429
+ end
430
+
431
+ it "should be forbidden" do
432
+ delete :destroy, :id => @agent_merge.id
433
+ response.should redirect_to(new_user_session_url)
434
+ end
435
+ end
436
+ end
437
+ end
@@ -1,73 +1,8 @@
1
1
  class ApplicationController < ActionController::Base
2
2
  protect_from_forgery
3
3
 
4
- rescue_from CanCan::AccessDenied, :with => :render_403
5
- rescue_from ActiveRecord::RecordNotFound, :with => :render_404
6
-
7
- before_filter :set_locale
8
-
9
4
  enju_resource_merge
10
-
11
- private
12
- def render_403
13
- return if performed?
14
- if user_signed_in?
15
- respond_to do |format|
16
- format.html {render :template => 'page/403', :status => 403}
17
- format.xml {render :template => 'page/403', :status => 403}
18
- format.json
19
- end
20
- else
21
- respond_to do |format|
22
- format.html {redirect_to new_user_session_url}
23
- format.xml {render :template => 'page/403', :status => 403}
24
- format.json
25
- end
26
- end
27
- end
28
-
29
- def render_404
30
- return if performed?
31
- respond_to do |format|
32
- format.html {render :template => 'page/404', :status => 404}
33
- format.xml {render :template => 'page/404', :status => 404}
34
- format.json
35
- end
36
- end
37
-
38
- def set_locale
39
- if params[:locale]
40
- unless I18n.available_locales.include?(params[:locale].to_s.intern)
41
- raise InvalidLocaleError
42
- end
43
- end
44
- if user_signed_in?
45
- locale = params[:locale] || session[:locale] || current_user.locale.try(:to_sym)
46
- else
47
- locale = params[:locale] || session[:locale]
48
- end
49
- if locale
50
- I18n.locale = @locale = session[:locale] = locale.to_sym
51
- else
52
- I18n.locale = @locale = session[:locale] = I18n.default_locale
53
- end
54
- rescue InvalidLocaleError
55
- @locale = I18n.default_locale
56
- end
57
-
58
- def access_denied
59
- raise CanCan::AccessDenied
60
- end
61
-
62
- def get_series_statement
63
- @series_statement = SeriesStatement.find(params[:series_statement_id]) if params[:series_statement_id]
64
- end
65
-
66
- def get_patron
67
- @patron = Patron.find(params[:patron_id]) if params[:patron_id]
68
- authorize! :show, @patron if @patron
69
- end
70
- end
71
-
72
- class InvalidLocaleError < StandardError
5
+ enju_leaf
6
+ enju_biblio
7
+ enju_library
73
8
  end
@@ -6,15 +6,15 @@
6
6
  case user.try(:role).try(:name)
7
7
  when 'Administrator'
8
8
  can :manage, [
9
- PatronMerge,
10
- PatronMergeList,
9
+ AgentMerge,
10
+ AgentMergeList,
11
11
  SeriesStatementMerge,
12
12
  SeriesStatementMergeList
13
13
  ]
14
14
  when 'Librarian'
15
15
  can :manage, [
16
- PatronMerge,
17
- PatronMergeList,
16
+ AgentMerge,
17
+ AgentMergeList,
18
18
  SeriesStatementMerge,
19
19
  SeriesStatementMergeList
20
20
  ]
@@ -1,28 +1,8 @@
1
+ # -*- encoding: utf-8 -*-
1
2
  class User < ActiveRecord::Base
2
- # Include default devise modules. Others available are:
3
- # :token_authenticatable, :encryptable, :confirmable, :lockable, :timeoutable and :omniauthable
4
- devise :database_authenticatable, :registerable,
5
- :recoverable, :rememberable, :trackable, :validatable
3
+ devise :database_authenticatable, #:registerable,
4
+ :recoverable, :rememberable, :trackable, #, :validatable
5
+ :lockable, :lock_strategy => :none, :unlock_strategy => :none
6
6
 
7
- # Setup accessible (or protected) attributes for your model
8
- attr_accessible :email, :password, :password_confirmation, :remember_me
9
-
10
- has_one :user_has_role
11
- has_one :role, :through => :user_has_role
12
- belongs_to :required_role, :class_name => 'Role', :foreign_key => 'required_role_id'
13
- has_many :purchase_requests
14
- has_many :order_lists
15
-
16
- def has_role?(role_in_question)
17
- return false unless role
18
- return true if role.name == role_in_question
19
- case role.name
20
- when 'Administrator'
21
- return true
22
- when 'Librarian'
23
- return true if role_in_question == 'User'
24
- else
25
- false
26
- end
27
- end
7
+ enju_leaf_user_model
28
8
  end
@@ -43,4 +43,4 @@ module Dummy
43
43
  end
44
44
  end
45
45
 
46
- require 'enju_biblio'
46
+ require 'enju_leaf'
Binary file
@@ -1,6 +1,6 @@
1
- class CreatePatrons < ActiveRecord::Migration
1
+ class CreateAgents < ActiveRecord::Migration
2
2
  def change
3
- create_table :patrons do |t|
3
+ create_table :agents do |t|
4
4
  t.integer :user_id
5
5
  t.string :last_name
6
6
  t.string :middle_name
@@ -35,7 +35,7 @@ class CreatePatrons < ActiveRecord::Migration
35
35
  t.datetime :date_of_death
36
36
  t.integer :language_id, :default => 1, :null => false
37
37
  t.integer :country_id, :default => 1, :null => false
38
- t.integer :patron_type_id, :default => 1, :null => false
38
+ t.integer :agent_type_id, :default => 1, :null => false
39
39
  t.integer :lock_version, :default => 0, :null => false
40
40
  t.text :note
41
41
  t.integer :required_role_id, :default => 1, :null => false
@@ -44,10 +44,10 @@ class CreatePatrons < ActiveRecord::Migration
44
44
  t.text :email
45
45
  t.text :url
46
46
  end
47
- add_index :patrons, :user_id, :unique => true
48
- add_index :patrons, :language_id
49
- add_index :patrons, :country_id
50
- add_index :patrons, :required_role_id
51
- add_index :patrons, :full_name
47
+ add_index :agents, :user_id, :unique => true
48
+ add_index :agents, :language_id
49
+ add_index :agents, :country_id
50
+ add_index :agents, :required_role_id
51
+ add_index :agents, :full_name
52
52
  end
53
53
  end
@@ -1,12 +1,12 @@
1
1
  class CreateOwns < ActiveRecord::Migration
2
2
  def change
3
3
  create_table :owns do |t|
4
- t.references :patron, :null => false
4
+ t.references :agent, :null => false
5
5
  t.references :item, :null => false
6
6
  t.integer :position
7
7
  t.timestamps
8
8
  end
9
- add_index :owns, :patron_id
9
+ add_index :owns, :agent_id
10
10
  add_index :owns, :item_id
11
11
  end
12
12
  end
@@ -1,12 +1,12 @@
1
1
  class CreateCreates < ActiveRecord::Migration
2
2
  def change
3
3
  create_table :creates do |t|
4
- t.references :patron, :null => false
4
+ t.references :agent, :null => false
5
5
  t.references :work, :null => false
6
6
  t.integer :position
7
7
  t.timestamps
8
8
  end
9
- add_index :creates, :patron_id
9
+ add_index :creates, :agent_id
10
10
  add_index :creates, :work_id
11
11
  end
12
12
  end
@@ -1,12 +1,12 @@
1
1
  class CreateProduces < ActiveRecord::Migration
2
2
  def change
3
3
  create_table :produces do |t|
4
- t.references :patron, :null => false
4
+ t.references :agent, :null => false
5
5
  t.references :manifestation, :null => false
6
6
  t.integer :position
7
7
  t.timestamps
8
8
  end
9
- add_index :produces, :patron_id
9
+ add_index :produces, :agent_id
10
10
  add_index :produces, :manifestation_id
11
11
  end
12
12
  end
@@ -0,0 +1,28 @@
1
+ class CreateLibraries < ActiveRecord::Migration
2
+ def change
3
+ create_table :libraries do |t|
4
+ t.string :name, :null => false
5
+ t.text :display_name
6
+ t.string :short_display_name, :null => false
7
+ t.string :zip_code
8
+ t.text :street
9
+ t.text :locality
10
+ t.text :region
11
+ t.string :telephone_number_1
12
+ t.string :telephone_number_2
13
+ t.string :fax_number
14
+ t.text :note
15
+ t.integer :call_number_rows, :default => 1, :null => false
16
+ t.string :call_number_delimiter, :default => "|", :null => false
17
+ t.integer :library_group_id, :default => 1, :null => false
18
+ t.integer :users_count, :default => 0, :null => false
19
+ t.integer :position
20
+ t.integer :country_id
21
+
22
+ t.timestamps
23
+ t.datetime :deleted_at
24
+ end
25
+ add_index :libraries, :library_group_id
26
+ add_index :libraries, :name, :unique => true
27
+ end
28
+ end