enju_circulation 0.1.0.pre36 → 0.1.0.pre37

data/spec/controllers/user_group_has_checkout_types_controller_spec.rb

@@ -5,7 +5,7 @@ describe UserGroupHasCheckoutTypesController do
 
   describe "GET index" do
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "assigns all user_group_has_checkout_types as @user_group_has_checkout_types" do
         get :index
@@ -14,7 +14,7 @@ describe UserGroupHasCheckoutTypesController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "assigns all user_group_has_checkout_types as @user_group_has_checkout_types" do
         get :index
@@ -23,7 +23,7 @@ describe UserGroupHasCheckoutTypesController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "assigns all user_group_has_checkout_types as @user_group_has_checkout_types" do
         get :index
@@ -43,7 +43,7 @@ describe UserGroupHasCheckoutTypesController do
 
   describe "GET show" do
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "assigns the requested user_group_has_checkout_type as @user_group_has_checkout_type" do
         user_group_has_checkout_type = FactoryGirl.create(:user_group_has_checkout_type)
@@ -53,7 +53,7 @@ describe UserGroupHasCheckoutTypesController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "assigns the requested user_group_has_checkout_type as @user_group_has_checkout_type" do
         user_group_has_checkout_type = FactoryGirl.create(:user_group_has_checkout_type)
@@ -63,7 +63,7 @@ describe UserGroupHasCheckoutTypesController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "assigns the requested user_group_has_checkout_type as @user_group_has_checkout_type" do
         user_group_has_checkout_type = FactoryGirl.create(:user_group_has_checkout_type)
@@ -83,7 +83,7 @@ describe UserGroupHasCheckoutTypesController do
 
   describe "GET new" do
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "assigns the requested user_group_has_checkout_type as @user_group_has_checkout_type" do
         get :new
@@ -93,7 +93,7 @@ describe UserGroupHasCheckoutTypesController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "should not assign the requested user_group_has_checkout_type as @user_group_has_checkout_type" do
         get :new
@@ -103,7 +103,7 @@ describe UserGroupHasCheckoutTypesController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "should not assign the requested user_group_has_checkout_type as @user_group_has_checkout_type" do
         get :new
@@ -123,7 +123,7 @@ describe UserGroupHasCheckoutTypesController do
 
   describe "GET edit" do
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "assigns the requested user_group_has_checkout_type as @user_group_has_checkout_type" do
         user_group_has_checkout_type = FactoryGirl.create(:user_group_has_checkout_type)
@@ -133,7 +133,7 @@ describe UserGroupHasCheckoutTypesController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "assigns the requested user_group_has_checkout_type as @user_group_has_checkout_type" do
         user_group_has_checkout_type = FactoryGirl.create(:user_group_has_checkout_type)
@@ -143,7 +143,7 @@ describe UserGroupHasCheckoutTypesController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "assigns the requested user_group_has_checkout_type as @user_group_has_checkout_type" do
         user_group_has_checkout_type = FactoryGirl.create(:user_group_has_checkout_type)
@@ -168,7 +168,7 @@ describe UserGroupHasCheckoutTypesController do
     end
 
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       describe "with valid params" do
         it "assigns a newly created user_group_has_checkout_type as @user_group_has_checkout_type" do
@@ -196,7 +196,7 @@ describe UserGroupHasCheckoutTypesController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       describe "with valid params" do
         it "assigns a newly created user_group_has_checkout_type as @user_group_has_checkout_type" do
@@ -224,7 +224,7 @@ describe UserGroupHasCheckoutTypesController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       describe "with valid params" do
         it "assigns a newly created user_group_has_checkout_type as @user_group_has_checkout_type" do
@@ -286,7 +286,7 @@ describe UserGroupHasCheckoutTypesController do
     end
 
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       describe "with valid params" do
         it "updates the requested user_group_has_checkout_type" do
@@ -308,7 +308,7 @@ describe UserGroupHasCheckoutTypesController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       describe "with valid params" do
         it "updates the requested user_group_has_checkout_type" do
@@ -331,7 +331,7 @@ describe UserGroupHasCheckoutTypesController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       describe "with valid params" do
         it "updates the requested user_group_has_checkout_type" do
@@ -380,7 +380,7 @@ describe UserGroupHasCheckoutTypesController do
     end
 
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "destroys the requested user_group_has_checkout_type" do
         delete :destroy, :id => @user_group_has_checkout_type.id
