enju_event 0.1.17.pre18 → 0.1.17.pre19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19d8e03ae2f152bb7bd62973d11643c6c9584142
-  data.tar.gz: d81b4c9c0736f99728e333b39403bc5b1b1d78ce
+  metadata.gz: 363a80afc5aa4dd9e672f1a6f5e3b892787688e9
+  data.tar.gz: 12ee593d3824d87cd5b8740e0d9dc55e39cc3230
 SHA512:
-  metadata.gz: d8d99e42d2685c5f0d4b3efd2f867f1758cab20215203e5b567a9ff984177f1ca7b5e5010e2d0fb0dfa5352ac1f992672fc43ed11e790023cbfae8f343122981
-  data.tar.gz: f9a6a667c97accb06e93a3741425629457635aaec5f4faa7fb932a2ac23e767a82ef7c652e4d8ea683cde09a8ab1c9144c3a365a7cc561fe187a198cb05f3ba4
+  metadata.gz: 3da5de410c3b035d7a3b32b7078e5ed17a2c6818da98bc60f56df4bd6e94845c7fde1a835fa9010016b7b3c71bb6655bcd2dc74c7c93b9f35bcd8aaf62f031ac
+  data.tar.gz: c4496f7b6a4de8332a9b3e4336ea72feb9012c347a40693916b2f274eb57b83c2e21713714fd693cdd61727601ce5aa678b34a4e557753960e91dbd6dfdedb70

data/app/controllers/event_export_files_controller.rb

