enju_event 0.1.0 → 0.1.1

data/app/models/event.rb

@@ -47,7 +47,7 @@ class Event < ActiveRecord::Base
   end
 
   def set_all_day
-    if self.all_day
+    if all_day
       self.start_at = self.start_at.beginning_of_day
       self.end_at = self.end_at.end_of_day
     end

data/app/models/event_import_file.rb

@@ -36,7 +36,9 @@ class EventImportFile < ActiveRecord::Base
     when 'create'
       import
     when 'update'
+      modify
     when 'destroy'
+      remove
     else
       import
     end
@@ -48,43 +50,36 @@ class EventImportFile < ActiveRecord::Base
     record = 2
 
     rows = open_import_file
-    field = rows.first
-    if [field['name']].reject{|f| f.to_s.strip == ""}.empty?
-      raise "You should specify a name in the first line"
-    end
-    if [field['start_at'], field['end_at']].reject{|field| field.to_s.strip == ""}.empty?
-      raise "You should specify dates in the first line"
-    end
-    #rows.shift
+    check_field(rows.first)
+
     rows.each do |row|
       next if row['dummy'].to_s.strip.present?
       import_result = EventImportResult.create!(:event_import_file => self, :body => row.fields.join("\t"))
 
       event = Event.new
-      event.name = row['name']
+      event.name = row['name'].to_s.strip
       event.note = row['note']
       event.start_at = row['start_at']
       event.end_at = row['end_at']
       category = row['category'].to_s.strip
-      event.all_day = true
-      library = Library.where(:name => row['library_short_name']).first
+      if row['all_day'].to_s.strip.downcase == 'false'
+        event.all_day = false
+      else
+        event.all_day = true
+      end
+      library = Library.where(:name => row['library']).first
       library = Library.web if library.blank?
       event.library = library
       event_category = EventCategory.where(:name => category).first || EventCategory.where(:name => 'unknown').first
       event.event_category = event_category
 
-      begin
-        if event.save!
-          import_result.event = event
-          num[:imported] += 1
-          if record % 50 == 0
-            Sunspot.commit
-            GC.start
-          end
+      if event.save!
+        import_result.event = event
+        num[:imported] += 1
+        if record % 50 == 0
+          Sunspot.commit
+          GC.start
         end
-      rescue
-        Rails.logger.info("event import failed: column #{record}")
-        num[:failed] += 1
       end
       import_result.save!
       record += 1
@@ -94,6 +89,54 @@ class EventImportFile < ActiveRecord::Base
     rows.close
     sm_complete!
     return num
+  #rescue => e
+  #  self.error_message = e
+  #  sm_fail!
+  end
+
+  def modify
+    sm_start!
+    rows = open_import_file
+    check_field(rows.first)
+
+    rows.each do |row|
+      next if row['dummy'].to_s.strip.present?
+      event = Event.find(row['id'].to_s.strip)
+      event_category = EventCategory.where(:name => row['category'].to_s.strip).first
+      event.event_category = event_category if event_category
+      library = Library.where(:name => row['library'].to_s.strip).first
+      event.library = library if library
+      event.name = row['name'] if row['name'].to_s.strip.present?
+      event.start_at = row['start_at'] if row['start_at'].to_s.strip.present?
+      event.end_at = row['end_at'] if row['end_at'].to_s.strip.present?
+      event.note = row['end_at'] if row['note'].to_s.strip.present?
+      if row['all_day'].to_s.strip.downcase == 'false'
+        event.all_day = false
+      else
+        event.all_day = true
+      end
+      event.save!
+    end
+    sm_complete!
+  #rescue => e
+  #  self.error_message = e
+  #  sm_fail!
+  end
+
+  def remove
+    sm_start!
+    rows = open_import_file
+    rows.shift
+
+    rows.each do |row|
+      next if row['dummy'].to_s.strip.present?
+      event = Event.find(row['id'].to_s.strip)
+      event.destroy
+    end
+    sm_complete!
+  #rescue => e
+  #  self.error_message = e
+  #  sm_fail!
   end
 
   def self.import
@@ -133,6 +176,15 @@ class EventImportFile < ActiveRecord::Base
     file.close
     rows
   end
+
+  def check_field(field)
+    if [field['name']].reject{|f| f.to_s.strip == ""}.empty?
+      raise "You should specify a name in the first line"
+    end
+    if [field['start_at'], field['end_at']].reject{|field| field.to_s.strip == ""}.empty?
+      raise "You should specify dates in the first line"
+    end
+  end
 end
 
 # == Schema Information

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

@@ -10,7 +10,6 @@
     <%= f.file_field :event_import -%>
   </div>
 
-  <!--
   <div class="field">
     <%= f.label :edit_mode -%><br />
     <%= f.radio_button :edit_mode, 'create', :checked => 'checked' %>
