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

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

@@ -3,7 +3,7 @@
 <div id="content_list">
   <% if @event_import_file %>
     <h2 class="event_title">
-      <%= link_to @event_import_file.event_import_file_name, @event_import_file %>
+      <%= link_to @event_import_file.event_import.blob.filename, @event_import_file %>
     </h2>
   <% end %>
 
@@ -14,20 +14,20 @@
     <th></th>
   </tr>
 
-<% @event_import_results.each do |event_import_result| %>
-  <tr class="line<%= cycle("0", "1") -%>">
-    <td>
-      <%= link_to event_import_result.event_import_file.event_import_file_name, event_import_result.event_import_file %>
-      <br />
-      <%=l event_import_result.created_at %>
-    </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 %>
+  <% @event_import_results.each do |event_import_result| %>
+    <tr class="line<%= cycle("0", "1") -%>">
+      <td>
+        <%= link_to event_import_result.event_import_file.event_import_file_name, event_import_result.event_import_file %>
+        <br />
+        <%=l event_import_result.created_at %>
+      </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) %>
@@ -36,15 +36,4 @@
 </div>
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
-  <ul>
-    <li>
-    <% if @event_import_file %>
-      <%= 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) -%>)
-    <% else %>
-      <%= link_to (image_tag 'icons/page_white_excel.png', size: '16x16', class: 'enju_icon', alt: 'TSV'), event_import_results_path(format: :txt, locale: @locale.to_s) -%>
-      (<%= link_to 'TSV', event_import_results_path(format: :txt, locale: @locale.to_s) -%>)
-    <% end %>
-    </li>
-  </ul>
 </div>

data/app/views/events/index.txt.ruby

@@ -0,0 +1,7 @@
+Event.csv_header(
+  role: current_user_role_name
+).to_csv(col_sep: "\t") + @events.map{|event|
+  event.to_hash(
+    role: current_user_role_name
+  ).values.to_csv(col_sep: "\t")
+}.join

data/config/locales/translation_en.yml

@@ -38,6 +38,7 @@ en:
         default_event_category_id: Default event category
       event_import_result:
         body: Body
+        lineno: Line
       event_export_file:
         event_export_file_name: Filename
         event_export_file_size: Size

data/config/locales/translation_ja.yml

@@ -38,6 +38,7 @@ ja:
         default_event_category_id: 既定の催し物の種別
       event_import_result:
         body: 本文
+        lineno: 行数
       event_export_file:
         event_export_file_name: ファイル名
         event_export_file_size: ファイルサイズ

data/db/migrate/113_create_events.rb

@@ -1,5 +1,5 @@
-class CreateEvents < ActiveRecord::Migration[4.2]
-  def self.up
+class CreateEvents < ActiveRecord::Migration[5.2]
+  def change
     create_table :events do |t|
       t.references :library, index: true, null: false
       t.references :event_category, index: true, null: false
@@ -8,14 +8,9 @@ class CreateEvents < ActiveRecord::Migration[4.2]
       t.datetime :start_at
       t.datetime :end_at
       t.boolean :all_day, default: false, null: false
-      t.datetime :deleted_at
       t.text :display_name
 
       t.timestamps
     end
   end
-
-  def self.down
-    drop_table :events
-  end
 end

data/db/migrate/114_create_event_categories.rb

@@ -1,4 +1,4 @@
-class CreateEventCategories < ActiveRecord::Migration[4.2]
+class CreateEventCategories < ActiveRecord::Migration[5.2]
   def self.up
     create_table :event_categories do |t|
       t.string :name, null: false

data/db/migrate/20081028093607_create_event_import_files.rb

@@ -1,4 +1,4 @@
-class CreateEventImportFiles < ActiveRecord::Migration[4.2]
+class CreateEventImportFiles < ActiveRecord::Migration[5.2]
   def self.up
     create_table :event_import_files do |t|
       t.references :parent, index: true

data/db/migrate/20090519203307_create_participates.rb

@@ -1,4 +1,4 @@
-class CreateParticipates < ActiveRecord::Migration[4.2]
+class CreateParticipates < ActiveRecord::Migration[5.2]
   def self.up
     create_table :participates do |t|
       t.references :agent, index: true, null: false

data/db/migrate/20100925074639_create_event_import_results.rb

@@ -1,4 +1,4 @@
-class CreateEventImportResults < ActiveRecord::Migration[4.2]
+class CreateEventImportResults < ActiveRecord::Migration[5.2]
   def self.up
     create_table :event_import_results do |t|
       t.references :event_import_file

data/db/migrate/20120413051535_add_event_import_fingerprint_to_event_import_file.rb

