enju_inventory 0.3.0 → 0.3.1

data/config/locales/translation_en.yml

@@ -7,12 +7,16 @@ en:
     attributes:
       inventory:
         note: Note
+        item_identifier: Item identifier
+        current_shelf_name: Current shelf
+        lineno: Line
       inventory_file:
         inventory_file_name: Filename
         inventory_content_type: Content type
         inventory_file_size: Size
-        file_hash: File hash
+        inventory_fingerprint: File hash
         note: Note
+        shelf: Shelf
 
   inventory_file:
     not_in_catalog: "Not in catalog"

data/config/locales/translation_ja.yml

@@ -7,12 +7,16 @@ ja:
     attributes:
       inventory:
         note: 注記
+        item_identifier: 個別資料ID
+        current_shelf_name: 現在の書棚
+        lineno: 行数
       inventory_file:
         inventory_file_name: ファイル名
         inventory_content_type: Content-Type
         inventory_file_size: ファイルサイズ
-        file_hash: ファイルのハッシュ
+        inventory_fingerprint: ファイルのハッシュ
         note: 注記
+        shelf: 書棚
 
   inventory_file:
     not_in_catalog: "目録に存在しない資料"

data/db/migrate/20191224083828_add_item_identifier_to_inventory.rb

@@ -0,0 +1,6 @@
+class AddItemIdentifierToInventory < ActiveRecord::Migration[5.2]
+  def change
+    add_column :inventories, :item_identifier, :string
+    add_index :inventories, :item_identifier
+  end
+end

data/db/migrate/20191224091957_add_current_shelf_name_to_inventory.rb

@@ -0,0 +1,6 @@
+class AddCurrentShelfNameToInventory < ActiveRecord::Migration[5.2]
+  def change
+    add_column :inventories, :current_shelf_name, :string
+    add_index :inventories, :current_shelf_name
+  end
+end

data/db/migrate/20191230082846_add_shelf_to_inventory_file.rb

@@ -0,0 +1,5 @@
+class AddShelfToInventoryFile < ActiveRecord::Migration[5.2]
+  def change
+    add_reference :inventory_files, :shelf, foreign_key: true
+  end
+end

data/lib/enju_inventory/version.rb

@@ -1,3 +1,3 @@
 module EnjuInventory
-  VERSION = "0.3.0"
+  VERSION = "0.3.1".freeze
 end

data/lib/generators/enju_inventory/setup/USAGE

@@ -0,0 +1,8 @@
+Description:
+    Explain the generator
+
+Example:
+    rails generate setup Thing
+
+    This will create:
+        what/will/it/create

data/lib/generators/enju_inventory/setup/setup_generator.rb

@@ -0,0 +1,13 @@
+class EnjuInventory::SetupGenerator < Rails::Generators::Base
+  source_root File.expand_path('../templates', __FILE__)
+
+  def copy_setup_files
+    inject_into_file 'app/controllers/application_controller.rb',
+      "  include EnjuInventory::Controller\n", after: "EnjuLibrary::Controller\n"
+    append_to_file("app/models/user.rb") do
+      <<"EOS"
+Item.include(EnjuInventory::EnjuItem)
+EOS
+    end
+  end
+end

data/spec/controllers/inventories_controller_spec.rb

@@ -10,7 +10,7 @@ describe InventoriesController do
       it "assigns all inventories as @inventories" do
         get :index
         expect(assigns(:inventories)).to eq(Inventory.page(1))
-        expect(response).to be_success
+        expect(response).to be_successful
       end
     end
 
@@ -20,7 +20,7 @@ describe InventoriesController do
       it "assigns all inventories as @inventories" do
         get :index
         expect(assigns(:inventories)).to eq(Inventory.page(1))
-        expect(response).to be_success
+        expect(response).to be_successful
       end
     end
 
@@ -50,7 +50,7 @@ describe InventoriesController do
       it "assigns the requested inventory as @inventory" do
         get :show, params: { id: 1 }
         expect(assigns(:inventory)).to eq(Inventory.find(1))
-        expect(response).to be_success
+        expect(response).to be_successful
       end
     end
 
@@ -60,7 +60,7 @@ describe InventoriesController do
       it "assigns the requested inventory as @inventory" do
         get :show, params: { id: 1 }
         expect(assigns(:inventory)).to eq(Inventory.find(1))