@@ -393,7 +393,7 @@ describe UserGroupHasCheckoutTypesController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "destroys the requested user_group_has_checkout_type" do
         delete :destroy, :id => @user_group_has_checkout_type.id
@@ -406,7 +406,7 @@ describe UserGroupHasCheckoutTypesController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "destroys the requested user_group_has_checkout_type" do
         delete :destroy, :id => @user_group_has_checkout_type.id

data/spec/controllers/user_reserve_stats_controller_spec.rb

@@ -9,7 +9,7 @@ describe UserReserveStatsController do
     end
 
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "assigns all user_reserve_stats as @user_reserve_stats" do
         get :index
@@ -18,7 +18,7 @@ describe UserReserveStatsController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "assigns all user_reserve_stats as @user_reserve_stats" do
         get :index
@@ -27,7 +27,7 @@ describe UserReserveStatsController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "assigns all user_reserve_stats as @user_reserve_stats" do
         get :index
@@ -45,7 +45,7 @@ describe UserReserveStatsController do
 
   describe "GET show" do
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "assigns the requested user_reserve_stat as @user_reserve_stat" do
         user_reserve_stat = FactoryGirl.create(:user_reserve_stat)
@@ -55,7 +55,7 @@ describe UserReserveStatsController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "assigns the requested user_reserve_stat as @user_reserve_stat" do
         user_reserve_stat = FactoryGirl.create(:user_reserve_stat)
@@ -65,7 +65,7 @@ describe UserReserveStatsController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "assigns the requested user_reserve_stat as @user_reserve_stat" do
         user_reserve_stat = FactoryGirl.create(:user_reserve_stat)
@@ -85,7 +85,7 @@ describe UserReserveStatsController do
 
   describe "GET new" do
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "assigns the requested user_reserve_stat as @user_reserve_stat" do
         get :new
@@ -94,7 +94,7 @@ describe UserReserveStatsController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "assigns the requested user_reserve_stat as @user_reserve_stat" do
         get :new
@@ -103,7 +103,7 @@ describe UserReserveStatsController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "should not assign the requested user_reserve_stat as @user_reserve_stat" do
         get :new
@@ -123,7 +123,7 @@ describe UserReserveStatsController do
 
   describe "GET edit" do
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "assigns the requested user_reserve_stat as @user_reserve_stat" do
         user_reserve_stat = FactoryGirl.create(:user_reserve_stat)
@@ -133,7 +133,7 @@ describe UserReserveStatsController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "assigns the requested user_reserve_stat as @user_reserve_stat" do
         user_reserve_stat = FactoryGirl.create(:user_reserve_stat)
@@ -143,7 +143,7 @@ describe UserReserveStatsController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "assigns the requested user_reserve_stat as @user_reserve_stat" do
         user_reserve_stat = FactoryGirl.create(:user_reserve_stat)
@@ -168,7 +168,7 @@ describe UserReserveStatsController do
     end
 
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       describe "with valid params" do
         it "assigns a newly created user_reserve_stat as @user_reserve_stat" do
@@ -196,7 +196,7 @@ describe UserReserveStatsController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       describe "with valid params" do
         it "assigns a newly created user_reserve_stat as @user_reserve_stat" do
@@ -224,7 +224,7 @@ describe UserReserveStatsController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       describe "with valid params" do
         it "assigns a newly created user_reserve_stat as @user_reserve_stat" do
@@ -286,7 +286,7 @@ describe UserReserveStatsController do
     end
 
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       describe "with valid params" do
         it "updates the requested user_reserve_stat" do
@@ -308,7 +308,7 @@ describe UserReserveStatsController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       describe "with valid params" do
         it "updates the requested user_reserve_stat" do
@@ -336,7 +336,7 @@ describe UserReserveStatsController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       describe "with valid params" do
         it "updates the requested user_reserve_stat" do
@@ -385,7 +385,7 @@ describe UserReserveStatsController do
     end
 
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "destroys the requested user_reserve_stat" do
         delete :destroy, :id => @user_reserve_stat.id
@@ -398,7 +398,7 @@ describe UserReserveStatsController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "destroys the requested user_reserve_stat" do
         delete :destroy, :id => @user_reserve_stat.id
@@ -411,7 +411,7 @@ describe UserReserveStatsController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "destroys the requested user_reserve_stat" do
         delete :destroy, :id => @user_reserve_stat.id

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