@@ -1,4 +1,4 @@
-class AddEventImportFingerprintToEventImportFile < ActiveRecord::Migration[4.2]
+class AddEventImportFingerprintToEventImportFile < ActiveRecord::Migration[5.2]
   def change
     add_column :event_import_files, :event_import_fingerprint, :string
   end

data/db/migrate/20120413170734_add_error_message_to_event_import_file.rb

@@ -1,4 +1,4 @@
-class AddErrorMessageToEventImportFile < ActiveRecord::Migration[4.2]
+class AddErrorMessageToEventImportFile < ActiveRecord::Migration[5.2]
   def change
     add_column :event_import_files, :error_message, :text
   end

data/db/migrate/20120415060342_rename_event_import_file_imported_at_to_executed_at.rb

@@ -1,4 +1,4 @@
-class RenameEventImportFileImportedAtToExecutedAt < ActiveRecord::Migration[4.2]
+class RenameEventImportFileImportedAtToExecutedAt < ActiveRecord::Migration[5.2]
   def up
     rename_column :event_import_files, :imported_at, :executed_at
   end

data/db/migrate/20140523171309_create_event_import_file_transitions.rb

@@ -1,4 +1,4 @@
-class CreateEventImportFileTransitions < ActiveRecord::Migration[4.2]
+class CreateEventImportFileTransitions < ActiveRecord::Migration[5.2]
   def change
     create_table :event_import_file_transitions do |t|
       t.string :to_state

data/db/migrate/20140628071719_add_user_encoding_to_event_import_file.rb

@@ -1,4 +1,4 @@
-class AddUserEncodingToEventImportFile < ActiveRecord::Migration[4.2]
+class AddUserEncodingToEventImportFile < ActiveRecord::Migration[5.2]
   def change
     add_column :event_import_files, :user_encoding, :string
   end

data/db/migrate/20140720192418_add_default_library_id_to_event_import_file.rb

@@ -1,4 +1,4 @@
-class AddDefaultLibraryIdToEventImportFile < ActiveRecord::Migration[4.2]
+class AddDefaultLibraryIdToEventImportFile < ActiveRecord::Migration[5.2]
   def change
     add_reference :event_import_files, :default_library
   end

data/db/migrate/20140812152348_create_event_export_files.rb

@@ -1,4 +1,4 @@
-class CreateEventExportFiles < ActiveRecord::Migration[4.2]
+class CreateEventExportFiles < ActiveRecord::Migration[5.2]
   def change
     create_table :event_export_files do |t|
       t.references :user, index: true

data/db/migrate/20140812153137_create_event_export_file_transitions.rb

@@ -1,4 +1,4 @@
-class CreateEventExportFileTransitions < ActiveRecord::Migration[4.2]
+class CreateEventExportFileTransitions < ActiveRecord::Migration[5.2]
   def change
     create_table :event_export_file_transitions do |t|
       t.string :to_state

data/db/migrate/20140814070854_add_default_event_category_id_to_event_import_file.rb

@@ -1,4 +1,4 @@
-class AddDefaultEventCategoryIdToEventImportFile < ActiveRecord::Migration[4.2]
+class AddDefaultEventCategoryIdToEventImportFile < ActiveRecord::Migration[5.2]
   def change
     add_reference :event_import_files, :default_event_category
   end

data/db/migrate/20151128142913_create_places.rb

@@ -1,4 +1,4 @@
-class CreatePlaces < ActiveRecord::Migration[4.2]
+class CreatePlaces < ActiveRecord::Migration[5.2]
   def change
     create_table :places do |t|
       t.string :term

data/db/migrate/20151201163718_add_place_id_to_event.rb

@@ -1,4 +1,4 @@
-class AddPlaceIdToEvent < ActiveRecord::Migration[4.2]
+class AddPlaceIdToEvent < ActiveRecord::Migration[5.2]
   def change
     add_reference :events, :place, index: true
   end

data/db/migrate/20160703184258_add_most_recent_to_event_import_file_transitions.rb

@@ -1,4 +1,4 @@
-class AddMostRecentToEventImportFileTransitions < ActiveRecord::Migration[4.2]
+class AddMostRecentToEventImportFileTransitions < ActiveRecord::Migration[5.2]
   def up
     add_column :event_import_file_transitions, :most_recent, :boolean, null: true
   end

data/db/migrate/20160703184311_add_most_recent_to_event_export_file_transitions.rb

@@ -1,4 +1,4 @@
-class AddMostRecentToEventExportFileTransitions < ActiveRecord::Migration[4.2]
+class AddMostRecentToEventExportFileTransitions < ActiveRecord::Migration[5.2]
   def up
     add_column :event_export_file_transitions, :most_recent, :boolean, null: true
   end

