enju_event 0.0.11 → 0.0.12

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (19) hide show
  1. data/app/views/event_import_files/show.html.erb +6 -1
  2. data/config/locales/translation_en.yml +1 -0
  3. data/config/locales/translation_ja.yml +1 -0
  4. data/lib/enju_event/version.rb +1 -1
  5. data/spec/dummy/db/test.sqlite3 +0 -0
  6. data/spec/dummy/private/system/event_imports/4/original/event_import_file_sample1.tsv +1 -1
  7. data/spec/dummy/private/system/event_imports/4/original/event_import_file_sample2.tsv +1 -1
  8. data/spec/dummy/solr/data/test/index/segments_1 +0 -0
  9. data/spec/dummy/solr/data/test/spellchecker/segments_1 +0 -0
  10. metadata +45 -63
  11. data/spec/dummy/db/development.sqlite3 +0 -0
  12. data/spec/dummy/private/system/event_import_files/event_imports/000/000/001/original/event_import_file_sample1.tsv +0 -5
  13. data/spec/dummy/private/system/event_import_files/event_imports/000/000/001/original/event_import_file_sample2.tsv +0 -3
  14. data/spec/dummy/private/system/event_import_files/event_imports/000/000/004/original/event_destroy_file.tsv +0 -4
  15. data/spec/dummy/private/system/event_import_files/event_imports/000/000/004/original/event_import_file_sample1.tsv +0 -5
  16. data/spec/dummy/private/system/event_import_files/event_imports/000/000/004/original/event_import_file_sample2.tsv +0 -3
  17. data/spec/dummy/private/system/event_import_files/event_imports/000/000/004/original/event_update_file.tsv +0 -4
  18. data/spec/dummy/private/system/event_imports/4/original/event_destroy_file.tsv +0 -4
  19. data/spec/dummy/private/system/event_imports/4/original/event_update_file.tsv +0 -4
data/app/views/event_import_files/show.html.erb CHANGED
@@ -44,10 +44,15 @@
44
44
  </p>
45
45
 
46
46
  <p>
47
- <strong><%= t('activerecord.attributes.manifestation_import_file.state') -%>:</strong>
47
+ <strong><%= t('activerecord.attributes.event_import_file.state') -%>:</strong>
48
48
  <%= localized_state(@event_import_file.state) -%>
49
49
  </p>
50
50
 
51
+ <p>
52
+ <strong><%= t('activerecord.attributes.event_import_file.error_message') -%>:</strong>
53
+ <%= @event_import_file.error_message -%>
54
+ </p>
55
+
51
56
  <p>
52
57
  <strong><%= t('activerecord.models.user') -%>:</strong>
53
58
  <%= link_to @event_import_file.user.username, @event_import_file.user -%>
data/config/locales/translation_en.yml CHANGED
@@ -30,6 +30,7 @@ en:
30
30
  event_import_updated_at: Updated at
31
31
  state: State
32
32
  edit_mode: Edit mode
33
+ error_message: Error message
33
34
  event_import_result:
34
35
  body: Body
35
36
 
data/config/locales/translation_ja.yml CHANGED
@@ -30,6 +30,7 @@ ja:
30
30
  event_import_updated_at: 更新時刻
31
31
  state: 状態
32
32
  edit_mode: 編集モード
33
+ error_message: エラーメッセージ
33
34
  event_import_result:
34
35
  body: 本文
35
36
 
data/lib/enju_event/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module EnjuEvent
2
- VERSION = "0.0.11"
2
+ VERSION = "0.0.12"
3
3
  end
data/spec/dummy/db/test.sqlite3 CHANGED
Binary file
data/spec/dummy/private/system/event_imports/4/original/event_import_file_sample1.tsv CHANGED
@@ -1,4 +1,4 @@
1
- "name" "category" "library" "start_at" "end_at" "dummy"
1
+ "name" "category" "library_shortname" "start_at" "end_at" "dummy"
2
2
  "イベント名" "カテゴリ。休館日の場合はclosed" "図書館名" "開始日" "終了日" "インポート省略"
3
3
  "hogehoge" "おはなし会" "kamata" "2009-04-01" "2009-04-03"
4
4
  "hogehoge" "hachioji"
data/spec/dummy/private/system/event_imports/4/original/event_import_file_sample2.tsv CHANGED
@@ -1,3 +1,3 @@
1
- "name" "library" "start_at" "end_at"
1
+ "name" "library_shortname" "start_at" "end_at"
2
2
  "���{��̍Â���" "kamata" "2011-03-26" "2011-03-27"
