enju_event 0.1.17.pre17 → 0.1.17.pre18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2bb07ab59c8323bb442f799092633366e0ea90a8
-  data.tar.gz: 0f17afccd53715fc1b1d11acc0562fc956a43d2a
+  metadata.gz: 19d8e03ae2f152bb7bd62973d11643c6c9584142
+  data.tar.gz: d81b4c9c0736f99728e333b39403bc5b1b1d78ce
 SHA512:
-  metadata.gz: 3ffbaac20359166dffe3c975e39570ec97bc4f029dbaa2e04b470f3b33b72b0c258c80f7eb22c7109910ae553cf475c519b08175a05f9380cec99ffb3e864665
-  data.tar.gz: 114b5002a79ea5ab32e28ebaa67f0c9597976ccdcf27b0d8be092796377db9a0a7abded1b1bc43945f71ee148b178b3c45886d86efae34c944415281183a8df2
+  metadata.gz: d8d99e42d2685c5f0d4b3efd2f867f1758cab20215203e5b567a9ff984177f1ca7b5e5010e2d0fb0dfa5352ac1f992672fc43ed11e790023cbfae8f343122981
+  data.tar.gz: f9a6a667c97accb06e93a3741425629457635aaec5f4faa7fb932a2ac23e767a82ef7c652e4d8ea683cde09a8ab1c9144c3a365a7cc561fe187a198cb05f3ba4

data/app/controllers/event_import_files_controller.rb

@@ -57,6 +57,9 @@ class EventImportFilesController < ApplicationController
 
     respond_to do |format|
       if @event_import_file.save
+        if @event_import_file.mode == 'import'
+          Resque.enqueue(EventImportFileQueue, @event_import_file.id)
+        end
         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 }
@@ -72,8 +75,10 @@ class EventImportFilesController < ApplicationController
   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) }
+        if @event_import_file.mode == 'import'
+          Resque.enqueue(EventImportFileQueue, @event_import_file.id)
+        end
+        format.html { redirect_to @event_import_file, :notice => t('controller.successfully_updated', :model => t('activerecord.models.event_import_file')) }
         format.json { head :no_content }
       else
         format.html { render :action => "edit" }

data/app/controllers/event_import_results_controller.rb

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

data/app/models/event.rb

@@ -36,26 +36,24 @@ class Event < ActiveRecord::Base
   paginates_per 10
 
   def set_date
-    if self.start_at.blank?
-      self.start_at = Time.zone.today.beginning_of_day
-    end
-    if self.end_at.blank?
-      self.end_at = Time.zone.today.end_of_day
+    if all_day
+      set_all_day
     end
-
-    set_all_day
   end
 
   def set_all_day
-    if all_day
-      self.start_at = self.start_at.beginning_of_day
-      self.end_at = self.end_at.end_of_day
+    return false unless start_at
+    self.start_at = start_at.beginning_of_day
+    if end_at
+      self.end_at = end_at.end_of_day
+    else
+      self.end_at = start_at.end_of_day
     end
   end
 
   def check_date
-    if self.start_at and self.end_at
-      if self.start_at >= self.end_at
+    if start_at and end_at
+      if start_at >= end_at
         errors.add(:start_at)
         errors.add(:end_at)
       end
@@ -63,7 +61,7 @@ class Event < ActiveRecord::Base
   end
 
   def set_display_name
-    self.display_name = self.name if self.display_name.blank?
+    self.display_name = name if display_name.blank?
   end
 end
 

data/app/models/event_import_file.rb

@@ -1,12 +1,14 @@
 class EventImportFile < ActiveRecord::Base
-  attr_accessible :event_import, :edit_mode
+  include Statesman::Adapters::ActiveRecordModel
   include ImportFile
-  default_scope :order => 'event_import_files.id DESC'
-  scope :not_imported, where(:state => 'pending')
-  scope :stucked, where('created_at < ? AND state = ?', 1.hour.ago, 'pending')
+  attr_accessible :event_import, :edit_mode, :user_encoding, :mode
+  default_scope {order('event_import_files.id DESC')}
+  scope :not_imported, -> {in_state(:pending)}
+  scope :stucked, -> {in_state(:pending).where('created_at < ?', 1.hour.ago)}
 
   if Setting.uploaded_file.storage == :s3
-    has_attached_file :event_import, :storage => :s3, :s3_credentials => "#{Rails.root.to_s}/config/s3.yml",
+    has_attached_file :event_import, :storage => :s3,
+      :s3_credentials => "#{Setting.amazon}",
       :s3_permissions => :private
   else
     has_attached_file :event_import,
