enju_leaf 1.1.0.rc12 → 1.1.0.rc13

data/spec/controllers/user_import_files_controller_spec.rb

@@ -5,7 +5,7 @@ describe UserImportFilesController do
 
   describe "GET index" do
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "assigns all user_import_files as @user_import_files" do
         get :index
@@ -14,7 +14,7 @@ describe UserImportFilesController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "assigns all user_import_files as @user_import_files" do
         get :index
@@ -23,12 +23,12 @@ describe UserImportFilesController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "assigns empty as @user_import_files" do
         get :index
         assigns(:user_import_files).should be_empty
-        response.should be_forbidden
+        expect(response).to be_forbidden
       end
     end
 
@@ -36,39 +36,39 @@ describe UserImportFilesController do
       it "assigns empty as @user_import_files" do
         get :index
         assigns(:user_import_files).should be_empty
-        response.should redirect_to(new_user_session_url)
+        expect(response).to redirect_to(new_user_session_url)
       end
     end
   end
 
   describe "GET show" do
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "assigns the requested user_import_file as @user_import_file" do
         get :show, :id => user_import_files(:two).id
         assigns(:user_import_file).should eq(user_import_files(:two))
-        response.should be_success
+        expect(response).to be_success
       end
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "assigns the requested user_import_file as @user_import_file" do
         get :show, :id => user_import_files(:two).id
         assigns(:user_import_file).should eq(user_import_files(:two))
-        response.should be_success
+        expect(response).to be_success
       end
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "assigns the requested user_import_file as @user_import_file" do
         get :show, :id => user_import_files(:two).id
         assigns(:user_import_file).should eq(user_import_files(:two))
-        response.should be_forbidden
+        expect(response).to be_forbidden
       end
     end
 
@@ -76,39 +76,39 @@ describe UserImportFilesController do
       it "assigns the requested user_import_file as @user_import_file" do
         get :show, :id => user_import_files(:two).id
         assigns(:user_import_file).should eq(user_import_files(:two))
-        response.should redirect_to(new_user_session_url)
+        expect(response).to redirect_to(new_user_session_url)
       end
     end
   end
 
   describe "GET new" do
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "assigns the requested user_import_file as @user_import_file" do
         get :new
         assigns(:user_import_file).should_not be_valid
-        response.should be_success
+        expect(response).to be_success
       end
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "should not assign the requested user_import_file as @user_import_file" do
         get :new
         assigns(:user_import_file).should_not be_valid
-        response.should be_success
+        expect(response).to be_success
       end
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "should not assign the requested user_import_file as @user_import_file" do
         get :new
         assigns(:user_import_file).should_not be_valid
-        response.should be_forbidden
+        expect(response).to be_forbidden
       end
     end
 
@@ -116,7 +116,7 @@ describe UserImportFilesController do
       it "should not assign the requested user_import_file as @user_import_file" do
         get :new
         assigns(:user_import_file).should_not be_valid
-        response.should redirect_to(new_user_session_url)
+        expect(response).to redirect_to(new_user_session_url)
       end
     end
   end
@@ -124,7 +124,9 @@ describe UserImportFilesController do
   describe "POST create" do
     describe "When logged in as Librarian" do
       before(:each) do
+        profile = FactoryGirl.create(:profile)
         @user = FactoryGirl.create(:librarian)
+        @user.profile = profile
         sign_in @user
       end
 
@@ -132,20 +134,22 @@ describe UserImportFilesController do
         post :create, :user_import_file => {:user_import => fixture_file_upload("/../../examples/user_import_file_sample.tsv", 'text/csv') }
         assigns(:user_import_file).should be_valid
         assigns(:user_import_file).user.username.should eq @user.username
-        response.should redirect_to user_import_file_url(assigns(:user_import_file))
+        expect(response).to redirect_to user_import_file_url(assigns(:user_import_file))
       end
     end
 
     describe "When logged in as User" do
       before(:each) do
+        profile = FactoryGirl.create(:profile)
         @user = FactoryGirl.create(:user)
+        @user.profile = profile
         sign_in @user
       end
 
       it "should be forbidden" do
         post :create, :user_import_file => {:user_import => fixture_file_upload("/../../examples/user_import_file_sample.tsv", 'text/csv') }
         assigns(:user_import_file).user.should be_nil
-        response.should be_forbidden
+        expect(response).to be_forbidden
       end
     end
 