3
3
  "���{��̍Â���2" "kamata" "2011-03-26" "2011-03-27"
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: enju_event
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.11
4
+ version: 0.0.12
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -13,7 +13,7 @@ date: 2012-04-13 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rails
16
- requirement: &70115373841980 !ruby/object:Gem::Requirement
16
+ requirement: &70166459063940 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ~>
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: '3.2'
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *70115373841980
24
+ version_requirements: *70166459063940
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: event-calendar
27
- requirement: &70115373840560 !ruby/object:Gem::Requirement
27
+ requirement: &70166459063320 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ~>
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: 2.3.3
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *70115373840560
35
+ version_requirements: *70166459063320
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: simple_form
38
- requirement: &70115373839560 !ruby/object:Gem::Requirement
38
+ requirement: &70166459062940 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: '0'
44
44
  type: :runtime
45
45
  prerelease: false
46
- version_requirements: *70115373839560
46
+ version_requirements: *70166459062940
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: devise
49
- requirement: &70115373838560 !ruby/object:Gem::Requirement
49
+ requirement: &70166459062320 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
54
54
  version: '0'
55
55
  type: :runtime
56
56
  prerelease: false
57
- version_requirements: *70115373838560
57
+ version_requirements: *70166459062320
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: cancan
60
- requirement: &70115373837220 !ruby/object:Gem::Requirement
60
+ requirement: &70166459061580 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
63
  - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
65
65
  version: '0'
66
66
  type: :runtime
67
67
  prerelease: false
68
- version_requirements: *70115373837220
68
+ version_requirements: *70166459061580
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: attribute_normalizer
71
- requirement: &70115373835840 !ruby/object:Gem::Requirement
71
+ requirement: &70166459061040 !ruby/object:Gem::Requirement
72
72
  none: false
73
73
  requirements:
74
74
  - - ~>
@@ -76,10 +76,10 @@ dependencies:
76
76
  version: '1.1'
77
77
  type: :runtime
78
78
  prerelease: false
79
- version_requirements: *70115373835840
79
+ version_requirements: *70166459061040
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: inherited_resources
82
- requirement: &70115373834720 !ruby/object:Gem::Requirement
82
+ requirement: &70166459060620 !ruby/object:Gem::Requirement
83
83
  none: false
84
84
  requirements:
85
85
  - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
87
87
  version: '0'
88
88
  type: :runtime
89
89
  prerelease: false
90
- version_requirements: *70115373834720
90
+ version_requirements: *70166459060620
91
91
  - !ruby/object:Gem::Dependency
92
92
  name: friendly_id
93
- requirement: &70115373850040 !ruby/object:Gem::Requirement
93
+ requirement: &70166459059840 !ruby/object:Gem::Requirement
94
94
  none: false
95
95
  requirements:
96
96
  - - ~>
@@ -98,10 +98,10 @@ dependencies:
98
98
  version: '4.0'
99
99
  type: :runtime
100
100
  prerelease: false
101
- version_requirements: *70115373850040
101
+ version_requirements: *70166459059840
102
102
  - !ruby/object:Gem::Dependency
103
103
  name: sunspot_rails
104
- requirement: &70115373849200 !ruby/object:Gem::Requirement
104
+ requirement: &70166459059200 !ruby/object:Gem::Requirement
105
105
  none: false
106
106
  requirements:
107
107
  - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
109
109
  version: '0'
110
110
  type: :runtime
111
111
  prerelease: false
112
- version_requirements: *70115373849200
112
+ version_requirements: *70166459059200
113
113
  - !ruby/object:Gem::Dependency
114
114
  name: sunspot_solr
115
- requirement: &70115373848640 !ruby/object:Gem::Requirement
115
+ requirement: &70166459058540 !ruby/object:Gem::Requirement
116
116
  none: false
117
117
  requirements:
118
118
  - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
120
120
  version: '0'
121
121
  type: :runtime
122
122
  prerelease: false
123
- version_requirements: *70115373848640
123
+ version_requirements: *70166459058540
124
124
  - !ruby/object:Gem::Dependency
125
125
  name: will_paginate
126
- requirement: &70115373847760 !ruby/object:Gem::Requirement
126
+ requirement: &70166459057760 !ruby/object:Gem::Requirement
127
127
  none: false
128
128
  requirements:
129
129
  - - ~>