@@ -23,54 +25,30 @@ class EventImportFile < ActiveRecord::Base
   belongs_to :user, :validate => true
   has_many :event_import_results
 
-  state_machine :initial => :pending do
-    event :sm_start do
-      transition [:pending, :started] => :started
-    end
-
-    event :sm_complete do
-      transition :started => :completed
-    end
+  has_many :event_import_file_transitions
 
-    event :sm_fail do
-      transition :started => :failed
-    end
-
-    before_transition any => :started do |agent_import_file|
-      agent_import_file.executed_at = Time.zone.now
-    end
+  enju_import_file_model
+  attr_accessor :mode
 
-    before_transition any => :completed do |agent_import_file|
-      agent_import_file.error_message = nil
-    end
+  def state_machine
+    @state_machine ||= EventImportFileStateMachine.new(self, transition_class: EventImportFileTransition)
   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
-  end
+  delegate :can_transition_to?, :transition_to!, :transition_to, :current_state,
+    to: :state_machine
 
   def import
-    self.reload
+    transition_to!(:started)
     num = {:imported => 0, :failed => 0}
-    rows = open_import_file
+    rows = open_import_file(create_import_temp_file)
     check_field(rows.first)
-    row_num = 2
+    row_num = 1
 
     rows.each do |row|
+      row_num += 1
       next if row['dummy'].to_s.strip.present?
       event_import_result = EventImportResult.new
-      event_import_result.assign_attributes({:event_import_file_id => id, :body => row.fields.join("\t")}, :as => :admin)
+      event_import_result.assign_attributes({:event_import_file_id => id, :body => row.fields.join("\t")}, as: :admin)
       event_import_result.save!
 
       event = Event.new
@@ -90,34 +68,36 @@ class EventImportFile < ActiveRecord::Base
       event_category = EventCategory.where(:name => category).first || EventCategory.where(:name => 'unknown').first
       event.event_category = event_category
 
-      if event.save!
+      if event.save 
         event_import_result.event = event
         num[:imported] += 1
         if row_num % 50 == 0
           Sunspot.commit
           GC.start
         end
+      else
+        num[:failed] += 1
       end
       event_import_result.save!
-      row_num += 1
     end
-    rows.close
-    sm_complete!
     Sunspot.commit
-    num
+    rows.close
+    transition_to!(:completed)
+    return num
   rescue => e
     self.error_message = "line #{row_num}: #{e.message}"
-    sm_fail!
+    transition_to!(:failed)
     raise e
   end
 
   def modify
-    sm_start!
-    rows = open_import_file
+    transition_to!(:started)
+    rows = open_import_file(create_import_temp_file)
     check_field(rows.first)
-    row_num = 2
+    row_num = 1
 
     rows.each do |row|
+      row_num += 1
       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
@@ -134,31 +114,32 @@ class EventImportFile < ActiveRecord::Base
         event.all_day = true
       end
       event.save!
-      row_num += 1
     end
-    sm_complete!
+    transition_to!(:completed)
   rescue => e
     self.error_message = "line #{row_num}: #{e.message}"
-    sm_fail!
+    transition_to!(:failed)
     raise e
   end
 
   def remove
-    sm_start!
-    rows = open_import_file
+    transition_to!(:started)
+    rows = open_import_file(create_import_temp_file)
     rows.shift
-    row_num = 2
+    row_num = 1
 
     rows.each do |row|
+      row_num += 1
       next if row['dummy'].to_s.strip.present?
       event = Event.find(row['id'].to_s.strip)
+      event.picture_files.destroy_all # workaround
+      event.reload
       event.destroy
-      row_num += 1
     end
-    sm_complete!
+    transition_to!(:completed)
   rescue => e
     self.error_message = "line #{row_num}: #{e.message}"
-    sm_fail!
+    transition_to!(:failed)
     raise e
   end
 
@@ -171,8 +152,12 @@ class EventImportFile < ActiveRecord::Base
   end
 
   private
-  def open_import_file
-    tempfile = Tempfile.new('event_import_file')
+  def self.transition_class
+    EventImportFileTransition
+  end
+
+  def create_import_temp_file
+    tempfile = Tempfile.new(self.class.name.underscore)
     if Setting.uploaded_file.storage == :s3
       uploaded_file_path = event_import.expiring_url(10)
     else
@@ -180,25 +165,19 @@ class EventImportFile < ActiveRecord::Base
     end
     open(uploaded_file_path){|f|
       f.each{|line|
-        if defined?(CharlockHolmes::EncodingDetector)
-          begin
-            string = line.encode('UTF-8', CharlockHolmes::EncodingDetector.detect(line)[:encoding], universal_newline: true)
-          rescue StandardError
-            string = NKF.nkf('-w -Lu', line)
-          end
-        else
-          string = NKF.nkf('-w -Lu', line)
-        end
-        tempfile.puts(string)
+        tempfile.puts(convert_encoding(line))
       }
     }
     tempfile.close