-        expect(response).to be_success
+        expect(response).to be_successful
       end
     end
 

data/spec/controllers/inventory_files_controller_spec.rb

@@ -85,7 +85,7 @@ describe InventoryFilesController do
       it "assigns the requested inventory_file as @inventory_file" do
         get :new
         expect(assigns(:inventory_file)).to_not be_valid
-        expect(response).to be_success
+        expect(response).to be_successful
       end
     end
 
@@ -95,7 +95,7 @@ describe InventoryFilesController do
       it "should not assign the requested inventory_file as @inventory_file" do
         get :new
         expect(assigns(:inventory_file)).to_not be_valid
-        expect(response).to be_success
+        expect(response).to be_successful
       end
     end
 
@@ -123,8 +123,7 @@ describe InventoryFilesController do
       login_fixture_librarian
 
       it "should create inventory_file" do
-        post :create, params: { inventory_file: {inventory: fixture_file_upload("/../../examples/inventory_file_sample.tsv", 'text/csv') } }
-        assigns(:inventory_file).save!
+        post :create, params: { inventory_file: { shelf_id: 1, inventory: fixture_file_upload("/../../examples/inventory_file_sample.tsv", 'text/csv') } }
         expect(assigns(:inventory_file)).to be_valid
         expect(assigns(:inventory_file).user.username).to eq @user.username
         expect(response).to redirect_to inventory_file_url(assigns(:inventory_file))
@@ -135,14 +134,14 @@ describe InventoryFilesController do
       login_fixture_user
 
       it "should be forbidden" do
-        post :create, params: { inventory_file: {inventory: fixture_file_upload("/../../examples/inventory_file_sample.tsv", 'text/csv') } }
+        post :create, params: { inventory_file: { shelf_id: 1, inventory: fixture_file_upload("/../../examples/inventory_file_sample.tsv", 'text/csv') } }
         expect(response).to be_forbidden
       end
     end
 
     describe "When not logged in" do
       it "should be redirect to new session url" do
-        post :create, params: { inventory_file: {inventory: fixture_file_upload("/../../examples/inventory_file_sample.tsv", 'text/csv') } }
+        post :create, params: { inventory_file: { shelf_id: 1, inventory: fixture_file_upload("/../../examples/inventory_file_sample.tsv", 'text/csv') } }
         expect(response).to redirect_to new_user_session_url
       end
     end

data/spec/controllers/items_controller_spec.rb

@@ -17,7 +17,7 @@ describe ItemsController do
 
       it 'should not get index with inventory_file_id' do
         get :index, params: { inventory_file_id: 1 }
-        expect(response).to be_success
+        expect(response).to be_successful
         assigns(:inventory_file).should eq InventoryFile.find(1)
         expect(assigns(:items)).to eq Item.inventory_items(assigns(:inventory_file), 'not_on_shelf').order('items.id').page(1)
       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/db/migrate/005_create_manifestations.rb

@@ -32,10 +32,10 @@ class CreateManifestations < ActiveRecord::Migration[4.2]
       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

data/spec/dummy/db/migrate/132_create_circulation_statuses.rb

@@ -0,0 +1,16 @@
+class CreateCirculationStatuses < ActiveRecord::Migration[4.2]
+  def self.up
+    create_table :circulation_statuses do |t|
+      t.string :name, null: false
+      t.text :display_name
+      t.text :note
+      t.integer :position
+
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :circulation_statuses
+  end
+end

data/spec/dummy/db/migrate/20130416054135_add_circulation_status_id_to_item.rb

@@ -0,0 +1,8 @@
+class AddCirculationStatusIdToItem < ActiveRecord::Migration[4.2]
+  def change
+    add_column :items, :circulation_status_id, :integer, default: 5, null: false
+    add_column :items, :checkout_type_id, :integer, default: 1, null: false
+    add_index :items, :circulation_status_id
+    add_index :items, :checkout_type_id
+  end
+end

data/spec/dummy/db/migrate/20180107161311_add_constraints_to_most_recent_for_agent_import_file_transitions.rb

@@ -2,7 +2,7 @@ class AddConstraintsToMostRecentForAgentImportFileTransitions < ActiveRecord::Mi
   disable_ddl_transaction!
 
   def up
