enju_circulation 0.1.0.pre41 → 0.1.0.pre42

data/app/views/manifestation_checkout_stats/_group_by_carrier_type.html.erb

@@ -2,7 +2,8 @@
       <tr>
         <th>
           <%= t('activerecord.models.library') %>
-          -
+	</th>
+	<th>
           <%= t('activerecord.models.shelf') %>
         </th>
         <% CarrierType.order(:position).each do |carrier_type| %>
@@ -10,39 +11,39 @@
         <% end %>
         <th><%= t('page.total') %></th>
       </tr>
-      <% (Shelf.order(:position) << nil).each do |shelf| %>
-        <tr>
-          <td>
-            <% if shelf %>
-              <strong>
-                <%= shelf.library.display_name.localize %>
-                -
-                <%= shelf.display_name.localize %>
-              </strong>
-            <% else %>
-              <strong><%= t('page.unknown') %></strong>
-            <% end %>
-          </td>
-          <% CarrierType.order(:position).each do |carrier_type| %>
+      <% Library.order(:position).each do |library| %>
+        <% library.shelves.order(:position).each do |shelf| %>
+          <tr>
+	    <td>
+              <%= library.display_name.localize %>
+            </td>
             <td>
-              <% if shelf %>
+              <%= shelf.display_name.localize %>
+            </td>
+            <% CarrierType.order(:position).each do |carrier_type| %>
+              <td>
                 <%= @carrier_type_results[[shelf.id, carrier_type.id]] %>
-              <% else %>
-                <%= @carrier_type_results[[nil, carrier_type.id]] %>
-              <% end %>
+              </td>
+            <% end %>
+            <td>
+              <%= @carrier_type_results.select{|r| r[0] == shelf.id}.sum{|k, v| v} %>
             </td>
-          <% end %>
+          </tr>
+        <% end %>
+      <% end %>
+      <tr>
+        <td colspan="2"><%= t('page.unknown') %></td>
+        <% CarrierType.order(:position).each do |carrier_type| %>
           <td>
-            <% if shelf %>
-              <%= @carrier_type_results.select{|r| r[0] == shelf.id}.sum{|k, v| v} %>
-            <% else %>
-              <%= @carrier_type_results.select{|r| r[0].nil?}.sum{|k, v| v} %>
-            <% end %>
+            <%= @carrier_type_results[[nil, carrier_type.id]] %>
           </td>
-        </tr>
-      <% end %>
+	<% end %>
+        <td>
+          <%= @carrier_type_results.select{|r| r[0].nil?}.sum{|k, v| v} %>
+        </td>
+      </tr>
       <tr>
-        <td><strong><%= t('page.total') %></strong></td>
+        <th colspan="2"><%= t('page.total') %></th>
         <% CarrierType.order(:position).each do |carrier_type| %>
           <td>
             <%= @carrier_type_results.select{|r| r[1] == carrier_type.id}.sum{|k, v| v} %>

data/app/views/manifestation_checkout_stats/_group_by_checkout_type.html.erb

@@ -2,7 +2,8 @@
       <tr>
         <th>
           <%= t('activerecord.models.library') %>
-          -
+	</th>
+	<th>
           <%= t('activerecord.models.shelf') %>
         </th>
         <% CheckoutType.order(:position).each do |checkout_type| %>
@@ -10,39 +11,39 @@
         <% end %>
         <th><%= t('page.total') %></th>
       </tr>
-      <% (Shelf.order(:position) << nil).each do |shelf| %>
-        <tr>
-          <td>
-            <% if shelf %>
-              <strong>
-                <%= shelf.library.display_name.localize %>
-                -
-                <%= shelf.display_name.localize %>
-              </strong>
-            <% else %>
-              <strong><%= t('page.unknown') %></strong>
-            <% end %>
-          </td>
-          <% CheckoutType.order(:position).each do |checkout_type| %>
+      <% Library.order(:position).each do |library| %>
+        <% library.shelves.order(:position).each do |shelf| %>
+          <tr>
+            <td>
+              <%= library.display_name.localize %>
+            </td>
             <td>