@@ -153,14 +157,14 @@ describe UserImportFilesController do
       it "should be redirected to new session url" do
         post :create, :user_import_file => {:user_import => fixture_file_upload("/../../examples/user_import_file_sample.tsv", 'text/csv') }
         assigns(:user_import_file).user.should be_nil
-        response.should redirect_to new_user_session_url
+        expect(response).to redirect_to new_user_session_url
       end
     end
   end
 
   describe "GET edit" do
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "assigns the requested user_import_file as @user_import_file" do
         user_import_file = user_import_files(:one)
@@ -170,7 +174,7 @@ describe UserImportFilesController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "assigns the requested user_import_file as @user_import_file" do
         user_import_file = user_import_files(:one)
@@ -180,12 +184,12 @@ describe UserImportFilesController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "assigns the requested user_import_file as @user_import_file" do
         user_import_file = user_import_files(:one)
         get :edit, :id => user_import_file.id
-        response.should be_forbidden
+        expect(response).to be_forbidden
       end
     end
 
@@ -193,45 +197,45 @@ describe UserImportFilesController do
       it "should not assign the requested user_import_file as @user_import_file" do
         user_import_file = user_import_files(:one)
         get :edit, :id => user_import_file.id
-        response.should redirect_to(new_user_session_url)
+        expect(response).to redirect_to(new_user_session_url)
       end
     end
   end
 
   describe "PUT update" do
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "should update user_import_file" do
         post :create, :user_import_file => {:user_import => fixture_file_upload("/../../examples/user_import_file_sample.tsv", 'text/csv') }
         put :update, :id => assigns(:user_import_file).id, :user_import_file => { :note => 'test' }
-        response.should redirect_to user_import_file_url(assigns(:user_import_file))
+        expect(response).to redirect_to user_import_file_url(assigns(:user_import_file))
       end
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "should update user_import_file" do
         post :create, :user_import_file => {:user_import => fixture_file_upload("/../../examples/user_import_file_sample.tsv", 'text/csv') }
         put :update, :id => assigns(:user_import_file).id, :user_import_file => { :note => 'test' }
-        response.should redirect_to user_import_file_url(assigns(:user_import_file))
+        expect(response).to redirect_to user_import_file_url(assigns(:user_import_file))
       end
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "should not update user_import_file" do
         put :update, :id => user_import_files(:two).id, :user_import_file => { }
-        response.should be_forbidden
+        expect(response).to be_forbidden
       end
     end
 
     describe "When not logged in" do
       it "should not update user_import_file" do
         put :update, :id => user_import_files(:two).id, :user_import_file => { }
-        response.should redirect_to new_user_session_url
+        expect(response).to redirect_to new_user_session_url
       end
     end
   end
@@ -242,7 +246,7 @@ describe UserImportFilesController do
     end
 
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "destroys the requested user_import_file" do
         delete :destroy, :id => @user_import_file.id
@@ -250,12 +254,12 @@ describe UserImportFilesController do
 
       it "redirects to the user_import_files list" do
         delete :destroy, :id => @user_import_file.id
-        response.should redirect_to(user_import_files_url)
+        expect(response).to redirect_to(user_import_files_url)
       end
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "destroys the requested user_import_file" do
         delete :destroy, :id => @user_import_file.id
@@ -263,12 +267,12 @@ describe UserImportFilesController do
 
       it "redirects to the user_import_files list" do
         delete :destroy, :id => @user_import_file.id
-        response.should redirect_to(user_import_files_url)
+        expect(response).to redirect_to(user_import_files_url)
       end
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "destroys the requested user_import_file" do
         delete :destroy, :id => @user_import_file.id
@@ -276,7 +280,7 @@ describe UserImportFilesController do
 
       it "should be forbidden" do
         delete :destroy, :id => @user_import_file.id
-        response.should be_forbidden
+        expect(response).to be_forbidden
       end
     end
 
@@ -287,7 +291,7 @@ describe UserImportFilesController do
 
       it "should be forbidden" do
         delete :destroy, :id => @user_import_file.id
-        response.should redirect_to(new_user_session_url)
+        expect(response).to redirect_to(new_user_session_url)
       end
     end
   end

data/spec/controllers/user_import_results_controller_spec.rb

@@ -6,7 +6,7 @@ describe UserImportResultsController do
 
   describe "GET index" do
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "assigns all user_import_results as @user_import_results" do
         get :index
