enju_event 0.4.0.beta.2 → 0.4.0.rc.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7dab754e58bfe446f10747db5d3e6dc553858be52cdf109123c863cb08b0887f
-  data.tar.gz: 1b2e9c0802e5029a7fe253938f3f5dd5e3e5cef55a9794debbce59e4725af077
+  metadata.gz: c73e5859f954cac026005df9deb9c4951faa9134465b72b55d460cb0b2748a88
+  data.tar.gz: b2321ebfa68b1897f17c89579870efabc4d659ff2976efe2073d33c92a6a9fb3
 SHA512:
-  metadata.gz: 7a6fd6c0aceaa9531a978f20d1803eedede8c5a5fbf9e3498e8adeb53a5fd701c9cede6a273642043ac7df0269b1b48c6ebd5ceeb0d41b53d8ccebc329304d69
-  data.tar.gz: 745c0d398255348680cd2a6c130daa97dca46507c873ef41c433d58165eb6ec8ae040a215e8804a153b2cbc5b692db3f223a1032b2cbc472cfe25ffb3296a59d
+  metadata.gz: c1e7f29228f1ebf46ddc525160b1f597b028a7e8a85e26782ca9fbf4d2ec508c56c06790e643c3535cdc8e206572a0c193afe1caa56c30d816219c0b577b911c
+  data.tar.gz: dc5d9a25867028eea5984f78fd3c161a83aa6bb6729650665b6dd45064cf9223be6aea8f30677b70c9e5dac7009f7595697f6ad0fd6e233a83db70074bb49a79

data/README.md

@@ -1,5 +1,5 @@
 # EnjuEvent
-![](https://github.com/next-l/enju_event/workflows/Ruby/badge.svg?branch=2.x)
+[![CircleCI](https://circleci.com/gh/next-l/enju_event/tree/2.x.svg?style=svg)](https://circleci.com/gh/next-l/enju_event/tree/2.x)
 [![Coverage Status](https://coveralls.io/repos/github/next-l/enju_event/badge.svg?branch=master)](https://coveralls.io/github/next-l/enju_event?branch=master)
 
 This project rocks and uses MIT-LICENSE.

data/app/controllers/event_import_files_controller.rb

@@ -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

data/app/controllers/event_import_results_controller.rb

@@ -7,9 +7,9 @@ class EventImportResultsController < ApplicationController
   def index
     @event_import_file = EventImportFile.where(id: params[:event_import_file_id]).first
     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: :desc).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|

data/app/mailers/event_export_mailer.rb

@@ -2,7 +2,7 @@ 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}>"
+    from = "#{LibraryGroup.system_name(event_export_file.user.profile.locale)} <#{@library_group.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
@@ -10,7 +10,7 @@ class EventExportMailer < ApplicationMailer
   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}>"
+    from = "#{LibraryGroup.system_name(event_export_file.user.profile.locale)} <#{@library_group.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

data/app/mailers/event_import_mailer.rb

@@ -2,7 +2,7 @@ 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}>"
+    from = "#{LibraryGroup.system_name(event_import_file.user.profile.locale)} <#{@library_group.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
@@ -10,7 +10,7 @@ class EventImportMailer < ApplicationMailer
   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}>"
+    from = "#{LibraryGroup.system_name(event_import_file.user.profile.locale)} <#{@library_group.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

data/app/models/event.rb

@@ -29,6 +29,7 @@ class Event < ApplicationRecord
   before_validation :set_display_name, on: :create
 
   paginates_per 10
+  translates :display_name
 
   def set_date
     if all_day
@@ -56,30 +57,48 @@ class Event < ApplicationRecord
     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,
+      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
+
+    I18n.available_locales.each do |locale|
+      record.merge!(
+        :"display_name_#{locale}" => send(:"display_name_#{locale}")
+      )
+    end
+
+    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
@@ -88,18 +107,17 @@ end
 #
 # Table name: events
 #
-#  id                        :integer          not null, primary key
-#  library_id                :integer          not null
-#  event_category_id         :integer          not null
+#  id                        :bigint           not null, primary key
+#  library_id                :bigint           not null
+#  event_category_id         :bigint           not null
 #  name                      :string
 #  note                      :text
 #  start_at                  :datetime
 #  end_at                    :datetime
 #  all_day                   :boolean          default(FALSE), not null
