enju_event 0.0.9 → 0.0.10

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

@@ -1,7 +1,7 @@
 class EventImportFile < ActiveRecord::Base
   include ImportFile
   default_scope :order => 'id DESC'
-  scope :not_imported, where(:state => 'pending', :imported_at => nil)
+  scope :not_imported, where(:state => 'pending')
   scope :stucked, where('created_at < ? AND state = ?', 1.hour.ago, 'pending')
 
   if configatron.uploaded_file.storage == :s3
@@ -15,7 +15,6 @@ class EventImportFile < ActiveRecord::Base
   validates_attachment_presence :event_import
   belongs_to :user, :validate => true
   has_many :event_import_results
-  before_create :set_digest
 
   state_machine :initial => :pending do
     event :sm_start do
@@ -31,19 +30,15 @@ class EventImportFile < ActiveRecord::Base
     end
   end
 
-  def set_digest(options = {:type => 'sha1'})
-    if File.exists?(event_import.queued_for_write[:original])
-      self.file_hash = Digest::SHA1.hexdigest(File.open(event_import.queued_for_write[:original].path, 'rb').read)
-    end
-  end
-
   def import_start
     sm_start!
     case edit_mode
     when 'create'
       import
     when 'update'
+      modify
     when 'destroy'
+      remove
     else
       import
     end
@@ -55,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
@@ -101,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
@@ -115,9 +151,9 @@ class EventImportFile < ActiveRecord::Base
   def open_import_file
     tempfile = Tempfile.new('event_import_file')
     if configatron.uploaded_file.storage == :s3
-      uploaded_file_path = open(self.event_import.expiring_url(10)).path
+      uploaded_file_path = event_import.expiring_url(10)
     else