-              <% if shelf %>
+              <%= shelf.display_name.localize %>
+            </td>
+            <% CheckoutType.order(:position).each do |checkout_type| %>
+              <td>
                 <%= @checkout_type_results[[shelf.id, checkout_type.id]] %>
-              <% else %>
-                <%= @checkout_type_results[[nil, checkout_type.id]] %>
-              <% end %>
+              </td>
+            <% end %>
+            <td>
+              <%= @checkout_type_results.select{|r| r[0] == shelf.id}.sum{|k, v| v} %>
             </td>
-          <% end %>
+          </tr>
+        <% end %>
+      <% end %>
+      <tr>
+        <td colspan="2"><%= t('page.unknown') %></th>
+        <% CheckoutType.order(:position).each do |checkout_type| %>
           <td>
-            <% if shelf %>
-              <%= @checkout_type_results.select{|r| r[0] == shelf.id}.sum{|k, v| v} %>
-            <% else %>
-              <%= @checkout_type_results.select{|r| r[0].nil?}.sum{|k, v| v} %>
-            <% end %>
+            <%= @checkout_type_results[[nil, checkout_type.id]] %>
           </td>
-        </tr>
-      <% end %>
+        <% end %>
+        <td>
+          <%= @checkout_type_results.select{|r| r[0].nil?}.sum{|k, v| v} %>
+        </td>
+      </tr>
       <tr>
-        <td><strong><%= t('page.total') %></strong></td>
+        <th colspan="2"><%= t('page.total') %></th>
         <% CheckoutType.order(:position).each do |checkout_type| %>
           <td>
             <%= @checkout_type_results.select{|r| r[1] == checkout_type.id}.sum{|k, v| v} %>

data/config/locales/translation_en.yml

@@ -23,6 +23,7 @@ en:
       reserve_stat_has_user: Reserve stat has user
       user_group_has_checkout_type: User group has checkout type
       carrier_type_has_checkout_type: Carrier type and checkout type
+      demand: Demand
 
     attributes:
       basket:

data/config/locales/translation_ja.yml

@@ -21,6 +21,7 @@ ja:
       reserve_stat_has_user: 利用者別予約統計
       user_group_has_checkout_type: 利用者グループと貸出区分の関係
       carrier_type_has_checkout_type: 資料の形態と貸出区分の関係
+      demand: 督促
 
     attributes:
       basket:

data/config/routes.rb

@@ -1,4 +1,6 @@
 Rails.application.routes.draw do
+  resources :demands
+
   get "/users/:user_id/checkouts" => redirect("/checkouts?user_id=%{user_id}")
   get "/users/:user_id/reserves" => redirect("/reserves?user_id=%{user_id}")
   get "/users/:user_id/baskets" => redirect("/baskets?user_id=%{user_id}")

data/db/migrate/20150106001709_create_demands.rb

@@ -0,0 +1,14 @@
+class CreateDemands < ActiveRecord::Migration
+  def change
+    create_table :demands do |t|
+      t.integer :user_id
+      t.integer :item_id
+      t.integer :message_id
+
+      t.timestamps null: false
+    end
+    add_index :demands, :user_id
+    add_index :demands, :item_id
+    add_index :demands, :message_id
+  end
+end

data/lib/enju_circulation/accept.rb

@@ -7,6 +7,7 @@ module EnjuCirculation
     module ClassMethods
       def enju_circulation_accept_model
         include InstanceMethods
+        before_save :accept!, on: :create
       end
     end
 

data/lib/enju_circulation/carrier_type.rb

@@ -0,0 +1,15 @@
+module EnjuCirculation
+  module EnjuCarrierType
+    def self.included(base)
+      base.extend ClassMethods
+    end
+
+    module ClassMethods
+      def enju_circulation_carrier_type_model
+        has_many :carrier_type_has_checkout_types, dependent: :destroy
+        has_many :checkout_types, through: :carrier_type_has_checkout_types
+        accepts_nested_attributes_for :carrier_type_has_checkout_types, allow_destroy: true, reject_if: :all_blank
+      end
+    end
+  end
+end

