enju_event 0.1.17.pre12 → 0.1.17.pre13
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/controllers/event_import_results_controller.rb +1 -1
- data/app/controllers/events_controller.rb +1 -1
- data/app/models/event.rb +1 -1
- data/app/models/event_import_file.rb +5 -6
- data/app/models/participate.rb +5 -5
- data/app/views/event_import_results/show.html.erb +1 -1
- data/app/views/participates/edit.html.erb +2 -2
- data/app/views/participates/index.html.erb +2 -2
- data/app/views/participates/new.html.erb +2 -2
- data/app/views/participates/show.html.erb +2 -2
- data/db/migrate/20090519203307_create_participates.rb +2 -2
- data/lib/enju_event/version.rb +1 -1
- data/spec/dummy/app/controllers/application_controller.rb +4 -105
- data/spec/dummy/config/application.rb +2 -2
- data/spec/dummy/config/initializers/mime_types.rb +0 -1
- data/spec/dummy/db/development.sqlite3 +0 -0
- data/spec/dummy/db/migrate/{001_create_patrons.rb → 001_create_agents.rb} +8 -8
- data/spec/dummy/db/migrate/012_create_owns.rb +2 -2
- data/spec/dummy/db/migrate/015_create_creates.rb +2 -2
- data/spec/dummy/db/migrate/047_create_produces.rb +2 -2
- data/spec/dummy/db/migrate/059_create_libraries.rb +2 -2
- data/spec/dummy/db/migrate/125_create_donates.rb +2 -2
- data/spec/dummy/db/migrate/20080830154109_create_realizes.rb +2 -2
- data/spec/dummy/db/migrate/{20080905191442_create_patron_types.rb → 20080905191442_create_agent_types.rb} +2 -2
- data/spec/dummy/db/migrate/20081028083142_create_agent_import_files.rb +22 -0
- data/spec/dummy/db/migrate/{20090812151902_create_patron_relationship_types.rb → 20090812151902_create_agent_relationship_types.rb} +2 -2
- data/spec/dummy/db/migrate/20091012101112_add_dcndl_schema.rb +2 -2
- data/spec/dummy/db/migrate/20100606073747_create_agent_relationships.rb +13 -0
- data/spec/dummy/db/migrate/20100814091104_add_position_to_agent_relationship.rb +11 -0
- data/spec/dummy/db/migrate/20100925074559_create_agent_import_results.rb +12 -0
- data/spec/dummy/db/migrate/20110301121550_add_birth_date_and_death_date_to_agent.rb +11 -0
- data/spec/dummy/db/migrate/20120413161403_add_fingerprint_to_agent_import_file.rb +5 -0
- data/spec/dummy/db/migrate/20120413170720_add_error_message_to_agent_import_file.rb +5 -0
- data/spec/dummy/db/migrate/20120511072422_add_agent_identifier_to_agent.rb +6 -0
- data/spec/dummy/db/migrate/20120602141129_add_edit_mode_to_agent_import_file.rb +5 -0
- data/spec/dummy/db/schema.rb +136 -134
- data/spec/dummy/db/test.sqlite3 +0 -0
- data/spec/dummy/private/system/event_import_files/event_imports/000/000/001/original/event_destroy_file.tsv +4 -0
- data/spec/dummy/private/system/event_import_files/event_imports/000/000/001/original/event_import_file_sample1.tsv +1 -1
- data/spec/dummy/private/system/event_import_files/event_imports/000/000/001/original/event_import_file_sample2.tsv +1 -1
- data/spec/dummy/private/system/event_import_files/event_imports/000/000/001/original/event_update_file.tsv +4 -0
- data/spec/dummy/private/system/event_import_files/event_imports/000/000/001/original/invalid_file.tsv +3 -0
- data/spec/dummy/solr/data/test/index/{_i4.fdt → _q6.fdt} +0 -0
- data/spec/dummy/solr/data/test/index/{_i4.fdx → _q6.fdx} +0 -0
- data/spec/dummy/solr/data/test/index/{_i4.fnm → _q6.fnm} +0 -0
- data/spec/dummy/solr/data/test/index/{_i4.frq → _q6.frq} +0 -0
- data/spec/dummy/solr/data/test/index/{_i4.nrm → _q6.nrm} +0 -0
- data/spec/dummy/solr/data/test/index/{_i4.prx → _q6.prx} +0 -0
- data/spec/dummy/solr/data/test/index/{_i4.tii → _q6.tii} +0 -0
- data/spec/dummy/solr/data/test/index/{_i4.tis → _q6.tis} +0 -0
- data/spec/dummy/solr/data/test/index/{_i5.fdt → _q7.fdt} +0 -0
- data/spec/dummy/solr/data/test/index/{_i5.fdx → _q7.fdx} +0 -0
- data/spec/dummy/solr/data/test/index/{_i5.fnm → _q7.fnm} +0 -0
- data/spec/dummy/solr/data/test/index/{_i5.frq → _q7.frq} +0 -0
- data/spec/dummy/solr/data/test/index/{_i5.nrm → _q7.nrm} +0 -0
- data/spec/dummy/solr/data/test/index/{_i5.prx → _q7.prx} +0 -0
- data/spec/dummy/solr/data/test/index/{_i5.tii → _q7.tii} +0 -0
- data/spec/dummy/solr/data/test/index/_q7.tis +0 -0
- data/spec/dummy/solr/data/test/index/segments.gen +0 -0
- data/spec/dummy/solr/data/test/index/segments_13d +0 -0
- data/spec/factories/{patron.rb → agent.rb} +3 -3
- data/spec/factories/participate.rb +1 -1
- data/spec/fixtures/{patron_types.yml → agent_types.yml} +4 -4
- data/spec/fixtures/{patrons.yml → agents.yml} +46 -46
- data/spec/fixtures/event_categories.yml +3 -3
- data/spec/fixtures/event_import_files.yml +1 -2
- data/spec/fixtures/libraries.yml +6 -6
- data/spec/fixtures/participates.yml +3 -3
- data/spec/models/event_import_file_spec.rb +1 -2
- data/spec/models/participate_spec.rb +1 -1
- metadata +92 -108
- data/spec/dummy/app/models/role.rb +0 -46
- data/spec/dummy/app/models/user_group.rb +0 -40
- data/spec/dummy/app/models/user_has_role.rb +0 -5
- data/spec/dummy/db/migrate/20081028083142_create_patron_import_files.rb +0 -22
- data/spec/dummy/db/migrate/20100606073747_create_patron_relationships.rb +0 -13
- data/spec/dummy/db/migrate/20100814091104_add_position_to_patron_relationship.rb +0 -11
- data/spec/dummy/db/migrate/20100925074559_create_patron_import_results.rb +0 -12
- data/spec/dummy/db/migrate/20110301121550_add_birth_date_and_death_date_to_patron.rb +0 -11
- data/spec/dummy/db/migrate/20110918161853_rename_series_statement_manifestation_id_to_root_manifestation_id.rb +0 -13
- data/spec/dummy/db/migrate/20120413161403_add_fingerprint_to_patron_import_file.rb +0 -5
- data/spec/dummy/db/migrate/20120413170720_add_error_message_to_patron_import_file.rb +0 -5
- data/spec/dummy/db/migrate/20120415060323_rename_patron_import_file_imported_at_to_executed_at.rb +0 -9
- data/spec/dummy/db/migrate/20120602141129_add_edit_mode_to_patron_import_file.rb +0 -5
- data/spec/dummy/solr/data/test/index/_i5.tis +0 -0
- data/spec/dummy/solr/data/test/index/segments_ql +0 -0
data/spec/dummy/db/test.sqlite3
CHANGED
Binary file
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
Binary file
|
Binary file
|
Binary file
|
@@ -1,13 +1,13 @@
|
|
1
1
|
FactoryGirl.define do
|
2
|
-
factory :
|
2
|
+
factory :agent do |f|
|
3
3
|
f.sequence(:full_name){|n| "full_name_#{n}"}
|
4
|
-
f.
|
4
|
+
f.agent_type_id{AgentType.find_by_name('Person').id}
|
5
5
|
f.country_id{Country.first.id}
|
6
6
|
f.language_id{Language.first.id}
|
7
7
|
end
|
8
8
|
end
|
9
9
|
|
10
10
|
FactoryGirl.define do
|
11
|
-
factory :
|
11
|
+
factory :invalid_agent, :class => Agent do |f|
|
12
12
|
end
|
13
13
|
end
|
@@ -1,19 +1,19 @@
|
|
1
1
|
---
|
2
|
-
|
2
|
+
agent_type_00001:
|
3
3
|
id: 1
|
4
4
|
name: Person
|
5
5
|
display_name: Person
|
6
6
|
note:
|
7
7
|
position: 1
|
8
8
|
|
9
|
-
|
9
|
+
agent_type_00002:
|
10
10
|
id: 2
|
11
11
|
name: CorporateBody
|
12
12
|
display_name: CorporateBody
|
13
13
|
note:
|
14
14
|
position: 2
|
15
15
|
|
16
|
-
|
16
|
+
agent_type_00003:
|
17
17
|
id: 3
|
18
18
|
name: Conference
|
19
19
|
display_name: Conference
|
@@ -22,7 +22,7 @@ patron_type_00003:
|
|
22
22
|
|
23
23
|
# == Schema Information
|
24
24
|
#
|
25
|
-
# Table name:
|
25
|
+
# Table name: agent_types
|
26
26
|
#
|
27
27
|
# id :integer not null, primary key
|
28
28
|
# name :string(255) not null
|
@@ -1,5 +1,5 @@
|
|
1
1
|
---
|
2
|
-
|
2
|
+
agent_00001:
|
3
3
|
place: ""
|
4
4
|
last_name: Administrator
|
5
5
|
first_name:
|
@@ -12,11 +12,11 @@ patron_00001:
|
|
12
12
|
address_1:
|
13
13
|
language_id: 1
|
14
14
|
country_id: 1
|
15
|
-
|
15
|
+
agent_type_id: 1
|
16
16
|
required_role_id: 1
|
17
17
|
created_at: 2007-11-19 17:06:06.507237 +09:00
|
18
18
|
user_id: 1
|
19
|
-
|
19
|
+
agent_00002:
|
20
20
|
place: ""
|
21
21
|
last_name: Librarian1
|
22
22
|
first_name:
|
@@ -29,11 +29,11 @@ patron_00002:
|
|
29
29
|
address_1:
|
30
30
|
language_id: 1
|
31
31
|
country_id: 1
|
32
|
-
|
32
|
+
agent_type_id: 1
|
33
33
|
required_role_id: 4
|
34
34
|
created_at: 2007-11-19 17:06:07.724517 +09:00
|
35
35
|
user_id: 2
|
36
|
-
|
36
|
+
agent_00003:
|
37
37
|
place:
|
38
38
|
last_name: Kosuke
|
39
39
|
first_name: Tanabe
|
@@ -46,11 +46,11 @@ patron_00003:
|
|
46
46
|
address_1:
|
47
47
|
language_id: 1
|
48
48
|
country_id: 1
|
49
|
-
|
49
|
+
agent_type_id: 1
|
50
50
|
required_role_id: 3
|
51
51
|
created_at: 2007-12-04 16:25:01.523618 +09:00
|
52
52
|
user_id: 3
|
53
|
-
|
53
|
+
agent_00004:
|
54
54
|
place:
|
55
55
|
last_name: Librarian2
|
56
56
|
first_name:
|
@@ -63,11 +63,11 @@ patron_00004:
|
|
63
63
|
address_1:
|
64
64
|
language_id: 1
|
65
65
|
country_id: 1
|
66
|
-
|
66
|
+
agent_type_id: 1
|
67
67
|
required_role_id: 1
|
68
68
|
created_at: 2007-12-04 16:25:01.785027 +09:00
|
69
69
|
user_id: 4
|
70
|
-
|
70
|
+
agent_00005:
|
71
71
|
place: ""
|
72
72
|
last_name: User2
|
73
73
|
first_name:
|
@@ -80,15 +80,15 @@ patron_00005:
|
|
80
80
|
address_1:
|
81
81
|
language_id: 1
|
82
82
|
country_id: 1
|
83
|
-
|
83
|
+
agent_type_id: 1
|
84
84
|
required_role_id: 2
|
85
85
|
created_at: 2007-11-19 17:24:50.153417 +09:00
|
86
86
|
user_id: 5
|
87
|
-
|
87
|
+
agent_00006:
|
88
88
|
place: ""
|
89
|
-
last_name: New
|
89
|
+
last_name: New agent 1
|
90
90
|
first_name:
|
91
|
-
full_name: New
|
91
|
+
full_name: New agent 1
|
92
92
|
updated_at: 2007-11-21 22:02:35.579396 +09:00
|
93
93
|
other_designation: ""
|
94
94
|
id: 6
|
@@ -97,14 +97,14 @@ patron_00006:
|
|
97
97
|
address_1:
|
98
98
|
language_id: 1
|
99
99
|
country_id: 1
|
100
|
-
|
100
|
+
agent_type_id: 1
|
101
101
|
required_role_id: 1
|
102
102
|
created_at: 2007-11-19 17:24:50.153417 +09:00
|
103
|
-
|
103
|
+
agent_00007:
|
104
104
|
place: ""
|
105
|
-
last_name: New
|
105
|
+
last_name: New agent 2
|
106
106
|
first_name:
|
107
|
-
full_name: New
|
107
|
+
full_name: New agent 2
|
108
108
|
updated_at: 2007-11-21 22:02:35.579396 +09:00
|
109
109
|
other_designation: ""
|
110
110
|
id: 7
|
@@ -113,14 +113,14 @@ patron_00007:
|
|
113
113
|
address_1:
|
114
114
|
language_id: 1
|
115
115
|
country_id: 1
|
116
|
-
|
116
|
+
agent_type_id: 1
|
117
117
|
required_role_id: 1
|
118
118
|
created_at: 2007-11-19 17:24:50.153417 +09:00
|
119
|
-
|
119
|
+
agent_00008:
|
120
120
|
place: ""
|
121
|
-
last_name: New
|
121
|
+
last_name: New agent 3
|
122
122
|
first_name:
|
123
|
-
full_name: New
|
123
|
+
full_name: New agent 3
|
124
124
|
updated_at: 2007-11-21 22:02:35.579396 +09:00
|
125
125
|
other_designation: ""
|
126
126
|
id: 8
|
@@ -129,14 +129,14 @@ patron_00008:
|
|
129
129
|
address_1:
|
130
130
|
language_id: 1
|
131
131
|
country_id: 1
|
132
|
-
|
132
|
+
agent_type_id: 1
|
133
133
|
required_role_id: 1
|
134
134
|
created_at: 2007-11-19 17:24:50.153417 +09:00
|
135
|
-
|
135
|
+
agent_00009:
|
136
136
|
place: ""
|
137
|
-
last_name: New
|
137
|
+
last_name: New agent 4
|
138
138
|
first_name:
|
139
|
-
full_name: New
|
139
|
+
full_name: New agent 4
|
140
140
|
updated_at: 2007-11-21 22:02:35.579396 +09:00
|
141
141
|
other_designation: ""
|
142
142
|
id: 9
|
@@ -145,14 +145,14 @@ patron_00009:
|
|
145
145
|
address_1:
|
146
146
|
language_id: 1
|
147
147
|
country_id: 1
|
148
|
-
|
148
|
+
agent_type_id: 1
|
149
149
|
required_role_id: 1
|
150
150
|
created_at: 2007-11-19 17:24:50.153417 +09:00
|
151
|
-
|
151
|
+
agent_00010:
|
152
152
|
place: ""
|
153
|
-
last_name: New
|
153
|
+
last_name: New agent 5
|
154
154
|
first_name:
|
155
|
-
full_name: New
|
155
|
+
full_name: New agent 5
|
156
156
|
updated_at: 2007-11-21 22:02:35.579396 +09:00
|
157
157
|
other_designation: ""
|
158
158
|
id: 10
|
@@ -161,10 +161,10 @@ patron_00010:
|
|
161
161
|
address_1:
|
162
162
|
language_id: 1
|
163
163
|
country_id: 1
|
164
|
-
|
164
|
+
agent_type_id: 1
|
165
165
|
required_role_id: 1
|
166
166
|
created_at: 2007-11-19 17:24:50.153417 +09:00
|
167
|
-
|
167
|
+
agent_00011:
|
168
168
|
place: ""
|
169
169
|
last_name: User3
|
170
170
|
first_name:
|
@@ -177,11 +177,11 @@ patron_00011:
|
|
177
177
|
address_1:
|
178
178
|
language_id: 1
|
179
179
|
country_id: 1
|
180
|
-
|
180
|
+
agent_type_id: 1
|
181
181
|
required_role_id: 1
|
182
182
|
created_at: 2007-11-19 17:24:50.153417 +09:00
|
183
183
|
user_id: 6
|
184
|
-
|
184
|
+
agent_00101:
|
185
185
|
place: ""
|
186
186
|
last_name: テスト名字
|
187
187
|
first_name: テスト名前
|
@@ -194,10 +194,10 @@ patron_00101:
|
|
194
194
|
address_1:
|
195
195
|
language_id: 1
|
196
196
|
country_id: 1
|
197
|
-
|
197
|
+
agent_type_id: 1
|
198
198
|
required_role_id: 1
|
199
199
|
created_at: 2010-03-03 17:00:00.579396 +09:00
|
200
|
-
|
200
|
+
agent_00102:
|
201
201
|
place: ""
|
202
202
|
last_name:
|
203
203
|
first_name:
|
@@ -210,10 +210,10 @@ patron_00102:
|
|
210
210
|
address_1:
|
211
211
|
language_id: 1
|
212
212
|
country_id: 1
|
213
|
-
|
213
|
+
agent_type_id: 1
|
214
214
|
required_role_id: 1
|
215
215
|
created_at: 2010-03-03 17:00:00.579396 +09:00
|
216
|
-
|
216
|
+
agent_00103:
|
217
217
|
place: ""
|
218
218
|
last_name:
|
219
219
|
first_name:
|
@@ -226,10 +226,10 @@ patron_00103:
|
|
226
226
|
address_1:
|
227
227
|
language_id: 1
|
228
228
|
country_id: 1
|
229
|
-
|
229
|
+
agent_type_id: 1
|
230
230
|
required_role_id: 1
|
231
231
|
created_at: 2010-03-16 19:00:00.579396 +09:00
|
232
|
-
|
232
|
+
agent_00104:
|
233
233
|
place: ""
|
234
234
|
last_name:
|
235
235
|
first_name:
|
@@ -242,10 +242,10 @@ patron_00104:
|
|
242
242
|
address_1:
|
243
243
|
language_id: 1
|
244
244
|
country_id: 1
|
245
|
-
|
245
|
+
agent_type_id: 1
|
246
246
|
required_role_id: 1
|
247
247
|
created_at: 2010-03-16 19:00:00.579396 +09:00
|
248
|
-
|
248
|
+
agent_00201:
|
249
249
|
place: ""
|
250
250
|
last_name:
|
251
251
|
first_name:
|
@@ -258,10 +258,10 @@ patron_00201:
|
|
258
258
|
address_1:
|
259
259
|
language_id: 1
|
260
260
|
country_id: 1
|
261
|
-
|
261
|
+
agent_type_id: 1
|
262
262
|
required_role_id: 1
|
263
263
|
created_at: 2010-03-15 17:00:00.579396 +09:00
|
264
|
-
|
264
|
+
agent_00202:
|
265
265
|
place: ""
|
266
266
|
last_name:
|
267
267
|
first_name:
|
@@ -274,7 +274,7 @@ patron_00202:
|
|
274
274
|
address_1:
|
275
275
|
language_id: 1
|
276
276
|
country_id: 1
|
277
|
-
|
277
|
+
agent_type_id: 1
|
278
278
|
required_role_id: 1
|
279
279
|
created_at: 2010-03-15 17:00:00.579396 +09:00
|
280
280
|
|
@@ -285,7 +285,7 @@ patron_00202:
|
|
285
285
|
|
286
286
|
# == Schema Information
|
287
287
|
#
|
288
|
-
# Table name:
|
288
|
+
# Table name: agents
|
289
289
|
#
|
290
290
|
# id :integer not null, primary key
|
291
291
|
# user_id :integer
|
@@ -322,7 +322,7 @@ patron_00202:
|
|
322
322
|
# date_of_death :datetime
|
323
323
|
# language_id :integer default(1), not null
|
324
324
|
# country_id :integer default(1), not null
|
325
|
-
#
|
325
|
+
# agent_type_id :integer default(1), not null
|
326
326
|
# lock_version :integer default(0), not null
|
327
327
|
# note :text
|
328
328
|
# required_role_id :integer default(1), not null
|
@@ -8,7 +8,7 @@ event_category_00002:
|
|
8
8
|
created_at: 2008-01-01 16:17:34.642433 +09:00
|
9
9
|
position: 2
|
10
10
|
event_category_00003:
|
11
|
-
name:
|
11
|
+
name: book_talk
|
12
12
|
display_name: おはなし会
|
13
13
|
updated_at: 2008-01-01 16:24:45.267241 +09:00
|
14
14
|
id: 3
|
@@ -16,7 +16,7 @@ event_category_00003:
|
|
16
16
|
created_at: 2008-01-01 16:17:45.415487 +09:00
|
17
17
|
position: 3
|
18
18
|
event_category_00004:
|
19
|
-
name:
|
19
|
+
name: movie_theater
|
20
20
|
display_name: 上映会
|
21
21
|
updated_at: 2008-01-01 16:24:55.261682 +09:00
|
22
22
|
id: 4
|
@@ -24,7 +24,7 @@ event_category_00004:
|
|
24
24
|
created_at: 2008-01-01 16:18:08.868680 +09:00
|
25
25
|
position: 4
|
26
26
|
event_category_00005:
|
27
|
-
name:
|
27
|
+
name: talk_event
|
28
28
|
display_name: 講演会
|
29
29
|
updated_at: 2008-01-01 16:25:04.251141 +09:00
|
30
30
|
id: 5
|
@@ -39,10 +39,9 @@ event_import_file_00003:
|
|
39
39
|
# event_import_file_size :integer
|
40
40
|
# event_import_updated_at :datetime
|
41
41
|
# edit_mode :string(255)
|
42
|
-
# event_import_fingerprint :string(255)
|
43
42
|
# created_at :datetime not null
|
44
43
|
# updated_at :datetime not null
|
45
|
-
#
|
44
|
+
# event_import_fingerprint :string(255)
|
46
45
|
# error_message :text
|
47
46
|
#
|
48
47
|
|
data/spec/fixtures/libraries.yml
CHANGED
@@ -14,7 +14,7 @@ library_00001:
|
|
14
14
|
street:
|
15
15
|
created_at: 2007-08-13 18:10:00 +09:00
|
16
16
|
library_group_id: 1
|
17
|
-
|
17
|
+
agent_id: 1
|
18
18
|
call_number_delimiter: "|"
|
19
19
|
position: 1
|
20
20
|
library_00002:
|
@@ -32,7 +32,7 @@ library_00002:
|
|
32
32
|
street:
|
33
33
|
created_at: 2007-08-13 18:10:00 +09:00
|
34
34
|
library_group_id: 1
|
35
|
-
|
35
|
+
agent_id: 2
|
36
36
|
call_number_delimiter: "|"
|
37
37
|
position: 2
|
38
38
|
isil: "JP-0000000"
|
@@ -51,7 +51,7 @@ library_00003:
|
|
51
51
|
street:
|
52
52
|
created_at: 2007-08-14 16:37:00 +09:00
|
53
53
|
library_group_id: 1
|
54
|
-
|
54
|
+
agent_id: 3
|
55
55
|
call_number_delimiter: "|"
|
56
56
|
position: 3
|
57
57
|
library_00004:
|
@@ -69,7 +69,7 @@ library_00004:
|
|
69
69
|
street:
|
70
70
|
created_at: 2007-08-23 19:51:00 +09:00
|
71
71
|
library_group_id: 1
|
72
|
-
|
72
|
+
agent_id: 4
|
73
73
|
call_number_delimiter: "|"
|
74
74
|
position: 4
|
75
75
|
|
@@ -78,8 +78,8 @@ library_00004:
|
|
78
78
|
# Table name: libraries
|
79
79
|
#
|
80
80
|
# id :integer not null, primary key
|
81
|
-
#
|
82
|
-
#
|
81
|
+
# agent_id :integer
|
82
|
+
# agent_type :string(255)
|
83
83
|
# name :string(255) not null
|
84
84
|
# display_name :text
|
85
85
|
# short_display_name :string(255) not null
|