+    tempfile
+  end
 
+  def open_import_file(tempfile)
     file = CSV.open(tempfile, :col_sep => "\t")
     header = file.first
     rows = CSV.open(tempfile, :headers => header, :col_sep => "\t")
     event_import_result = EventImportResult.new
-    event_import_result.assign_attributes({:event_import_file_id => id, :body => header.join("\t")}, :as => :admin)
+    event_import_result.assign_attributes({:event_import_file_id => id, :body => header.join("\t")}, as: :admin)
     event_import_result.save!
     tempfile.close(true)
     file.close
@@ -226,7 +205,6 @@ end
 #  user_id                   :integer
 #  note                      :text
 #  executed_at               :datetime
-#  state                     :string(255)
 #  event_import_file_name    :string(255)
 #  event_import_content_type :string(255)
 #  event_import_file_size    :integer
@@ -236,5 +214,6 @@ end
 #  updated_at                :datetime         not null
 #  event_import_fingerprint  :string(255)
 #  error_message             :text
+#  user_encoding             :string(255)
 #
 

data/app/models/event_import_file_state_machine.rb

@@ -0,0 +1,19 @@
+class EventImportFileStateMachine
+  include Statesman::Machine
+
+  state :pending, initial: true
+  state :started
+  state :completed
+  state :failed
+
+  transition from: :pending, to: :started
+  transition from: :started, to: [:completed, :failed]
+
+  after_transition(from: :pending, to: :started) do |event_import_file|
+    event_import_file.update_column(:executed_at, Time.zone.now)
+  end
+
+  before_transition(from: :started, to: :completed) do |event_import_file|
+    event_import_file.error_message = nil
+  end
+end

data/app/models/event_import_file_transition.rb

@@ -0,0 +1,20 @@
+class EventImportFileTransition < ActiveRecord::Base
+  include Statesman::Adapters::ActiveRecordTransition
+
+  
+  belongs_to :event_import_file, inverse_of: :event_import_file_transitions
+  attr_accessible :to_state, :sort_key, :metadata
+end
+
+# == Schema Information
+#
+# Table name: event_import_file_transitions
+#
+#  id                   :integer          not null, primary key
+#  to_state             :string(255)
+#  metadata             :text             default("{}")
+#  sort_key             :integer
+#  event_import_file_id :integer
+#  created_at           :datetime         not null
+#  updated_at           :datetime         not null
+#

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

@@ -1,4 +1,4 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
   <%- if @library -%>
     <h1 class="title">
       <%= t('calendar.library_calendar', :library_name => @library.display_name.localize) -%>
@@ -34,7 +34,7 @@
   </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.listing', :model => t('activerecord.models.event')), events_path -%></li>
     <li><%= link_to t('page.show_all'), :controller => :calendar, :action => :index -%></li>

data/app/views/event_categories/edit.html.erb

@@ -1,11 +1,11 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.editing', :model => t('activerecord.models.event_category')) -%></h1>
 <div id="content_list">
   <%= render 'form' %>
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.show'), @event_category -%></li>
     <li><%= link_to t('page.back'), event_categories_path -%></li>

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

@@ -1,4 +1,4 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.listing', :model => t('activerecord.models.event_category')) -%></h1>
 <div id="content_list">
 
@@ -37,7 +37,7 @@
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <%- if can? :create, EventCategory -%>
       <li><%= link_to t('page.new', :model => t('activerecord.models.event_category')), new_event_category_path -%></li>

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

@@ -1,11 +1,11 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.new', :model => t('activerecord.models.event_category')) -%></h1>
 <div id="content_list">
   <%= render 'form' %>
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.back'), event_categories_path -%></li>
   </ul>

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

@@ -1,4 +1,4 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.showing', :model => t('activerecord.models.event_category')) -%></h1>
 <div id="content_list">
 <p id="notice"><%= notice %></p>
@@ -21,7 +21,7 @@
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.edit'), edit_event_category_path(@event_category) -%></li>
     <li><%= back_to_index(flash[:page_info]) -%></li>

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

@@ -1,4 +1,4 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.editing', :model => t('activerecord.models.event_import_file')) -%></h1>
 <div id="content_list">
 
@@ -17,7 +17,7 @@
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.show'), @event_import_file -%></li>
     <li><%= link_to t('page.back'), event_import_files_path -%></li>