enju_library 0.3.11 → 0.4.0.beta.1

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

@@ -34,13 +34,13 @@
 
   <div class="field">
     <%= f.label :default_user_group_id -%>
-    <%= f.select(:default_user_group_id, @user_groups.collect{|u| [u.display_name.localize, u.id]}) -%><br />
+    <%= f.select(:default_user_group_id, @user_groups.collect{|u| [u.display_name, u.id]}) -%><br />
     <%= t('user_import_file.default_user_group') %>
   </div>
 
   <div class="field">
     <%= f.label :default_library_id -%>
-    <%= f.select(:default_library_id, @libraries.collect{|l| [l.display_name.localize, l.id]}) -%><br />
+    <%= f.select(:default_library_id, @libraries.collect{|l| [l.display_name, l.id]}) -%><br />
     <%= t('user_import_file.default_library') %>
   </div>
 

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

@@ -43,12 +43,12 @@
 
 <p>
   <strong><%= t('activerecord.attributes.user_import_file.default_user_group_id') -%>:</strong>
-  <%= link_to @user_import_file.default_user_group.display_name.localize, @user_import_file.default_user_group if @user_import_file.default_user_group.try(:display_name) -%>
+  <%= link_to @user_import_file.default_user_group.display_name, @user_import_file.default_user_group if @user_import_file.default_user_group.try(:display_name) -%>
 </p>
 
 <p>
   <strong><%= t('activerecord.attributes.user_import_file.default_library_id') -%>:</strong>
-  <%= link_to @user_import_file.default_library.display_name.localize, @user_import_file.default_library if @user_import_file.default_library.try(:display_name) -%>
+  <%= link_to @user_import_file.default_library.display_name, @user_import_file.default_library if @user_import_file.default_library.try(:display_name) -%>
 </p>
 
 <p>

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

