enju_event 0.1.2 → 0.1.3

data/app/models/event_import_file.rb

@@ -28,9 +28,18 @@ class EventImportFile < ActiveRecord::Base
     event :sm_fail do
       transition :started => :failed
     end
+
+    before_transition any => :started do |patron_import_file|
+      patron_import_file.executed_at = Time.zone.now
+    end
+
+    before_transition any => :completed do |patron_import_file|
+      patron_import_file.error_message = nil
+    end
   end
 
   def import_start
+    executed_at = Time.zone.now
     sm_start!
     case edit_mode
     when 'create'
@@ -47,10 +56,9 @@ class EventImportFile < ActiveRecord::Base
   def import
     self.reload
     num = {:imported => 0, :failed => 0}
-    row_num = 2
-
     rows = open_import_file
     check_field(rows.first)
+    row_num = 2
 
     rows.each do |row|
       next if row['dummy'].to_s.strip.present?
@@ -84,7 +92,6 @@ class EventImportFile < ActiveRecord::Base
       import_result.save!
       row_num += 1
     end
-    self.update_attribute(:imported_at, Time.zone.now)
     Sunspot.commit
     rows.close
     sm_complete!
@@ -92,12 +99,14 @@ class EventImportFile < ActiveRecord::Base
   rescue => e
     self.error_message = "line #{row_num}: #{e.message}"
     sm_fail!
+    raise e
   end
 
   def modify
     sm_start!
     rows = open_import_file
     check_field(rows.first)
+    row_num = 2
 
     rows.each do |row|
       next if row['dummy'].to_s.strip.present?
@@ -116,11 +125,13 @@ class EventImportFile < ActiveRecord::Base
         event.all_day = true
       end
       event.save!
+      row_num += 1
     end
     sm_complete!
   rescue => e
     self.error_message = "line #{row_num}: #{e.message}"
     sm_fail!
+    raise e
   end
 
   def remove
@@ -133,11 +144,13 @@ class EventImportFile < ActiveRecord::Base
       next if row['dummy'].to_s.strip.present?
       event = Event.find(row['id'].to_s.strip)
       event.destroy
+      row_num += 1
     end
     sm_complete!
   rescue => e
     self.error_message = "line #{row_num}: #{e.message}"
     sm_fail!
+    raise e
   end
 
   def self.import
@@ -163,15 +176,9 @@ class EventImportFile < ActiveRecord::Base
     }
     tempfile.close
 
-    if RUBY_VERSION > '1.9'
-      file = CSV.open(tempfile, :col_sep => "\t")
-      header = file.first
-      rows = CSV.open(tempfile, :headers => header, :col_sep => "\t")
-    else
-      file = FasterCSV.open(tempfile.path, :col_sep => "\t")
-      header = file.first
-      rows = FasterCSV.open(tempfile.path, :headers => header, :col_sep => "\t")
-    end
+    file = CSV.open(tempfile, :col_sep => "\t")
+    header = file.first
+    rows = CSV.open(tempfile, :headers => header, :col_sep => "\t")
     EventImportResult.create!(:event_import_file => self, :body => header.join("\t"))
     tempfile.close(true)
     file.close
@@ -198,15 +205,17 @@ end
 #  size                      :integer
 #  user_id                   :integer
 #  note                      :text
-#  imported_at               :datetime
+#  executed_at               :datetime
 #  state                     :string(255)
 #  event_import_file_name    :string(255)
 #  event_import_content_type :string(255)
 #  event_import_file_size    :integer
 #  event_import_updated_at   :datetime
-#  created_at                :datetime
-#  updated_at                :datetime
 #  edit_mode                 :string(255)
 #  event_import_fingerprint  :string(255)
+#  created_at                :datetime        not null
+#  updated_at                :datetime        not null
+#  event_fingerprint         :string(255)
+#  error_message             :text
 #
 

data/app/views/event_import_files/index.html.erb

@@ -6,7 +6,7 @@
   <tr>
     <th>Id</th>
     <th><%= t('activerecord.attributes.event_import_file.event_import_file_name') -%></th>
-    <th><%= t('activerecord.attributes.event_import_file.imported_at') -%></th>
+    <th><%= t('activerecord.attributes.event_import_file.executed_at') -%></th>
     <th><%= t('activerecord.models.user') -%></th>
     <th><%= t('activerecord.attributes.event_import_file.edit_mode') -%></th>
     <th><%= t('activerecord.attributes.event_import_file.state') -%></th>
