enju_biblio 0.3.2 → 0.3.3

data/config/locales/translation_en.yml

@@ -444,3 +444,14 @@ en:
   import_request:
     record_not_found: Record not found.
     error: An error occured during import.
+
+  resource_import_mailer:
+    completed:
+      subject: 'Import completed'
+    failed:
+      subject: 'Import failed'
+  resource_export_mailer:
+    completed:
+      subject: 'Export completed'
+    failed:
+      subject: 'Export failed'

data/config/locales/translation_ja.yml

@@ -449,3 +449,14 @@ ja:
   import_request:
     record_not_found: 書誌レコードが見つかりませんでした。
     error: インポート中にエラーが発生しました。
+
+  resource_import_mailer:
+    completed:
+      subject: 'インポートが完了しました'
+    failed:
+      subject: 'インポートに失敗しました'
+  resource_export_mailer:
+    completed:
+      subject: 'エクスポートが完了しました'
+    failed:
+      subject: 'エクスポートに失敗しました'

data/lib/enju_biblio/version.rb

@@ -1,3 +1,3 @@
 module EnjuBiblio
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

data/spec/controllers/items_controller_spec.rb

@@ -265,12 +265,6 @@ describe ItemsController do
           assigns(:item).manifestation.should_not be_nil
           expect(response).to redirect_to(item_url(assigns(:item)))
         end
-
-        it 'should create a lending policy' do
-          old_lending_policy_count = LendingPolicy.count
-          post :create, params: { item: @attrs }
-          LendingPolicy.count.should eq old_lending_policy_count
-        end
       end
 
       describe 'with invalid params' do
@@ -326,27 +320,6 @@ describe ItemsController do
           expect(response).to render_template('new')
         end
       end
-
-      it 'should create reserved item' do
-        post :create, params: { item: { circulation_status_id: 1, manifestation_id: 2 } }
-        expect(assigns(:item)).to be_valid
-
-        expect(response).to redirect_to item_url(assigns(:item))
-        flash[:message].should eq I18n.t('item.this_item_is_reserved')
-        assigns(:item).manifestation.should eq Manifestation.find(2)
-        assigns(:item).should be_retained
-      end
-
-      it "should create another item with already retained" do
-        reserve = FactoryBot.create(:reserve)
-        reserve.transition_to!(:requested)
-        post :create, params: { item: FactoryBot.attributes_for(:item, manifestation_id: reserve.manifestation.id) }
-        expect(assigns(:item)).to be_valid
-        expect(response).to redirect_to item_url(assigns(:item))
-        post :create, params: { item: FactoryBot.attributes_for(:item, manifestation_id: reserve.manifestation.id) }
-        expect(assigns(:item)).to be_valid
-        expect(response).to redirect_to item_url(assigns(:item))
-      end
     end
 
     describe 'When logged in as User' do
@@ -533,16 +506,6 @@ describe ItemsController do
         end.should raise_error(ActiveRecord::RecordNotFound)
         # expect(response).to be_missing
       end
-
-      it 'should not destroy item if not checked in' do
-        delete :destroy, params: { id: 1 }
-        expect(response).to be_forbidden
-      end
-
-      it 'should not destroy a removed item' do
-        delete :destroy, params: { id: 23 }
-        expect(response).to be_forbidden
-      end
     end
 
     describe 'When logged in as Librarian' do

data/spec/dummy/app/jobs/application_job.rb

@@ -0,0 +1,7 @@
+class ApplicationJob < ActiveJob::Base
+  # Automatically retry jobs that encountered a deadlock
+  # retry_on ActiveRecord::Deadlocked
+
+  # Most jobs are safe to ignore if the underlying records are no longer available
+  # discard_on ActiveJob::DeserializationError
+end

data/spec/dummy/app/mailers/application_mailer.rb

@@ -0,0 +1,4 @@
+class ApplicationMailer < ActionMailer::Base
+  default from: 'from@example.com'
+end
+

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

@@ -0,0 +1,3 @@
+class ApplicationRecord < ActiveRecord::Base
+  self.abstract_class = true
+end

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

@@ -1,4 +1,4 @@
-class User < ActiveRecord::Base
+class User < ApplicationRecord
   # Include default devise modules. Others available are:
   # :token_authenticatable, :encryptable, :confirmable, :lockable, :timeoutable and :omniauthable
   devise :database_authenticatable, #:registerable,