@@ -20,7 +19,6 @@
     <%= f.radio_button :edit_mode, 'destroy' %>
     <%= f.label :edit_mode, t('page.destroy'), :value => 'destroy' %>
   </div>
-  -->
 
   <div class="actions">
     <%= f.submit %>

data/db/migrate/20081028093607_create_event_import_files.rb

@@ -13,6 +13,7 @@ class CreateEventImportFiles < ActiveRecord::Migration
       t.integer :event_import_file_size
       t.datetime :event_import_updated_at
       t.string :edit_mode
+      t.string :event_import_fingerprint
 
       t.timestamps
     end

data/db/migrate/20120413170734_add_error_message_to_event_import_file.rb

@@ -0,0 +1,5 @@
+class AddErrorMessageToEventImportFile < ActiveRecord::Migration
+  def change
+    add_column :event_import_files, :error_message, :text
+  end
+end

data/lib/enju_event/version.rb

@@ -1,3 +1,3 @@
 module EnjuEvent
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/spec/controllers/calendar_controller_spec.rb

@@ -0,0 +1,57 @@
+require 'spec_helper'
+
+describe CalendarController do
+  fixtures :all
+
+  describe "GET index", :solr => true do
+    describe "When logged in as Administrator" do
+      login_admin
+
+      it "assigns all event_stripss as @event_stripss" do
+        get :index
+        assigns(:event_strips).should_not be_empty
+      end
+    end
+
+    describe "When not logged in" do
+      it "assigns all event_stripss as @event_stripss" do
+        get :index
+        assigns(:event_strips).should_not be_empty
+      end
+
+      it "should get index when a year and a month are set" do
+        get :index, :year => 2010, :month => 3
+        response.should be_success
+        assigns(:event_strips).should_not be_empty
+      end
+
+      it "should redirect to a new event if no event is present" do
+        get :show, :year => 2010, :month => 3, :day => 1
+        response.should redirect_to new_event_path(:date => '2010/03/01')
+      end
+
+      it "should redirect to an existing event" do
+        get :show, :year => 2008, :month => 1, :day => 13
+        response.should redirect_to events_path(:date => '2008/01/13')
+      end
+    end
+  end
+
+  describe "GET show" do
+    describe "When logged in as Administrator" do
+      login_admin
+
+      it "should redirect to a new event" do
+        get :show, :year => '2011', :month => '1', :day => '1'
+        response.should redirect_to(new_event_path(:date => '2011/01/01'))
+      end
+    end
+
+    describe "When not logged in" do
+      it "should redirect to a new event" do
+        get :show, :year => '2011', :month => '1', :day => '1'
+        response.should redirect_to(new_event_path(:date => '2011/01/01'))
+      end
+    end
+  end
+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 => 20120413051535) do
+ActiveRecord::Schema.define(:version => 20120413170734) do
 
   create_table "countries", :force => true do |t|
     t.string  "name",         :null => false
@@ -68,6 +68,7 @@ ActiveRecord::Schema.define(:version => 20120413051535) do
     t.datetime "created_at",                :null => false
     t.datetime "updated_at",                :null => false
     t.string   "event_fingerprint"
+    t.text     "error_message"
   end
 
   add_index "event_import_files", ["parent_id"], :name => "index_event_import_files_on_parent_id"

data/spec/dummy/private/system/event_import_files/event_imports/000/000/004/original/event_destroy_file.tsv

@@ -0,0 +1,4 @@
+id	dummy
+1	
+2	
+3	この行は無視される

data/spec/dummy/private/system/event_import_files/event_imports/000/000/004/original/event_import_file_sample1.tsv

@@ -1,4 +1,4 @@
-"name"	"category"	"library_shortname"	"start_at"	"end_at"	"dummy"
+"name"	"category"	"library"	"start_at"	"end_at"	"dummy"
 "イベント名"	"カテゴリ。休館日の場合はclosed"	"図書館名"	"開始日"	"終了日"	"インポート省略"
 "hogehoge"	"おはなし会"	"kamata"	"2009-04-01"	"2009-04-03"	
 "hogehoge"		"hachioji"			

data/spec/dummy/private/system/event_import_files/event_imports/000/000/004/original/event_import_file_sample2.tsv

@@ -1,3 +1,3 @@
-"name"	"library_shortname"	"start_at"	"end_at"
+"name"	"library"	"start_at"	"end_at"
 "���{��̍Â���"	"kamata"	"2011-03-26"	"2011-03-27"
 "���{��̍Â���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

@@ -0,0 +1,4 @@
+id	name	category	library	start_at	end_at	all_day	note	dummy
+1	変更後のイベント名		kamata	2012-04-01	2012-04-02			
+2			mita		2012-04-03	FALSE		
+3	変更後のイベント名							この行は無視される