@@ -15,7 +15,7 @@ describe UserImportResultsController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "assigns all user_import_results as @user_import_results" do
         get :index
@@ -24,7 +24,7 @@ describe UserImportResultsController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "assigns empty as @user_import_results" do
         get :index
@@ -44,7 +44,7 @@ describe UserImportResultsController do
 
   describe "GET show" do
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "assigns the requested user_import_result as @user_import_result" do
         get :show, :id => 1
@@ -53,7 +53,7 @@ describe UserImportResultsController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "assigns the requested user_import_result as @user_import_result" do
         get :show, :id => 1
@@ -62,7 +62,7 @@ describe UserImportResultsController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "assigns the requested user_import_result as @user_import_result" do
         get :show, :id => 1
@@ -85,7 +85,7 @@ describe UserImportResultsController do
     end
 
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "destroys the requested user_import_result" do
         delete :destroy, :id => @user_import_result.id
@@ -98,7 +98,7 @@ describe UserImportResultsController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "destroys the requested user_import_result" do
         delete :destroy, :id => @user_import_result.id
@@ -111,7 +111,7 @@ describe UserImportResultsController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "destroys the requested user_import_result" do
         delete :destroy, :id => @user_import_result.id

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

@@ -5,4 +5,7 @@ class User < ActiveRecord::Base
     :lockable, :lock_strategy => :none, :unlock_strategy => :none
 
   enju_leaf_user_model
+  enju_message_user_model
+  enju_circulation_user_model
+  enju_bookmark_user_model
 end

data/spec/dummy/config/application.rb

@@ -3,7 +3,7 @@ require File.expand_path('../boot', __FILE__)
 require 'rails/all'
 
 Bundler.require
-require "enju_leaf"
+require 'enju_leaf'
 
 module Dummy
   class Application < Rails::Application
@@ -57,3 +57,5 @@ module Dummy
   end
 end
 
+require 'enju_circulation'
+require 'enju_bookmark'

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

@@ -34,4 +34,6 @@ Dummy::Application.configure do
 
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr
+
+  config.action_mailer.default_url_options = {:host => 'localhost:3000'}
 end

data/spec/dummy/db/migrate/{001_create_patrons.rb → 001_create_agents.rb}

@@ -1,4 +1,4 @@
-class CreatePatrons < ActiveRecord::Migration
+class CreateAgents < ActiveRecord::Migration
   def change
     create_table :agents do |t|
       t.integer :user_id
@@ -40,7 +40,6 @@ class CreatePatrons < ActiveRecord::Migration
       t.text :note
       t.integer :required_role_id, :default => 1, :null => false
       t.integer :required_score, :default => 0, :null => false
-      t.string :state
       t.text :email
       t.text :url
     end

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

@@ -19,38 +19,26 @@ class CreateManifestations < ActiveRecord::Migration
       t.integer :height
       t.integer :width
       t.integer :depth
-      t.string :isbn
-      t.string :isbn10
-      t.string :wrong_isbn
-      t.string :nbn
-      t.string :lccn
-      t.string :oclc_number
-      t.string :issn
-      t.integer :price # TODO: 通貨単位
+      t.integer :price # TODO: currency unit
       t.text :fulltext
-      t.string :volume_number_list
-      t.string :issue_number_list
-      t.string :serial_number_list
+      t.string :volume_number_string
+      t.string :issue_number_string
+      t.string :serial_number_string
       t.integer :edition
       t.text :note
       t.boolean :repository_content, :default => false, :null => false
       t.integer :lock_version, :default => 0, :null => false
       t.integer :required_role_id, :default => 1, :null => false
-      t.string :state
       t.integer :required_score, :default => 0, :null => false
       t.integer :frequency_id, :default => 1, :null => false
       t.boolean :subscription_master, :default => false, :null => false
     end
     #add_index :manifestations, :carrier_type_id
     #add_index :manifestations, :required_role_id
-    add_index :manifestations, :isbn
-    add_index :manifestations, :nbn
-    add_index :manifestations, :lccn
-    add_index :manifestations, :oclc_number
-    add_index :manifestations, :issn
     add_index :manifestations, :access_address
     #add_index :manifestations, :frequency_id
     add_index :manifestations, :manifestation_identifier
     add_index :manifestations, :updated_at
+    add_index :manifestations, :date_of_publication
   end
 end

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