@@ -7,14 +7,8 @@ class User < ActiveRecord::Base
   # Setup accessible (or protected) attributes for your model
 
   include EnjuSeed::EnjuUser
-  include EnjuCirculation::EnjuUser
   include EnjuMessage::EnjuUser
 end
 
-CarrierType.include(EnjuCirculation::EnjuCarrierType)
-Manifestation.include(EnjuCirculation::EnjuManifestation)
 Manifestation.include(EnjuSubject::EnjuManifestation)
-Item.include(EnjuCirculation::EnjuItem)
 Item.include(EnjuLibrary::EnjuItem)
-Profile.include(EnjuCirculation::EnjuProfile)
-UserGroup.include(EnjuCirculation::EnjuUserGroup)

data/spec/dummy/config/application.rb

@@ -4,9 +4,10 @@ require 'rails/all'
 
 Bundler.require(*Rails.groups)
 require "enju_biblio"
+require "enju_event"
 require "enju_leaf"
 require "enju_manifestation_viewer"
-require "enju_circulation"
+require "enju_message"
 require "enju_ndl"
 require 'resque/server'
 

data/spec/dummy/db/migrate/029_create_subjects.rb

@@ -1,24 +1,21 @@
 class CreateSubjects < ActiveRecord::Migration[4.2]
   def self.up
     create_table :subjects do |t|
-      t.integer :parent_id
+      t.references :parent, index: true
       t.integer :use_term_id
       t.string :term
       t.text :term_transcription
-      t.integer :subject_type_id, null: false
+      t.references :subject_type, index: true, null: false
       t.text :scope_note
       t.text :note
-      t.integer :required_role_id, default: 1, null: false
+      t.references :required_role, index: true, default: 1, null: false
       t.integer :lock_version, default: 0, null: false
       t.datetime :created_at
       t.datetime :updated_at
       t.datetime :deleted_at
     end
     add_index :subjects, :term
-    add_index :subjects, :parent_id
     add_index :subjects, :use_term_id
-    add_index :subjects, :subject_type_id
-    add_index :subjects, :required_role_id
   end
 
   def self.down

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

@@ -1,14 +1,11 @@
 class CreateCheckins < ActiveRecord::Migration[4.2]
   def self.up
     create_table :checkins do |t|
-      t.integer :item_id, null: false
-      t.integer :librarian_id
-      t.integer :basket_id
+      t.references :item, index: true, foreign_key: true, null: false
+      t.references :librarian, index: true
+      t.references :basket, index: true
       t.timestamps
     end
-    add_index :checkins, :item_id
-    add_index :checkins, :librarian_id
-    add_index :checkins, :basket_id
   end
 
   def self.down

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

@@ -1,22 +1,17 @@
 class CreateCheckouts < ActiveRecord::Migration[4.2]
   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.references :user, index: true, foreign_key: true
+      t.references :item, index: true, foreign_key: true, null: false
+      t.references :checkin, index: true, foreign_key: true
+      t.references :librarian, index: true
+      t.references :basket, index: true
       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, %i[item_id basket_id], unique: true
-    add_index :checkouts, :librarian_id
-    add_index :checkouts, :checkin_id
+    add_index :checkouts, [:item_id, :basket_id], unique: true
   end
 
   def self.down

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

@@ -1,10 +1,10 @@
 class CreateReserves < ActiveRecord::Migration[4.2]
   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.references :user, index: true, foreign_key: true, null: false
+      t.references :manifestation, index: true, null: false
+      t.references :item, index: true
+      t.references :request_status_type, null: false
       t.datetime :checked_out_at
       t.timestamps
       t.datetime :canceled_at
@@ -13,11 +13,6 @@ class CreateReserves < ActiveRecord::Migration[4.2]
       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

data/spec/dummy/db/migrate/121_create_checked_items.rb

@@ -1,14 +1,13 @@
 class CreateCheckedItems < ActiveRecord::Migration[4.2]
   def self.up
     create_table :checked_items do |t|
-      t.integer :item_id, null: false
-      t.integer :basket_id, null: false
+      t.references :item, index: true, foreign_key: true, null: false
+      t.references :basket, index: true, foreign_key: true, null: false
+      t.references :librarian, index: true
       t.datetime :due_date, null: false
 
       t.timestamps
     end