-#  deleted_at                :datetime
 #  display_name              :text
-#  created_at                :datetime
-#  updated_at                :datetime
-#  place_id                  :integer
+#  created_at                :datetime         not null
+#  updated_at                :datetime         not null
+#  place_id                  :bigint
 #  display_name_translations :jsonb            not null
 #

data/app/models/event_category.rb

@@ -11,12 +11,12 @@ end
 #
 # Table name: event_categories
 #
-#  id                        :integer          not null, primary key
+#  id                        :bigint           not null, primary key
 #  name                      :string           not null
 #  display_name              :text
 #  note                      :text
 #  position                  :integer
-#  created_at                :datetime
-#  updated_at                :datetime
+#  created_at                :datetime         not null
+#  updated_at                :datetime         not null
 #  display_name_translations :jsonb            not null
 #

data/app/models/event_export_file.rb

@@ -29,14 +29,17 @@ class EventExportFile < ApplicationRecord
     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")
-    save!
-    transition_to!(:completed)
+    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
     mailer = EventExportMailer.completed(self)
     send_message(mailer)
   rescue => e
@@ -45,28 +48,19 @@ class EventExportFile < ApplicationRecord
     send_message(mailer)
     raise e
   end
-
-  private
-  def self.transition_class
-    EventExportFileTransition
-  end
-
-  def self.initial_state
-    :pending
-  end
 end
 
 # == Schema Information
 #
 # Table name: event_export_files
 #
-#  id                        :integer          not null, primary key
-#  user_id                   :integer
+#  id                        :bigint           not null, primary key
+#  user_id                   :bigint
 #  event_export_file_name    :string
 #  event_export_content_type :string
 #  event_export_file_size    :bigint
 #  event_export_updated_at   :datetime
 #  executed_at               :datetime
-#  created_at                :datetime
-#  updated_at                :datetime
+#  created_at                :datetime         not null
+#  updated_at                :datetime         not null
 #

data/app/models/event_export_file_transition.rb

@@ -9,12 +9,12 @@ end
 #
 # Table name: event_export_file_transitions
 #
-#  id                   :integer          not null, primary key
+#  id                   :bigint           not null, primary key
 #  to_state             :string
 #  metadata             :text             default({})
 #  sort_key             :integer
 #  event_export_file_id :integer
-#  created_at           :datetime
-#  updated_at           :datetime
+#  created_at           :datetime         not null
+#  updated_at           :datetime         not null
 #  most_recent          :boolean          not null
 #

data/app/models/event_import_file.rb

@@ -176,13 +176,6 @@ class EventImportFile < ApplicationRecord
   end
 
   private
-  def self.transition_class
-    EventImportFileTransition
-  end
-
-  def self.initial_state
-    :pending
-  end
 
   def open_import_file(tempfile)
     file = CSV.open(tempfile, col_sep: "\t")
@@ -218,11 +211,11 @@ end
 #
 # Table name: event_import_files
 #
-#  id                        :integer          not null, primary key
-#  parent_id                 :integer
+#  id                        :bigint           not null, primary key
+#  parent_id                 :bigint
 #  content_type              :string
 #  size                      :integer
-#  user_id                   :integer
+#  user_id                   :bigint
 #  note                      :text
 #  executed_at               :datetime
 #  event_import_file_name    :string
@@ -230,11 +223,11 @@ end
 #  event_import_file_size    :integer
 #  event_import_updated_at   :datetime
 #  edit_mode                 :string
-#  created_at                :datetime
-#  updated_at                :datetime
+#  created_at                :datetime         not null
+#  updated_at                :datetime         not null
 #  event_import_fingerprint  :string
 #  error_message             :text
 #  user_encoding             :string
-#  default_library_id        :integer
-#  default_event_category_id :integer
+#  default_library_id        :bigint
+#  default_event_category_id :bigint
 #

data/app/models/event_import_file_transition.rb

@@ -11,7 +11,7 @@ end
 #
 #  id                   :bigint           not null, primary key
 #  to_state             :string
