enju_event 0.0.27 → 0.1.0

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2012 Kosuke Tanabe
+Copyright 2011 YOURNAME
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -14,7 +14,7 @@ end
 
 RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'EnjuEvent'
+  rdoc.title    = 'EnjuSubject'
   rdoc.options << '--line-numbers'
   rdoc.rdoc_files.include('README.rdoc')
   rdoc.rdoc_files.include('lib/**/*.rb')
@@ -29,18 +29,8 @@ Bundler::GemHelper.install_tasks
 require 'rspec/core'
 require 'rspec/core/rake_task'
 
-require 'rake/testtask'
-
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = false
-end
-
 RSpec::Core::RakeTask.new(:spec) do |spec|
     spec.pattern = FileList['spec/**/*_spec.rb']
 end
 
-
 task :default => :spec

data/app/controllers/calendar_controller.rb

@@ -23,7 +23,7 @@ class CalendarController < ApplicationController
     date = Time.zone.local(params[:year].to_i, params[:month].to_i, params[:day].to_i) rescue Time.zone.now
     date_string = date.strftime('%Y/%m/%d')
     if Event.search do
-      with(:start_at).less_than_or_equal_to date
+      with(:start_at).less_than date
       with(:end_at).greater_than date
     end.results.empty?
       redirect_to new_event_path(:date => date_string)

data/app/controllers/event_categories_controller.rb

@@ -1,5 +1,5 @@
 class EventCategoriesController < InheritedResources::Base
-  respond_to :html, :json
+  respond_to :html, :xml
   load_and_authorize_resource
 
   def update

data/app/controllers/event_import_files_controller.rb

@@ -2,18 +2,18 @@ class EventImportFilesController < ApplicationController
   load_and_authorize_resource
 
   # GET /event_import_files
-  # GET /event_import_files.json
+  # GET /event_import_files.xml
   def index
     @event_import_files = EventImportFile.page(params[:page])
 
     respond_to do |format|
       format.html # index.html.erb
-      format.json { render :json => @event_import_files }
+      format.xml  { render :xml => @event_import_files }
     end
   end
 
   # GET /event_import_files/1
-  # GET /event_import_files/1.json
+  # GET /event_import_files/1.xml
   def show
     if @event_import_file.event_import.path
       unless configatron.uploaded_file.storage == :s3
@@ -23,7 +23,7 @@ class EventImportFilesController < ApplicationController
 
     respond_to do |format|
       format.html # show.html.erb