@@ -0,0 +1,100 @@
+class EventExportFilesController < ApplicationController
+  load_and_authorize_resource
+
+  # GET /event_export_files
+  # GET /event_export_files.json
+  def index
+    @event_export_files = EventExportFile.order('id DESC').page(params[:page])
+
+    respond_to do |format|
+      format.html # index.html.erb
+      format.json { render json: @event_export_files }
+    end
+  end
+
+  # GET /event_export_files/1
+  # GET /event_export_files/1.json
+  def show
+    if @event_export_file.event_export.path
+      unless Setting.uploaded_file.storage == :s3
+        file = @event_export_file.event_export.path
+      end
+    end
+
+    respond_to do |format|
+      format.html # show.html.erb
+      format.json { render json: @event_export_file }
+      format.download {
+        if Setting.uploaded_file.storage == :s3
+          redirect_to @event_export_file.event_export.expiring_url(10)
+        else
+          send_file file, filename: @event_export_file.event_export_file_name, type: 'application/octet-stream'
+        end
+      }
+    end
+  end
+
+  # GET /event_export_files/new
+  # GET /event_export_files/new.json
+  def new
+    @event_export_file = EventExportFile.new
+    @event_export_file.user = current_user
+
+    respond_to do |format|
+      format.html # new.html.erb
+      format.json { render json: @event_export_file }
+    end
+  end
+
+  # GET /event_export_files/1/edit
+  def edit
+  end
+
+  # POST /event_export_files
+  # POST /event_export_files.json
+  def create
+    @event_export_file = EventExportFile.new(params[:event_export_file])
+    @event_export_file.user = current_user
+
+    respond_to do |format|
+      if @event_export_file.save
+        if @event_export_file.mode == 'export'
+          Resque.enqueue(EventExportFileQueue, @event_export_file.id)
+        end
+        format.html { redirect_to @event_export_file, notice: t('export.successfully_created', model: t('activerecord.models.event_export_file')) }
+        format.json { render json: @event_export_file, status: :created, location: @event_export_file }
+      else
+        format.html { render action: "new" }
+        format.json { render json: @event_export_file.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # PUT /event_export_files/1
+  # PUT /event_export_files/1.json
+  def update
+    respond_to do |format|
+      if @event_export_file.update_attributes(params[:event_export_file])
+        if @event_export_file.mode == 'export'
+          EventExportFileQueue.perform(@event_export_file.id)
+        end
+        format.html { redirect_to @event_export_file, notice: t('controller.successfully_updated', model: t('activerecord.models.event_export_file')) }
+        format.json { head :no_content }
+      else
+        format.html { render action: "edit" }
+        format.json { render json: @event_export_file.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # DELETE /event_export_files/1
+  # DELETE /event_export_files/1.json
+  def destroy
+    @event_export_file.destroy
+
+    respond_to do |format|
+      format.html { redirect_to event_export_files_url }
+      format.json { head :no_content }
+    end
+  end
+end

data/app/controllers/event_import_files_controller.rb

@@ -1,5 +1,6 @@
 class EventImportFilesController < ApplicationController
   load_and_authorize_resource
+  before_filter :prepare_options, only: [:new, :edit]
 
   # GET /event_import_files
   # GET /event_import_files.json
@@ -8,7 +9,7 @@ class EventImportFilesController < ApplicationController
 
     respond_to do |format|
       format.html # index.html.erb
-      format.json { render :json => @event_import_files }
+      format.json { render json: @event_import_files }
     end
   end
 
@@ -23,12 +24,12 @@ class EventImportFilesController < ApplicationController
 
     respond_to do |format|
       format.html # show.html.erb
-      format.json { render :json => @event_import_file }
+      format.json { render json: @event_import_file }
       format.download {
         if Setting.uploaded_file.storage == :s3
           redirect_to @event_import_file.event_import.expiring_url(10)
         else
-          send_file file, :filename => @event_import_file.event_import_file_name, :type => 'application/octet-stream'
+          send_file file, filename: @event_import_file.event_import_file_name, type: 'application/octet-stream'
         end
       }
     end
@@ -38,10 +39,12 @@ class EventImportFilesController < ApplicationController
   # GET /event_import_files/new.json
   def new
     @event_import_file = EventImportFile.new
+    @event_import_file.default_library = current_user.profile.library
+    @event_import_file.default_event_category = EventCategory.order(:position).first
 
     respond_to do |format|
       format.html # new.html.erb
-      format.json { render :json => @event_import_file }
+      format.json { render json: @event_import_file }
     end
   end
 
@@ -60,12 +63,12 @@ class EventImportFilesController < ApplicationController
         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 }
+        format.html { redirect_to @event_import_file, notice: t('import.successfully_created', model: t('activerecord.models.event_import_file')) }
+        format.json { render json: @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 }
+        prepare_options
+        format.html { render action: "new" }
+        format.json { render json: @event_import_file.errors, status: :unprocessable_entity }
       end
     end
   end
@@ -78,11 +81,12 @@ class EventImportFilesController < ApplicationController
         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.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" }
-        format.json { render :json => @event_import_file.errors, :status => :unprocessable_entity }
+        prepare_options
+        format.html { render action: "edit" }
+        format.json { render json: @event_import_file.errors, status: :unprocessable_entity }
       end
     end
   end
@@ -97,4 +101,9 @@ class EventImportFilesController < ApplicationController
       format.json { head :no_content }
     end
   end
+
+  def prepare_options
+    @libraries = Library.all
+    @event_categories = EventCategory.all
+  end
 end

data/app/controllers/event_import_results_controller.rb

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

data/app/controllers/events_controller.rb

@@ -2,11 +2,11 @@
 class EventsController < ApplicationController
   load_and_authorize_resource
   before_filter :get_library, :get_agent
-  before_filter :get_libraries, :except => :destroy
+  before_filter :get_libraries, except: :destroy
   before_filter :prepare_options
-  before_filter :store_page, :only => :index
-  after_filter :solr_commit, :only => [:create, :update, :destroy]
-  after_filter :convert_charset, :only => :index
+  before_filter :store_page, only: :index
+  after_filter :solr_commit, only: [:create, :update, :destroy]
+  after_filter :convert_charset, only: :index
 
   # GET /events
   # GET /events.json
@@ -45,9 +45,9 @@ class EventsController < ApplicationController
 
     respond_to do |format|
       format.html # index.html.erb
-      format.json { render :json => @events }
-      format.rss  { render :layout => false }
-      format.csv
+      format.json { render json: @events }
+      format.rss  { render layout: false }
+      format.txt
       format.atom
       format.ics
     end
@@ -60,7 +60,7 @@ class EventsController < ApplicationController
 
     respond_to do |format|
       format.html # show.html.erb
-      format.json { render :json => @event }
+      format.json { render json: @event }
     end
   end
 
@@ -83,7 +83,7 @@ class EventsController < ApplicationController
 
     respond_to do |format|
       format.html # new.html.erb
-      format.json { render :json => @event }
+      format.json { render json: @event }
     end
   end
 
@@ -101,13 +101,13 @@ class EventsController < ApplicationController
 
     respond_to do |format|
       if @event.save
-        flash[:notice] = t('controller.successfully_created', :model => t('activerecord.models.event'))
+        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.json { render json: @event, status: :created, location: @event }
       else
         prepare_options
-        format.html { render :action => "new" }
-        format.json { render :json => @event.errors, :status => :unprocessable_entity }
+        format.html { render action: "new" }
+        format.json { render json: @event.errors, status: :unprocessable_entity }
       end
     end
   end
@@ -121,13 +121,13 @@ class EventsController < ApplicationController
     respond_to do |format|
       if @event.update_attributes(params[:event])
 
-        flash[:notice] = t('controller.successfully_updated', :model => t('activerecord.models.event'))
+        flash[:notice] = t('controller.successfully_updated', model: t('activerecord.models.event'))
         format.html { redirect_to(@event) }
         format.json { head :no_content }
       else
         prepare_options
-        format.html { render :action => "edit" }
-        format.json { render :json => @event.errors, :status => :unprocessable_entity }
+        format.html { render action: "edit" }
+        format.json { render json: @event.errors, status: :unprocessable_entity }
       end
     end
   end

data/app/controllers/participates_controller.rb

@@ -8,7 +8,7 @@ class ParticipatesController < ApplicationController
 
     respond_to do |format|
       format.html # index.html.erb
-      format.json { render :json => @participates }
+      format.json { render json: @participates }
     end
   end
 
@@ -17,7 +17,7 @@ class ParticipatesController < ApplicationController
   def show
     respond_to do |format|
       format.html # show.html.erb
-      format.json { render :json => @participate }
+      format.json { render json: @participate }
     end
   end
 
@@ -28,7 +28,7 @@ class ParticipatesController < ApplicationController
 
     respond_to do |format|
       format.html # new.html.erb
-      format.json { render :json => @participate }
+      format.json { render json: @participate }
     end
   end
 
@@ -45,10 +45,10 @@ class ParticipatesController < ApplicationController
       if @participate.save
         flash[:notice] = 'Participate was successfully created.'
         format.html { redirect_to(@participate) }
-        format.json { render :json => @participate, :status => :created, :location => @participate }
+        format.json { render json: @participate, status: :created, location: @participate }
       else
-        format.html { render :action => "new" }
-        format.json { render :json => @participate.errors, :status => :unprocessable_entity }
+        format.html { render action: "new" }
+        format.json { render json: @participate.errors, status: :unprocessable_entity }
       end
     end
   end
@@ -62,8 +62,8 @@ class ParticipatesController < ApplicationController
         format.html { redirect_to(@participate) }
         format.json { head :no_content }
       else
-        format.html { render :action => "edit" }
-        format.json { render :json => @participate.errors, :status => :unprocessable_entity }
+        format.html { render action: "edit" }
+        format.json { render json: @participate.errors, status: :unprocessable_entity }
       end
     end
   end

data/app/models/enju_event/ability.rb

@@ -12,6 +12,7 @@ module EnjuEvent
         can :manage, [
           Event,
           EventImportFile,
+          EventExportFile,
           Participate
         ]
         can :read, EventImportResult
@@ -19,6 +20,7 @@ module EnjuEvent
         can :manage, [
           Event,
           EventImportFile,
+          EventExportFile,
           Participate
         ]
         can :read, [

data/app/models/event.rb

@@ -9,11 +9,11 @@ class Event < ActiveRecord::Base
   scope :upcoming, lambda {|datetime| where('start_at >= ?', Time.zone.parse(datetime).beginning_of_day)}
   scope :at, lambda {|library| where(:library_id => library.id)}
 
-  belongs_to :event_category, :validate => true
-  belongs_to :library, :validate => true
-  has_many :picture_files, :as => :picture_attachable
-  has_many :participates, :dependent => :destroy
-  has_many :agents, :through => :participates
+  belongs_to :event_category, validate: true
+  belongs_to :library, validate: true
+  has_many :picture_files, as: :picture_attachable
+  has_many :participates, dependent: :destroy
+  has_many :agents, through: :participates
   has_one :event_import_result
 
   has_event_calendar
@@ -27,11 +27,11 @@ class Event < ActiveRecord::Base
     time :end_at
   end
 
-  validates_presence_of :name, :library, :event_category
+  validates_presence_of :name, :library, :event_category, :start_at, :end_at
   validates_associated :library, :event_category
   validate :check_date
   before_validation :set_date
-  before_validation :set_display_name, :on => :create
+  before_validation :set_display_name, on: :create
 
   paginates_per 10
 
@@ -42,12 +42,9 @@ class Event < ActiveRecord::Base
   end
 
   def set_all_day
-    return false unless start_at
-    self.start_at = start_at.beginning_of_day
-    if end_at
+    if start_at and end_at
+      self.start_at = start_at.beginning_of_day
       self.end_at = end_at.end_of_day
-    else
-      self.end_at = start_at.end_of_day
     end
   end
 
@@ -63,6 +60,31 @@ class Event < ActiveRecord::Base
   def set_display_name
     self.display_name = name if display_name.blank?
   end
+
+  def self.export(options = {format: :txt})
+    header = %w(
+      name
+      event_category
+      library
+      start_at
+      end_at
+      all_day
+    ).join("\t")
+    events = Event.all.map{|e|
+      lines = []
+      lines << e.name
+      lines << e.event_category.name
+      lines << e.library.name
+      lines << e.start_at
+      lines << e.end_at
+      lines << e.all_day
+    }
+    if options[:format] == :txt
+      events.map{|e| e.join("\t")}.unshift(header).join("\r\n")
+    else
+      event
+    end
+  end
 end
 
 # == Schema Information
@@ -70,8 +92,8 @@ end
 # Table name: events
 #
 #  id                :integer          not null, primary key
-#  library_id        :integer          default(1), not null
-#  event_category_id :integer          default(1), not null
+#  library_id        :integer          not null
+#  event_category_id :integer          not null
 #  name              :string(255)
 #  note              :text
 #  start_at          :datetime
@@ -82,4 +104,3 @@ end
 #  created_at        :datetime         not null
 #  updated_at        :datetime         not null
 #
-

data/app/models/event_category.rb

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

data/app/models/event_export_file.rb

@@ -0,0 +1,51 @@
+class EventExportFile < ActiveRecord::Base
+  include Statesman::Adapters::ActiveRecordModel
+  include ExportFile
+  enju_export_file_model
+  has_attached_file :event_export
+  validates_attachment_content_type :event_export, :content_type => /\Atext\/plain\Z/
+  has_many :event_export_file_transitions
+
+  def state_machine
+    EventExportFileStateMachine.new(self, transition_class: EventExportFileTransition)
+  end
+
+  delegate :can_transition_to?, :transition_to!, :transition_to, :current_state,
+    to: :state_machine
+
+  def export!
+    transition_to!(:started)
+    tempfile = Tempfile.new(['event_export_file_', '.txt'])
+    file = Event.export(format: :txt)
+    tempfile.puts(file)
+    tempfile.close
+    self.event_export = File.new(tempfile.path, "r")
+    if save
+      send_message
+    end
+    transition_to!(:completed)
+  rescue => e
+    transition_to!(:failed)
+    raise e
+  end
+
+  private
+  def self.transition_class
+    EventExportFileTransition
+  end
+end
+
+# == Schema Information
+#
+# Table name: event_export_files
+#
+#  id                        :integer          not null, primary key
+#  user_id                   :integer
+#  event_export_file_name    :string(255)
+#  event_export_content_type :string(255)
+#  event_export_file_size    :integer
+#  event_export_updated_at   :datetime
+#  executed_at               :datetime
+#  created_at                :datetime         not null
+#  updated_at                :datetime         not null
+#

data/app/models/event_export_file_state_machine.rb

@@ -0,0 +1,15 @@
+class EventExportFileStateMachine
+  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_export_file|
+    event_export_file.update_column(:executed_at, Time.zone.now)
+  end
+end

data/app/models/event_export_file_transition.rb

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