@@ -1,7 +1,7 @@
 class CreateItems < ActiveRecord::Migration
   def change
     create_table :items do |t|
-      #t.integer :manifestation_id
+      t.integer :manifestation_id
       t.string :call_number
       t.string :item_identifier
       t.timestamps
@@ -13,10 +13,9 @@ class CreateItems < ActiveRecord::Migration
       t.integer :price
       t.integer :lock_version, :default => 0, :null => false
       t.integer :required_role_id, :default => 1, :null => false
-      t.string :state
       t.integer :required_score, :default => 0, :null => false
     end
-    #add_index :items, :manifestation_id
+    add_index :items, :manifestation_id
     add_index :items, :shelf_id
     add_index :items, :item_identifier
     add_index :items, :required_role_id

data/spec/dummy/db/migrate/032_create_checkins.rb

@@ -0,0 +1,17 @@
+class CreateCheckins < ActiveRecord::Migration
+  def self.up
+    create_table :checkins do |t|
+      t.integer :item_id, :null => false
+      t.integer :librarian_id
+      t.integer :basket_id
+      t.timestamps
+    end
+    add_index :checkins, :item_id
+    add_index :checkins, :librarian_id
+    add_index :checkins, :basket_id
+  end
+
+  def self.down
+    drop_table :checkins
+  end
+end

data/spec/dummy/db/migrate/033_create_checkouts.rb

@@ -0,0 +1,25 @@
+class CreateCheckouts < ActiveRecord::Migration
+  def self.up
+    create_table :checkouts do |t|
+      t.integer :user_id
+      t.integer :item_id, :null => false
+      t.integer :checkin_id
+      t.integer :librarian_id
+      t.integer :basket_id
+      t.datetime :due_date
+      t.integer :checkout_renewal_count, :default => 0, :null => false
+      t.integer :lock_version, :default => 0, :null => false
+      t.timestamps
+    end
+    add_index :checkouts, :user_id
+    add_index :checkouts, :item_id
+    add_index :checkouts, :basket_id
+    add_index :checkouts, [:item_id, :basket_id], :unique => true
+    add_index :checkouts, :librarian_id
+    add_index :checkouts, :checkin_id
+  end
+
+  def self.down
+    drop_table :checkouts
+  end
+end

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

@@ -0,0 +1,27 @@
+class CreateReserves < ActiveRecord::Migration
+  def self.up
+    create_table :reserves do |t|
+      t.integer :user_id, :null => false
+      t.integer :manifestation_id, :null => false
+      t.integer :item_id
+      t.integer :request_status_type_id, :null => false
+      t.datetime :checked_out_at
+      t.timestamps
+      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
+
+    add_index :reserves, :user_id
+    add_index :reserves, :manifestation_id
+    add_index :reserves, :item_id
+    add_index :reserves, :request_status_type_id
+  end
+
+  def self.down
+    drop_table :reserves
+  end
+end

data/spec/dummy/db/migrate/055_create_bookmarks.rb

@@ -0,0 +1,22 @@
+class CreateBookmarks < ActiveRecord::Migration
+  def self.up
+    create_table :bookmarks, :force => true do |t|
+      t.integer :user_id, :null => false
+      t.integer :manifestation_id
+      t.text :title
+      t.string :url
+      t.text :note
+      t.boolean :shared
+
+      t.timestamps
+    end
+
+    add_index :bookmarks, :user_id
+    add_index :bookmarks, :manifestation_id
+    add_index :bookmarks, :url
+  end
+
+  def self.down
+    drop_table :bookmarks
+  end
+end

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

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

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

@@ -4,11 +4,9 @@ class CreateLibraryGroups < ActiveRecord::Migration
       t.string :name, :null => false
       t.text :display_name
       t.string :short_name, :null => false
-      t.string :email
       t.text :my_networks
       t.text :login_banner
       t.text :note
-      t.integer :valid_period_for_new_user, :default => 365, :null => false
       t.integer :country_id
       t.integer :position
 

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

@@ -0,0 +1,23 @@
+class CreateEvents < ActiveRecord::Migration
+  def self.up
+    create_table :events do |t|
+      t.integer :library_id, :default => 1, :null => false
+      t.integer :event_category_id, :default => 1, :null => false
+      t.string :name
+      t.text :note
+      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
+    add_index :events, :library_id
+    add_index :events, :event_category_id
+  end
+
+  def self.down
+    drop_table :events
+  end
+end