data/spec/models/event_import_file_spec.rb

@@ -36,6 +36,35 @@ describe EventImportFile do
       Event.order('id DESC').first.end_at.to_s.should eq Time.zone.parse('2011-03-27').end_of_day.to_s
     end
   end
+
+  describe "when its mode is 'update'" do
+    it "should update events" do
+      @file = EventImportFile.create :event_import => File.new("#{Rails.root.to_s}/../../examples/event_update_file.tsv")
+      @file.modify
+      event1 = Event.find(1)
+      event1.name.should eq '変更後のイベント名'
+      event1.start_at.should eq Time.zone.parse('2012-04-01').beginning_of_day
+      event1.end_at.to_s.should eq Time.zone.parse('2012-04-02').end_of_day.to_s
+
+      event2 = Event.find(2)
+      event2.end_at.to_s.should eq Time.zone.parse('2012-04-03').beginning_of_day.to_s
+      event2.all_day.should be_false
+      event2.library.name.should eq 'mita'
+
+      event3 = Event.find(3)
+      event3.name.should eq 'ミーティング'
+    end
+  end
+    
+
+  describe "when its mode is 'destroy'" do
+    it "should destroy events" do
+      old_event_count = Event.count
+      @file = EventImportFile.create :event_import => File.new("#{Rails.root.to_s}/../../examples/event_destroy_file.tsv")
+      @file.remove
+      Event.count.should eq old_event_count - 2
+    end
+  end
 end
 
 # == Schema Information

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enju_event
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   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: &70106175265680 !ruby/object:Gem::Requirement
+  requirement: &70284135878440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70106175265680
+  version_requirements: *70284135878440
 - !ruby/object:Gem::Dependency
   name: event-calendar
-  requirement: &70106175265180 !ruby/object:Gem::Requirement
+  requirement: &70284135877640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2.3.3
   type: :runtime
   prerelease: false
-  version_requirements: *70106175265180
+  version_requirements: *70284135877640
 - !ruby/object:Gem::Dependency
   name: simple_form
-  requirement: &70106175264640 !ruby/object:Gem::Requirement
+  requirement: &70284135877060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70106175264640
+  version_requirements: *70284135877060
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &70106175263980 !ruby/object:Gem::Requirement
+  requirement: &70284135876260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70106175263980
+  version_requirements: *70284135876260
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &70106175263160 !ruby/object:Gem::Requirement
+  requirement: &70284135875740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70106175263160
+  version_requirements: *70284135875740
 - !ruby/object:Gem::Dependency
   name: attribute_normalizer
-  requirement: &70106175261560 !ruby/object:Gem::Requirement
+  requirement: &70284135875180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70106175261560
+  version_requirements: *70284135875180
 - !ruby/object:Gem::Dependency
   name: inherited_resources
-  requirement: &70106175259360 !ruby/object:Gem::Requirement
+  requirement: &70284135874580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70106175259360
+  version_requirements: *70284135874580
 - !ruby/object:Gem::Dependency
   name: friendly_id
-  requirement: &70106175273900 !ruby/object:Gem::Requirement
+  requirement: &70284135889620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: '4.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70106175273900
+  version_requirements: *70284135889620
 - !ruby/object:Gem::Dependency
   name: sunspot_rails
-  requirement: &70106175272960 !ruby/object:Gem::Requirement
+  requirement: &70284135888420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70106175272960
+  version_requirements: *70284135888420
 - !ruby/object:Gem::Dependency
   name: sunspot_solr
-  requirement: &70106175272220 !ruby/object:Gem::Requirement
+  requirement: &70284135887420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70106175272220
+  version_requirements: *70284135887420
 - !ruby/object:Gem::Dependency
   name: will_paginate
-  requirement: &70106175270960 !ruby/object:Gem::Requirement
+  requirement: &70284135886340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +131,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70106175270960
+  version_requirements: *70284135886340
 - !ruby/object:Gem::Dependency
   name: has_scope
-  requirement: &70106175270120 !ruby/object:Gem::Requirement
+  requirement: &70284135885280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70106175270120
+  version_requirements: *70284135885280
 - !ruby/object:Gem::Dependency
   name: configatron
-  requirement: &70106175268560 !ruby/object:Gem::Requirement
+  requirement: &70284135883680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70106175268560
+  version_requirements: *70284135883680
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &70106175267420 !ruby/object:Gem::Requirement
+  requirement: &70284135898680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -164,10 +164,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70106175267420
+  version_requirements: *70284135898680
 - !ruby/object:Gem::Dependency
   name: state_machine
-  requirement: &70106175283060 !ruby/object:Gem::Requirement
+  requirement: &70284135897580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,10 +175,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70106175283060
+  version_requirements: *70284135897580
 - !ruby/object:Gem::Dependency
   name: addressable