data/db/migrate/20180107164558_add_constraints_to_most_recent_for_event_import_file_transitions.rb

@@ -1,4 +1,4 @@
-class AddConstraintsToMostRecentForEventImportFileTransitions < ActiveRecord::Migration[4.2]
+class AddConstraintsToMostRecentForEventImportFileTransitions < ActiveRecord::Migration[5.2]
   disable_ddl_transaction!
 
   def up

data/db/migrate/20180107164617_add_constraints_to_most_recent_for_event_export_file_transitions.rb

@@ -1,4 +1,4 @@
-class AddConstraintsToMostRecentForEventExportFileTransitions < ActiveRecord::Migration[4.2]
+class AddConstraintsToMostRecentForEventExportFileTransitions < ActiveRecord::Migration[5.2]
   disable_ddl_transaction!
 
   def up

data/lib/enju_event/engine.rb

@@ -2,7 +2,6 @@ require "enju_message"
 require "ri_cal"
 require "csv"
 require "nkf"
-require "jbuilder"
 begin
   require 'charlock_holmes/string'
 rescue LoadError

data/lib/enju_event/version.rb

@@ -1,3 +1,3 @@
 module EnjuEvent
-  VERSION = "0.4.0.beta.2"
+  VERSION = "0.4.0.rc.1".freeze
 end

data/lib/generators/enju_event/setup/setup_generator.rb

@@ -5,10 +5,10 @@ class EnjuEvent::SetupGenerator < Rails::Generators::Base
     directory("db/fixtures", "db/fixtures/enju_event")
     rake("enju_event_engine:install:migrations")
     inject_into_file 'app/controllers/application_controller.rb',
-      "  enju_event\n", after: "enju_library\n"
+      "  include EnjuEvent::Controller\n", after: "include EnjuLibrary::Controller\n"
     inject_into_file 'app/assets/stylesheets/application.css',
-      " *= require enju_event/application\n", after: " *= require enju_leaf/application\n"
+      " *= require enju_event/application\n", after: " *= require enju_leaf\n"
     inject_into_file 'app/assets/javascripts/application.js',
-      "//= require enju_event/application\n", after: "//= require enju_leaf/application\n"
+      "//= require enju_event/application\n", after: "//= require enju_leaf\n"
   end
 end

data/spec/controllers/event_import_results_controller_spec.rb

@@ -9,7 +9,7 @@ describe EventImportResultsController do
 
       it "assigns all event_import_results as @event_import_results" do
         get :index
-        assigns(:event_import_results).should eq(EventImportResult.page(1))
+        assigns(:event_import_results).should eq(EventImportResult.order(created_at: :desc).page(1))
       end
     end
 
@@ -18,7 +18,7 @@ describe EventImportResultsController do
 
       it "assigns all event_import_results as @event_import_results" do
         get :index
-        assigns(:event_import_results).should eq(EventImportResult.page(1))
+        assigns(:event_import_results).should eq(EventImportResult.order(created_at: :desc).page(1))
       end
     end
 

data/spec/dummy/app/controllers/application_controller.rb

@@ -3,7 +3,6 @@ class ApplicationController < ActionController::Base
   include EnjuLibrary::Controller
   include EnjuBiblio::Controller
   include EnjuEvent::Controller
-  before_action :set_paper_trail_whodunnit
   after_action :verify_authorized
 
   include Pundit

data/spec/dummy/db/migrate/001_create_agents.rb

@@ -1,4 +1,4 @@
-class CreateAgents < ActiveRecord::Migration[4.2]
+class CreateAgents < ActiveRecord::Migration[5.2]
   def change
     create_table :agents do |t|
       t.string :last_name
@@ -13,7 +13,6 @@ class CreateAgents < ActiveRecord::Migration[4.2]
       t.text :full_name_transcription
       t.text :full_name_alternative
       t.timestamps
-      t.datetime :deleted_at
       t.string :zip_code_1
       t.string :zip_code_2
       t.text :address_1

data/spec/dummy/db/migrate/005_create_manifestations.rb

@@ -1,4 +1,4 @@
-class CreateManifestations < ActiveRecord::Migration[4.2]
+class CreateManifestations < ActiveRecord::Migration[5.2]
   def change
     create_table :manifestations do |t|
       t.text :original_title, null: false
@@ -9,7 +9,6 @@ class CreateManifestations < ActiveRecord::Migration[4.2]
       t.datetime :date_of_publication
       t.datetime :copyright_date
       t.timestamps
-      t.datetime :deleted_at
       t.string :access_address
       t.integer :language_id, default: 1, null: false
       t.integer :carrier_type_id, default: 1, null: false

data/spec/dummy/db/migrate/006_create_items.rb