-#  metadata             :jsonb
+#  metadata             :text             default({})
 #  sort_key             :integer
 #  event_import_file_id :integer
 #  created_at           :datetime         not null

data/app/models/event_import_result.rb

@@ -1,5 +1,4 @@
 class EventImportResult < ApplicationRecord
-  default_scope { order('event_import_results.id') }
   scope :file_id, proc{|file_id| where(event_import_file_id: file_id)}
   scope :failed, -> { where(event_id: nil) }
 
@@ -13,10 +12,10 @@ end
 #
 # Table name: event_import_results
 #
-#  id                   :integer          not null, primary key
-#  event_import_file_id :integer
-#  event_id             :integer
+#  id                   :bigint           not null, primary key
+#  event_import_file_id :bigint
+#  event_id             :bigint
 #  body                 :text
-#  created_at           :datetime
-#  updated_at           :datetime
+#  created_at           :datetime         not null
+#  updated_at           :datetime         not null
 #

data/app/models/participate.rb

@@ -13,10 +13,10 @@ end
 #
 # Table name: participates
 #
-#  id         :integer          not null, primary key
-#  agent_id   :integer          not null
-#  event_id   :integer          not null
+#  id         :bigint           not null, primary key
+#  agent_id   :bigint           not null
+#  event_id   :bigint           not null
 #  position   :integer
-#  created_at :datetime
-#  updated_at :datetime
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
 #

data/app/models/place.rb

@@ -7,10 +7,10 @@ end
 #
 # Table name: places
 #
-#  id         :integer          not null, primary key
+#  id         :bigint           not null, primary key
 #  term       :string
 #  city       :text
-#  country_id :integer
+#  country_id :bigint
 #  latitude   :float
 #  longitude  :float
 #  created_at :datetime         not null

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) %>

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

@@ -1,85 +1,81 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.showing', model: t('activerecord.models.event_import_file')) -%></h1>
-<div id="content_list">
-<p id="notice"><%= notice %></p>
-
-<p>
-  <strong>Id:</strong>
-  <%= @event_import_file.id -%>
-</p>
-
-<p>
-  <strong><%= t('activerecord.attributes.event_import_file.event_import_file_name') -%>:</strong>
-  <%= link_to @event_import_file.event_import_file_name, event_import_file_path(@event_import_file, format: :download) if @event_import_file.event_import_file_name %>
-</p>
-
-<p>
-  <strong><%= t('activerecord.attributes.event_import_file.event_import_content_type') -%>:</strong>
-  <%= @event_import_file.event_import_content_type -%>
-</p>
-
-<p>
-  <strong><%= t('activerecord.attributes.event_import_file.event_import_file_size') -%>:</strong>
-  <%= @event_import_file.event_import_file_size -%>
-</p>
-
-<p>
-  <strong><%= t('activerecord.attributes.event_import_file.event_import_fingerprint') -%>:</strong>
-  <%= @event_import_file.event_import_fingerprint -%>
-</p>
-
-<p>
-  <strong><%= t('page.created_at') -%>:</strong>
-  <%= l(@event_import_file.created_at) if @event_import_file.created_at -%>
-</p>
-
-<p>
-  <strong><%= t('activerecord.attributes.event_import_file.executed_at') -%>:</strong>
-  <%= l(@event_import_file.executed_at) if @event_import_file.executed_at -%>
-</p>
-
-<p>
-  <strong><%= t('activerecord.attributes.event_import_file.edit_mode') -%>:</strong>
-  <%= @event_import_file.edit_mode -%>
-</p>
-
-<p>
-  <strong><%= t('activerecord.attributes.event_import_file.user_encoding') -%>:</strong>
-  <%= @event_import_file.user_encoding -%>
-</p>
-
-<p>
-  <strong><%= t('activerecord.attributes.event_import_file.default_event_category_id') -%>:</strong>
-  <%= link_to @event_import_file.default_event_category.display_name, @event_import_file.default_event_category if @event_import_file.default_event_category.try(:display_name) -%>
-</p>
-
-<p>
-  <strong><%= t('activerecord.attributes.event_import_file.default_library_id') -%>:</strong>
-  <%= link_to @event_import_file.default_library.display_name, @event_import_file.default_library if @event_import_file.default_library.try(:display_name) -%>
-</p>
-
-<p>
-  <strong><%= t('activerecord.attributes.event_import_file.state') -%>:</strong>
-  <%= localized_state(@event_import_file.current_state) -%>
-</p>
-
-<p>
-  <strong><%= t('activerecord.attributes.event_import_file.error_message') -%>:</strong>
-  <%= @event_import_file.error_message -%>
-</p>
+  <h1 class="title"><%= t('page.showing', model: t('activerecord.models.event_import_file')) -%></h1>
+  <div id="content_list">
+    <p id="notice"><%= notice %></p>
+
+    <p>
+      <strong>Id:</strong>
+      <%= @event_import_file.id -%>
+    </p>
+
+    <% if @event_import_file.event_import_file_name %>
+    <p>
+      <strong><%= t('activerecord.attributes.event_import_file.event_import_file_name') -%>:</strong>
+      <%= link_to @event_import_file.event_import_file_name, event_import_file_path(@event_import_file, format: :download) %>
+      (<%= @event_import_file.event_import_content_type -%>)
+    </p>
+
+    <p>
+      <strong><%= t('activerecord.attributes.event_import_file.event_import_file_size') -%>:</strong>
+      <%= @event_import_file.event_import_file_size -%>
+    </p>
+    <% end %>
 