-  requirement: &70106175282400 !ruby/object:Gem::Requirement
+  requirement: &70284135896540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,10 +186,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70106175282400
+  version_requirements: *70284135896540
 - !ruby/object:Gem::Dependency
   name: acts_as_list
-  requirement: &70106175281560 !ruby/object:Gem::Requirement
+  requirement: &70284135895560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -197,10 +197,10 @@ dependencies:
         version: 0.1.5
   type: :runtime
   prerelease: false
-  version_requirements: *70106175281560
+  version_requirements: *70284135895560
 - !ruby/object:Gem::Dependency
   name: enju_message
-  requirement: &70106175280820 !ruby/object:Gem::Requirement
+  requirement: &70284135894700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -208,10 +208,10 @@ dependencies:
         version: 0.0.13
   type: :runtime
   prerelease: false
-  version_requirements: *70106175280820
+  version_requirements: *70284135894700
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70106175280240 !ruby/object:Gem::Requirement
+  requirement: &70284135894040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -219,10 +219,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70106175280240
+  version_requirements: *70284135894040
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70106175279520 !ruby/object:Gem::Requirement
+  requirement: &70284135893320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -230,10 +230,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70106175279520
+  version_requirements: *70284135893320
 - !ruby/object:Gem::Dependency
   name: sunspot-rails-tester
-  requirement: &70106175278920 !ruby/object:Gem::Requirement
+  requirement: &70284135892680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -241,10 +241,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70106175278920
+  version_requirements: *70284135892680
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
-  requirement: &70106175277900 !ruby/object:Gem::Requirement
+  requirement: &70284135891880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -252,7 +252,7 @@ dependencies:
         version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *70106175277900
+  version_requirements: *70284135891880
 description: Event management for Next-L Enju
 email:
 - tanabe@mwr.mediacom.keio.ac.jp
@@ -311,6 +311,7 @@ files:
 - db/migrate/20090519203307_create_participates.rb
 - 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
 - lib/enju_event/engine.rb
 - lib/enju_event/import_file.rb
 - lib/enju_event/version.rb
@@ -319,6 +320,7 @@ files:
 - MIT-LICENSE
 - Rakefile
 - README.rdoc
+- spec/controllers/calendar_controller_spec.rb
 - spec/controllers/event_categories_controller_spec.rb
 - spec/controllers/event_import_files_controller_spec.rb
 - spec/controllers/events_controller_spec.rb
@@ -393,8 +395,10 @@ files:
 - spec/dummy/lib/enju_leaf.rb
 - spec/dummy/private/system/event_import_files/event_imports/000/000/001/original/event_import_file_sample1.tsv
 - spec/dummy/private/system/event_import_files/event_imports/000/000/001/original/event_import_file_sample2.tsv
+- spec/dummy/private/system/event_import_files/event_imports/000/000/004/original/event_destroy_file.tsv
 - spec/dummy/private/system/event_import_files/event_imports/000/000/004/original/event_import_file_sample1.tsv
 - spec/dummy/private/system/event_import_files/event_imports/000/000/004/original/event_import_file_sample2.tsv
+- spec/dummy/private/system/event_import_files/event_imports/000/000/004/original/event_update_file.tsv
 - spec/dummy/private/system/event_imports/4/original/event_import_file_sample1.tsv
 - spec/dummy/private/system/event_imports/4/original/event_import_file_sample2.tsv
 - spec/dummy/public/404.html
@@ -473,6 +477,7 @@ signing_key:
 specification_version: 3
 summary: enju_event plugin
 test_files:
+- spec/controllers/calendar_controller_spec.rb
 - spec/controllers/event_categories_controller_spec.rb
 - spec/controllers/event_import_files_controller_spec.rb
 - spec/controllers/events_controller_spec.rb
@@ -547,8 +552,10 @@ test_files:
 - spec/dummy/lib/enju_leaf.rb
 - spec/dummy/private/system/event_import_files/event_imports/000/000/001/original/event_import_file_sample1.tsv
 - spec/dummy/private/system/event_import_files/event_imports/000/000/001/original/event_import_file_sample2.tsv
+- spec/dummy/private/system/event_import_files/event_imports/000/000/004/original/event_destroy_file.tsv
 - spec/dummy/private/system/event_import_files/event_imports/000/000/004/original/event_import_file_sample1.tsv
 - spec/dummy/private/system/event_import_files/event_imports/000/000/004/original/event_import_file_sample2.tsv
+- spec/dummy/private/system/event_import_files/event_imports/000/000/004/original/event_update_file.tsv
 - spec/dummy/private/system/event_imports/4/original/event_import_file_sample1.tsv
 - spec/dummy/private/system/event_imports/4/original/event_import_file_sample2.tsv
 - spec/dummy/public/404.html