data/lib/enju_circulation/item.rb

@@ -44,9 +44,10 @@ module EnjuCirculation
         validates_associated :circulation_status, :checkout_type
         validates_presence_of :circulation_status, :checkout_type
         searchable do
-          integer :circulation_status_id
+          string :circulation_status do
+            circulation_status.name
+          end
         end
-        attr_accessible :item_has_use_restriction_attributes
         accepts_nested_attributes_for :item_has_use_restriction
 
         after_create :create_lending_policy

data/lib/enju_circulation/profile.rb

@@ -7,9 +7,6 @@ module EnjuCirculation
     module ClassMethods
       def enju_circulation_profile_model
         include InstanceMethods
-        attr_accessible :save_checkout_history, :checkout_icalendar_token
-        attr_accessible :save_checkout_history, :checkout_icalendar_token,
-          as: :admin
       end
     end
 

data/lib/enju_circulation/user.rb

@@ -7,9 +7,9 @@ module EnjuCirculation
     module ClassMethods
       def enju_circulation_user_model
         include InstanceMethods
-        attr_accessible :save_checkout_history, :checkout_icalendar_token
-        attr_accessible :save_checkout_history, :checkout_icalendar_token,
-          :as => :admin
+        #attr_accessible :save_checkout_history, :checkout_icalendar_token
+        #attr_accessible :save_checkout_history, :checkout_icalendar_token,
+        #  :as => :admin
 
         has_many :checkouts, :dependent => :nullify
         has_many :reserves, :dependent => :destroy
@@ -60,6 +60,10 @@ module EnjuCirculation
         return true if profile.user_group.user_group_has_checkout_types.available_for_carrier_type(manifestation.carrier_type).where(:user_group_id => profile.user_group.id).collect(&:reservation_limit).max.to_i <= reserves.waiting.size
         false
       end
+
+      def has_overdue?(day = 1)
+        true if checkouts.where(checkin_id: nil).where(Checkout.arel_table[:due_date].lt day.days.ago).count >= 1
+      end
     end
   end
 end

data/lib/enju_circulation/user_group.rb

@@ -9,7 +9,6 @@ module EnjuCirculation
         has_many :user_group_has_checkout_types, dependent: :destroy
         has_many :checkout_types, through: :user_group_has_checkout_types
         has_many :lending_policies
-        attr_accessible :user_group_has_checkout_types_attributes
         accepts_nested_attributes_for :user_group_has_checkout_types, :allow_destroy => true, :reject_if => :all_blank
 
         validates_numericality_of :number_of_day_to_notify_due_date,

data/lib/enju_circulation/version.rb

@@ -1,3 +1,3 @@
 module EnjuCirculation
-  VERSION = "0.1.0.pre41"
+  VERSION = "0.1.0.pre42"
 end

data/lib/enju_circulation.rb

@@ -6,6 +6,7 @@ require "enju_circulation/user_group"
 require "enju_circulation/profile"
 require "enju_circulation/accept"
 require "enju_circulation/basket"
+require "enju_circulation/carrier_type"
 require "enju_circulation/controller"
 require "enju_circulation/helper"
 
@@ -20,4 +21,5 @@ ActiveRecord::Base.send :include, EnjuCirculation::EnjuUserGroup
 ActiveRecord::Base.send :include, EnjuCirculation::EnjuProfile
 ActiveRecord::Base.send :include, EnjuCirculation::EnjuAccept
 ActiveRecord::Base.send :include, EnjuCirculation::EnjuBasket
+ActiveRecord::Base.send :include, EnjuCirculation::EnjuCarrierType
 ActionView::Base.send :include, EnjuCirculation::ManifestationsHelper

data/spec/controllers/checked_items_controller_spec.rb

@@ -197,8 +197,8 @@ describe CheckedItemsController do
 
   describe "POST create" do
     before(:each) do
-      @attrs = {:item_identifier => '00011'}
-      @invalid_attrs = {:item_identifier => 'invalid'}
+      @attrs = {item_identifier: '00011'}
+      @invalid_attrs = {item_identifier: 'invalid'}
     end
 
     describe "When logged in as Administrator" do