-<p>
-  <strong><%= t('activerecord.models.user') -%>:</strong>
-  <%= link_to @event_import_file.user.username, @event_import_file.user.profile if @event_import_file.user.try(:profile) -%>
-</p>
+    <p>
+      <strong><%= t('page.created_at') -%>:</strong>
+      <%= l(@event_import_file.created_at) if @event_import_file.created_at -%>
+    </p>
+
+    <p>
+      <strong><%= t('activerecord.attributes.event_import_file.executed_at') -%>:</strong>
+      <%= l(@event_import_file.executed_at) if @event_import_file.executed_at -%>
+    </p>
+
+    <p>
+      <strong><%= t('activerecord.attributes.event_import_file.edit_mode') -%>:</strong>
+      <%= @event_import_file.edit_mode -%>
+    </p>
+
+    <p>
+      <strong><%= t('activerecord.attributes.event_import_file.user_encoding') -%>:</strong>
+      <%= @event_import_file.user_encoding -%>
+    </p>
+
+    <p>
+      <strong><%= t('activerecord.attributes.event_import_file.default_event_category_id') -%>:</strong>
+      <%= link_to @event_import_file.default_event_category.display_name, @event_import_file.default_event_category if @event_import_file.default_event_category.try(:display_name) -%>
+    </p>
+
+    <p>
+      <strong><%= t('activerecord.attributes.event_import_file.default_library_id') -%>:</strong>
+      <%= link_to @event_import_file.default_library.display_name, @event_import_file.default_library if @event_import_file.default_library.try(:display_name) -%>
+    </p>
+
+    <p>
+      <strong><%= t('activerecord.attributes.event_import_file.state') -%>:</strong>
+      <%= localized_state(@event_import_file.current_state) -%>
+    </p>
+
+    <p>
+      <strong><%= t('activerecord.attributes.event_import_file.error_message') -%>:</strong>
+      <%= simple_format(@event_import_file.error_message) -%>
+    </p>
+
+    <p>
+      <strong><%= t('activerecord.models.user') -%>:</strong>
+      <%= link_to @event_import_file.user.username, @event_import_file.user.profile if @event_import_file.user.try(:profile) -%>
+    </p>
+
+    <% if @event_import_results %>
+      <%= render 'results' %>
+    <% end %>
 
-</div>
+  </div>
 </div>
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <%= form_for(@event_import_file) do |f| %>
   <ul>
-    <li><%= link_to t('activerecord.models.event_import_result'), event_import_results_path(event_import_file_id: @event_import_file.id) -%></li>
     <li><%= back_to_index(flash[:page_info]) -%></li>
     <% if current_user.has_role?('Administrator') %>
       <li><%= link_to 'Resque', resque_path %></li>