-    add_index :agent_import_file_transitions, [:agent_import_file_id, :most_recent], unique: true, where: "most_recent", name: "index_agent_import_file_transitions_parent_most_recent" # , algorithm: :concurrently
+    add_index :agent_import_file_transitions, [:agent_import_file_id, :most_recent], unique: true, where: "most_recent", name: "index_agent_import_file_transitions_parent_most_recent" #, algorithm: :concurrently
     change_column_null :agent_import_file_transitions, :most_recent, false
   end
 

data/spec/dummy/db/migrate/20180107161331_add_constraints_to_most_recent_for_resource_import_file_transitions.rb

@@ -2,7 +2,7 @@ class AddConstraintsToMostRecentForResourceImportFileTransitions < ActiveRecord:
   disable_ddl_transaction!
 
   def up
-    add_index :resource_import_file_transitions, [:resource_import_file_id, :most_recent], unique: true, where: "most_recent", name: "index_resource_import_file_transitions_parent_most_recent" # , algorithm: :concurrently
+    add_index :resource_import_file_transitions, [:resource_import_file_id, :most_recent], unique: true, where: "most_recent", name: "index_resource_import_file_transitions_parent_most_recent" #, algorithm: :concurrently
     change_column_null :resource_import_file_transitions, :most_recent, false
   end
 

data/spec/dummy/db/migrate/20180107161347_add_constraints_to_most_recent_for_resource_export_file_transitions.rb

@@ -2,7 +2,7 @@ class AddConstraintsToMostRecentForResourceExportFileTransitions < ActiveRecord:
   disable_ddl_transaction!
 
   def up
-    add_index :resource_export_file_transitions, [:resource_export_file_id, :most_recent], unique: true, where: "most_recent", name: "index_resource_export_file_transitions_parent_most_recent" # , algorithm: :concurrently
+    add_index :resource_export_file_transitions, [:resource_export_file_id, :most_recent], unique: true, where: "most_recent", name: "index_resource_export_file_transitions_parent_most_recent" #, algorithm: :concurrently
     change_column_null :resource_export_file_transitions, :most_recent, false
   end
 

data/spec/dummy/db/migrate/20180107161410_add_constraints_to_most_recent_for_import_request_transitions.rb

@@ -2,7 +2,7 @@ class AddConstraintsToMostRecentForImportRequestTransitions < ActiveRecord::Migr
   disable_ddl_transaction!
 
   def up
-    add_index :import_request_transitions, [:import_request_id, :most_recent], unique: true, where: "most_recent", name: "index_import_request_transitions_parent_most_recent" # , algorithm: :concurrently
+    add_index :import_request_transitions, [:import_request_id, :most_recent], unique: true, where: "most_recent", name: "index_import_request_transitions_parent_most_recent" #, algorithm: :concurrently
     change_column_null :import_request_transitions, :most_recent, false
   end
 

data/spec/dummy/db/migrate/20190818075603_add_memo_to_manifestation.rb

@@ -0,0 +1,5 @@
+class AddMemoToManifestation < ActiveRecord::Migration[5.2]
+  def change
+    add_column :manifestations, :memo, :text
+  end
+end

data/spec/dummy/db/migrate/20190818075628_add_memo_to_item.rb

@@ -0,0 +1,5 @@
+class AddMemoToItem < ActiveRecord::Migration[5.2]
+  def change
+    add_column :items, :memo, :text
+  end
+end

data/spec/dummy/db/migrate/20191219122214_create_custom_properties.rb

@@ -0,0 +1,12 @@
+class CreateCustomProperties < ActiveRecord::Migration[5.2]
+  def change
+    create_table :custom_properties do |t|
+      t.integer :resource_id, null: false
+      t.string :resource_type, null: false
+      t.text :label, null: false
+      t.text :value
+
+      t.timestamps
+    end
+  end
+end

data/spec/dummy/db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20180107161410) do
+ActiveRecord::Schema.define(version: 2019_12_30_082846) do
 
   create_table "accepts", force: :cascade do |t|
     t.integer "basket_id"
@@ -209,6 +209,15 @@ ActiveRecord::Schema.define(version: 20180107161410) do
     t.datetime "attachment_updated_at"
   end
 