@@ -206,7 +206,7 @@ describe CheckedItemsController do
 
       describe "When the item is missing" do
         it "assigns a newly created checked_item as @checked_item" do
-          post :create, :checked_item => {:item_identifier => 'not found'} , :basket_id => 1
+          post :create, :checked_item => {item_identifier: 'not found'} , :basket_id => 1
           assigns(:checked_item).should_not be_valid
           assigns(:checked_item).errors[:base].include?(I18n.t('activerecord.errors.messages.checked_item.item_not_found')).should be_truthy
         end
@@ -214,7 +214,7 @@ describe CheckedItemsController do
 
       describe "When the item is not for checkout" do
         it "assigns a newly created checked_item as @checked_item" do
-          post :create, :checked_item => {:item_identifier => '00017'} , :basket_id => 1
+          post :create, :checked_item => {item_identifier: '00017'} , :basket_id => 1
           assigns(:checked_item).should_not be_valid
           assigns(:checked_item).errors[:base].include?(I18n.t('activerecord.errors.messages.checked_item.not_available_for_checkout')).should be_truthy
         end
@@ -222,7 +222,7 @@ describe CheckedItemsController do
 
       describe "When the item is already checked out" do
         it "assigns a newly created checked_item as @checked_item" do
-          post :create, :checked_item => {:item_identifier => '00013'} , :basket_id => 8
+          post :create, :checked_item => {item_identifier: '00013'} , :basket_id => 8
           assigns(:checked_item).should_not be_valid
           assigns(:checked_item).errors[:base].include?(I18n.t('activerecord.errors.messages.checked_item.already_checked_out')).should be_truthy
         end
@@ -231,7 +231,7 @@ describe CheckedItemsController do
       describe "When the item is reserved" do
         it "assigns a newly created checked_item as @checked_item" do
           old_count = items(:item_00021).manifestation.reserves.waiting.count
-          post :create, :checked_item => {:item_identifier => '00021'} , :basket_id => 11
+          post :create, :checked_item => {item_identifier: '00021'} , :basket_id => 11
           assigns(:checked_item).should be_valid
           assigns(:checked_item).item.manifestation.reserves.waiting.count.should eq old_count - 1
           assigns(:checked_item).librarian.should eq users(:admin)
@@ -239,12 +239,12 @@ describe CheckedItemsController do
       end
 
       it "should not create checked_item without basket_id" do
-        post :create, :checked_item => {:item_identifier => '00004'}
+        post :create, :checked_item => {item_identifier: '00004'}
         response.should be_forbidden
       end
 
       it "should not create checked_item without item_id" do
-        post :create, :checked_item => { }, :basket_id => 1
+        post :create, :checked_item => {item_identifier: '00004' }, :basket_id => 1
         response.should be_success
       end
     end
@@ -259,41 +259,41 @@ describe CheckedItemsController do
       end
 
       it "should create checked_item with item_identifier" do
-        post :create, :checked_item => {:item_identifier => '00011'}, :basket_id => 3
+        post :create, :checked_item => {item_identifier: '00011'}, :basket_id => 3
         assigns(:checked_item).should be_truthy
         assigns(:checked_item).due_date.should_not be_nil
         response.should redirect_to checked_items_url(basket_id: assigns(:checked_item).basket_id)
       end 
 
       it "should override due_date" do
-        post :create, :checked_item => {:item_identifier => '00011', :due_date_string => 1.year.from_now.strftime('%Y-%m-%d')}, :basket_id => 3
+        post :create, :checked_item => {item_identifier: '00011', :due_date_string => 1.year.from_now.strftime('%Y-%m-%d')}, :basket_id => 3
         assigns(:checked_item).should be_truthy
         assigns(:checked_item).due_date.should eq 1.year.from_now.end_of_day
         response.should redirect_to checked_items_url(basket_id: assigns(:checked_item).basket_id)
       end 
 
       it "should not create checked_item with an invalid due_date" do