-    add_index :checked_items, :item_id
-    add_index :checked_items, :basket_id
   end
 
   def self.down

data/spec/dummy/db/migrate/129_create_item_has_use_restrictions.rb

@@ -1,13 +1,11 @@
 class CreateItemHasUseRestrictions < ActiveRecord::Migration[4.2]
   def self.up
     create_table :item_has_use_restrictions do |t|
-      t.integer :item_id, null: false
-      t.integer :use_restriction_id, null: false
+      t.references :item, index: true, foreign_key: true, null: false
+      t.references :use_restriction, index: true, foreign_key: true, null: false
 
       t.timestamps
     end
-    add_index :item_has_use_restrictions, :item_id
-    add_index :item_has_use_restrictions, :use_restriction_id
   end
 
   def self.down

data/spec/dummy/db/migrate/20081030023518_create_user_group_has_checkout_types.rb

@@ -1,8 +1,8 @@
 class CreateUserGroupHasCheckoutTypes < ActiveRecord::Migration[4.2]
   def self.up
     create_table :user_group_has_checkout_types do |t|
-      t.integer :user_group_id, null: false
-      t.integer :checkout_type_id, null: false
+      t.references :user_group, index: true, foreign_key: true, null: false
+      t.references :checkout_type, index: true, foreign_key: true, null: false
       t.integer :checkout_limit, default: 0, null: false
       t.integer :checkout_period, default: 0, null: false
       t.integer :checkout_renewal_limit, default: 0, null: false
@@ -15,8 +15,6 @@ class CreateUserGroupHasCheckoutTypes < ActiveRecord::Migration[4.2]
 
       t.timestamps
     end
-    add_index :user_group_has_checkout_types, :user_group_id
-    add_index :user_group_has_checkout_types, :checkout_type_id
   end
 
   def self.down

data/spec/dummy/db/migrate/20081030023615_create_carrier_type_has_checkout_types.rb

@@ -1,15 +1,14 @@
 class CreateCarrierTypeHasCheckoutTypes < ActiveRecord::Migration[4.2]
   def self.up
     create_table :carrier_type_has_checkout_types do |t|
-      t.integer :carrier_type_id, null: false
-      t.integer :checkout_type_id, null: false
+      t.references :carrier_type, index: false, foreign_key: true, null: false
+      t.references :checkout_type, index: true, foreign_key: true, null: false
       t.text :note
       t.integer :position
 
       t.timestamps
     end
     add_index :carrier_type_has_checkout_types, :carrier_type_id, name: 'index_carrier_type_has_checkout_types_on_m_form_id'
-    add_index :carrier_type_has_checkout_types, :checkout_type_id
   end
 
   def self.down

data/spec/dummy/db/migrate/20081212075554_create_checkout_stat_has_manifestations.rb

@@ -1,8 +1,8 @@
 class CreateCheckoutStatHasManifestations < ActiveRecord::Migration[4.2]
   def self.up
     create_table :checkout_stat_has_manifestations do |t|
-      t.integer :manifestation_checkout_stat_id, null: false
-      t.integer :manifestation_id, null: false
+      t.references :manifestation_checkout_stat, index: false, null: false
+      t.references :manifestation, index: false, foreign_key: true, null: false
       t.integer :checkouts_count
 
       t.timestamps

data/spec/dummy/db/migrate/20081215094955_create_checkout_stat_has_users.rb

@@ -1,14 +1,12 @@
 class CreateCheckoutStatHasUsers < ActiveRecord::Migration[4.2]
   def self.up
     create_table :checkout_stat_has_users do |t|
-      t.integer :user_checkout_stat_id, null: false
-      t.integer :user_id, null: false
+      t.references :user_checkout_stat, index: true, foreign_key: true, null: false
+      t.references :user, index: true, foreign_key: true, null: false
       t.integer :checkouts_count, default: 0, null: false
 
       t.timestamps
     end
-    add_index :checkout_stat_has_users, :user_checkout_stat_id
-    add_index :checkout_stat_has_users, :user_id
   end
 
   def self.down

data/spec/dummy/db/migrate/20081216190517_create_reserve_stat_has_manifestations.rb

