enju_event 0.3.2 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe8972f33249e3c93091453371867af2aaad982ff8e5556f98965b3986bdba47
-  data.tar.gz: 384fd3ed3fbcfc45c2e42547688376feb12b45971175261f8efd7cb68339ea88
+  metadata.gz: 27b0c9dc4dc6da8c3186d98a1f4c6c99b9f95e4305f8c96b50297a5e692e3d86
+  data.tar.gz: c5298009340080f52bce7d1f9a698cf10b5772071b8ca4348b9129c348127a1b
 SHA512:
-  metadata.gz: 4989defc134bdfb65c0a72f29b7a46811beda71d73eb630515eaa5932dcbcd9dbb7e72324dc814f221bddde485dbc5e688af278b37dc89eb4510e0f03bb552ed
-  data.tar.gz: 2604ba288359404444ac06c3be9c18c6b3067d666f14ec42ecb67f78d9406ff1d3d0c4ff10ecfa54152e3b3e176e898b2add1a8be2a0c8b3ff1a840756f2bcdd
+  metadata.gz: 63640ab077e20f166c74c854980d1e7763d9c985a725a2d5e1cedf10030808e14d4ce7c36d19f34224cae9e4e84e556f06c89eedd8637ad5f812a2592dc4c00f
+  data.tar.gz: f171242671fd67136c9a5e1fe83fb36cfc0a03a40c8b704ad45f4de63145f5ea84e1406087b230c4799d86038f42879cd723e7cc5ddcc40d1980bf31e73620da

data/README.md