-        post :create, :checked_item => {:item_identifier => '00011', :due_date_string => "invalid"}, :basket_id => 3
+        post :create, :checked_item => {item_identifier: '00011', :due_date_string => "invalid"}, :basket_id => 3
         assigns(:checked_item).should_not be_valid
         assigns(:checked_item).due_date.should be_nil
         response.should be_success
       end 
 
       it "should not create checked_item if excessed checkout_limit" do
-        post :create, :checked_item => {:item_identifier => '00011'}, :basket_id => 1
+        post :create, :checked_item => {item_identifier: '00011'}, :basket_id => 1
         response.should be_success
         assigns(:checked_item).errors["base"].include?(I18n.t('activerecord.errors.messages.checked_item.excessed_checkout_limit')).should be_truthy
       end
 
       it "should show message when the item includes supplements" do
-        post :create, :checked_item => {:item_identifier => '00006'}, :basket_id => 3
+        post :create, :checked_item => {item_identifier: '00006'}, :basket_id => 3
         assigns(:checked_item).due_date.should_not be_nil
         response.should redirect_to checked_items_url(basket_id: assigns(:checked_item).basket_id)
         flash[:message].index(I18n.t('item.this_item_include_supplement')).should be_truthy
       end 
 
       it "should create checked_item when ignore_restriction is checked" do
-        post :create, :checked_item => {:item_identifier => '00011', :ignore_restriction => "1"}, :basket_id => 2
+        post :create, :checked_item => {item_identifier: '00011', :ignore_restriction => "1"}, :basket_id => 2
         assigns(:checked_item).due_date.should_not be_nil
         response.should redirect_to checked_items_url(basket_id: assigns(:checked_item).basket_id)
       end
@@ -303,14 +303,14 @@ describe CheckedItemsController do
       login_fixture_user
 
       it "should not create checked_item" do
-        post :create, :checked_item => {:item_identifier => '00004'}, :basket_id => 3
+        post :create, :checked_item => {item_identifier: '00004'}, :basket_id => 3
         response.should be_forbidden
       end
     end
 
     describe "When not logged in as" do
       it "should not create checked_item" do
-        post :create, :checked_item => {:item_identifier => '00004'}, :basket_id => 1
+        post :create, :checked_item => {item_identifier: '00004'}, :basket_id => 1
         response.should redirect_to new_user_session_url
       end
     end
@@ -318,8 +318,8 @@ describe CheckedItemsController do
 
   describe "PUT update" do
     before(:each) do
-      @attrs = {:item_identifier => '00011'}
-      @invalid_attrs = {:item_identifier => 'invalid'}
+      @attrs = {item_identifier: '00011'}
+      @invalid_attrs = {item_identifier: 'invalid'}
     end
 
     describe "When logged in as Administrator" do

data/spec/controllers/checkouts_controller_spec.rb

@@ -17,7 +17,7 @@ describe CheckoutsController do
 
       it "assigns all checkouts as @checkouts" do
         get :index
-        assigns(:checkouts).should eq Checkout.not_returned.order('checkouts.id DESC').page(1)
+        assigns(:checkouts).should eq Checkout.order('checkouts.created_at DESC').page(1)
       end
 
       it "should get other user's index" do
@@ -81,7 +81,7 @@ describe CheckoutsController do
 
       it "assigns all checkouts as @checkouts" do
         get :index
-        assigns(:checkouts).should eq(users(:user1).checkouts.not_returned.order('checkouts.id DESC').page(1))
+        assigns(:checkouts).should eq(users(:user1).checkouts.order('checkouts.created_at DESC').page(1))
         response.should be_success
       end
 
@@ -95,7 +95,7 @@ describe CheckoutsController do
       it "should get my index feed" do
         get :index, :format => 'rss'
         response.should be_success
-        assigns(:checkouts).should eq(users(:user1).checkouts.not_returned.order('checkouts.id DESC').page(1))
+        assigns(:checkouts).should eq(users(:user1).checkouts.order('checkouts.created_at DESC').page(1))
       end
 
       it "should get my index with user_id" do

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_circulation_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/application.rb