@@ -131,10 +131,10 @@ dependencies:
131
131
  version: '3.0'
132
132
  type: :runtime
133
133
  prerelease: false
134
- version_requirements: *70115373847760
134
+ version_requirements: *70166459057760
135
135
  - !ruby/object:Gem::Dependency
136
136
  name: has_scope
137
- requirement: &70115373846960 !ruby/object:Gem::Requirement
137
+ requirement: &70166459057200 !ruby/object:Gem::Requirement
138
138
  none: false
139
139
  requirements:
140
140
  - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
142
142
  version: '0'
143
143
  type: :runtime
144
144
  prerelease: false
145
- version_requirements: *70115373846960
145
+ version_requirements: *70166459057200
146
146
  - !ruby/object:Gem::Dependency
147
147
  name: configatron
148
- requirement: &70115373846020 !ruby/object:Gem::Requirement
148
+ requirement: &70166459056740 !ruby/object:Gem::Requirement
149
149
  none: false
150
150
  requirements:
151
151
  - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
153
153
  version: '0'
154
154
  type: :runtime
155
155
  prerelease: false
156
- version_requirements: *70115373846020
156
+ version_requirements: *70166459056740
157
157
  - !ruby/object:Gem::Dependency
158
158
  name: paperclip
159
- requirement: &70115373845220 !ruby/object:Gem::Requirement
159
+ requirement: &70166459056200 !ruby/object:Gem::Requirement
160
160
  none: false
161
161
  requirements:
162
162
  - - ~>
@@ -164,10 +164,10 @@ dependencies:
164
164
  version: '2.7'
165
165
  type: :runtime
166
166
  prerelease: false
167
- version_requirements: *70115373845220
167
+ version_requirements: *70166459056200
168
168
  - !ruby/object:Gem::Dependency
169
169
  name: state_machine
170
- requirement: &70115373844440 !ruby/object:Gem::Requirement
170
+ requirement: &70166459072140 !ruby/object:Gem::Requirement
171
171
  none: false
172
172
  requirements:
173
173
  - - ! '>='
@@ -175,10 +175,10 @@ dependencies:
175
175
  version: '0'
176
176
  type: :runtime
177
177
  prerelease: false
178
- version_requirements: *70115373844440
178
+ version_requirements: *70166459072140
179
179
  - !ruby/object:Gem::Dependency
180
180
  name: addressable
181
- requirement: &70115373843260 !ruby/object:Gem::Requirement
181
+ requirement: &70166459071660 !ruby/object:Gem::Requirement
182
182
  none: false
183
183
  requirements:
184
184
  - - ! '>='
@@ -186,10 +186,10 @@ dependencies:
186
186
  version: '0'
187
187
  type: :runtime
188
188
  prerelease: false
189
- version_requirements: *70115373843260
189
+ version_requirements: *70166459071660
190
190
  - !ruby/object:Gem::Dependency
191
191
  name: acts_as_list
192
- requirement: &70115373857800 !ruby/object:Gem::Requirement
192
+ requirement: &70166459071160 !ruby/object:Gem::Requirement
193
193
  none: false
194
194
  requirements:
195
195
  - - ~>
@@ -197,10 +197,10 @@ dependencies:
197
197
  version: 0.1.5
198
198
  type: :runtime
199
199
  prerelease: false
200
- version_requirements: *70115373857800
200
+ version_requirements: *70166459071160
201
201
  - !ruby/object:Gem::Dependency
202
202
  name: enju_message
203
- requirement: &70115373856340 !ruby/object:Gem::Requirement
203
+ requirement: &70166459070660 !ruby/object:Gem::Requirement
204
204
  none: false
205
205
  requirements:
206
206
  - - ~>
@@ -208,10 +208,10 @@ dependencies:
208
208
  version: 0.0.13
209
209
  type: :runtime
210
210
  prerelease: false
211
- version_requirements: *70115373856340
211
+ version_requirements: *70166459070660
212
212
  - !ruby/object:Gem::Dependency
213
213
  name: sqlite3
214
- requirement: &70115373854720 !ruby/object:Gem::Requirement
214
+ requirement: &70166459070280 !ruby/object:Gem::Requirement
215
215
  none: false
216
216
  requirements:
217
217
  - - ! '>='
@@ -219,10 +219,10 @@ dependencies:
219
219
  version: '0'
220
220
  type: :development
221
221
  prerelease: false
