enju_event 0.1.17.pre23 → 0.1.17.pre24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d54c9387e424146f6b179873c0877487299d957
-  data.tar.gz: 4b647521b23555c7f7410674b07c60c25ea20664
+  metadata.gz: 17d45db27bc16033db8607e141c7520a62abc6fa
+  data.tar.gz: 94a4f03dfba6ebcbcc40df5961fcc235b2ee277f
 SHA512:
-  metadata.gz: f70029c5c1ec60bc87a43c2e566650e42cdd9bcaf2a9c966f7932d0255208ec963c181e9c56eeec07e16608365efeba8be4e288e57ad99b9446fa8596a3f8ed7
-  data.tar.gz: 6b6d1e1f0772ba472b2834a7499d2b6515394419f6baa93da69152aa2134efb4874ec7ce6e27539cee12f13753db6cf183270bba16ef8bb7710cc1bc883ca993
+  metadata.gz: 563fefa032cca6eecf657f5da95c92688852445a491402e4fcc6bd85b8bba42a375fac11cf2ef84e057f3108d8bad084c6c9d5c4654e21fa23040782527d2354
+  data.tar.gz: 6cd3e4e41661d192675c644e56505885529f6b59ba9b2931251bf36ab2b1ceb6b0b6039512c42d3a3fae36eb55cf7f639240c6ad9870120ce14268fdfe1509e7

data/README.rdoc