-      uploaded_file_path = self.event_import.path
+      uploaded_file_path = event_import.path
     end
     open(uploaded_file_path){|f|
       f.each{|line|
@@ -140,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
@@ -150,7 +195,6 @@ end
 #  parent_id                 :integer
 #  content_type              :string(255)
 #  size                      :integer
-#  file_hash                 :string(255)
 #  user_id                   :integer
 #  note                      :text
 #  imported_at               :datetime
@@ -162,5 +206,6 @@ end
 #  created_at                :datetime
 #  updated_at                :datetime
 #  edit_mode                 :string(255)
+#  event_import_fingerprint  :string(255)
 #
 

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/app/views/event_import_files/show.html.erb

@@ -24,8 +24,8 @@
 </p>
 
 <p>
-  <strong><%= t('activerecord.attributes.event_import_file.file_hash') -%>:</strong>
-  <%= @event_import_file.file_hash -%>
+  <strong><%= t('activerecord.attributes.event_import_file.event_import_fingerprint') -%>:</strong>
+  <%= @event_import_file.event_import_fingerprint -%>
 </p>
 
 <p>

data/config/locales/translation_en.yml

@@ -24,7 +24,7 @@ en:
         event_import_file_name: Filename
         event_import_content_type: Content type
         event_import_file_size: Size
-        file_hash: File hash
+        event_import_fingerprint: File hash
         note: Note
         imported_at: Imported at
         event_import_updated_at: Updated at

data/config/locales/translation_ja.yml

@@ -24,7 +24,7 @@ ja:
         event_import_file_name: ファイル名
         event_import_content_type: Content-Type
         event_import_file_size: ファイルサイズ
-        file_hash: ファイルのハッシュ
+        event_import_fingerprint: ファイルのハッシュ
         note: 注記
         imported_at: インポート時刻
         event_import_updated_at: 更新時刻

data/db/migrate/20081028093607_create_event_import_files.rb

@@ -4,7 +4,6 @@ class CreateEventImportFiles < ActiveRecord::Migration
       t.integer :parent_id
       t.string :content_type
       t.integer :size
-      t.string :file_hash
       t.integer :user_id
       t.text :note
       t.datetime :imported_at
@@ -14,12 +13,12 @@ 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
     add_index :event_import_files, :parent_id
     add_index :event_import_files, :user_id
-    add_index :event_import_files, :file_hash
     add_index :event_import_files, :state
   end
 

data/db/migrate/20120413051535_add_event_fingerprint_to_event_import_file.rb

@@ -0,0 +1,5 @@
+class AddEventFingerprintToEventImportFile < ActiveRecord::Migration
+  def change
+    add_column :event_import_files, :event_fingerprint, :string
+  end
+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.0.9"
+  VERSION = "0.0.10"
 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/controllers/participates_controller_spec.rb

@@ -2,6 +2,7 @@ require 'spec_helper'
 require 'sunspot/rails/spec_helper'
 
 describe ParticipatesController do
+  fixtures :all
   disconnect_sunspot
 
   def valid_attributes

data/spec/dummy/db/migrate/20120105074911_add_isil_to_library.rb

@@ -0,0 +1,5 @@
+class AddIsilToLibrary < ActiveRecord::Migration
+  def change
+    add_column :libraries, :isil, :string
+  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 => 20111201163718) do
+ActiveRecord::Schema.define(:version => 20120413170734) do
 
   create_table "countries", :force => true do |t|
     t.string  "name",         :null => false
@@ -37,8 +37,8 @@ ActiveRecord::Schema.define(:version => 20111201163718) do
     t.datetime "locked_at"
     t.datetime "failed_at"
     t.string   "locked_by"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",                :null => false
+    t.datetime "updated_at",                :null => false
   end
 
   add_index "delayed_jobs", ["priority", "run_at"], :name => "delayed_jobs_priority"
@@ -48,15 +48,14 @@ ActiveRecord::Schema.define(:version => 20111201163718) do
     t.text     "display_name"
     t.text     "note"
     t.integer  "position"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",   :null => false
+    t.datetime "updated_at",   :null => false
   end
 
   create_table "event_import_files", :force => true do |t|
     t.integer  "parent_id"
     t.string   "content_type"
     t.integer  "size"
-    t.string   "file_hash"
     t.integer  "user_id"
     t.text     "note"
     t.datetime "imported_at"
@@ -66,11 +65,12 @@ ActiveRecord::Schema.define(:version => 20111201163718) do
     t.integer  "event_import_file_size"
     t.datetime "event_import_updated_at"
     t.string   "edit_mode"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    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", ["file_hash"], :name => "index_event_import_files_on_file_hash"
   add_index "event_import_files", ["parent_id"], :name => "index_event_import_files_on_parent_id"
   add_index "event_import_files", ["state"], :name => "index_event_import_files_on_state"
   add_index "event_import_files", ["user_id"], :name => "index_event_import_files_on_user_id"
@@ -79,8 +79,8 @@ ActiveRecord::Schema.define(:version => 20111201163718) do
     t.integer  "event_import_file_id"
     t.integer  "event_id"
     t.text     "body"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",           :null => false
+    t.datetime "updated_at",           :null => false
   end
 
   create_table "events", :force => true do |t|
@@ -93,8 +93,8 @@ ActiveRecord::Schema.define(:version => 20111201163718) do
     t.boolean  "all_day",           :default => false, :null => false
     t.datetime "deleted_at"
     t.text     "display_name"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",                           :null => false
+    t.datetime "updated_at",                           :null => false
   end
 
   add_index "events", ["event_category_id"], :name => "index_events_on_event_category_id"
@@ -136,9 +136,10 @@ ActiveRecord::Schema.define(:version => 20111201163718) do
     t.integer  "users_count",           :default => 0,   :null => false
     t.integer  "position"
     t.integer  "country_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",                             :null => false
+    t.datetime "updated_at",                             :null => false
     t.datetime "deleted_at"
+    t.string   "isil"
   end
 
   add_index "libraries", ["library_group_id"], :name => "index_libraries_on_library_group_id"
@@ -156,8 +157,8 @@ ActiveRecord::Schema.define(:version => 20111201163718) do
     t.integer  "valid_period_for_new_user",   :default => 365,                      :null => false
     t.boolean  "post_to_union_catalog",       :default => false,                    :null => false
     t.integer  "country_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",                                                        :null => false
+    t.datetime "updated_at",                                                        :null => false
     t.text     "admin_networks"
     t.boolean  "allow_bookmark_external_url", :default => false,                    :null => false
     t.integer  "position"
@@ -170,8 +171,8 @@ ActiveRecord::Schema.define(:version => 20111201163718) do
     t.integer  "patron_id",  :null => false
     t.integer  "event_id",   :null => false
     t.integer  "position"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
   end
 
   add_index "participates", ["event_id"], :name => "index_participates_on_event_id"
@@ -182,8 +183,8 @@ ActiveRecord::Schema.define(:version => 20111201163718) do
     t.text     "display_name"
     t.text     "note"
     t.integer  "position"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",   :null => false
+    t.datetime "updated_at",   :null => false
   end
 
   create_table "patrons", :force => true do |t|
@@ -199,8 +200,8 @@ ActiveRecord::Schema.define(:version => 20111201163718) do
     t.string   "full_name"
     t.text     "full_name_transcription"
     t.text     "full_name_alternative"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",                                  :null => false
+    t.datetime "updated_at",                                  :null => false
     t.datetime "deleted_at"
     t.string   "zip_code_1"
     t.string   "zip_code_2"
@@ -247,8 +248,8 @@ ActiveRecord::Schema.define(:version => 20111201163718) do
     t.text     "display_name"
     t.text     "note"
     t.integer  "position"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",   :null => false
+    t.datetime "updated_at",   :null => false
   end
 
   create_table "shelves", :force => true do |t|
@@ -258,8 +259,8 @@ ActiveRecord::Schema.define(:version => 20111201163718) do
     t.integer  "library_id",   :default => 1, :null => false
     t.integer  "items_count",  :default => 0, :null => false
     t.integer  "position"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",                  :null => false
+    t.datetime "updated_at",                  :null => false
     t.datetime "deleted_at"
   end
 
@@ -270,15 +271,15 @@ ActiveRecord::Schema.define(:version => 20111201163718) do
     t.text     "display_name"
     t.text     "note"
     t.integer  "position"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",   :null => false
+    t.datetime "updated_at",   :null => false
   end
 
   create_table "user_has_roles", :force => true do |t|
     t.integer  "user_id"
     t.integer  "role_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
   end
 
   create_table "users", :force => true do |t|
@@ -288,8 +289,8 @@ ActiveRecord::Schema.define(:version => 20111201163718) do
     t.text     "note"
     t.string   "locale"
     t.string   "user_number"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",                                            :null => false
+    t.datetime "updated_at",                                            :null => false
     t.string   "email",                                 :default => "", :null => false
     t.string   "encrypted_password",     :limit => 128, :default => "", :null => false
     t.string   "reset_password_token"

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

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

@@ -0,0 +1,3 @@
+"name"	"library_shortname"	"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_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

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

@@ -0,0 +1,3 @@
+"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/dummy/private/system/event_imports/4/original/event_destroy_file.tsv

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

data/spec/dummy/private/system/event_imports/4/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_imports/4/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_imports/4/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/fixtures/event_import_files.yml

@@ -4,7 +4,6 @@ event_import_file_00001:
   id: 1
   event_import_file_name: MyString
   event_import_file_size: 1
-  file_hash: MyString
   user_id: 1
   event_import_content_type: text/csv
   state: completed
@@ -12,7 +11,6 @@ event_import_file_00002:
   id: 2
   event_import_file_name: MyString
   event_import_file_size: 1
-  file_hash: MyString
   user_id: 1
   event_import_content_type: text/csv
   state: pending
@@ -20,7 +18,6 @@ event_import_file_00003:
   id: 3
   event_import_file_name: MyString
   event_import_file_size: 1
-  file_hash: MyString
   user_id: 1
   event_import_content_type: text/csv
   state: pending