@@ -17,7 +17,7 @@
   <tr class="line<%= cycle("0", "1") -%>">
     <td><%= link_to (event_import_file.id), event_import_file -%></td>
     <td><%= link_to event_import_file.event_import_file_name, event_import_file -%></td>
-    <td><%= l(event_import_file.imported_at) if event_import_file.imported_at -%></td>
+    <td><%= l(event_import_file.executed_at) if event_import_file.executed_at -%></td>
     <td><%= link_to event_import_file.user.username, event_import_file.user -%></td>
     <td><%= event_import_file.edit_mode -%></td>
     <td><%= localized_state(event_import_file.state) -%></td>

data/app/views/event_import_files/show.html.erb

@@ -34,8 +34,8 @@
 </p>
 
 <p>
-  <strong><%= t('activerecord.attributes.event_import_file.imported_at') -%>:</strong>
-  <%= l(@event_import_file.imported_at) if @event_import_file.imported_at -%>
+  <strong><%= t('activerecord.attributes.event_import_file.executed_at') -%>:</strong>
+  <%= l(@event_import_file.executed_at) if @event_import_file.executed_at -%>
 </p>
 
 <p>
@@ -44,10 +44,15 @@
 </p>
 
 <p>
-  <strong><%= t('activerecord.attributes.manifestation_import_file.state') -%>:</strong>
+  <strong><%= t('activerecord.attributes.event_import_file.state') -%>:</strong>
   <%= localized_state(@event_import_file.state) -%>
 </p>
 
+<p>
+  <strong><%= t('activerecord.attributes.event_import_file.error_message') -%>:</strong>
+  <%= @event_import_file.error_message -%>
+</p>
+
 <p>
   <strong><%= t('activerecord.models.user') -%>:</strong>
   <%= link_to @event_import_file.user.username, @event_import_file.user -%>

data/config/locales/translation_en.yml

@@ -26,10 +26,11 @@ en:
         event_import_file_size: Size
         event_import_fingerprint: File hash
         note: Note
-        imported_at: Imported at
+        executed_at: Executed at
         event_import_updated_at: Updated at
         state: State
         edit_mode: Edit mode
+        error_message: Error message
       event_import_result:
         body: Body
 

data/config/locales/translation_ja.yml

@@ -26,10 +26,11 @@ ja:
         event_import_file_size: ファイルサイズ
         event_import_fingerprint: ファイルのハッシュ
         note: 注記
-        imported_at: インポート時刻
+        executed_at: 実行時刻
         event_import_updated_at: 更新時刻
         state: 状態
         edit_mode: 編集モード
+        error_message: エラーメッセージ
       event_import_result:
         body: 本文
 

data/db/migrate/20120415060342_rename_event_import_file_imported_at_to_executed_at.rb

@@ -0,0 +1,9 @@
+class RenameEventImportFileImportedAtToExecutedAt < ActiveRecord::Migration
+  def up
+    rename_column :event_import_files, :imported_at, :executed_at
+  end
+
+  def down
+    rename_column :event_import_files, :executed_at, :impored_at
+  end
+end

data/lib/enju_event/version.rb

@@ -1,3 +1,3 @@
 module EnjuEvent
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/spec/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20120413170734) do
+ActiveRecord::Schema.define(:version => 20120415060342) do
 
   create_table "countries", :force => true do |t|
     t.string  "name",         :null => false
@@ -58,13 +58,14 @@ ActiveRecord::Schema.define(:version => 20120413170734) do
     t.integer  "size"
     t.integer  "user_id"
     t.text     "note"
-    t.datetime "imported_at"
+    t.datetime "executed_at"
     t.string   "state"
     t.string   "event_import_file_name"
     t.string   "event_import_content_type"
     t.integer  "event_import_file_size"
     t.datetime "event_import_updated_at"
     t.string   "edit_mode"
+    t.string   "event_import_fingerprint"
     t.datetime "created_at",                :null => false
     t.datetime "updated_at",                :null => false
     t.string   "event_fingerprint"

data/spec/fixtures/event_import_files.yml

@@ -30,17 +30,19 @@ event_import_file_00003:
 #  parent_id                 :integer
 #  content_type              :string(255)
 #  size                      :integer
-#  file_hash                 :string(255)
 #  user_id                   :integer
 #  note                      :text