@@ -11,4 +11,15 @@
 </div>
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
+  <ul>
+    <li>
+    <% if @user_import_file %>
+      <%= link_to((image_tag 'icons/page_white_excel.png', size: '16x16', class: 'enju_icon', alt: 'TSV'), user_import_results_path(user_import_file_id: @user_import_file.id, format: :txt, locale: @locale.to_s)) -%>
+      (<%= link_to 'TSV', user_import_results_path(user_import_file_id: @user_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'), user_import_results_path(format: :txt, locale: @locale.to_s)) -%>
+      (<%= link_to 'TSV', user_import_results_path(format: :txt, locale: @locale.to_s) -%>)
+    <% end %>
+    </li>
+  </ul>
 </div>

data/app/views/withdraws/_list.html.erb

@@ -20,8 +20,8 @@
       <td>
         <%= render 'manifestations/show_index', manifestation: withdraw.item.manifestation %>
         <%= link_to withdraw.item.item_identifier, withdraw.item -%> / <%= withdraw.item.call_number %>
-        (<%= link_to withdraw.item.shelf.library.display_name.localize, withdraw.item.shelf.library %> /
-        <%= link_to withdraw.item.shelf.display_name.localize, withdraw.item.shelf %>)<br />
+        (<%= link_to withdraw.item.shelf.library.display_name, withdraw.item.shelf.library %> /
+        <%= link_to withdraw.item.shelf.display_name, withdraw.item.shelf %>)<br />
         <%=l withdraw.created_at %>
       </td>
     </tr>

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

@@ -23,8 +23,8 @@
         <% if withdraw.item %>
           <%= render 'manifestations/show_index', manifestation: withdraw.item.manifestation %>
           <%= link_to withdraw.item.item_identifier, withdraw.item -%> / <%= withdraw.item.call_number %>
-          (<%= link_to withdraw.item.shelf.library.display_name.localize, withdraw.item.shelf.library %> /
-          <%= link_to withdraw.item.shelf.display_name.localize, withdraw.item.shelf %>)<br />
+          (<%= link_to withdraw.item.shelf.library.display_name, withdraw.item.shelf.library %> /
+          <%= link_to withdraw.item.shelf.display_name, withdraw.item.shelf %>)<br />
           <%=l withdraw.created_at %>
         <% end %>
       </td>
@@ -45,6 +45,6 @@
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.new', model: t('activerecord.models.withdraw')), new_withdraw_path -%></li>
-    <li><%= link_to t('page.listing', model: t('activerecord.attributes.withdraw.removed_items', status: CirculationStatus.where(name: 'Removed').first.display_name.localize) + t('activerecord.models.item')), items_path(circulation_status: 'Removed')  -%></li>
+    <li><%= link_to t('page.listing', model: t('activerecord.attributes.withdraw.removed_items', status: CirculationStatus.where(name: 'Removed').first.display_name) + t('activerecord.models.item')), items_path(circulation_status: 'Removed')  -%></li>
   </ul>
 </div>

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

@@ -10,6 +10,6 @@
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.listing', model: t('activerecord.models.withdraw')), withdraws_path -%></li>
-    <li><%= link_to t('page.listing', model: t('activerecord.attributes.withdraw.removed_items', status: CirculationStatus.where(name: 'Removed').first.display_name.localize) + t('activerecord.models.item')), items_path(circulation_status: 'Removed')  -%></li>
+    <li><%= link_to t('page.listing', model: t('activerecord.attributes.withdraw.removed_items', status: CirculationStatus.where(name: 'Removed').first.display_name) + t('activerecord.models.item')), items_path(circulation_status: 'Removed')  -%></li>
   </ul>
 </div>

data/config/locales/translation_en.yml

@@ -26,8 +26,8 @@ en:
         telephone_number_1: Telephone number 1
         telephone_number_2: Telephone number 2
         fax_number: Fax number
-        latitude: Latitude
-        longitude: Longitude
+        lat: Lat
+        lng: Lng
         note: Note
         call_number_rows: Call number rows
         call_number_delimiter: Call number delimiter
@@ -59,8 +59,6 @@ en:
         max_number_of_results: Max number of results
         book_jacket_source: Book jacket source
         header_logo: Header logo
-        default_custom_manifestation_label: Default custom properties (Manifestation)
-        default_custom_item_label: Default custom properties (Item)
       bookstore:
         name: Name
         zip_code: Zip code

data/config/locales/translation_ja.yml

@@ -26,8 +26,8 @@ ja:
         telephone_number_1: 電話番号1
         telephone_number_2: 電話番号2
         fax_number: ファックス番号
-        latitude: 緯度
-        longitude: 経度
+        lat: 緯度
+        lng: 経度
         note: 注記
         call_number_rows: 請求記号の列数
         call_number_delimiter: 請求番号の区切り文字
@@ -59,8 +59,6 @@ ja:
         max_number_of_results: 検索結果の最大件数
         book_jacket_source: 書影の取得元
         header_logo: ヘッダーのロゴ
-        default_custom_manifestation_label: 既定のカスタム項目（書誌）
-        default_custom_item_label: 既定のカスタム項目（所蔵）
       bookstore:
         name: 名前
         zip_code: 郵便番号

data/db/migrate/20160813191647_add_max_number_of_results_to_library_group.rb

@@ -1,5 +1,5 @@
 class AddMaxNumberOfResultsToLibraryGroup < ActiveRecord::Migration[4.2]
   def change
-    add_column :library_groups, :max_number_of_results, :integer, default: 1000
+    add_column :library_groups, :max_number_of_results, :integer, default: 500
   end
 end

data/db/migrate/20190630113817_add_display_name_translations_to_library_group.rb

@@ -0,0 +1,12 @@
+class AddDisplayNameTranslationsToLibraryGroup < ActiveRecord::Migration[5.2]
+  def change
+    add_column :budget_types, :display_name_translations, :jsonb, default: {}, null: false
+    add_column :libraries, :display_name_translations, :jsonb, default: {}, null: false
+    add_column :library_groups, :display_name_translations, :jsonb, default: {}, null: false
+    add_column :request_status_types, :display_name_translations, :jsonb, default: {}, null: false
+    add_column :request_types, :display_name_translations, :jsonb, default: {}, null: false
+    add_column :search_engines, :display_name_translations, :jsonb, default: {}, null: false
+    add_column :shelves, :display_name_translations, :jsonb, default: {}, null: false
+    add_column :user_groups, :display_name_translations, :jsonb, default: {}, null: false
+  end
+end

data/db/migrate/20190630115523_add_login_banner_translations_to_library_group.rb

@@ -0,0 +1,6 @@
+class AddLoginBannerTranslationsToLibraryGroup < ActiveRecord::Migration[5.2]
+  def change
+    add_column :library_groups, :login_banner_translations, :jsonb, default: {}, null: false
+    add_column :library_groups, :footer_banner_translations, :jsonb, default: {}, null: false
+  end
+end

data/lib/enju_library/version.rb

@@ -1,3 +1,3 @@
 module EnjuLibrary
-  VERSION = "0.3.11".freeze
+  VERSION = "0.4.0.beta.1"
 end

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

@@ -5,13 +5,8 @@ class EnjuLibrary::SetupGenerator < Rails::Generators::Base
   def copy_setup_files
     directory("db/fixtures", "db/fixtures/enju_library")
     return if file == 'fixture'
-    inject_into_class 'app/controllers/application_controller.rb', ApplicationController,
-      "  include EnjuLibrary::Controller\n"
+    inject_into_file 'app/controllers/application_controller.rb',
+      "  include EnjuLibrary::Controller\n", after: "include EnjuLeaf::Controller\n"
     append_to_file("app/models/user.rb", "Item.include(EnjuLibrary::EnjuItem)\n")
-    gsub_file 'app/models/user.rb', /, :validatable$/, <<EOS
-, # :validatable,
-      :lockable, lock_strategy: :none, unlock_strategy: :none
-  include EnjuSeed::EnjuUser
-EOS
   end
 end

data/lib/generators/enju_library/setup/templates/db/fixtures/budget_types.yml

@@ -0,0 +1,4 @@
+default:
+  name: default
+  display_name: "既定の予算"
+  position: 1

data/lib/generators/enju_library/setup/templates/db/fixtures/libraries.yml

@@ -2,7 +2,7 @@
 library_00001: 
   name: web
   short_display_name: Web
-  display_name: World Wide Web
+  display_name_translations: {"en": "World Wide Web", "ja": "ウェブ"}
   fax_number: 
   telephone_number_1: 
   telephone_number_2: 
@@ -14,7 +14,7 @@ library_00001:
 library_00002: 
   name: yours
   short_display_name: your_library
-  display_name: Your Library
+  display_name_translations: {"en": "Your Library", "ja": "自分の図書館"}
   fax_number: 
   telephone_number_1: 
   telephone_number_2: 

data/lib/generators/enju_library/setup/templates/db/fixtures/library_groups.yml

@@ -1,12 +1,18 @@
-library_group_00001:
+# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
+one:
   id: 1
   name: enju_library
-  display_name: "en: Enju Library\r\n\
-    ja: えんじゅ図書館"
-  short_name: enju
+  display_name_translations: {"en": "Enju Library", "ja": "えんじゅ図書館"}
+  short_name: enju_library
   note: 
   my_networks: "0.0.0.0/0\r\n\
     ::/0"
+  url: "http://localhost:3000/"
+  position: 1
+  login_banner_translations: {"ja": "オープンソース図書館システム Next-L Enju です。このメッセージは管理者としてログインした後に変更することができます。",
+    "en": "Next-L Enju, an open-source integrated library system. You can edit this message after logging in as Administrator."}
+  footer_banner_translations: {"en":"[Next-L Enju Leaf __VERSION__](https://github.com/next-l/enju_leaf), an open source integrated library system | [About this system](/page/about) | [Report bugs](https://github.com/next-l/enju_leaf/issues) | [Manual](https://next-l.github.io/manual/)",
+    "ja":"[Next-L Enju Leaf __VERSION__](https://github.com/next-l/enju_leaf), オープンソース統合図書館システム | [このシステムについて](/page/about) | [不具合を報告する](https://github.com/next-l/enju_leaf/issues) | [マニュアル](https://next-l.github.io/manual/)"}
   admin_networks: "0.0.0.0/0\r\n\
     ::/0"
-  settings: "{\"max_number_of_results\":500, \"family_name_first\":true, \"skip_mobile_agents\":\"ipad\"}"
+  pub_year_facet_range_interval: 10

data/lib/generators/enju_library/setup/templates/db/fixtures/user_groups.yml

@@ -1,7 +1,6 @@
 --- 
 user_group_00001: 
   name: "first_group"
-  display_name: "First group"
+  display_name_translations: {"en": "First group", "ja": "最初のグループ"}
   note: ""
   position: 1
-  id: 1

data/spec/controllers/budget_types_controller_spec.rb

@@ -103,7 +103,7 @@ describe BudgetTypesController do
         budget_type = BudgetType.create! valid_attributes
         # Assuming there are no other budget_types in the database, this
         # specifies that the BudgetType created on the previous line
-        # receives the :update message with whatever params are
+        # receives the :update_attributes message with whatever params are
         # submitted in the request.
         BudgetType.any_instance.should_receive(:update).with('note' => 'test')
         put :update, params: { id: budget_type.id, budget_type: { note: 'test' } }

data/spec/controllers/items_controller_spec.rb

@@ -0,0 +1,35 @@
+require 'rails_helper'
+
+RSpec.describe WithdrawsController, type: :controller do
+  fixtures :all
+
+  describe 'GET #show' do
+    before do
+      @withdraw = FactoryBot.create(:withdraw)
+    end
+
+    describe 'When logged in as Librarian' do
+      login_fixture_librarian
+      it 'should show withdrawn item' do
+        get :show, params: { id: @withdraw.to_param }
+        response.should be_successful
+      end
+    end
+
+    describe 'When logged in as User' do
+      login_fixture_user
+      it 'should show withdrawn item' do
+        get :show, params: { id: @withdraw.to_param }
+        response.should be_forbidden
+      end
+    end
+
+    describe 'When not logged in' do
+      it 'should show withdrawn item' do
+        item = FactoryBot.create(:item)
+        get :show, params: { id: @withdraw.to_param }
+        response.should redirect_to new_user_session_url
+      end
+    end
+  end
+end

data/spec/dummy/app/helpers/application_helper.rb

@@ -1,4 +1,5 @@
 module ApplicationHelper
   include EnjuLeaf::ApplicationHelper
+  include EnjuLibrary::ApplicationHelper
   include EnjuBiblio::ApplicationHelper
 end

data/spec/dummy/app/models/user.rb

@@ -3,9 +3,8 @@ class User < ApplicationRecord
     :recoverable, :rememberable, :trackable, #, :validatable
     :lockable, lock_strategy: :none, unlock_strategy: :none
 
-  include EnjuSeed::EnjuUser
+  include EnjuLibrary::EnjuUser
   include EnjuCirculation::EnjuUser
-      has_one :profile, dependent: :nullify
 end
 
 Accept.include(EnjuCirculation::EnjuAccept)

data/spec/dummy/bin/bundle

@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
 load Gem.bin_path('bundler', 'bundle')

data/spec/dummy/bin/setup

@@ -1,10 +1,9 @@
 #!/usr/bin/env ruby
-require 'pathname'
 require 'fileutils'
 include FileUtils
 
 # path to your application root.
-APP_ROOT = Pathname.new File.expand_path('../../', __FILE__)
+APP_ROOT = File.expand_path('..', __dir__)
 
 def system!(*args)
   system(*args) || abort("\n== Command #{args} failed ==")
@@ -21,7 +20,6 @@ chdir APP_ROOT do
   # Install JavaScript dependencies if using Yarn
   # system('bin/yarn')
 
-
   # puts "\n== Copying sample files =="
   # unless File.exist?('config/database.yml')
   #   cp 'config/database.yml.sample', 'config/database.yml'

data/spec/dummy/bin/update

@@ -1,10 +1,9 @@
 #!/usr/bin/env ruby
-require 'pathname'
 require 'fileutils'
 include FileUtils
 
 # path to your application root.
-APP_ROOT = Pathname.new File.expand_path('../../', __FILE__)
+APP_ROOT = File.expand_path('..', __dir__)
 
 def system!(*args)
   system(*args) || abort("\n== Command #{args} failed ==")
@@ -18,6 +17,9 @@ chdir APP_ROOT do
   system! 'gem install bundler --conservative'
   system('bundle check') || system!('bundle install')
 
+  # Install JavaScript dependencies if using Yarn
+  # system('bin/yarn')
+
   puts "\n== Updating database =="
   system! 'bin/rails db:migrate'
 

data/spec/dummy/bin/yarn

@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby
-VENDOR_PATH = File.expand_path('..', __dir__)
-Dir.chdir(VENDOR_PATH) do
+APP_ROOT = File.expand_path('..', __dir__)
+Dir.chdir(APP_ROOT) do
   begin
-    exec "yarnpkg #{ARGV.join(" ")}"
+    exec "yarnpkg", *ARGV
   rescue Errno::ENOENT
     $stderr.puts "Yarn executable was not detected in the system."
     $stderr.puts "Download Yarn at https://yarnpkg.com/en/docs/install"

data/spec/dummy/config/application.rb

@@ -17,6 +17,7 @@ module Dummy
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration should go into files in config/initializers
     # -- all .rb files in that directory are automatically loaded.
+    config.i18n.available_locales = [:en, :ja]
   end
 end
 

data/spec/dummy/config/database.yml

@@ -1,25 +1,86 @@
-# SQLite version 3.x
-#   gem install sqlite3
+# PostgreSQL. Versions 9.1 and up are supported.
 #
-#   Ensure the SQLite 3 gem is defined in your Gemfile
-#   gem 'sqlite3'
+# Install the pg driver:
+#   gem install pg
+# On OS X with Homebrew:
+#   gem install pg -- --with-pg-config=/usr/local/bin/pg_config
+# On OS X with MacPorts:
+#   gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config
+# On Windows:
+#   gem install pg
+#       Choose the win32 build.
+#       Install PostgreSQL and put its /bin directory on your path.
+#
+# Configure Using Gemfile
+# gem 'pg'
 #
 default: &default
-  adapter: sqlite3
+  adapter: postgresql
+  encoding: unicode
+  # For details on connection pooling, see Rails configuration guide
+  # http://guides.rubyonrails.org/configuring.html#database-pooling
   pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
-  timeout: 5000
+  user: postgres
 
 development:
   <<: *default
-  database: db/development.sqlite3
+  database: enju_library_dummy_development
+
+  # The specified database role being used to connect to postgres.
+  # To create additional roles in postgres see `$ createuser --help`.
+  # When left blank, postgres will use the default role. This is
+  # the same name as the operating system user that initialized the database.
+  #username: enju_library_dummy
+
+  # The password associated with the postgres role (username).
+  #password:
+
+  # Connect on a TCP socket. Omitted by default since the client uses a
+  # domain socket that doesn't need configuration. Windows does not have
+  # domain sockets, so uncomment these lines.
+  #host: localhost
+
+  # The TCP port the server listens on. Defaults to 5432.
+  # If your server runs on a different port number, change accordingly.
+  #port: 5432
+
+  # Schema search path. The server defaults to $user,public
+  #schema_search_path: myapp,sharedapp,public
+
+  # Minimum log levels, in increasing order:
+  #   debug5, debug4, debug3, debug2, debug1,
+  #   log, notice, warning, error, fatal, and panic
+  # Defaults to warning.
+  #min_messages: notice
 
 # Warning: The database defined as "test" will be erased and
 # re-generated from your development database when you run "rake".
 # Do not set this db to the same as development or production.
 test:
   <<: *default
-  database: db/test.sqlite3
+  database: enju_library_dummy_test
 
+# As with config/secrets.yml, you never want to store sensitive information,
+# like your database password, in your source code. If your source code is
+# ever seen by anyone, they now have access to your database.
+#
+# Instead, provide the password as a unix environment variable when you boot
+# the app. Read http://guides.rubyonrails.org/configuring.html#configuring-a-database
+# for a full rundown on how to provide these environment variables in a
+# production deployment.
+#
+# On Heroku and other platform providers, you may have a full connection URL
+# available as an environment variable. For example:
+#
+#   DATABASE_URL="postgres://myuser:mypass@localhost/somedatabase"
+#
+# You can use this database configuration with:
+#
+#   production:
+#     url: <%= ENV['DATABASE_URL'] %>
+#
 production:
   <<: *default
-  database: db/production.sqlite3
+  database: enju_library_dummy_production
+  username: enju_library_dummy
+  password: <%= ENV['DUMMY_DATABASE_PASSWORD'] %>

data/spec/dummy/config/initializers/assets.rb

@@ -6,7 +6,7 @@ Rails.application.config.assets.version = '1.0'
 # Add additional assets to the asset load path.
 # Rails.application.config.assets.paths << Emoji.images_path
 # Add Yarn node_modules folder to the asset load path.
-Rails.application.config.assets.paths << Rails.root.join('node_modules')
+Rails.application.config.assets.paths << Rails.root.join('../../', 'node_modules')
 
 # Precompile additional assets.
 # application.js, application.css, and all non-JS/CSS in the app/assets

data/spec/dummy/config/storage.yml

@@ -0,0 +1,34 @@
+test:
+  service: Disk
+  root: <%= Rails.root.join("tmp/storage") %>
+
+local:
+  service: Disk
+  root: <%= Rails.root.join("storage") %>
+
+# Use rails credentials:edit to set the AWS secrets (as aws:access_key_id|secret_access_key)
+# amazon:
+#   service: S3
+#   access_key_id: <%= Rails.application.credentials.dig(:aws, :access_key_id) %>
+#   secret_access_key: <%= Rails.application.credentials.dig(:aws, :secret_access_key) %>
+#   region: us-east-1
+#   bucket: your_own_bucket
+
+# Remember not to checkin your GCS keyfile to a repository
+# google:
+#   service: GCS
+#   project: your_project
+#   credentials: <%= Rails.root.join("path/to/gcs.keyfile") %>
+#   bucket: your_own_bucket
+
+# Use rails credentials:edit to set the Azure Storage secret (as azure_storage:storage_access_key)
+# microsoft:
+#   service: AzureStorage
+#   storage_account_name: your_account_name
+#   storage_access_key: <%= Rails.application.credentials.dig(:azure_storage, :storage_access_key) %>
+#   container: your_container_name
+
+# mirror:
+#   service: Mirror
+#   primary: local
+#   mirrors: [ amazon, google, microsoft ]

data/spec/dummy/db/migrate/113_create_events.rb

@@ -1,8 +1,8 @@
 class CreateEvents < ActiveRecord::Migration[4.2]
   def self.up
     create_table :events do |t|
-      t.integer :library_id, null: false
-      t.integer :event_category_id, null: false
+      t.references :library, index: true, null: false
+      t.references :event_category, index: true, null: false
       t.string :name
       t.text :note
       t.datetime :start_at
@@ -13,8 +13,6 @@ class CreateEvents < ActiveRecord::Migration[4.2]
 
       t.timestamps
     end
-    add_index :events, :library_id
-    add_index :events, :event_category_id
   end
 
   def self.down

data/spec/dummy/db/migrate/20081028093607_create_event_import_files.rb

@@ -1,10 +1,10 @@
 class CreateEventImportFiles < ActiveRecord::Migration[4.2]
   def self.up
     create_table :event_import_files do |t|
-      t.integer :parent_id
+      t.references :parent, index: true
       t.string :content_type
       t.integer :size
-      t.integer :user_id
+      t.references :user, index: true
       t.text :note
       t.datetime :imported_at
       t.string :event_import_file_name
@@ -15,8 +15,6 @@ class CreateEventImportFiles < ActiveRecord::Migration[4.2]
 
       t.timestamps
     end
-    add_index :event_import_files, :parent_id
-    add_index :event_import_files, :user_id
   end
 
   def self.down

data/spec/dummy/db/migrate/20090519203307_create_participates.rb

@@ -1,14 +1,12 @@
 class CreateParticipates < ActiveRecord::Migration[4.2]
   def self.up
     create_table :participates do |t|
-      t.integer :agent_id, null: false
-      t.integer :event_id, null: false
+      t.references :agent, index: true, null: false
+      t.references :event, index: true, null: false
       t.integer :position
 
       t.timestamps
     end
-    add_index :participates, :event_id
-    add_index :participates, :agent_id
   end
 
   def self.down

data/spec/dummy/db/migrate/20100925074639_create_event_import_results.rb

@@ -1,8 +1,8 @@
 class CreateEventImportResults < ActiveRecord::Migration[4.2]
   def self.up
     create_table :event_import_results do |t|
-      t.integer :event_import_file_id
-      t.integer :event_id
+      t.references :event_import_file
+      t.references :event
       t.text :body
 
       t.timestamps

data/spec/dummy/db/migrate/20140720192418_add_default_library_id_to_event_import_file.rb

@@ -1,5 +1,5 @@
 class AddDefaultLibraryIdToEventImportFile < ActiveRecord::Migration[4.2]
   def change
-    add_column :event_import_files, :default_library_id, :integer
+    add_reference :event_import_files, :default_library
   end
 end

data/spec/dummy/db/migrate/20140812152348_create_event_export_files.rb

@@ -1,7 +1,7 @@
 class CreateEventExportFiles < ActiveRecord::Migration[4.2]
   def change
     create_table :event_export_files do |t|
-      t.integer :user_id
+      t.references :user, index: true
       t.attachment :event_export
       t.datetime :executed_at
 

data/spec/dummy/db/migrate/20140814070854_add_default_event_category_id_to_event_import_file.rb

@@ -1,5 +1,5 @@
 class AddDefaultEventCategoryIdToEventImportFile < ActiveRecord::Migration[4.2]
   def change
-    add_column :event_import_files, :default_event_category_id, :integer
+    add_reference :event_import_files, :default_event_category
   end
 end