enju_event 0.0.10 → 0.0.11

data/app/models/event_import_file.rb

@@ -47,7 +47,7 @@ class EventImportFile < ActiveRecord::Base
   def import
     self.reload
     num = {:imported => 0, :failed => 0}
-    record = 2
+    row_num = 2
 
     rows = open_import_file
     check_field(rows.first)
@@ -76,22 +76,22 @@ class EventImportFile < ActiveRecord::Base
       if event.save!
         import_result.event = event
         num[:imported] += 1
-        if record % 50 == 0
+        if row_num % 50 == 0
           Sunspot.commit
           GC.start
         end
       end
       import_result.save!
-      record += 1
+      row_num += 1
     end
     self.update_attribute(:imported_at, Time.zone.now)
     Sunspot.commit
     rows.close
     sm_complete!
     return num
-  #rescue => e
-  #  self.error_message = e
-  #  sm_fail!
+  rescue => e
+    self.error_message = "line #{row_num}: #{e.message}"
+    sm_fail!
   end
 
   def modify
@@ -118,15 +118,16 @@ class EventImportFile < ActiveRecord::Base
       event.save!
     end
     sm_complete!
-  #rescue => e
-  #  self.error_message = e
-  #  sm_fail!
+  rescue => e
+    self.error_message = "line #{row_num}: #{e.message}"
+    sm_fail!
   end
 
   def remove
     sm_start!
     rows = open_import_file
     rows.shift
+    row_num = 2
 
     rows.each do |row|
       next if row['dummy'].to_s.strip.present?
@@ -134,9 +135,9 @@ class EventImportFile < ActiveRecord::Base
       event.destroy
     end
     sm_complete!
-  #rescue => e
-  #  self.error_message = e
-  #  sm_fail!
+  rescue => e
+    self.error_message = "line #{row_num}: #{e.message}"
+    sm_fail!
   end
 
   def self.import

data/lib/enju_event/version.rb

@@ -1,3 +1,3 @@
 module EnjuEvent
-  VERSION = "0.0.10"
+  VERSION = "0.0.11"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enju_event
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70121480769260 !ruby/object:Gem::Requirement
+  requirement: &70115373841980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70121480769260
+  version_requirements: *70115373841980
 - !ruby/object:Gem::Dependency
   name: event-calendar
-  requirement: &70121480768460 !ruby/object:Gem::Requirement
+  requirement: &70115373840560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2.3.3
   type: :runtime
   prerelease: false
-  version_requirements: *70121480768460
+  version_requirements: *70115373840560
 - !ruby/object:Gem::Dependency
   name: simple_form
-  requirement: &70121480767900 !ruby/object:Gem::Requirement
+  requirement: &70115373839560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70121480767900
+  version_requirements: *70115373839560
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &70121480767080 !ruby/object:Gem::Requirement
+  requirement: &70115373838560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70121480767080
+  version_requirements: *70115373838560
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &70121480766560 !ruby/object:Gem::Requirement
+  requirement: &70115373837220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70121480766560
+  version_requirements: *70115373837220
 - !ruby/object:Gem::Dependency
   name: attribute_normalizer
-  requirement: &70121480766000 !ruby/object:Gem::Requirement
+  requirement: &70115373835840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70121480766000
+  version_requirements: *70115373835840
 - !ruby/object:Gem::Dependency
   name: inherited_resources
-  requirement: &70121480781780 !ruby/object:Gem::Requirement
+  requirement: &70115373834720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70121480781780
+  version_requirements: *70115373834720
 - !ruby/object:Gem::Dependency
   name: friendly_id
-  requirement: &70121480780440 !ruby/object:Gem::Requirement
+  requirement: &70115373850040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: '4.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70121480780440
+  version_requirements: *70115373850040
 - !ruby/object:Gem::Dependency
   name: sunspot_rails
-  requirement: &70121480779260 !ruby/object:Gem::Requirement
+  requirement: &70115373849200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70121480779260
+  version_requirements: *70115373849200
 - !ruby/object:Gem::Dependency
   name: sunspot_solr
-  requirement: &70121480778260 !ruby/object:Gem::Requirement
+  requirement: &70115373848640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70121480778260
+  version_requirements: *70115373848640
 - !ruby/object:Gem::Dependency
   name: will_paginate
-  requirement: &70121480777080 !ruby/object:Gem::Requirement
+  requirement: &70115373847760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +131,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70121480777080
+  version_requirements: *70115373847760
 - !ruby/object:Gem::Dependency
   name: has_scope
-  requirement: &70121480776020 !ruby/object:Gem::Requirement
+  requirement: &70115373846960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70121480776020
+  version_requirements: *70115373846960
 - !ruby/object:Gem::Dependency
   name: configatron
-  requirement: &70121480774380 !ruby/object:Gem::Requirement
+  requirement: &70115373846020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70121480774380
+  version_requirements: *70115373846020
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &70121480789420 !ruby/object:Gem::Requirement
+  requirement: &70115373845220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -164,10 +164,10 @@ dependencies:
         version: '2.7'
   type: :runtime
   prerelease: false
-  version_requirements: *70121480789420
+  version_requirements: *70115373845220
 - !ruby/object:Gem::Dependency
   name: state_machine
-  requirement: &70121480788400 !ruby/object:Gem::Requirement
+  requirement: &70115373844440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,10 +175,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70121480788400
+  version_requirements: *70115373844440
 - !ruby/object:Gem::Dependency
   name: addressable
-  requirement: &70121480787260 !ruby/object:Gem::Requirement
+  requirement: &70115373843260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,10 +186,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70121480787260
+  version_requirements: *70115373843260
 - !ruby/object:Gem::Dependency
   name: acts_as_list
-  requirement: &70121480786360 !ruby/object:Gem::Requirement
+  requirement: &70115373857800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -197,10 +197,10 @@ dependencies:
         version: 0.1.5
   type: :runtime
   prerelease: false
-  version_requirements: *70121480786360
+  version_requirements: *70115373857800
 - !ruby/object:Gem::Dependency
   name: enju_message
-  requirement: &70121480785540 !ruby/object:Gem::Requirement
+  requirement: &70115373856340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -208,10 +208,10 @@ dependencies:
         version: 0.0.13
   type: :runtime
   prerelease: false
-  version_requirements: *70121480785540
+  version_requirements: *70115373856340
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70121480784880 !ruby/object:Gem::Requirement
+  requirement: &70115373854720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -219,10 +219,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70121480784880
+  version_requirements: *70115373854720
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70121480784140 !ruby/object:Gem::Requirement
+  requirement: &70115373852800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -230,10 +230,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70121480784140
+  version_requirements: *70115373852800
 - !ruby/object:Gem::Dependency
   name: sunspot-rails-tester
-  requirement: &70121480783460 !ruby/object:Gem::Requirement
+  requirement: &70115373850960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -241,10 +241,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70121480783460
+  version_requirements: *70115373850960
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
-  requirement: &70121480782660 !ruby/object:Gem::Requirement
+  requirement: &70115373865760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -252,7 +252,7 @@ dependencies:
         version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *70121480782660
+  version_requirements: *70115373865760
 description: Event management for Next-L Enju
 email:
 - tanabe@mwr.mediacom.keio.ac.jp