@@ -7,51 +7,7 @@ class User < ActiveRecord::Base
   # Setup accessible (or protected) attributes for your model
   attr_accessible :email, :password, :password_confirmation, :remember_me
 
-  has_one :patron
-  has_one :user_has_role
-  has_one :role, :through => :user_has_role
-  belongs_to :user_group
-  belongs_to :required_role, :class_name => 'Role', :foreign_key => 'required_role_id'
-  belongs_to :library
-
-  extend FriendlyId
-  friendly_id :username
+  enju_leaf_user_model
   enju_circulation_user_model
-
-  def has_role?(role_in_question)
-    return false unless role
-    return true if role.name == role_in_question
-    case role.name
-    when 'Administrator'
-      return true
-    when 'Librarian'
-      return true if role_in_question == 'User'
-    else
-      false
-    end
-  end
-
-  if defined?(EnjuMessage)
-    has_many :sent_messages, :foreign_key => 'sender_id', :class_name => 'Message'
-    has_many :received_messages, :foreign_key => 'receiver_id', :class_name => 'Message'
-
-    def send_message(status, options = {})
-      MessageRequest.transaction do
-        request = MessageRequest.new
-        request.sender = User.find(1)
-        request.receiver = self
-        request.message_template = MessageTemplate.localized_template(status, self.locale)
-        request.save_message_body(options)
-        request.sm_send_message!
-      end
-    end
-  end
-
-  def patron
-    LocalAgent.new(self)
-  end
-
-  def full_name
-    username
-  end
+  enju_message_user_model
 end

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_agents.rb

@@ -1,7 +1,6 @@
 class CreateAgents < ActiveRecord::Migration
   def change
     create_table :agents do |t|
-      t.integer :user_id
       t.string :last_name
       t.string :middle_name
       t.string :first_name
@@ -38,18 +37,11 @@ class CreateAgents < ActiveRecord::Migration
       t.integer :agent_type_id, :default => 1, :null => false
       t.integer :lock_version, :default => 0, :null => false
       t.text :note
-      t.integer :creates_count, :default => 0, :null => false
-      t.integer :realizes_count, :default => 0, :null => false
-      t.integer :produces_count, :default => 0, :null => false
-      t.integer :owns_count, :default => 0, :null => false
-      #t.integer :resource_has_subjects_count, :default => 0, :null => false
       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
-    add_index :agents, :user_id, :unique => true
     add_index :agents, :language_id
     add_index :agents, :country_id
     add_index :agents, :required_role_id

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

@@ -21,29 +21,24 @@ class CreateManifestations < ActiveRecord::Migration
       t.integer :depth
       t.integer :price # TODO: 通貨単位
       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.integer :produces_count, :default => 0, :null => false
-      t.integer :exemplifies_count, :default => 0, :null => false
-      t.integer :embodies_count, :default => 0, :null => false
-      t.integer :exemplifies_count, :default => 0, :null => false
-      t.integer :work_has_subjects_count, :default => 0, :null => false
       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, :carrier_type_id
+    #add_index :manifestations, :required_role_id
     add_index :manifestations, :access_address
-    add_index :manifestations, :frequency_id
+    #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,25 +1,19 @@
 class CreateItems < ActiveRecord::Migration
   def change
     create_table :items do |t|
-      #t.integer :manifestation_id
       t.string :call_number
       t.string :item_identifier
       t.timestamps
       t.datetime :deleted_at
       t.integer :shelf_id, :default => 1, :null => false
       t.boolean :include_supplements, :default => false, :null => false
-      t.integer :checkouts_count, :default => 0, :null => false
-      t.integer :owns_count, :default => 0, :null => false
-      t.integer :resource_has_subjects_count, :default => 0, :null => false
       t.text :note
       t.string :url
       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, :shelf_id
     add_index :items, :item_identifier
     add_index :items, :required_role_id

data/spec/dummy/db/migrate/112_create_frequencies.rb

@@ -0,0 +1,12 @@
+class CreateFrequencies < ActiveRecord::Migration
+  def change
+    create_table :frequencies do |t|
+      t.string :name, :null => false
+      t.text :display_name
+      t.text :note
+      t.integer :position
+
+      t.timestamps
+    end
+  end
+end

data/spec/dummy/db/migrate/117_create_form_of_works.rb

@@ -0,0 +1,12 @@
+class CreateFormOfWorks < ActiveRecord::Migration
+  def change
+    create_table :form_of_works do |t|
+      t.string :name, :null => false
+      t.text :display_name
+      t.text :note
+      t.integer :position
+
+      t.timestamps
+    end
+  end
+end