+  create_table "circulation_statuses", force: :cascade do |t|
+    t.string "name", null: false
+    t.text "display_name"
+    t.text "note"
+    t.integer "position"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
   create_table "colors", force: :cascade do |t|
     t.integer "library_group_id"
     t.string "property"
@@ -262,6 +271,15 @@ ActiveRecord::Schema.define(version: 20180107161410) do
     t.index ["work_id"], name: "index_creates_on_work_id"
   end
 
+  create_table "custom_properties", force: :cascade do |t|
+    t.integer "resource_id", null: false
+    t.string "resource_type", null: false
+    t.text "label", null: false
+    t.text "value"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
+
   create_table "donates", force: :cascade do |t|
     t.integer "agent_id", null: false
     t.integer "item_id", null: false
@@ -359,8 +377,12 @@ ActiveRecord::Schema.define(version: 20180107161410) do
     t.text "note"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.string "item_identifier"
+    t.string "current_shelf_name"
+    t.index ["current_shelf_name"], name: "index_inventories_on_current_shelf_name"
     t.index ["inventory_file_id"], name: "index_inventories_on_inventory_file_id"
     t.index ["item_id"], name: "index_inventories_on_item_id"
+    t.index ["item_identifier"], name: "index_inventories_on_item_identifier"
   end
 
   create_table "inventory_files", force: :cascade do |t|
@@ -376,6 +398,8 @@ ActiveRecord::Schema.define(version: 20180107161410) do
     t.integer "inventory_file_size"
     t.datetime "inventory_updated_at"
     t.string "inventory_fingerprint"
+    t.integer "shelf_id"
+    t.index ["shelf_id"], name: "index_inventory_files_on_shelf_id"
     t.index ["user_id"], name: "index_inventory_files_on_user_id"
   end
 
@@ -396,12 +420,17 @@ ActiveRecord::Schema.define(version: 20180107161410) do
     t.datetime "acquired_at"
     t.integer "bookstore_id"
     t.integer "budget_type_id"
+    t.integer "circulation_status_id", default: 5, null: false
+    t.integer "checkout_type_id", default: 1, null: false
     t.string "binding_item_identifier"
     t.string "binding_call_number"
     t.datetime "binded_at"
     t.integer "manifestation_id", null: false
+    t.text "memo"
     t.index ["binding_item_identifier"], name: "index_items_on_binding_item_identifier"
     t.index ["bookstore_id"], name: "index_items_on_bookstore_id"
+    t.index ["checkout_type_id"], name: "index_items_on_checkout_type_id"
+    t.index ["circulation_status_id"], name: "index_items_on_circulation_status_id"
     t.index ["item_identifier"], name: "index_items_on_item_identifier"
     t.index ["manifestation_id"], name: "index_items_on_manifestation_id"
     t.index ["required_role_id"], name: "index_items_on_required_role_id"
@@ -581,6 +610,7 @@ ActiveRecord::Schema.define(version: 20180107161410) do
     t.text "publication_place"
     t.text "extent"
     t.text "dimensions"
+    t.text "memo"
     t.index ["access_address"], name: "index_manifestations_on_access_address"
     t.index ["date_of_publication"], name: "index_manifestations_on_date_of_publication"
     t.index ["doi"], name: "index_manifestations_on_doi"

data/spec/fixtures/carrier_types.yml