@@ -44,7 +44,7 @@ module Dummy
     # This will create an empty whitelist of attributes available for mass-assignment for all models
     # in your app. As such, your models will need to explicitly whitelist or blacklist accessible
     # parameters by using an attr_accessible or attr_protected declaration.
-    config.active_record.whitelist_attributes = true
+    #config.active_record.whitelist_attributes = true
 
     # Enable the asset pipeline
     config.assets.enabled = true

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

@@ -23,11 +23,11 @@ Dummy::Application.configure do
   config.action_dispatch.best_standards_support = :builtin
 
   # Raise exception on mass assignment protection for Active Record models
-  config.active_record.mass_assignment_sanitizer = :strict
+  #config.active_record.mass_assignment_sanitizer = :strict
 
   # Log the query plan for queries taking more than this (works
   # with SQLite, MySQL, and PostgreSQL)
-  config.active_record.auto_explain_threshold_in_seconds = 0.5
+  # config.active_record.auto_explain_threshold_in_seconds = 0.5
 
   # Do not compress assets
   config.assets.compress = false

data/spec/dummy/config/routes.rb

@@ -1,4 +1,6 @@
 Dummy::Application.routes.draw do
+  resources :demands
+
   devise_for :users
 
   # The priority is based upon order of creation:

data/spec/dummy/db/migrate/{20111201155456_devise_create_users.rb → 002_devise_create_users.rb}

@@ -13,7 +13,7 @@ class DeviseCreateUsers < ActiveRecord::Migration
       t.datetime :remember_created_at
 
       ## Trackable
-      t.integer  :sign_in_count, :default => 0, :null => false
+      t.integer  :sign_in_count, :default => 0
       t.datetime :current_sign_in_at
       t.datetime :last_sign_in_at
       t.string   :current_sign_in_ip
@@ -26,10 +26,13 @@ class DeviseCreateUsers < ActiveRecord::Migration
       # t.string   :unconfirmed_email # Only if using reconfirmable
 
       ## Lockable
-      # t.integer  :failed_attempts, :default => 0, :null => false # Only if lock strategy is :failed_attempts
+      # t.integer  :failed_attempts, :default => 0 # Only if lock strategy is :failed_attempts
       # t.string   :unlock_token # Only if unlock strategy is :email or :both
       # t.datetime :locked_at
 
+      ## Token authenticatable
+      # t.string :authentication_token
+
 
       t.timestamps
     end
@@ -38,5 +41,6 @@ class DeviseCreateUsers < ActiveRecord::Migration
     add_index :users, :reset_password_token, :unique => true
     # add_index :users, :confirmation_token,   :unique => true
     # add_index :users, :unlock_token,         :unique => true
+    # add_index :users, :authentication_token, :unique => true
   end
 end

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

@@ -0,0 +1,13 @@
+class CreateRoles < ActiveRecord::Migration
+  def change
+    create_table "roles" do |t|
+      t.column :name, :string, :null => false
+      t.column :display_name, :string
+      t.column :note, :text
+      t.column :created_at, :datetime
+      t.column :updated_at, :datetime
+      t.integer :score, :default => 0, :null => false
+      t.integer :position
+    end
+  end
+end

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

@@ -1,5 +1,5 @@
 class CreateLibraries < ActiveRecord::Migration
-  def self.up
+  def change
     create_table :libraries do |t|
       t.string :name, :null => false
       t.text :display_name
@@ -25,8 +25,4 @@ class CreateLibraries < ActiveRecord::Migration
     add_index :libraries, :library_group_id
     add_index :libraries, :name, :unique => true
   end
-
-  def self.down
-    drop_table :libraries
-  end
 end

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

@@ -1,5 +1,5 @@
 class CreateShelves < ActiveRecord::Migration
-  def self.up
+  def change
     create_table :shelves do |t|
       t.string :name, :null => false
       t.text :display_name
@@ -12,8 +12,4 @@ class CreateShelves < ActiveRecord::Migration
     end
     add_index :shelves, :library_id
   end
-
-  def self.down
-    drop_table :shelves
-  end
 end