222
- version_requirements: *70115373854720
222
+ version_requirements: *70166459070280
223
223
  - !ruby/object:Gem::Dependency
224
224
  name: rspec-rails
225
- requirement: &70115373852800 !ruby/object:Gem::Requirement
225
+ requirement: &70166459069820 !ruby/object:Gem::Requirement
226
226
  none: false
227
227
  requirements:
228
228
  - - ! '>='
@@ -230,10 +230,10 @@ dependencies:
230
230
  version: '0'
231
231
  type: :development
232
232
  prerelease: false
233
- version_requirements: *70115373852800
233
+ version_requirements: *70166459069820
234
234
  - !ruby/object:Gem::Dependency
235
235
  name: sunspot-rails-tester
236
- requirement: &70115373850960 !ruby/object:Gem::Requirement
236
+ requirement: &70166459069400 !ruby/object:Gem::Requirement
237
237
  none: false
238
238
  requirements:
239
239
  - - ! '>='
@@ -241,10 +241,10 @@ dependencies:
241
241
  version: '0'
242
242
  type: :development
243
243
  prerelease: false
244
- version_requirements: *70115373850960
244
+ version_requirements: *70166459069400
245
245
  - !ruby/object:Gem::Dependency
246
246
  name: factory_girl_rails
247
- requirement: &70115373865760 !ruby/object:Gem::Requirement
247
+ requirement: &70166459068900 !ruby/object:Gem::Requirement
248
248
  none: false
249
249
  requirements:
250
250
  - - ~>
@@ -252,7 +252,7 @@ dependencies:
252
252
  version: '3.0'
253
253
  type: :development
254
254
  prerelease: false
255
- version_requirements: *70115373865760
255
+ version_requirements: *70166459068900
256
256
  description: Event management for Next-L Enju
257
257
  email:
258
258
  - tanabe@mwr.mediacom.keio.ac.jp
@@ -366,7 +366,6 @@ files:
366
366
  - spec/dummy/config/locales/en.yml
367
367
  - spec/dummy/config/routes.rb
368
368
  - spec/dummy/config.ru
369
- - spec/dummy/db/development.sqlite3
370
369
  - spec/dummy/db/migrate/001_create_patrons.rb
371
370
  - spec/dummy/db/migrate/059_create_libraries.rb
372
371
  - spec/dummy/db/migrate/069_create_shelves.rb
@@ -393,16 +392,8 @@ files:
393
392
  - spec/dummy/lib/enju_leaf/master_model.rb
394
393
  - spec/dummy/lib/enju_leaf/url_validator.rb
395
394
  - spec/dummy/lib/enju_leaf.rb
396
- - spec/dummy/private/system/event_import_files/event_imports/000/000/001/original/event_import_file_sample1.tsv
397
- - spec/dummy/private/system/event_import_files/event_imports/000/000/001/original/event_import_file_sample2.tsv
398
- - spec/dummy/private/system/event_import_files/event_imports/000/000/004/original/event_destroy_file.tsv
399
- - spec/dummy/private/system/event_import_files/event_imports/000/000/004/original/event_import_file_sample1.tsv
400
- - spec/dummy/private/system/event_import_files/event_imports/000/000/004/original/event_import_file_sample2.tsv
401
- - spec/dummy/private/system/event_import_files/event_imports/000/000/004/original/event_update_file.tsv
402
- - spec/dummy/private/system/event_imports/4/original/event_destroy_file.tsv
403
395
  - spec/dummy/private/system/event_imports/4/original/event_import_file_sample1.tsv
404
396
  - spec/dummy/private/system/event_imports/4/original/event_import_file_sample2.tsv
405
- - spec/dummy/private/system/event_imports/4/original/event_update_file.tsv
406
397
  - spec/dummy/public/404.html
407
398
  - spec/dummy/public/422.html
408
399
  - spec/dummy/public/500.html
@@ -525,7 +516,6 @@ test_files:
525
516
  - spec/dummy/config/locales/en.yml
526
517
  - spec/dummy/config/routes.rb
527
518
  - spec/dummy/config.ru
528
- - spec/dummy/db/development.sqlite3
529
519
  - spec/dummy/db/migrate/001_create_patrons.rb
530
520
  - spec/dummy/db/migrate/059_create_libraries.rb
531
521
  - spec/dummy/db/migrate/069_create_shelves.rb
@@ -552,16 +542,8 @@ test_files:
552
542
  - spec/dummy/lib/enju_leaf/master_model.rb