@@ -1,8 +1,8 @@
 class CreateReserveStatHasManifestations < ActiveRecord::Migration[4.2]
   def self.up
     create_table :reserve_stat_has_manifestations do |t|
-      t.integer :manifestation_reserve_stat_id, null: false
-      t.integer :manifestation_id, null: false
+      t.references :manifestation_reserve_stat, index: false, null: false
+      t.references :manifestation, index: false, foreign_key: true, null: false
       t.integer :reserves_count
 
       t.timestamps

data/spec/dummy/db/migrate/20081220034117_create_reserve_stat_has_users.rb

@@ -1,14 +1,12 @@
 class CreateReserveStatHasUsers < ActiveRecord::Migration[4.2]
   def self.up
     create_table :reserve_stat_has_users do |t|
-      t.integer :user_reserve_stat_id, null: false
-      t.integer :user_id, null: false
+      t.references :user_reserve_stat, index: true, foreign_key: true, null: false
+      t.references :user, index: true, foreign_key: true, null: false
       t.integer :reserves_count
 
       t.timestamps
     end
-    add_index :reserve_stat_has_users, :user_reserve_stat_id
-    add_index :reserve_stat_has_users, :user_id
   end
 
   def self.down

data/spec/dummy/db/migrate/20090831220301_create_lending_policies.rb

@@ -1,8 +1,8 @@
 class CreateLendingPolicies < ActiveRecord::Migration[4.2]
   def self.up
     create_table :lending_policies do |t|
-      t.integer :item_id, null: false
-      t.integer :user_group_id, null: false
+      t.references :item, index: false, foreign_key: true, null: false
+      t.references :user_group, index: false, foreign_key: true, null: false
       t.integer :loan_period, default: 0, null: false
       t.datetime :fixed_due_date
       t.integer :renewal, default: 0, null: false
@@ -12,7 +12,7 @@ class CreateLendingPolicies < ActiveRecord::Migration[4.2]
 
       t.timestamps
     end
-    add_index :lending_policies, %i[item_id user_group_id], unique: true
+    add_index :lending_policies, [:item_id, :user_group_id], unique: true
   end
 
   def self.down

data/spec/dummy/db/migrate/20100606065209_create_user_has_roles.rb

@@ -1,12 +1,10 @@
 class CreateUserHasRoles < ActiveRecord::Migration[4.2]
   def change
     create_table :user_has_roles do |t|
-      t.integer :user_id
-      t.integer :role_id
+      t.references :user, index: true, foreign_key: true, null: false
+      t.references :role, index: true, foreign_key: true, null: false
 
       t.timestamps
     end
-    add_index :user_has_roles, :user_id
-    add_index :user_has_roles, :role_id
   end
 end

data/spec/dummy/db/migrate/20110627122938_add_number_of_day_to_notify_overdue_to_user_group.rb

@@ -1,7 +1,7 @@
 class AddNumberOfDayToNotifyOverdueToUserGroup < ActiveRecord::Migration[4.2]
   def self.up
-    add_column :user_groups, :number_of_day_to_notify_overdue, :integer, default: 1, null: false
-    add_column :user_groups, :number_of_day_to_notify_due_date, :integer, default: 7, null: false
+    add_column :user_groups, :number_of_day_to_notify_overdue, :integer, default: 7, null: false
+    add_column :user_groups, :number_of_day_to_notify_due_date, :integer, default: 3, null: false
     add_column :user_groups, :number_of_time_to_notify_overdue, :integer, default: 3, null: false
   end
 

data/spec/dummy/db/migrate/20111129044509_add_pickup_location_to_reserve.rb

@@ -0,0 +1,6 @@
+class AddPickupLocationToReserve < ActiveRecord::Migration[4.2]
+  def change
+    add_column :reserves, :pickup_location_id, :integer
+    add_index :reserves, :pickup_location_id
+  end
+end

data/spec/dummy/db/migrate/20120424103932_add_librarian_id_to_checked_item.rb

@@ -1,5 +1,5 @@
 class AddLibrarianIdToCheckedItem < ActiveRecord::Migration[4.2]
   def change
-    add_column :checked_items, :librarian_id, :integer
+    add_reference :checked_items, :user, index: true, foreign_key: true, column_name: :librarian_id
   end
 end