@@ -0,0 +1,54 @@
+--- 
+carrier_type_00001: 
+  name: volume
+  display_name: Volume
+  updated_at: 2007-11-20 16:04:29.853828 +09:00
+  id: 1
+  note: !binary |
+    5pys44Gn44GZ44CC
+
+  created_at: 2007-11-20 15:47:03.641530 +09:00
+  position: 1
+carrier_type_00002: 
+  name: audio_disc
+  display_name: Audio disc
+  updated_at: 2007-12-19 01:45:26.040674 +09:00
+  id: 2
+  note: "\xE9\x9F\xB3\xE6\xA5\xBDCD\xE3\x81\xA7\xE3\x81\x99\xE3\x80\x82"
+  created_at: 2007-12-19 01:45:26.040674 +09:00
+  position: 2
+carrier_type_00003: 
+  name: videodisc
+  display_name: Video disc
+  updated_at: 2007-12-23 04:24:23.151410 +09:00
+  id: 3
+  note: "DVD\xE3\x81\xA7\xE3\x81\x99\xE3\x80\x82"
+  created_at: 2007-12-23 04:24:23.151410 +09:00
+  position: 3
+carrier_type_00004: 
+  name: online_resource
+  display_name: online_resource
+  updated_at: 2007-12-24 01:30:50.637433 +09:00
+  id: 4
+  note: !binary |
+    44Kz44Oz44OU44Ol44O844K/44Gu44OV44Kh44Kk44Or44Gn44GZ44CC
+
+  created_at: 2007-12-24 01:30:50.637433 +09:00
+  position: 4
+
+# == Schema Information
+#
+# Table name: carrier_types
+#
+#  id                      :integer          not null, primary key
+#  name                    :string           not null
+#  display_name            :text
+#  note                    :text
+#  position                :integer
+#  created_at              :datetime
+#  updated_at              :datetime
+#  attachment_file_name    :string
+#  attachment_content_type :string
+#  attachment_file_size    :integer
+#  attachment_updated_at   :datetime
+#

data/spec/fixtures/circulation_statuses.yml

@@ -0,0 +1,119 @@
+--- 
+circulation_status_00001: 
+  name: Available For Pickup
+  display_name: "en: Available For Pickup\r\n\
+    ja: 持ち出し可能"
+  id: 1
+  note: ""
+  position: 1
+circulation_status_00002: 
+  name: Available On Shelf
+  display_name: "en: Available On Shelf\r\n\
+    ja: 在架（利用可能）"
+  id: 2
+  note: ""
+  position: 2
+circulation_status_00003: 
+  name: Circulation Status Undefined
+  display_name: Circulation Status Undefined
+  id: 3
+  note: ""
+  position: 3
+circulation_status_00004: 
+  name: Claimed Returned Or Never Borrowed
+  display_name: Claimed Returned Or Never Borrowed
+  id: 4
+  note: ""
+  position: 4
+circulation_status_00005: 
+  name: In Process  
+  display_name: "en: In Process\r\n\
+    ja: 作業中"
+  id: 5
+  note: ""
+  position: 5
+circulation_status_00006: 
+  name: In Transit Between Library Locations  
+  display_name: In Transit Between Library Locations
+  id: 6
+  note: ""
+  position: 6
+circulation_status_00007: 
+  name: Lost  
+  display_name: "en: Lost\r\n\
+    ja: 紛失"
+  id: 7
+  note: ""
+  position: 7
+circulation_status_00008: 
+  name: Missing  
+  display_name: "en: Missing\r\n\
+    ja: 行方不明"
+  id: 8
+  note: ""
+  position: 8
+circulation_status_00009: 
+  name: Not Available  
+  display_name: "en: Not Available\r\n\
+    ja: 利用不可"
+  id: 9
+  note: ""
+  position: 9
+circulation_status_00010: 
+  name: On Loan
+  display_name: "en: On Loan\r\n\
+    ja: 貸出中"
+  id: 10
+  note: ""
+  position: 10
+circulation_status_00011: 
+  name: On Order  
+  display_name: On Order
+  id: 11
+  note: ""
+  position: 11
+circulation_status_00012: 
+  name: Pending Transfer  
+  display_name: Pending Transfer
+  id: 12
+  note: ""
+  position: 12
+circulation_status_00013: 
+  name: Recalled
+  display_name: Recalled
+  id: 13
+  note: ""
+  position: 13
+circulation_status_00014: 
+  name: Waiting To Be Reshelved
+  display_name: Waiting To Be Reshelved
+  id: 14
+  note: ""
+  position: 14
+circulation_status_00015: 
+  name: Not arrived
+  display_name: "en: Not arrived\r\n\
+    ja: 未着"
+  id: 15
+  note: ""
+  position: 15
+circulation_status_00016: 
+  name: Removed
+  display_name: "en: Removed\r\n\
+    ja: 除籍済み"
+  id: 16
+  note: ""
+  position: 16
+
+# == Schema Information
+#
+# Table name: circulation_statuses
+#
+#  id           :integer          not null, primary key
+#  name         :string           not null
+#  display_name :text
+#  note         :text
+#  position     :integer
+#  created_at   :datetime
+#  updated_at   :datetime
+#