enju_event 0.1.1 → 0.1.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (8) hide show
  1. data/app/models/event_import_file.rb +13 -12
  2. data/lib/enju_event/version.rb +1 -1
  3. data/spec/dummy/db/test.sqlite3 +0 -0
  4. data/spec/dummy/private/system/event_imports/4/original/event_destroy_file.tsv +4 -0
  5. data/spec/dummy/private/system/event_imports/4/original/event_import_file_sample1.tsv +1 -1
  6. data/spec/dummy/private/system/event_imports/4/original/event_import_file_sample2.tsv +1 -1
  7. data/spec/dummy/private/system/event_imports/4/original/event_update_file.tsv +4 -0
  8. metadata +49 -45
data/app/models/event_import_file.rb CHANGED
@@ -47,7 +47,7 @@ class EventImportFile < ActiveRecord::Base
47
47
  def import
48
48
  self.reload
49
49
  num = {:imported => 0, :failed => 0}
50
- record = 2
50
+ row_num = 2
51
51
 
52
52
  rows = open_import_file
53
53
  check_field(rows.first)
@@ -76,22 +76,22 @@ class EventImportFile < ActiveRecord::Base
76
76
  if event.save!
77
77
  import_result.event = event
78
78
  num[:imported] += 1
79
- if record % 50 == 0
79
+ if row_num % 50 == 0
80
80
  Sunspot.commit
81
81
  GC.start
82
82
  end
83
83
  end
84
84
  import_result.save!
85
- record += 1
85
+ row_num += 1
86
86
  end
87
87
  self.update_attribute(:imported_at, Time.zone.now)
88
88
  Sunspot.commit
89
89
  rows.close
90
90
  sm_complete!
91
91
  return num
92
- #rescue => e
93
- # self.error_message = e
94
- # sm_fail!
92
+ rescue => e
93
+ self.error_message = "line #{row_num}: #{e.message}"
94
+ sm_fail!
95
95
  end
96
96
 
97
97
  def modify
@@ -118,15 +118,16 @@ class EventImportFile < ActiveRecord::Base
118
118
  event.save!
119
119
  end
120
120
  sm_complete!
121
- #rescue => e
122
- # self.error_message = e
123
- # sm_fail!
121
+ rescue => e
122
+ self.error_message = "line #{row_num}: #{e.message}"
123
+ sm_fail!
124
124
  end
125
125
 
126
126
  def remove
127
127
  sm_start!
128
128
  rows = open_import_file
129
129
  rows.shift
130
+ row_num = 2
130
131
 
131
132
  rows.each do |row|
132
133
  next if row['dummy'].to_s.strip.present?
@@ -134,9 +135,9 @@ class EventImportFile < ActiveRecord::Base
134
135
  event.destroy
135
136
  end
136
137
  sm_complete!
137
- #rescue => e
138
- # self.error_message = e
139
- # sm_fail!
138
+ rescue => e
139
+ self.error_message = "line #{row_num}: #{e.message}"
140
+ sm_fail!
140
141
  end
141
142
 
142
143
  def self.import
data/lib/enju_event/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module EnjuEvent
2
- VERSION = "0.1.1"
2
+ VERSION = "0.1.2"
3
3
  end
data/spec/dummy/db/test.sqlite3 CHANGED
Binary file
data/spec/dummy/private/system/event_imports/4/original/event_destroy_file.tsv ADDED
@@ -0,0 +1,4 @@
1
+ id dummy
2
+ 1
3
+ 2
4
+ 3 この行は無視される
data/spec/dummy/private/system/event_imports/4/original/event_import_file_sample1.tsv CHANGED
@@ -1,4 +1,4 @@
1
- "name" "category" "library_shortname" "start_at" "end_at" "dummy"
1
+ "name" "category" "library" "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_shortname" "start_at" "end_at"
1
+ "name" "library" "start_at" "end_at"
2
2
  "���{��̍Â���" "kamata" "2011-03-26" "2011-03-27"
3
3
  "���{��̍Â���2" "kamata" "2011-03-26" "2011-03-27"
data/spec/dummy/private/system/event_imports/4/original/event_update_file.tsv ADDED
@@ -0,0 +1,4 @@
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 変更後のイベント名 この行は無視される
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.1.1
4
+ version: 0.1.2
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: &70284135878440 !ruby/object:Gem::Requirement
16
+ requirement: &70131153018340 !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: *70284135878440
24
+ version_requirements: *70131153018340
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: event-calendar
27
- requirement: &70284135877640 !ruby/object:Gem::Requirement
27
+ requirement: &70131153016840 !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: *70284135877640
35
+ version_requirements: *70131153016840
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: simple_form
38
- requirement: &70284135877060 !ruby/object:Gem::Requirement
38
+ requirement: &70131153015920 !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: *70284135877060
46
+ version_requirements: *70131153015920
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: devise
49
- requirement: &70284135876260 !ruby/object:Gem::Requirement
49
+ requirement: &70131153014900 !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: *70284135876260
57
+ version_requirements: *70131153014900
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: cancan
60
- requirement: &70284135875740 !ruby/object:Gem::Requirement
60
+ requirement: &70131153013580 !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: *70284135875740
68
+ version_requirements: *70131153013580
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: attribute_normalizer
71
- requirement: &70284135875180 !ruby/object:Gem::Requirement
71
+ requirement: &70131153012160 !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: *70284135875180
79
+ version_requirements: *70131153012160
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: inherited_resources
82
- requirement: &70284135874580 !ruby/object:Gem::Requirement
82
+ requirement: &70131153011080 !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: *70284135874580
90
+ version_requirements: *70131153011080
91
91
  - !ruby/object:Gem::Dependency