-#  imported_at               :datetime
+#  executed_at               :datetime
 #  state                     :string(255)
 #  event_import_file_name    :string(255)
 #  event_import_content_type :string(255)
 #  event_import_file_size    :integer
 #  event_import_updated_at   :datetime
-#  created_at                :datetime
-#  updated_at                :datetime
 #  edit_mode                 :string(255)
+#  event_import_fingerprint  :string(255)
+#  created_at                :datetime        not null
+#  updated_at                :datetime        not null
+#  event_fingerprint         :string(255)
+#  error_message             :text
 #
 

data/spec/models/event_import_file_spec.rb

@@ -17,6 +17,9 @@ describe EventImportFile do
       Event.count.should eq old_events_count + 3
       Event.closing_days.size.should eq closing_days_size + 1
       EventImportResult.count.should eq old_import_results_count + 4
+
+      @file.event_import_fingerprint.should be_true
+      @file.executed_at.should be_true
     end
   end
 
@@ -75,17 +78,19 @@ end
 #  parent_id                 :integer
 #  content_type              :string(255)
 #  size                      :integer
-#  file_hash                 :string(255)
 #  user_id                   :integer
 #  note                      :text
-#  imported_at               :datetime
+#  executed_at               :datetime
 #  state                     :string(255)
 #  event_import_file_name    :string(255)
 #  event_import_content_type :string(255)
 #  event_import_file_size    :integer
 #  event_import_updated_at   :datetime
-#  created_at                :datetime
-#  updated_at                :datetime
 #  edit_mode                 :string(255)
+#  event_import_fingerprint  :string(255)
+#  created_at                :datetime        not null
+#  updated_at                :datetime        not null
+#  event_fingerprint         :string(255)
+#  error_message             :text
 #
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enju_event
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-13 00:00:00.000000000 Z
+date: 2012-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70131153018340 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70131153018340
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: event-calendar
-  requirement: &70131153016840 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +37,15 @@ dependencies:
         version: 2.3.3
   type: :runtime
   prerelease: false
-  version_requirements: *70131153016840
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.3.3
 - !ruby/object:Gem::Dependency
   name: simple_form
-  requirement: &70131153015920 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70131153015920
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &70131153014900 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70131153014900
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &70131153013580 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +85,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70131153013580
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: attribute_normalizer
-  requirement: &70131153012160 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +101,15 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70131153012160
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: inherited_resources
-  requirement: &70131153011080 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +117,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70131153011080
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: friendly_id
-  requirement: &70131153026380 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +133,15 @@ dependencies:
         version: '4.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70131153026380
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: sunspot_rails
-  requirement: &70131153025540 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +149,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70131153025540
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sunspot_solr
-  requirement: &70131153024980 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +165,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70131153024980
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: will_paginate
-  requirement: &70131153024100 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +181,15 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70131153024100
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: has_scope
-  requirement: &70131153023300 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +197,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70131153023300
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: configatron
-  requirement: &70131153022360 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +213,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70131153022360
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &70131153021560 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -164,10 +229,15 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70131153021560
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: state_machine
-  requirement: &70131153020780 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,10 +245,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70131153020780
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: addressable
-  requirement: &70131153019600 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,32 +261,47 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70131153019600
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: acts_as_list
-  requirement: &70131153034160 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.5
+        version: 0.1.6
   type: :runtime
   prerelease: false
-  version_requirements: *70131153034160
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.6
 - !ruby/object:Gem::Dependency
   name: enju_message
-  requirement: &70131153032700 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.13
+        version: 0.0.18
   type: :runtime
   prerelease: false
-  version_requirements: *70131153032700
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.18
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70131153030580 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -219,10 +309,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70131153030580
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70131153029140 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -230,10 +325,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70131153029140
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sunspot-rails-tester
-  requirement: &70131153027320 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -241,18 +341,28 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70131153027320
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
-  requirement: &70131153042120 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70131153042120
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Event management for Next-L Enju
 email:
 - tanabe@mwr.mediacom.keio.ac.jp
@@ -312,6 +422,7 @@ files:
 - db/migrate/20100925074639_create_event_import_results.rb
 - db/migrate/20120413051535_add_event_fingerprint_to_event_import_file.rb
 - db/migrate/20120413170734_add_error_message_to_event_import_file.rb
+- db/migrate/20120415060342_rename_event_import_file_imported_at_to_executed_at.rb
 - lib/enju_event/engine.rb
 - lib/enju_event/import_file.rb
 - lib/enju_event/version.rb
@@ -474,7 +585,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: enju_event plugin