-      format.json { render :json => @event_import_file }
+      format.xml  { render :xml => @event_import_file }
       format.download {
         if configatron.uploaded_file.storage == :s3
           redirect_to @event_import_file.event_import.expiring_url(10)
@@ -35,13 +35,13 @@ class EventImportFilesController < ApplicationController
   end
 
   # GET /event_import_files/new
-  # GET /event_import_files/new.json
+  # GET /event_import_files/new.xml
   def new
     @event_import_file = EventImportFile.new
 
     respond_to do |format|
       format.html # new.html.erb
-      format.json { render :json => @event_import_file }
+      format.xml  { render :xml => @event_import_file }
     end
   end
 
@@ -50,7 +50,7 @@ class EventImportFilesController < ApplicationController
   end
 
   # POST /event_import_files
-  # POST /event_import_files.json
+  # POST /event_import_files.xml
   def create
     @event_import_file = EventImportFile.new(params[:event_import_file])
     @event_import_file.user = current_user
@@ -59,37 +59,37 @@ class EventImportFilesController < ApplicationController
       if @event_import_file.save
         flash[:notice] = t('controller.successfully_created', :model => t('activerecord.models.event_import_file'))
         format.html { redirect_to(@event_import_file) }
-        format.json { render :json => @event_import_file, :status => :created, :location => @event_import_file }
+        format.xml  { render :xml => @event_import_file, :status => :created, :location => @event_import_file }
       else
         format.html { render :action => "new" }
-        format.json { render :json => @event_import_file.errors, :status => :unprocessable_entity }
+        format.xml  { render :xml => @event_import_file.errors, :status => :unprocessable_entity }
       end
     end
   end
 
   # PUT /event_import_files/1
-  # PUT /event_import_files/1.json
+  # PUT /event_import_files/1.xml
   def update
     respond_to do |format|
       if @event_import_file.update_attributes(params[:event_import_file])
         flash[:notice] = t('controller.successfully_updated', :model => t('activerecord.models.event_import_file'))
         format.html { redirect_to(@event_import_file) }
-        format.json { head :no_content }
+        format.xml  { head :ok }
       else
         format.html { render :action => "edit" }
-        format.json { render :json => @event_import_file.errors, :status => :unprocessable_entity }
+        format.xml  { render :xml => @event_import_file.errors, :status => :unprocessable_entity }
       end
     end
   end
 
   # DELETE /event_import_files/1
-  # DELETE /event_import_files/1.json
+  # DELETE /event_import_files/1.xml
   def destroy
     @event_import_file.destroy
 
     respond_to do |format|
-      format.html { redirect_to event_import_files_url }
-      format.json { head :no_content }
+      format.html { redirect_to(event_import_files_url) }
+      format.xml  { head :ok }
     end
   end
 end

data/app/controllers/event_import_results_controller.rb

@@ -1,5 +1,5 @@
 class EventImportResultsController < InheritedResources::Base
-  respond_to :html, :json, :csv
+  respond_to :html, :xml, :csv
   load_and_authorize_resource
   has_scope :file_id
   actions :index, :show, :destroy

data/app/controllers/events_controller.rb

@@ -9,7 +9,7 @@ class EventsController < ApplicationController
   after_filter :convert_charset, :only => :index
 
   # GET /events
-  # GET /events.json
+  # GET /events.xml
   def index
     @count = {}
     query = params[:query].to_s.strip
@@ -26,7 +26,7 @@ class EventsController < ApplicationController
       with(:library_id).equal_to library.id if library
       #with(:tag).equal_to tag
       if date
-        with(:start_at).less_than_or_equal_to Time.zone.parse(date)
+        with(:start_at).less_than Time.zone.parse(date)
         with(:end_at).greater_than Time.zone.parse(date)
       end
       case mode
@@ -45,7 +45,7 @@ class EventsController < ApplicationController
 
     respond_to do |format|
       format.html # index.html.erb
-      format.json { render :json => @events }
+      format.xml  { render :xml => @events }
       format.rss  { render :layout => false }
       format.csv
       format.atom
@@ -54,18 +54,18 @@ class EventsController < ApplicationController
   end
 
   # GET /events/1
-  # GET /events/1.json
+  # GET /events/1.xml
   def show
     @event = Event.find(params[:id])
 
     respond_to do |format|
       format.html # show.html.erb
-      format.json { render :json => @event }
+      format.xml  { render :xml => @event }
     end
   end
 
   # GET /events/new
-  # GET /events/new.json
+  # GET /events/new.xml
   def new
      prepare_options
     if params[:date]
@@ -83,7 +83,7 @@ class EventsController < ApplicationController
 
     respond_to do |format|
       format.html # new.html.erb
-      format.json { render :json => @event }
+      format.xml  { render :xml => @event }
     end
   end
 
@@ -94,7 +94,7 @@ class EventsController < ApplicationController
   end
 
   # POST /events
-  # POST /events.json
+  # POST /events.xml
   def create
     @event = Event.new(params[:event])
     @event.set_date
@@ -103,17 +103,17 @@ class EventsController < ApplicationController
       if @event.save
         flash[:notice] = t('controller.successfully_created', :model => t('activerecord.models.event'))
         format.html { redirect_to(@event) }
-        format.json { render :json => @event, :status => :created, :location => @event }
+        format.xml  { render :xml => @event, :status => :created, :location => @event }
       else
         prepare_options
         format.html { render :action => "new" }
-        format.json { render :json => @event.errors, :status => :unprocessable_entity }
+        format.xml  { render :xml => @event.errors, :status => :unprocessable_entity }
       end
     end
   end
 
   # PUT /events/1
-  # PUT /events/1.json
+  # PUT /events/1.xml
   def update
     @event = Event.find(params[:id])
     @event.set_date
@@ -123,24 +123,24 @@ class EventsController < ApplicationController
 
         flash[:notice] = t('controller.successfully_updated', :model => t('activerecord.models.event'))
         format.html { redirect_to(@event) }
-        format.json { head :no_content }
+        format.xml  { head :ok }
       else
         prepare_options
         format.html { render :action => "edit" }
-        format.json { render :json => @event.errors, :status => :unprocessable_entity }
+        format.xml  { render :xml => @event.errors, :status => :unprocessable_entity }
       end
     end
   end
 
   # DELETE /events/1
-  # DELETE /events/1.json
+  # DELETE /events/1.xml
   def destroy
     @event = Event.find(params[:id])
     @event.destroy
 
     respond_to do |format|
-      format.html { redirect_to events_url }
-      format.json { head :no_content }
+      format.html { redirect_to(events_url) }
+      format.xml  { head :ok }
     end
   end
 

data/app/controllers/participates_controller.rb

@@ -60,7 +60,7 @@ class ParticipatesController < ApplicationController
       if @participate.update_attributes(params[:participate])
         flash[:notice] = 'Participate was successfully updated.'
         format.html { redirect_to(@participate) }
-        format.json { head :no_content }
+        format.json { head :ok }
       else
         format.html { render :action => "edit" }
         format.json { render :json => @participate.errors, :status => :unprocessable_entity }
@@ -74,8 +74,8 @@ class ParticipatesController < ApplicationController
     @participate.destroy
 
     respond_to do |format|
-      format.html { redirect_to participates_url }
-      format.json { head :no_content }
+      format.html { redirect_to(participates_url) }
+      format.json { head :ok }
     end
   end
 end

data/app/models/event.rb

@@ -1,8 +1,5 @@
 # -*- encoding: utf-8 -*-
 class Event < ActiveRecord::Base
-  attr_accessible :library_id, :event_category_id, :name, :note, :start_at,
-    :end_at, :all_day, :display_name
-
   scope :closing_days, includes(:event_category).where('event_categories.name = ?', 'closed')
   scope :on, lambda {|datetime| where('start_at >= ? AND start_at < ?', datetime.beginning_of_day, datetime.tomorrow.beginning_of_day + 1)}
   scope :past, lambda {|datetime| where('end_at <= ?', Time.zone.parse(datetime).beginning_of_day)}
@@ -11,6 +8,7 @@ class Event < ActiveRecord::Base
 
   belongs_to :event_category, :validate => true
   belongs_to :library, :validate => true
+  has_many :attachment_files, :as => :attachable
   has_many :picture_files, :as => :picture_attachable
   has_many :participates, :dependent => :destroy
   has_many :patrons, :through => :participates
@@ -49,7 +47,7 @@ class Event < ActiveRecord::Base
   end
 
   def set_all_day
-    if all_day
+    if self.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_category.rb

@@ -1,5 +1,4 @@
 class EventCategory < ActiveRecord::Base
-  attr_accessible :name, :display_name, :note
   include MasterModel
   default_scope :order => "position"
   has_many :events

data/app/models/event_import_file.rb

@@ -1,7 +1,6 @@
 class EventImportFile < ActiveRecord::Base
-  attr_accessible :event_import, :edit_mode
   include ImportFile
-  default_scope :order => 'event_import_files.id DESC'
+  default_scope :order => 'id DESC'
   scope :not_imported, where(:state => 'pending')
   scope :stucked, where('created_at < ? AND state = ?', 1.hour.ago, 'pending')
 
@@ -29,26 +28,15 @@ 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'
       import
     when 'update'
-      modify
     when 'destroy'
-      remove
     else
       import
     end
@@ -57,103 +45,55 @@ class EventImportFile < ActiveRecord::Base
   def import
     self.reload
     num = {:imported => 0, :failed => 0}
-    rows = open_import_file
-    check_field(rows.first)
-    row_num = 2
+    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
     rows.each do |row|
       next if row['dummy'].to_s.strip.present?
-      event_import_result = EventImportResult.new
-      event_import_result.assign_attributes({:event_import_file_id => self.id, :body => row.fields.join("\t")}, :as => :admin)
-      event_import_result.save!
+      import_result = EventImportResult.create!(:event_import_file => self, :body => row.fields.join("\t"))
 
       event = Event.new
-      event.name = row['name'].to_s.strip
+      event.name = row['name']
       event.note = row['note']
       event.start_at = row['start_at']
       event.end_at = row['end_at']
       category = row['category'].to_s.strip
-      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
+      event.all_day = true
+      library = Library.where(:name => row['library_short_name']).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
 
-      if event.save!
-        event_import_result.event = event
-        num[:imported] += 1
-        if row_num % 50 == 0
-          Sunspot.commit
-          GC.start
+      begin
+        if event.save!
+          import_result.event = event
+          num[:imported] += 1
+          if record % 50 == 0
+            Sunspot.commit
+            GC.start
+          end
         end
+      rescue
+        Rails.logger.info("event import failed: column #{record}")
+        num[:failed] += 1
       end
-      event_import_result.save!
-      row_num += 1
+      import_result.save!
+      record += 1
     end
+    self.update_attribute(:imported_at, Time.zone.now)
     Sunspot.commit
     rows.close
     sm_complete!
     return num
-  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?
-      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!
-      row_num += 1
-    end
-    sm_complete!
-  rescue => e
-    self.error_message = "line #{row_num}: #{e.message}"
-    sm_fail!
-    raise e
-  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?
-      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
@@ -188,22 +128,11 @@ class EventImportFile < ActiveRecord::Base
       header = file.first
       rows = FasterCSV.open(tempfile.path, :headers => header, :col_sep => "\t")
     end
-    event_import_result = EventImportResult.new
-    event_import_result.assign_attributes({:event_import_file_id => self.id, :body => header.join("\t")}, :as => :admin)
-    event_import_result.save!
+    EventImportResult.create!(:event_import_file => self, :body => header.join("\t"))
     tempfile.close(true)
     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
@@ -216,17 +145,15 @@ end
 #  size                      :integer
 #  user_id                   :integer
 #  note                      :text
-#  executed_at               :datetime
+#  imported_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
 #