@@ -1,3 +1,10 @@
-= EnjuEvent {<img src="https://secure.travis-ci.org/nabeta/enju_event.png?branch=master" alt="Build Status" />}[http://travis-ci.org/nabeta/enju_event]
+= EnjuEvent
+{<img src="https://secure.travis-ci.org/next-l/enju_event.png?branch=1.1" alt="Build Status" />}[http://travis-ci.org/next-l/enju_event]
+{<img src="https://coveralls.io/repos/next-l/enju_event/badge.png?branch=1.1" alt="Coverage Status" />}[https://coveralls.io/r/next-l/enju_event?branch=1.1]
+{<img src="https://hakiri.io/github/next-l/enju_event/1.1.svg" alt="security" />}[https://hakiri.io/github/next-l/enju_event/1.1]
 
 This project rocks and uses MIT-LICENSE.
+
+== 製作者・貢献者 (Authors and contributors)
+* {TANABE, Kosuke}[https://github.com/nabeta] ({@nabeta}[https://twitter.com/nabeta])
+* {Project Next-L}[http://www.next-l.jp] ({@ProjectNextL}[https://twitter.com/ProjectNextL])

data/app/controllers/event_categories_controller.rb

@@ -38,7 +38,7 @@ class EventCategoriesController < ApplicationController
   # POST /event_categories
   # POST /event_categories.json
   def create
-    @event_category = EventCategory.new(params[:event_category])
+    @event_category = EventCategory.new(event_category_params)
 
     respond_to do |format|
       if @event_category.save
@@ -60,7 +60,7 @@ class EventCategoriesController < ApplicationController
     end
 
     respond_to do |format|
-      if @event_category.update_attributes(params[:event_category])
+      if @event_category.update_attributes(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
@@ -80,4 +80,9 @@ class EventCategoriesController < ApplicationController
       format.json { head :no_content }
     end
   end
+
+  private
+  def event_category_params
+    params.require(:event_category).permit(:name, :display_name, :note)
+  end
 end

data/app/controllers/event_export_files_controller.rb

@@ -53,7 +53,7 @@ class EventExportFilesController < ApplicationController
   # POST /event_export_files
   # POST /event_export_files.json
   def create
-    @event_export_file = EventExportFile.new(params[:event_export_file])
+    @event_export_file = EventExportFile.new(event_export_file_params)
     @event_export_file.user = current_user
 
     respond_to do |format|
@@ -74,7 +74,7 @@ class EventExportFilesController < ApplicationController
   # 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.update_attributes(event_export_file_params)
         if @event_export_file.mode == 'export'
           EventExportFileQueue.perform(@event_export_file.id)
         end
@@ -97,4 +97,9 @@ class EventExportFilesController < ApplicationController
       format.json { head :no_content }
     end
   end
+
+  private
+  def event_export_file_params
+    params.require(:event_export_file).permit(:mode)
+  end
 end

data/app/controllers/event_import_files_controller.rb

@@ -40,7 +40,7 @@ class EventImportFilesController < ApplicationController
   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
+    @event_import_file.default_event_category = @event_categories.first
 
     respond_to do |format|
       format.html # new.html.erb
@@ -55,7 +55,7 @@ class EventImportFilesController < ApplicationController
   # POST /event_import_files
   # POST /event_import_files.json
   def create
-    @event_import_file = EventImportFile.new(params[:event_import_file])
+    @event_import_file = EventImportFile.new(event_import_file_params)
     @event_import_file.user = current_user
 
     respond_to do |format|
@@ -77,7 +77,7 @@ class EventImportFilesController < ApplicationController
   # PUT /event_import_files/1.json
   def update
     respond_to do |format|
-      if @event_import_file.update_attributes(params[:event_import_file])
+      if @event_import_file.update_attributes(event_import_file_params)
         if @event_import_file.mode == 'import'
           Resque.enqueue(EventImportFileQueue, @event_import_file.id)
         end
@@ -102,8 +102,16 @@ class EventImportFilesController < ApplicationController
     end
   end
 
+  private
+  def event_import_file_params
+    params.require(:event_import_file).permit(
+      :event_import, :edit_mode, :user_encoding, :mode,
+      :default_library_id, :default_event_category_id
+    )
+  end
+
   def prepare_options
     @libraries = Library.all
-    @event_categories = EventCategory.all
+    @event_categories = EventCategory.order(:position)
   end
 end

data/app/controllers/event_import_results_controller.rb

@@ -36,4 +36,11 @@ class EventImportResultsController < ApplicationController
       format.json { head :no_content }
     end
   end
+
+  private
+  def event_import_result_params
+    params.require(:event_import_result).permit(
+      :event_id, :event_import_file_id, :body #, as: :admin
+    )
+  end
 end

data/app/controllers/events_controller.rb

@@ -96,7 +96,7 @@ class EventsController < ApplicationController
   # POST /events
   # POST /events.json
   def create
-    @event = Event.new(params[:event])
+    @event = Event.new(event_params)
     @event.set_date
 
     respond_to do |format|
@@ -119,7 +119,7 @@ class EventsController < ApplicationController
     @event.set_date
 
     respond_to do |format|
-      if @event.update_attributes(params[:event])
+      if @event.update_attributes(event_params)
 
         flash[:notice] = t('controller.successfully_updated', model: t('activerecord.models.event'))
         format.html { redirect_to(@event) }
@@ -144,8 +144,14 @@ class EventsController < ApplicationController
   end
 
   private
+  def event_params
+    params.require(:event).permit(
+      :library_id, :event_category_id, :name, :note, :start_at,
+      :end_at, :all_day, :display_name
+    )
+  end
+
   def prepare_options
     @event_categories = EventCategory.all
   end
-
 end

data/app/controllers/participates_controller.rb

@@ -39,7 +39,7 @@ class ParticipatesController < ApplicationController
   # POST /participates
   # POST /participates.json
   def create
-    @participate = Participate.new(params[:participate])
+    @participate = Participate.new(participate_params)
 
     respond_to do |format|
       if @participate.save
@@ -57,7 +57,7 @@ class ParticipatesController < ApplicationController
   # PUT /participates/1.json
   def update
     respond_to do |format|
-      if @participate.update_attributes(params[:participate])
+      if @participate.update_attributes(participate_params)
         flash[:notice] = 'Participate was successfully updated.'
         format.html { redirect_to(@participate) }
         format.json { head :no_content }
@@ -78,4 +78,9 @@ class ParticipatesController < ApplicationController
       format.json { head :no_content }
     end
   end
+
+  private
+  def participate_params
+    params.require(:participate).permit(:agent_id, :event_id)
+  end
 end

data/app/models/event.rb

@@ -1,8 +1,5 @@
 # -*- encoding: utf-8 -*-
 class Event < ActiveRecord::Base
-  attr_accessible :library_id, :event_category_id, :name, :note, :start_at,
-    :end_at, :all_day, :display_name
-
   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)}

data/app/models/event_category.rb

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

data/app/models/event_export_file.rb

@@ -1,9 +1,15 @@
 class EventExportFile < ActiveRecord::Base
-  attr_accessible
-  include Statesman::Adapters::ActiveRecordModel
+  include Statesman::Adapters::ActiveRecordQueries
   include ExportFile
   enju_export_file_model
-  has_attached_file :event_export
+  if Setting.uploaded_file.storage == :s3
+    has_attached_file :event_export, storage: :s3,
+      s3_credentials: Setting.amazon,
+      s3_permissions: :private
+  else
+    has_attached_file :event_export,
+      path: ":rails_root/private/system/:class/:attachment/:id_partition/:style/:filename"
+  end
   validates_attachment_content_type :event_export, :content_type => /\Atext\/plain\Z/
   has_many :event_export_file_transitions
 
@@ -34,6 +40,10 @@ class EventExportFile < ActiveRecord::Base
   def self.transition_class
     EventExportFileTransition
   end
+
+  def self.initial_state
+    :pending
+  end
 end
 
 # == Schema Information

data/app/models/event_export_file_transition.rb

@@ -3,7 +3,7 @@ class EventExportFileTransition < ActiveRecord::Base
 
   
   belongs_to :event_export_file, inverse_of: :event_export_file_transitions
-  attr_accessible :to_state, :sort_key, :metadata
+  #attr_accessible :to_state, :sort_key, :metadata
 end
 
 # == Schema Information

data/app/models/event_import_file.rb

@@ -1,15 +1,13 @@
 class EventImportFile < ActiveRecord::Base
-  include Statesman::Adapters::ActiveRecordModel
+  include Statesman::Adapters::ActiveRecordQueries
   include ImportFile
-  attr_accessible :event_import, :edit_mode, :user_encoding, :mode,
-    :default_library_id, :default_event_category_id
   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)}
 
   if Setting.uploaded_file.storage == :s3
     has_attached_file :event_import, storage: :s3,
-      s3_credentials: "#{Setting.amazon}",
+      s3_credentials: Setting.amazon,
       s3_permissions: :private
   else
     has_attached_file :event_import,
@@ -51,7 +49,7 @@ class EventImportFile < ActiveRecord::Base
       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") }, as: :admin)
+      event_import_result.assign_attributes({ event_import_file_id: id, body: row.fields.join("\t") })
       event_import_result.save!
 
       event = Event.new
@@ -165,6 +163,10 @@ class EventImportFile < ActiveRecord::Base
     EventImportFileTransition
   end
 
+  def self.initial_state
+    :pending
+  end
+
   def open_import_file(tempfile)
     file = CSV.open(tempfile, col_sep: "\t")
     header_columns = %w(
@@ -178,7 +180,7 @@ class EventImportFile < ActiveRecord::Base
     end
     rows = CSV.open(tempfile, headers: header, col_sep: "\t")
     event_import_result = EventImportResult.new
-    event_import_result.assign_attributes({ event_import_file_id: id, body: header.join("\t") }, as: :admin)
+    event_import_result.assign_attributes({ event_import_file_id: id, body: header.join("\t") })
     event_import_result.save!
     tempfile.close(true)
     file.close

data/app/models/event_import_file_transition.rb

@@ -3,7 +3,7 @@ class EventImportFileTransition < ActiveRecord::Base
 
   
   belongs_to :event_import_file, inverse_of: :event_import_file_transitions
-  attr_accessible :to_state, :sort_key, :metadata
+  #attr_accessible :to_state, :sort_key, :metadata
 end
 
 # == Schema Information

data/app/models/event_import_result.rb

@@ -1,5 +1,4 @@
 class EventImportResult < ActiveRecord::Base
-  attr_accessible :event_id, :event_import_file_id, :body, as: :admin
   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) }

data/app/models/participate.rb

@@ -1,5 +1,4 @@
 class Participate < ActiveRecord::Base
-  attr_accessible :agent_id, :event_id
   belongs_to :agent
   belongs_to :event
 

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

@@ -19,13 +19,13 @@
         <td><%= link_to event_export_file.id, event_export_file %></td>
         <td><%= event_export_file.user.try(:username) %></td>
         <td>
-          <%= link_to event_export_file.event_export_file_name, event_export_file.event_export.url if event_export_file.event_export.path %>
+          <%= link_to event_export_file.event_export_file_name, event_export_file_path(event_export_file, format: :download) if event_export_file.event_export_file_name %>
           <br />
           <%= event_export_file.created_at %>
         </td>
         <td><%= localized_state(event_export_file.current_state) -%></td>
         <td>
-          <%= link_to t('page.destroy'), event_export_file, method: :delete, data: {confirm: t('page.are_you_sure')}, method: :delete -%>
+          <%= link_to t('page.destroy'), event_export_file, data: {confirm: t('page.are_you_sure')}, method: :delete -%>
         </td>
       </tr>
     <% end %>

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

@@ -10,7 +10,7 @@
 
 <p>
   <strong><%= t('activerecord.attributes.event_export_file.event_export_file_name') -%></strong>
-  <%= link_to @event_export_file.event_export_file_name, @event_export_file.event_export.url if @event_export_file.event_export_file_name %>
+  <%= link_to @event_export_file.event_export_file_name, event_export_file_path(@event_export_file, format: :download) if @event_export_file.event_export_file_name %>
 </p>
 
 <p>

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

@@ -20,7 +20,7 @@
       <tr class="line<%= cycle("0", "1") -%>">
         <td><%= link_to (event_import_file.id), event_import_file -%></td>
         <td>
-          <%= link_to event_import_file.event_import_file_name, event_import_file -%>
+          <%= 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 %>
           <br />
           <%= t('activerecord.models.user') -%>: <%= link_to event_import_file.user.username, event_import_file.user.profile if event_import_file.user.try(:profile) -%></td>
         <td><%= event_import_file.edit_mode -%></td>

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

@@ -10,7 +10,7 @@
 
 <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) -%>
+  <%= 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>

data/db/migrate/20140523171309_create_event_import_file_transitions.rb

@@ -2,7 +2,11 @@ class CreateEventImportFileTransitions < ActiveRecord::Migration
   def change
     create_table :event_import_file_transitions do |t|
       t.string :to_state
-      t.text :metadata, default: "{}"
+      if ActiveRecord::Base.configurations[Rails.env]["adapter"].try(:match, /mysql/)
+        t.text :metadata
+      else
+        t.text :metadata, default: "{}"
+      end
       t.integer :sort_key
       t.integer :event_import_file_id
       t.timestamps

data/db/migrate/20140812153137_create_event_export_file_transitions.rb

@@ -2,7 +2,11 @@ class CreateEventExportFileTransitions < ActiveRecord::Migration
   def change
     create_table :event_export_file_transitions do |t|
       t.string :to_state
-      t.text :metadata, default: "{}"
+      if ActiveRecord::Base.configurations[Rails.env]["adapter"].try(:match, /mysql/)
+        t.text :metadata
+      else
+        t.text :metadata, default: "{}"
+      end
       t.integer :sort_key
       t.integer :event_export_file_id
       t.timestamps

data/lib/enju_event/engine.rb

@@ -1,4 +1,3 @@
-require "enju_seed"
 require "enju_message"
 require "paperclip"
 require "statesman"
@@ -9,7 +8,6 @@ begin
   require 'charlock_holmes/string'
 rescue LoadError
 end
-require "protected_attributes" if Rails::VERSION::MAJOR == 4
 
 module EnjuEvent
   class Engine < ::Rails::Engine

data/lib/enju_event/version.rb

@@ -1,3 +1,3 @@
 module EnjuEvent
-  VERSION = "0.1.17.pre23"
+  VERSION = "0.1.17.pre24"
 end

data/spec/controllers/event_export_files_controller_spec.rb

@@ -126,7 +126,7 @@ describe EventExportFilesController do
       login_fixture_librarian
 
       it "should create agent_export_file" do
-        post :create, :event_export_file => { }
+        post :create, :event_export_file => { event_export_file_name: 'test.txt' }
         assigns(:event_export_file).should be_valid
         assigns(:event_export_file).user.username.should eq @user.username
         response.should redirect_to event_export_file_url(assigns(:event_export_file))
@@ -137,7 +137,7 @@ describe EventExportFilesController do
       login_fixture_user
 
       it "should be forbidden" do
-        post :create, :event_export_file => { }
+        post :create, :event_export_file => { event_export_file_name: 'test.txt' }
         assigns(:event_export_file).user.should be_nil
         response.should be_forbidden
       end
@@ -145,7 +145,7 @@ describe EventExportFilesController do
 
     describe "When not logged in" do
       it "should be redirected to new session url" do
-        post :create, :event_export_file => { }
+        post :create, :event_export_file => { event_export_file_name: 'test.txt' }
         assigns(:event_export_file).user.should be_nil
         response.should redirect_to new_user_session_url
       end
@@ -197,7 +197,7 @@ describe EventExportFilesController do
       login_fixture_admin
 
       it "should update event_export_file" do
-        put :update, :id => event_export_files(:event_export_file_00003).id, :event_export_file => { }
+        put :update, :id => event_export_files(:event_export_file_00003).id, :event_export_file => { event_export_file_name: 'test.txt' }
         response.should redirect_to event_export_file_url(assigns(:event_export_file))
       end
     end
@@ -206,7 +206,7 @@ describe EventExportFilesController do
       login_fixture_librarian
 
       it "should update event_export_file" do
-        put :update, :id => event_export_files(:event_export_file_00003).id, :event_export_file => { }
+        put :update, :id => event_export_files(:event_export_file_00003).id, :event_export_file => { event_export_file_name: 'test.txt' }
         response.should redirect_to event_export_file_url(assigns(:event_export_file))
       end
     end

data/spec/controllers/event_import_files_controller_spec.rb

@@ -201,7 +201,7 @@ describe EventImportFilesController do
       login_fixture_librarian
 
       it "should update event_import_file" do
-        put :update, :id => event_import_files(:event_import_file_00003).id, :event_import_file => { }
+        put :update, :id => event_import_files(:event_import_file_00003).id, :event_import_file => { edit_mode: 'update' }
         response.should redirect_to event_import_file_url(assigns(:event_import_file))
       end
     end

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

@@ -5,7 +5,6 @@ class User < ActiveRecord::Base
          :recoverable, :rememberable, :trackable, :validatable
 
   # Setup accessible (or protected) attributes for your model
-  attr_accessible :email, :password, :password_confirmation, :remember_me
 
   enju_leaf_user_model
   enju_message_user_model

data/spec/dummy/bin/bundle

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

data/spec/dummy/bin/rails

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+APP_PATH = File.expand_path('../../config/application', __FILE__)
+require_relative '../config/boot'
+require 'rails/commands'

data/spec/dummy/bin/rake

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+require_relative '../config/boot'
+require 'rake'
+Rake.application.run

data/spec/dummy/bin/setup

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+require 'pathname'
+
+# path to your application root.
+APP_ROOT = Pathname.new File.expand_path('../../',  __FILE__)
+
+Dir.chdir APP_ROOT do
+  # This script is a starting point to setup your application.
+  # Add necessary setup steps to this file:
+
+  puts "== Installing dependencies =="
+  system "gem install bundler --conservative"
+  system "bundle check || bundle install"
+
+  # puts "\n== Copying sample files =="
+  # unless File.exist?("config/database.yml")
+  #   system "cp config/database.yml.sample config/database.yml"
+  # end
+
+  puts "\n== Preparing database =="
+  system "bin/rake db:setup"
+
+  puts "\n== Removing old logs and tempfiles =="
+  system "rm -f log/*"
+  system "rm -rf tmp/cache"
+
+  puts "\n== Restarting application server =="
+  system "touch tmp/restart.txt"
+end

data/spec/dummy/config/database.yml

@@ -1,25 +1,30 @@
-# SQLite version 3.x
-#   gem install sqlite3
-#
-#   Ensure the SQLite 3 gem is defined in your Gemfile
-#   gem 'sqlite3'
-development:
+sqlite: &sqlite
   adapter: sqlite3
-  database: db/development.sqlite3
+  database: db/<%= Rails.env %>.sqlite3
+
+mysql: &mysql
+  adapter: mysql2
+  username: root
+  password:
+  database: enju_<%= Rails.env %>
+
+postgresql: &postgresql
+  adapter: postgresql
+  username: postgres
+  password:
+  database: enju_<%= Rails.env %>
+
+defaults: &defaults
   pool: 5
   timeout: 5000
+  host: localhost
+  <<: *<%= ENV['DB'] || "sqlite" %>
+
+development:
+  <<: *defaults
 
-# 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:
-  adapter: sqlite3
-  database: db/test.sqlite3
-  pool: 5
-  timeout: 5000
+  <<: *defaults
 
 production:
-  adapter: sqlite3
-  database: db/production.sqlite3
-  pool: 5
-  timeout: 5000
+  <<: *defaults

data/spec/dummy/config/environments/test.rb

@@ -30,7 +30,7 @@ Dummy::Application.configure do
   config.action_mailer.delivery_method = :test
 
   # Raise exception on mass assignment protection for Active Record models
-  config.active_record.mass_assignment_sanitizer = :strict
+  #config.active_record.mass_assignment_sanitizer = :strict
 
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr

data/spec/dummy/db/migrate/035_create_reserves.rb

@@ -10,7 +10,6 @@ class CreateReserves < ActiveRecord::Migration
       t.datetime :canceled_at
       t.datetime :expired_at
       t.datetime :deleted_at
-      t.string :state
       t.boolean :expiration_notice_to_patron, :default => false
       t.boolean :expiration_notice_to_library, :default => false
     end

data/spec/dummy/db/migrate/133_create_agent_merges.rb

@@ -0,0 +1,15 @@
+class CreateAgentMerges < ActiveRecord::Migration
+  def self.up
+    create_table :agent_merges do |t|
+      t.integer :agent_id, :agent_merge_list_id, :null => false
+
+      t.timestamps
+    end
+    add_index :agent_merges, :agent_id
+    add_index :agent_merges, :agent_merge_list_id
+  end
+
+  def self.down
+    drop_table :agent_merges
+  end
+end

data/spec/dummy/db/migrate/134_create_agent_merge_lists.rb

@@ -0,0 +1,13 @@
+class CreateAgentMergeLists < ActiveRecord::Migration
+  def self.up
+    create_table :agent_merge_lists do |t|
+      t.string :title
+
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :agent_merge_lists
+  end
+end