@@ -1,10 +1,9 @@
-class CreateItems < ActiveRecord::Migration[4.2]
+class CreateItems < ActiveRecord::Migration[5.2]
   def change
     create_table :items do |t|
       t.string :call_number
       t.string :item_identifier
       t.timestamps
-      t.datetime :deleted_at
       t.integer :shelf_id, default: 1, null: false
       t.boolean :include_supplements, default: false, null: false
       t.text :note

data/spec/dummy/db/migrate/012_create_owns.rb

@@ -1,4 +1,4 @@
-class CreateOwns < ActiveRecord::Migration[4.2]
+class CreateOwns < ActiveRecord::Migration[5.2]
   def change
     create_table :owns do |t|
       t.references :agent, null: false
@@ -6,7 +6,5 @@ class CreateOwns < ActiveRecord::Migration[4.2]
       t.integer :position
       t.timestamps
     end
-    add_index :owns, :agent_id
-    add_index :owns, :item_id
   end
 end

data/spec/dummy/db/migrate/015_create_creates.rb

@@ -1,4 +1,4 @@
-class CreateCreates < ActiveRecord::Migration[4.2]
+class CreateCreates < ActiveRecord::Migration[5.2]
   def change
     create_table :creates do |t|
       t.references :agent, null: false
@@ -6,7 +6,5 @@ class CreateCreates < ActiveRecord::Migration[4.2]
       t.integer :position
       t.timestamps
     end
-    add_index :creates, :agent_id
-    add_index :creates, :work_id
   end
 end

data/spec/dummy/db/migrate/041_create_roles.rb

@@ -1,4 +1,4 @@
-class CreateRoles < ActiveRecord::Migration[4.2]
+class CreateRoles < ActiveRecord::Migration[5.2]
   def change
     create_table "roles" do |t|
       t.column :name, :string, null: false

data/spec/dummy/db/migrate/047_create_produces.rb

@@ -1,4 +1,4 @@
-class CreateProduces < ActiveRecord::Migration[4.2]
+class CreateProduces < ActiveRecord::Migration[5.2]
   def change
     create_table :produces do |t|
       t.references :agent, null: false
@@ -6,7 +6,5 @@ class CreateProduces < ActiveRecord::Migration[4.2]
       t.integer :position
       t.timestamps
     end
-    add_index :produces, :agent_id
-    add_index :produces, :manifestation_id
   end
 end

data/spec/dummy/db/migrate/059_create_libraries.rb

@@ -1,4 +1,4 @@
-class CreateLibraries < ActiveRecord::Migration[4.2]
+class CreateLibraries < ActiveRecord::Migration[5.2]
   def change
     create_table :libraries do |t|
       t.string :name, index: true, null: false
@@ -20,7 +20,6 @@ class CreateLibraries < ActiveRecord::Migration[4.2]
       t.references :country
 
       t.timestamps
-      t.datetime :deleted_at
     end
   end
 end

data/spec/dummy/db/migrate/069_create_shelves.rb

@@ -1,4 +1,4 @@
-class CreateShelves < ActiveRecord::Migration[4.2]
+class CreateShelves < ActiveRecord::Migration[5.2]
   def change
     create_table :shelves do |t|
       t.string :name, null: false
@@ -8,7 +8,6 @@ class CreateShelves < ActiveRecord::Migration[4.2]
       t.integer :items_count, default: 0, null: false
       t.integer :position
       t.timestamps
-      t.datetime :deleted_at
     end
   end
 end

data/spec/dummy/db/migrate/073_create_carrier_types.rb

@@ -1,4 +1,4 @@
-class CreateCarrierTypes < ActiveRecord::Migration[4.2]
+class CreateCarrierTypes < ActiveRecord::Migration[5.2]
   def change
     create_table :carrier_types do |t|
       t.string :name, null: false

data/spec/dummy/db/migrate/077_create_user_groups.rb

@@ -1,4 +1,4 @@
-class CreateUserGroups < ActiveRecord::Migration[4.2]
+class CreateUserGroups < ActiveRecord::Migration[5.2]
   def change
     create_table :user_groups do |t|
       t.string :name, not_null: true
@@ -6,7 +6,6 @@ class CreateUserGroups < ActiveRecord::Migration[4.2]
       t.text :note
       t.integer :position
       t.timestamps
-      t.datetime :deleted_at
     end
   end
 end

data/spec/dummy/db/migrate/080_create_library_groups.rb

@@ -1,4 +1,4 @@
-class CreateLibraryGroups < ActiveRecord::Migration[4.2]
+class CreateLibraryGroups < ActiveRecord::Migration[5.2]
   def change
     create_table :library_groups do |t|
       t.string :name, null: false