92
92
  name: friendly_id
93
- requirement: &70284135889620 !ruby/object:Gem::Requirement
93
+ requirement: &70131153026380 !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: *70284135889620
101
+ version_requirements: *70131153026380
102
102
  - !ruby/object:Gem::Dependency
103
103
  name: sunspot_rails
104
- requirement: &70284135888420 !ruby/object:Gem::Requirement
104
+ requirement: &70131153025540 !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: *70284135888420
112
+ version_requirements: *70131153025540
113
113
  - !ruby/object:Gem::Dependency
114
114
  name: sunspot_solr
115
- requirement: &70284135887420 !ruby/object:Gem::Requirement
115
+ requirement: &70131153024980 !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: *70284135887420
123
+ version_requirements: *70131153024980
124
124
  - !ruby/object:Gem::Dependency
125
125
  name: will_paginate
126
- requirement: &70284135886340 !ruby/object:Gem::Requirement
126
+ requirement: &70131153024100 !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: *70284135886340
134
+ version_requirements: *70131153024100
135
135
  - !ruby/object:Gem::Dependency
136
136
  name: has_scope
137
- requirement: &70284135885280 !ruby/object:Gem::Requirement
137
+ requirement: &70131153023300 !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: *70284135885280
145
+ version_requirements: *70131153023300
146
146
  - !ruby/object:Gem::Dependency
147
147
  name: configatron
148
- requirement: &70284135883680 !ruby/object:Gem::Requirement
148
+ requirement: &70131153022360 !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: *70284135883680
156
+ version_requirements: *70131153022360
157
157
  - !ruby/object:Gem::Dependency
158
158
  name: paperclip
159
- requirement: &70284135898680 !ruby/object:Gem::Requirement
159
+ requirement: &70131153021560 !ruby/object:Gem::Requirement
160
160
  none: false
161
161
  requirements:
162
162
  - - ~>
@@ -164,10 +164,10 @@ dependencies:
164
164
  version: '3.0'
165
165
  type: :runtime
166
166
  prerelease: false
167
- version_requirements: *70284135898680
167
+ version_requirements: *70131153021560
168
168
  - !ruby/object:Gem::Dependency
169
169
  name: state_machine
170
- requirement: &70284135897580 !ruby/object:Gem::Requirement
170
+ requirement: &70131153020780 !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: *70284135897580
178
+ version_requirements: *70131153020780
179
179
  - !ruby/object:Gem::Dependency
180
180
  name: addressable
181
- requirement: &70284135896540 !ruby/object:Gem::Requirement
181
+ requirement: &70131153019600 !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: *70284135896540
189
+ version_requirements: *70131153019600
190
190
  - !ruby/object:Gem::Dependency
191
191
  name: acts_as_list
192
- requirement: &70284135895560 !ruby/object:Gem::Requirement
192
+ requirement: &70131153034160 !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: *70284135895560
200
+ version_requirements: *70131153034160
201
201
  - !ruby/object:Gem::Dependency
202
202
  name: enju_message
203
- requirement: &70284135894700 !ruby/object:Gem::Requirement
203
+ requirement: &70131153032700 !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: *70284135894700
211
+ version_requirements: *70131153032700
212
212
  - !ruby/object:Gem::Dependency
213
213
  name: sqlite3
214
- requirement: &70284135894040 !ruby/object:Gem::Requirement
214
+ requirement: &70131153030580 !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: *70284135894040
222
+ version_requirements: *70131153030580
223
223
  - !ruby/object:Gem::Dependency
224
224
  name: rspec-rails
225
- requirement: &70284135893320 !ruby/object:Gem::Requirement
225
+ requirement: &70131153029140 !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: *70284135893320
233
+ version_requirements: *70131153029140
234
234
  - !ruby/object:Gem::Dependency
235
235
  name: sunspot-rails-tester
236
- requirement: &70284135892680 !ruby/object:Gem::Requirement
236
+ requirement: &70131153027320 !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: *70284135892680
244
+ version_requirements: *70131153027320
245
245
  - !ruby/object:Gem::Dependency
246
246
  name: factory_girl_rails
247
- requirement: &70284135891880 !ruby/object:Gem::Requirement
247
+ requirement: &70131153042120 !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: *70284135891880
255
+ version_requirements: *70131153042120
256
256
  description: Event management for Next-L Enju
257
257
  email:
258
258
  - tanabe@mwr.mediacom.keio.ac.jp
@@ -399,8 +399,10 @@ files:
399
399
  - spec/dummy/private/system/event_import_files/event_imports/000/000/004/original/event_import_file_sample1.tsv
400
400
  - spec/dummy/private/system/event_import_files/event_imports/000/000/004/original/event_import_file_sample2.tsv
401
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
402
403
  - spec/dummy/private/system/event_imports/4/original/event_import_file_sample1.tsv
403
404
  - 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
404
406
  - spec/dummy/public/404.html
405
407
  - spec/dummy/public/422.html
406
408
  - spec/dummy/public/500.html
@@ -556,8 +558,10 @@ test_files:
556
558
  - spec/dummy/private/system/event_import_files/event_imports/000/000/004/original/event_import_file_sample1.tsv
557
559
  - spec/dummy/private/system/event_import_files/event_imports/000/000/004/original/event_import_file_sample2.tsv
558
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
559
562
  - spec/dummy/private/system/event_imports/4/original/event_import_file_sample1.tsv
560
563
  - 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
561
565
  - spec/dummy/public/404.html
562
566
  - spec/dummy/public/422.html
563
567
  - spec/dummy/public/500.html