553
543
  - spec/dummy/lib/enju_leaf/url_validator.rb
554
544
  - spec/dummy/lib/enju_leaf.rb
555
- - spec/dummy/private/system/event_import_files/event_imports/000/000/001/original/event_import_file_sample1.tsv
556
- - spec/dummy/private/system/event_import_files/event_imports/000/000/001/original/event_import_file_sample2.tsv
557
- - spec/dummy/private/system/event_import_files/event_imports/000/000/004/original/event_destroy_file.tsv
558
- - spec/dummy/private/system/event_import_files/event_imports/000/000/004/original/event_import_file_sample1.tsv
559
- - spec/dummy/private/system/event_import_files/event_imports/000/000/004/original/event_import_file_sample2.tsv
560
- - spec/dummy/private/system/event_import_files/event_imports/000/000/004/original/event_update_file.tsv
561
- - spec/dummy/private/system/event_imports/4/original/event_destroy_file.tsv
562
545
  - spec/dummy/private/system/event_imports/4/original/event_import_file_sample1.tsv
563
546
  - spec/dummy/private/system/event_imports/4/original/event_import_file_sample2.tsv
564
- - spec/dummy/private/system/event_imports/4/original/event_update_file.tsv
565
547
  - spec/dummy/public/404.html
566
548
  - spec/dummy/public/422.html
567
549
  - spec/dummy/public/500.html
data/spec/dummy/db/development.sqlite3 DELETED
File without changes
data/spec/dummy/private/system/event_import_files/event_imports/000/000/001/original/event_import_file_sample1.tsv DELETED
@@ -1,5 +0,0 @@
1
- "name" "category" "library_shortname" "start_at" "end_at" "dummy"
2
- "イベント名" "カテゴリ。休館日の場合はclosed" "図書館名" "開始日" "終了日" "インポート省略"
3
- "hogehoge" "おはなし会" "kamata" "2009-04-01" "2009-04-03"
4
- "hogehoge" "hachioji"
5
- "休館日" "closed" "kamata" "2011-04-01" "2011-04-03"
data/spec/dummy/private/system/event_import_files/event_imports/000/000/001/original/event_import_file_sample2.tsv DELETED
@@ -1,3 +0,0 @@
1
- "name" "library_shortname" "start_at" "end_at"
2
- "���{��̍Â���" "kamata" "2011-03-26" "2011-03-27"
3
- "���{��̍Â���2" "kamata" "2011-03-26" "2011-03-27"
data/spec/dummy/private/system/event_import_files/event_imports/000/000/004/original/event_import_file_sample1.tsv DELETED
@@ -1,5 +0,0 @@
1
- "name" "category" "library" "start_at" "end_at" "dummy"
2
- "イベント名" "カテゴリ。休館日の場合はclosed" "図書館名" "開始日" "終了日" "インポート省略"
3
- "hogehoge" "おはなし会" "kamata" "2009-04-01" "2009-04-03"
4
- "hogehoge" "hachioji"
5
- "休館日" "closed" "kamata" "2011-04-01" "2011-04-03"
data/spec/dummy/private/system/event_import_files/event_imports/000/000/004/original/event_import_file_sample2.tsv DELETED
@@ -1,3 +0,0 @@
1
- "name" "library" "start_at" "end_at"
2
- "���{��̍Â���" "kamata" "2011-03-26" "2011-03-27"
3
- "���{��̍Â���2" "kamata" "2011-03-26" "2011-03-27"
data/spec/dummy/private/system/event_import_files/event_imports/000/000/004/original/event_update_file.tsv DELETED
@@ -1,4 +0,0 @@
1
- id name category library start_at end_at all_day note dummy
2
- 1 変更後のイベント名 kamata 2012-04-01 2012-04-02
3
- 2 mita 2012-04-03 FALSE
4
- 3 変更後のイベント名 この行は無視される
data/spec/dummy/private/system/event_imports/4/original/event_destroy_file.tsv DELETED
@@ -1,4 +0,0 @@
1
- id dummy
2
- 1
3
- 2
4
- 3 この行は無視される
data/spec/dummy/private/system/event_imports/4/original/event_update_file.tsv DELETED
@@ -1,4 +0,0 @@
1
- id name category library start_at end_at all_day note dummy
2
- 1 変更後のイベント名 kamata 2012-04-01 2012-04-02
3
- 2 mita 2012-04-03 FALSE
4
- 3 変更後のイベント名 この行は無視される