data/spec/dummy/db/migrate/154_create_messages.rb

@@ -6,7 +6,6 @@ class CreateMessages < ActiveRecord::Migration
       t.string   :subject, :null => false
       t.text     :body
       t.integer :message_request_id
-      t.string :state
       t.integer :parent_id
 
       t.timestamps

data/spec/dummy/db/migrate/20080819181903_create_message_requests.rb

@@ -7,11 +7,9 @@ class CreateMessageRequests < ActiveRecord::Migration
       t.datetime :sent_at
       t.datetime :deleted_at
       t.text :body
-      t.string :state
 
       t.timestamps
     end
-    add_index :message_requests, :state
   end
 
   def self.down

data/spec/dummy/db/migrate/20081028083142_create_agent_import_files.rb

@@ -0,0 +1,20 @@
+class CreateAgentImportFiles < ActiveRecord::Migration
+  def change
+    create_table :agent_import_files do |t|
+      t.integer :parent_id
+      t.string :content_type
+      t.integer :size
+      t.integer :user_id
+      t.text :note
+      t.datetime :executed_at
+      t.string :agent_import_file_name
+      t.string :agent_import_content_type
+      t.integer :agent_import_file_size
+      t.datetime :agent_import_updated_at
+
+      t.timestamps
+    end
+    add_index :agent_import_files, :parent_id
+    add_index :agent_import_files, :user_id
+  end
+end

data/spec/dummy/db/migrate/20081028083208_create_resource_import_files.rb

@@ -0,0 +1,20 @@
+class CreateResourceImportFiles < ActiveRecord::Migration
+  def change
+    create_table :resource_import_files do |t|
+      t.integer :parent_id
+      t.string :content_type
+      t.integer :size
+      t.integer :user_id
+      t.text :note
+      t.datetime :executed_at
+      t.string :resource_import_file_name
+      t.string :resource_import_content_type
+      t.integer :resource_import_file_size
+      t.datetime :resource_import_updated_at
+
+      t.timestamps
+    end
+    add_index :resource_import_files, :parent_id
+    add_index :resource_import_files, :user_id
+  end
+end

data/spec/dummy/db/migrate/20090705133942_add_attachments_picture_to_picture_file.rb

@@ -0,0 +1,15 @@
+class AddAttachmentsPictureToPictureFile < ActiveRecord::Migration
+  def self.up
+    add_column :picture_files, :picture_file_name, :string
+    add_column :picture_files, :picture_content_type, :string
+    add_column :picture_files, :picture_file_size, :integer
+    add_column :picture_files, :picture_updated_at, :datetime
+  end
+
+  def self.down
+    remove_column :picture_files, :picture_file_name
+    remove_column :picture_files, :picture_content_type
+    remove_column :picture_files, :picture_file_size
+    remove_column :picture_files, :picture_updated_at
+  end
+end

data/spec/dummy/db/migrate/20090705212043_add_attachments_attachment_to_manifestation.rb

@@ -0,0 +1,15 @@
+class AddAttachmentsAttachmentToManifestation < ActiveRecord::Migration
+  def self.up
+    add_column :manifestations, :attachment_file_name, :string
+    add_column :manifestations, :attachment_content_type, :string
+    add_column :manifestations, :attachment_file_size, :integer
+    add_column :manifestations, :attachment_updated_at, :datetime
+  end
+
+  def self.down
+    remove_column :manifestations, :attachment_file_name
+    remove_column :manifestations, :attachment_content_type
+    remove_column :manifestations, :attachment_file_size
+    remove_column :manifestations, :attachment_updated_at
+  end
+end

data/spec/dummy/db/migrate/20090719201843_create_extents.rb

@@ -0,0 +1,12 @@
+class CreateExtents < ActiveRecord::Migration
+  def change
+    create_table :extents do |t|
+      t.string :name, :null => false
+      t.text :display_name
+      t.text :note
+      t.integer :position
+
+      t.timestamps
+    end
+  end
+end

data/spec/dummy/db/migrate/20090720091106_create_medium_of_performances.rb

@@ -0,0 +1,12 @@
+class CreateMediumOfPerformances < ActiveRecord::Migration
+  def change
+    create_table :medium_of_performances do |t|
+      t.string :name, :null => false
+      t.text :display_name
+      t.text :note
+      t.integer :position
+
+      t.timestamps
+    end
+  end
+end