@@ -0,0 +1,11 @@
+# EnjuEvent
+[![Travis CI](https://travis-ci.com/next-l/enju_event.svg?branch=1.3)](https://travis-ci.com/next-l/enju_event)
+[![Coverage Status](https://coveralls.io/repos/github/next-l/enju_event/badge.svg?branch=1.3)](https://coveralls.io/github/next-l/enju_event?branch=1.3)
+[![security](https://hakiri.io/github/next-l/enju_event/1.3.svg)](https://hakiri.io/github/next-l/enju_event/1.3)
+
+This project rocks and uses MIT-LICENSE.
+
+## 製作者・貢献者 (Authors and contributors)
+* [TANABE, Kosuke](https://github.com/nabeta) ([@nabeta](https://twitter.com/nabeta))
+* [Project Next-L](https://www.next-l.jp) ([@ProjectNextL](https://twitter.com/ProjectNextL))
+

data/app/controllers/concerns/enju_event/enju_libraries_controller.rb

@@ -0,0 +1,17 @@
+module EnjuEvent
+  module EnjuLibrariesController
+    extend ActiveSupport::Concern
+
+    def show
+      search = Sunspot.new_search(Event)
+      library_id = @library.id
+      search.build do
+        with(:library_id).equal_to library_id
+        order_by(:start_at, :desc)
+      end
+      page = params[:event_page] || 1
+      search.query.paginate(page.to_i, Event.default_per_page)
+      @events = search.execute!.results
+    end
+  end
+end

data/app/controllers/event_categories_controller.rb

@@ -62,7 +62,7 @@ class EventCategoriesController < ApplicationController
     end
 
     respond_to do |format|
-      if @event_category.update_attributes(event_category_params)
+      if @event_category.update(event_category_params)
         format.html { redirect_to @event_category, notice:  t('controller.successfully_updated', model:  t('activerecord.models.event_category')) }
         format.json { head :no_content }
       else

data/app/controllers/event_export_files_controller.rb

@@ -76,7 +76,7 @@ class EventExportFilesController < ApplicationController
   # PUT /event_export_files/1.json
   def update
     respond_to do |format|
-      if @event_export_file.update_attributes(event_export_file_params)
+      if @event_export_file.update(event_export_file_params)
         if @event_export_file.mode == 'export'
           EventExportFileJob.perform_later(@event_export_file)
         end

data/app/controllers/event_import_files_controller.rb

@@ -6,7 +6,7 @@ class EventImportFilesController < ApplicationController
   # GET /event_import_files
   # GET /event_import_files.json
   def index
-    @event_import_files = EventImportFile.page(params[:page])
+    @event_import_files = EventImportFile.order(created_at: :desc).page(params[:page])
 
     respond_to do |format|
       format.html # index.html.erb
@@ -22,6 +22,7 @@ class EventImportFilesController < ApplicationController
         file = @event_import_file.event_import.path
       end
     end
+    @event_import_results = @event_import_file.event_import_results.page(params[:page])
 
     respond_to do |format|
       format.html # show.html.erb
@@ -78,7 +79,7 @@ class EventImportFilesController < ApplicationController
   # PUT /event_import_files/1.json
   def update
     respond_to do |format|
-      if @event_import_file.update_attributes(event_import_file_params)
+      if @event_import_file.update(event_import_file_params)
         if @event_import_file.mode == 'import'
           EventImportFileJob.perform_later(@event_import_file)
         end

data/app/controllers/event_import_results_controller.rb

@@ -5,17 +5,17 @@ class EventImportResultsController < ApplicationController
   # GET /event_import_results
   # GET /event_import_results.json
   def index
-    @event_import_file = EventImportFile.where(id: params[:event_import_file_id]).first
+    @event_import_file = EventImportFile.find_by(id: params[:event_import_file_id])
     if @event_import_file
-      @event_import_results = @event_import_file.event_import_results.page(params[:page])
+      @event_import_results = @event_import_file.event_import_results.order(created_at: :asc).page(params[:page])
     else
-      @event_import_results = EventImportResult.page(params[:page])
+      @event_import_results = EventImportResult.order(created_at: :desc).page(params[:page])
     end
 
     respond_to do |format|
       format.html # index.html.erb
       format.json { render json: @event_import_results }
-      format.txt
+      format.text
     end
   end
 

data/app/controllers/events_controller.rb

@@ -52,7 +52,7 @@ class EventsController < ApplicationController
       format.html.phone
       format.json
       format.rss  { render layout: false }
-      format.txt
+      format.text
       format.atom
       format.ics
     end
@@ -125,7 +125,7 @@ class EventsController < ApplicationController
     @event.set_date
 
     respond_to do |format|
-      if @event.update_attributes(event_params)
+      if @event.update(event_params)
 
         flash[:notice] = t('controller.successfully_updated', model: t('activerecord.models.event'))
         format.html { redirect_to(@event) }
@@ -169,4 +169,10 @@ class EventsController < ApplicationController
   def prepare_options
     @event_categories = EventCategory.all
   end
+
+  def filtered_params
+    params.permit([:format, :library_id, :mode, :query, :page, :per_page])
+  end
+
+  helper_method :filtered_params
 end

data/app/controllers/participates_controller.rb

@@ -58,7 +58,7 @@ class ParticipatesController < ApplicationController
   # PUT /participates/1.json
   def update
     respond_to do |format|
-      if @participate.update_attributes(participate_params)
+      if @participate.update(participate_params)
         flash[:notice] = 'Participate was successfully updated.'
         format.html { redirect_to(@participate) }
         format.json { head :no_content }

data/app/controllers/places_controller.rb

@@ -50,7 +50,7 @@ class PlacesController < ApplicationController
     # Use callbacks to share common setup or constraints between actions.
   def set_place
     @place = Place.find(params[:id])
-    autorize @place
+    authorize @place
   end
 
   def check_policy

data/app/jobs/event_export_file_job.rb

@@ -1,4 +1,4 @@
-class EventExportFileJob < ActiveJob::Base
+class EventExportFileJob < ApplicationJob
   queue_as :enju_leaf
 
   def perform(event_export_file)

data/app/jobs/event_import_file_job.rb

@@ -1,4 +1,4 @@
-class EventImportFileJob < ActiveJob::Base
+class EventImportFileJob < ApplicationJob
   queue_as :enju_leaf
 
   def perform(event_import_file)

data/app/mailers/event_export_mailer.rb

@@ -0,0 +1,17 @@
+class EventExportMailer < ApplicationMailer
+  def completed(event_export_file)
+    @event_export_file = event_export_file
+    @library_group = LibraryGroup.site_config
+    from = "#{LibraryGroup.system_name(event_export_file.user.profile.locale)} <#{@library_group.user.email}>"
+    subject = "#{I18n.t('event_export_mailer.completed.subject')}: #{@event_export_file.id}"
+    mail(from: from, to: event_export_file.user.email, subject: subject)
+  end
+
+  def failed(event_export_file)
+    @event_export_file = event_export_file
+    @library_group = LibraryGroup.site_config
+    from = "#{LibraryGroup.system_name(event_export_file.user.profile.locale)} <#{@library_group.user.email}>"
+    subject = "#{I18n.t('event_export_mailer.failed.subject')}: #{@event_export_file.id}"
+    mail(from: from, to: event_export_file.user.email, subject: subject)
+  end
+end

data/app/mailers/event_import_mailer.rb

@@ -0,0 +1,17 @@
+class EventImportMailer < ApplicationMailer
+  def completed(event_import_file)
+    @event_import_file = event_import_file
+    @library_group = LibraryGroup.site_config
+    from = "#{LibraryGroup.system_name(event_import_file.user.profile.locale)} <#{@library_group.user.email}>"
+    subject = "#{I18n.t('event_import_mailer.completed.subject')}: #{@event_import_file.id}"
+    mail(from: from, to: event_import_file.user.email, subject: subject)
+  end
+
+  def failed(event_import_file)
+    @event_import_file = event_import_file
+    @library_group = LibraryGroup.site_config
+    from = "#{LibraryGroup.system_name(event_import_file.user.profile.locale)} <#{@library_group.user.email}>"
+    subject = "#{I18n.t('event_import_mailer.failed.subject')}: #{@event_import_file.id}"
+    mail(from: from, to: event_import_file.user.email, subject: subject)
+  end
+end

data/app/models/concerns/enju_event/enju_library.rb

@@ -0,0 +1,15 @@
+module EnjuEvent
+  module EnjuLibrary
+    extend ActiveSupport::Concern
+
+    included do
+      has_many :events
+    end
+
+    def closed?(date)
+      events.closing_days.map{ |c|
+        c.start_at.beginning_of_day
+      }.include?(date.beginning_of_day)
+    end
+  end
+end

data/app/models/event.rb

@@ -1,4 +1,4 @@
-class Event < ActiveRecord::Base
+class Event < ApplicationRecord
   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)}
@@ -56,30 +56,43 @@ class Event < ActiveRecord::Base
     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
-    )
-    lines = []
-    Event.find_each.map{|e|
-      line = []
-      line << e.name
-      line << e.event_category.name
-      line << e.library.name
-      line << e.start_at
-      line << e.end_at
-      line << e.all_day
-      lines << line
+  # CSVのヘッダ
+  # @param [String] role 権限
+  def self.csv_header(role: 'Guest')
+    Event.new.to_hash(role: role).keys
+  end
+
+  # CSV出力用のハッシュ
+  # @param [String] role 権限
+  def to_hash(role: 'Guest')
+    record = {
+      name: name,
+      display_name: display_name,
+      event_category: event_category.try(:name),
+      library: library.try(:name),
+      start_at: start_at,
+      end_at: end_at,
+      all_day: all_day,
+      note: note,
+      created_at: created_at,
+      updated_at: updated_at
     }
-    if options[:format] == :txt
-      lines.map{|line| line.to_csv(col_sep: "\t")}.unshift(header.to_csv(col_sep: "\t")).join
-    else
-      event
+
+    record
+  end
+
+  # TSVでのエクスポート
+  # @param [String] role 権限
+  # @param [String] col_sep 区切り文字
+  def self.export(role: 'Guest', col_sep: "\t")
+    file = Tempfile.create('event_export') do |f|
+      f.write Event.csv_header(role: role).to_csv(col_sep: col_sep)
+      Event.find_each do |event|
+        f.write event.to_hash(role: role).values.to_csv(col_sep: col_sep)
+      end
+
+      f.rewind
+      f.read
     end
   end
 end

data/app/models/event_category.rb

@@ -1,4 +1,4 @@
-class EventCategory < ActiveRecord::Base
+class EventCategory < ApplicationRecord
   include MasterModel
   default_scope { order('position') }
   has_many :events

data/app/models/event_export_file.rb

@@ -1,4 +1,4 @@
-class EventExportFile < ActiveRecord::Base
+class EventExportFile < ApplicationRecord
   include Statesman::Adapters::ActiveRecordQueries
   include ExportFile
 
@@ -26,18 +26,23 @@ class EventExportFile < ActiveRecord::Base
     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
+    role_name = user.try(:role).try(:name)
+    tsv = Event.export(role: role_name)
+
+    EventExportFile.transaction do
+      transition_to!(:started)
+      role_name = user.try(:role).try(:name)
+      self.event_export = StringIO.new(tsv)
+      self.event_export.instance_write(:filename, "event_export.txt")
+      save!
+      transition_to!(:completed)
     end
-    transition_to!(:completed)
+    mailer = EventExportMailer.completed(self)
+    send_message(mailer)
   rescue => e
     transition_to!(:failed)
+    mailer = EventExportMailer.failed(self)
+    send_message(mailer)
     raise e
   end
 

data/app/models/event_export_file_transition.rb

@@ -1,4 +1,4 @@
-class EventExportFileTransition < ActiveRecord::Base
+class EventExportFileTransition < ApplicationRecord
   include Statesman::Adapters::ActiveRecordTransition
 
 

data/app/models/event_import_file.rb

@@ -1,7 +1,6 @@
-class EventImportFile < ActiveRecord::Base
+class EventImportFile < ApplicationRecord
   include Statesman::Adapters::ActiveRecordQueries
   include ImportFile
-  default_scope {order('event_import_files.id DESC')}
   scope :not_imported, -> {in_state(:pending)}
   scope :stucked, -> {in_state(:pending).where('event_import_files.created_at < ?', 1.hour.ago)}
 
@@ -52,9 +51,7 @@ class EventImportFile < ActiveRecord::Base
     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") })
-      event_import_result.save!
+      event_import_result = EventImportResult.new(event_import_file_id: id, body: row.fields.join("\t"))
 
       event = Event.new
       event.name = row['name'].to_s.strip
@@ -68,10 +65,10 @@ class EventImportFile < ActiveRecord::Base
       else
         event.all_day = false
       end
-      library = Library.where(name: row['library']).first
+      library = Library.find_by(name: row['library'])
       library = default_library || Library.web if library.blank?
       event.library = library
-      event_category = EventCategory.where(name: row['event_category']).first
+      event_category = EventCategory.find_by(name: row['event_category'])
       event_category = default_event_category if event_category.blank?
       event.event_category = event_category
 
@@ -90,12 +87,15 @@ class EventImportFile < ActiveRecord::Base
     Sunspot.commit
     rows.close
     transition_to!(:completed)
-    send_message
+    mailer = EventImportMailer.completed(self)
+    send_message(mailer)
     num
   rescue => e
     self.error_message = "line #{row_num}: #{e.message}"
     save
     transition_to!(:failed)
+    mailer = EventImportMailer.failed(self)
+    send_message(mailer)
     raise e
   end
 
@@ -111,7 +111,7 @@ class EventImportFile < ActiveRecord::Base
       event = Event.find(row['id'].to_s.strip)
       event_category = EventCategory.where(name: row['event_category'].to_s.strip).first
       event.event_category = event_category if event_category
-      library = Library.where(name: row['library'].to_s.strip).first
+      library = Library.find_by(name: row['library'].to_s.strip)
       event.library = library if library
       event.name = row['name'] if row['name'].to_s.strip.present?
       event.start_at = Time.zone.parse(row['start_at']) if row['start_at'].present?
@@ -125,10 +125,14 @@ class EventImportFile < ActiveRecord::Base
       event.save!
     end
     transition_to!(:completed)
+    mailer = EventImportMailer.completed(self)
+    send_message(mailer)
   rescue => e
     self.error_message = "line #{row_num}: #{e.message}"
     save
     transition_to!(:failed)
+    mailer = EventImportMailer.failed(self)
+    send_message(mailer)
     raise e
   end
 
@@ -147,10 +151,14 @@ class EventImportFile < ActiveRecord::Base
       event.destroy
     end
     transition_to!(:completed)
+    mailer = EventImportMailer.completed(self)
+    send_message(mailer)
   rescue => e
     self.error_message = "line #{row_num}: #{e.message}"
     save
     transition_to!(:failed)
+    mailer = EventImportMailer.failed(self)
+    send_message(mailer)
     raise e
   end
 
@@ -173,9 +181,7 @@ class EventImportFile < ActiveRecord::Base
 
   def open_import_file(tempfile)
     file = CSV.open(tempfile, col_sep: "\t")
-    header_columns = %w(
-      id name display_name library event_category start_at end_at all_day note dummy
-    )
+    header_columns = EventImportResult.header
     header = file.first
     ignored_columns = header - header_columns
     unless ignored_columns.empty?

data/app/models/event_import_file_transition.rb

@@ -1,4 +1,4 @@
-class EventImportFileTransition < ActiveRecord::Base
+class EventImportFileTransition < ApplicationRecord
   include Statesman::Adapters::ActiveRecordTransition
 
 

data/app/models/event_import_result.rb

@@ -1,5 +1,4 @@
-class EventImportResult < ActiveRecord::Base
-  default_scope { order('event_import_results.id') }
+class EventImportResult < ApplicationRecord
   scope :file_id, proc{|file_id| where(event_import_file_id: file_id)}
   scope :failed, -> { where(event_id: nil) }
 
@@ -7,6 +6,12 @@ class EventImportResult < ActiveRecord::Base
   belongs_to :event, optional: true
 
   validates :event_import_file_id, presence: true
+
+  def self.header
+    %w(
+      id name display_name library event_category start_at end_at all_day note dummy
+    )
+  end
 end
 
 # == Schema Information

data/app/models/participate.rb

@@ -1,4 +1,4 @@
-class Participate < ActiveRecord::Base
+class Participate < ApplicationRecord
   belongs_to :agent
   belongs_to :event
 

data/app/models/place.rb

@@ -1,4 +1,4 @@
-class Place < ActiveRecord::Base
+class Place < ApplicationRecord
   has_many :events
   validates :term, presence: true
 end

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

@@ -3,7 +3,7 @@
 
   <div class="field">
     <%= f.label :name %><br />
-    <%= f.text_field :name %>
+    <%= f.text_field :name, required: true %>
   </div>
   <div class="field">
     <%= f.label :display_name %><br />

data/app/views/event_export_mailer/completed.en.text.erb

@@ -0,0 +1,9 @@
+The following export task is completed.
+
+ID: <%= @event_export_file.id %>
+Created at: <%= @event_export_file.created_at %>
+Detail: <%= event_export_file_url(@event_export_file) %>
+
+--  
+<%= @library_group.display_name %>
+<%= root_url %>

data/app/views/event_export_mailer/completed.ja.text.erb

@@ -0,0 +1,9 @@
+以下の資料のインポートが完了しました。
+
+ID: <%= @event_export_file.id %>
+作成時刻: <%= @event_export_file.created_at %>
+詳細: <%= event_export_file_url(@event_export_file) %>
+
+--  
+<%= @library_group.display_name %>
+<%= root_url %>

data/app/views/event_export_mailer/failed.en.text.erb

@@ -0,0 +1,9 @@
+The following export task failed.
+
+ID: <%= @event_export_file.id %>
+Created at: <%= @event_export_file.created_at %>
+Detail: <%= event_export_file_url(@event_export_file) %>
+
+--  
+<%= @library_group.display_name %>
+<%= root_url %>

data/app/views/event_export_mailer/failed.ja.text.erb

@@ -0,0 +1,9 @@
+以下の資料のインポートに失敗しました。
+
+ID: <%= @event_export_file.id %>
+作成時刻: <%= @event_export_file.created_at %>
+詳細: <%= event_export_file_url(@event_export_file) %>
+
+--  
+<%= @library_group.display_name %>
+<%= root_url %>

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

@@ -0,0 +1,26 @@
+<h2><%= t('activerecord.models.event_import_result') %></h2>
+<p>
+  <%= link_to((image_tag 'icons/page_white_excel.png', size: '16x16', class: 'enju_icon', alt: 'TSV'), event_import_results_path(event_import_file_id: @event_import_file.id, format: :txt, locale: @locale.to_s)) -%>
+  (<%= link_to 'TSV', event_import_results_path(event_import_file_id: @event_import_file.id, format: :txt, locale: @locale.to_s) -%>)
+</p>
+
+<table class="table table-striped index">
+  <tr>
+    <th><%= t('activerecord.attributes.event_import_result.lineno') %></th>
+    <th><%= t('activerecord.attributes.event_import_result.body') %></th>
+    <th><%= t('activerecord.models.event') %></th>
+    <th></th>
+  </tr>
+<% @event_import_results.each_with_index do |event_import_result, idx| %>
+  <tr class="line<%= cycle("0", "1") -%>">
+    <td><%= @event_import_results.offset_value + idx + 1 %></td>
+    <td><%= event_import_result.body.inspect %></td>
+    <td><%= link_to event_import_result.event.display_name, event_import_result.event if event_import_result.event %></td>
+    <td>
+      <%= link_to t('page.show'), event_import_result %>
+      <%= link_to t('page.destroy'), event_import_result, data: {confirm: t('page.are_you_sure')}, method: :delete %>
+    </td>
+  </tr>
+<% end %>
+</table>
+<%= paginate(@event_import_results) %>