enju_biblio 0.1.0.pre58 → 0.1.0.pre59

data/config/locales/translation_ja.yml

@@ -7,7 +7,6 @@ ja:
       create_type: 著作の関係
       embody: 具体化
       exemplify: 書誌と所蔵の関係
-      extent: 大きさ
       form_of_work: 著作の形態
       frequency: 発行頻度
       item: 所蔵情報
@@ -39,6 +38,10 @@ ja:
       identifier_type: 識別子の種類
       resource_export_file: 書誌と所蔵のエクスポート
       agent_export_file: 人物・団体情報のエクスポート
+      patron_merge_list: 人物・団体の統合リスト
+      patron_merge: 人物・団体の統合
+      series_statement_merge_list: シリーズ情報統合リスト
+      series_statement_merge: シリーズ情報の統合
 
     attributes:
       manifestation:
@@ -82,7 +85,7 @@ ja:
         contributor_string: 協力者・編者
         publisher_string: 出版者
         series_statement_string: シリーズ情報
-        periodical: 逐次刊行物
+        serial: 逐次刊行物
         series_master: シリーズ情報マスタ
         subject: 件名
         classification: 分類
@@ -90,6 +93,9 @@ ja:
         statement_of_responsibility: 責任表示
         publication_place: 出版地
         parent_id: 親書誌
+        extent: ページ数
+        dimensions: 大きさ
+        fulltext_content: 全文あり
       manifestation/subjects:
           term: 件名
       manifestation/classifications:
@@ -205,11 +211,6 @@ ja:
         display_name: 表示名
         note: 注記
         position: 位置
-      extent:
-        name: 名前
-        display_name: 表示名
-        note: 注記
-        position: 位置
       agent_type:
         name: 名前
         display_name: 表示名
@@ -291,6 +292,7 @@ ja:
         position: 位置
       resource_import_result:
         body: 本文
+        error_message: エラーメッセージ
       agent_import_result:
         body: 本文
       create_type:
@@ -321,6 +323,12 @@ ja:
         agent_export_file_name: ファイル名
         agent_export_file_size: ファイルサイズ
         state: 状態
+      patron_merge_list:
+        title: タイトル
+      patron_merge:
+      series_statement_merge_list:
+        title: タイトル
+      series_statement_merge:
 
   resource_import_file:
     update_relationship: 関連を更新
@@ -404,3 +412,13 @@ ja:
     add: 追加
     remove: 削除
     add_series_statement: 別のシリーズ情報を追加する
+    merge: "統合する（取り消しはできません）"
+    merge_resource: "%{model}を統合する"
+
+  merge_list:
+    successfully_merged: "%{model}は正常に統合されました。"
+    specify_id: "%{model}のIDを指定してください。"
+
+  import:
+    manifestation_found: "書誌インポート省略: すでに登録されている書誌が見つかりました。"
+    item_found: "所蔵インポート省略: すでに登録されている個別資料が見つかりました。"

data/config/routes.rb

@@ -72,7 +72,6 @@ Rails.application.routes.draw do
   resources :medium_of_performances
   resources :carrier_types
   resources :content_types
-  resources :extents
   resources :agent_types
 
   resources :agent_relationship_types
@@ -89,6 +88,26 @@ Rails.application.routes.draw do
 
   resources :picture_files
 
+  resources :agents do
+    resources :agent_merges
+    resources :agent_merge_lists
+  end
+  resources :agent_merge_lists do
+    resources :agents
+    resources :agent_merges
+  end
+  resources :agent_merges
+
+  resources :series_statements do
+    resources :series_statement_merges
+    resources :series_statement_merge_lists
+  end
+  resources :series_statement_merge_lists do
+    resources :series_statements
+    resources :series_statement_merges
+  end
+  resources :series_statement_merges
+
   get '/isbn/:isbn_id' => 'manifestations#index'
   get '/page/advanced_search' => 'page#advanced_search'
 end

data/db/migrate/005_create_manifestations.rb

@@ -13,7 +13,6 @@ class CreateManifestations < ActiveRecord::Migration
       t.string :access_address
       t.integer :language_id, :default => 1, :null => false
       t.integer :carrier_type_id, :default => 1, :null => false
-      t.integer :extent_id, :default => 1, :null => false
       t.integer :start_page
       t.integer :end_page
       t.integer :height

data/db/migrate/133_create_agent_merges.rb

@@ -0,0 +1,15 @@
+class CreateAgentMerges < ActiveRecord::Migration
+  def self.up
+    create_table :agent_merges do |t|
+      t.integer :agent_id, :agent_merge_list_id, :null => false
+
+      t.timestamps
+    end
+    add_index :agent_merges, :agent_id
+    add_index :agent_merges, :agent_merge_list_id
+  end
+
+  def self.down
+    drop_table :agent_merges
+  end
+end

data/db/migrate/134_create_agent_merge_lists.rb

@@ -0,0 +1,13 @@
+class CreateAgentMergeLists < ActiveRecord::Migration
+  def self.up
+    create_table :agent_merge_lists do |t|
+      t.string :title
+
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :agent_merge_lists
+  end
+end

data/db/migrate/20110627035057_create_series_statement_merges.rb

@@ -7,6 +7,6 @@ class CreateSeriesStatementMerges < ActiveRecord::Migration
       t.timestamps
     end
     add_index :series_statement_merges, :series_statement_id
-    add_index :series_statement_merges, :series_statement_merge_list_id
+    add_index :series_statement_merges, :series_statement_merge_list_id, name: "index_series_statement_merges_on_list_id"
   end
 end

data/db/migrate/20140822114527_add_error_message_to_resource_import_result.rb

@@ -0,0 +1,5 @@
+class AddErrorMessageToResourceImportResult < ActiveRecord::Migration
+  def change
+    add_column :resource_import_results, :error_message, :text
+  end
+end

data/db/migrate/20140823083524_add_extent_to_manifestation.rb

@@ -0,0 +1,5 @@
+class AddExtentToManifestation < ActiveRecord::Migration
+  def change
+    add_column :manifestations, :extent, :text
+  end
+end

data/db/migrate/20140823094847_add_dimensions_to_manifestation.rb

@@ -0,0 +1,5 @@
+class AddDimensionsToManifestation < ActiveRecord::Migration
+  def change
+    add_column :manifestations, :dimensions, :text
+  end
+end

data/db/migrate/20140823095740_rename_manifestation_periodical_to_serial.rb

@@ -0,0 +1,9 @@
+class RenameManifestationPeriodicalToSerial < ActiveRecord::Migration
+  def up
+    rename_column :manifestations, :periodical, :serial
+  end
+
+  def down
+    rename_column :manifestations, :serial, :periodical
+  end
+end

data/lib/enju_biblio.rb

@@ -54,6 +54,14 @@ module EnjuBiblio
     def get_basket
       @basket = Basket.find(params[:basket_id]) if params[:basket_id]
     end
+
+    def get_agent_merge_list
+      @agent_merge_list = AgentMergeList.find(params[:agent_merge_list_id]) if params[:agent_merge_list_id]
+    end
+
+    def get_series_statement_merge_list
+      @series_statement_merge_list = SeriesStatementMergeList.find(params[:series_statement_merge_list_id]) if params[:series_statement_merge_list_id]
+    end
   end
 end
 

data/lib/enju_biblio/version.rb

@@ -1,3 +1,3 @@
 module EnjuBiblio
-  VERSION = "0.1.0.pre58"
+  VERSION = "0.1.0.pre59"
 end

data/lib/tasks/agent_type.rb

@@ -0,0 +1,15 @@
+def update_agent_type
+  agent_types = YAML.load(open('db/fixtures/enju_biblio/agent_types.yml').read)
+  agent_types.each do |line|
+    l = line[1].select!{|k, v| %w(name display_name note).include?(k)}
+
+    case l["name"]
+    when "person"
+      agent_type = AgentType.where(name: 'Person').first
+      agent_type.update_attributes!(l) if agent_type
+    when "corporate_body"
+      agent_type = AgentType.where(name: 'CorporateBody').first
+      agent_type.update_attributes!(l) if agent_type
+    end
+  end
+end

data/lib/tasks/enju_biblio_tasks.rake

@@ -1,4 +1,5 @@
 require 'active_record/fixtures'
+require 'tasks/agent_type'
 require 'tasks/carrier_type'
 require 'tasks/content_type'
 require 'tasks/identifier_type'
@@ -26,6 +27,7 @@ namespace :enju_biblio do
   task :upgrade => :environment do
     Item.transaction do
       update_item
+      update_agent_type
       update_carrier_type
       update_content_type
       update_identifier_type

data/spec/controllers/agent_merge_lists_controller_spec.rb

@@ -0,0 +1,456 @@
+require 'spec_helper'
+require 'sunspot/rails/spec_helper'
+
+describe AgentMergeListsController do
+  fixtures :all
+  disconnect_sunspot
+
+  describe "GET index" do
+    describe "When logged in as Administrator" do
+      login_admin
+
+      it "assigns all agent_merge_lists as @agent_merge_lists" do
+        get :index
+        assigns(:agent_merge_lists).should eq(AgentMergeList.page(1))
+      end
+    end
+
+    describe "When logged in as Librarian" do
+      login_librarian
+
+      it "assigns all agent_merge_lists as @agent_merge_lists" do
+        get :index
+        assigns(:agent_merge_lists).should eq(AgentMergeList.page(1))
+      end
+    end
+
+    describe "When logged in as User" do
+      login_user
+
+      it "assigns empty as @agent_merge_lists" do
+        get :index
+        assigns(:agent_merge_lists).should be_empty
+      end
+    end
+
+    describe "When not logged in" do
+      it "assigns empty as @agent_merge_lists" do
+        get :index
+        assigns(:agent_merge_lists).should be_empty
+      end
+    end
+  end
+
+  describe "GET show" do
+    before(:each) do
+      @agent_merge_list = FactoryGirl.create(:agent_merge_list)
+    end
+
+    describe "When logged in as Administrator" do
+      login_admin
+
+      it "assigns the requested agent_merge_list as @agent_merge_list" do
+        get :show, :id => @agent_merge_list.id
+        assigns(:agent_merge_list).should eq(@agent_merge_list)
+        response.should be_success
+      end
+    end
+
+    describe "When logged in as Librarian" do
+      login_librarian
+
+      it "assigns the requested agent_merge_list as @agent_merge_list" do
+        get :show, :id => @agent_merge_list.id
+        assigns(:agent_merge_list).should eq(@agent_merge_list)
+        response.should be_success
+      end
+    end
+
+    describe "When logged in as User" do
+      login_user
+
+      it "assigns the requested agent_merge_list as @agent_merge_list" do
+        get :show, :id => @agent_merge_list.id
+        assigns(:agent_merge_list).should eq(@agent_merge_list)
+        response.should be_forbidden
+      end
+    end
+
+    describe "When not logged in" do
+      it "assigns the requested agent_merge_list as @agent_merge_list" do
+        get :show, :id => @agent_merge_list.id
+        assigns(:agent_merge_list).should eq(@agent_merge_list)
+        response.should redirect_to new_user_session_url
+      end
+    end
+  end
+
+  describe "GET new" do
+    describe "When logged in as Administrator" do
+      login_admin
+
+      it "assigns the requested agent_merge_list as @agent_merge_list" do
+        get :new
+        assigns(:agent_merge_list).should_not be_valid
+      end
+    end
+
+    describe "When logged in as Librarian" do
+      login_librarian
+
+      it "assigns the requested agent_merge_list as @agent_merge_list" do
+        get :new
+        assigns(:agent_merge_list).should_not be_valid
+      end
+    end
+
+    describe "When logged in as User" do
+      login_user
+
+      it "should not assign the requested agent_merge_list as @agent_merge_list" do
+        get :new
+        assigns(:agent_merge_list).should_not be_valid
+        response.should be_forbidden
+      end
+    end
+
+    describe "When not logged in" do
+      it "should not assign the requested agent_merge_list as @agent_merge_list" do
+        get :new
+        assigns(:agent_merge_list).should_not be_valid
+        response.should redirect_to(new_user_session_url)
+      end
+    end
+  end
+
+  describe "GET edit" do
+    describe "When logged in as Administrator" do
+      login_admin
+
+      it "assigns the requested agent_merge_list as @agent_merge_list" do
+        agent_merge_list = FactoryGirl.create(:agent_merge_list)
+        get :edit, :id => agent_merge_list.id
+        assigns(:agent_merge_list).should eq(agent_merge_list)
+      end
+    end
+
+    describe "When logged in as Librarian" do
+      login_librarian
+
+      it "assigns the requested agent_merge_list as @agent_merge_list" do
+        agent_merge_list = FactoryGirl.create(:agent_merge_list)
+        get :edit, :id => agent_merge_list.id
+        assigns(:agent_merge_list).should eq(agent_merge_list)
+      end
+    end
+
+    describe "When logged in as User" do
+      login_user
+
+      it "assigns the requested agent_merge_list as @agent_merge_list" do
+        agent_merge_list = FactoryGirl.create(:agent_merge_list)
+        get :edit, :id => agent_merge_list.id
+        response.should be_forbidden
+      end
+    end
+
+    describe "When not logged in" do
+      it "should not assign the requested agent_merge_list as @agent_merge_list" do
+        agent_merge_list = FactoryGirl.create(:agent_merge_list)
+        get :edit, :id => agent_merge_list.id
+        response.should redirect_to(new_user_session_url)
+      end
+    end
+  end
+
+  describe "POST create" do
+    before(:each) do
+      @attrs = FactoryGirl.attributes_for(:agent_merge_list)
+      @invalid_attrs = {:title => ''}
+    end
+
+    describe "When logged in as Administrator" do
+      login_admin
+
+      describe "with valid params" do
+        it "assigns a newly created agent_merge_list as @agent_merge_list" do
+          post :create, :agent_merge_list => @attrs
+          assigns(:agent_merge_list).should be_valid
+        end
+
+        it "redirects to the created agent_merge_list" do
+          post :create, :agent_merge_list => @attrs
+          response.should redirect_to(agent_merge_list_url(assigns(:agent_merge_list)))
+        end
+      end
+
+      describe "with invalid params" do
+        it "assigns a newly created but unsaved agent_merge_list as @agent_merge_list" do
+          post :create, :agent_merge_list => @invalid_attrs
+          assigns(:agent_merge_list).should_not be_valid
+        end
+
+        it "re-renders the 'new' template" do
+          post :create, :agent_merge_list => @invalid_attrs
+          response.should render_template("new")
+        end
+      end
+    end
+
+    describe "When logged in as Librarian" do
+      login_librarian
+
+      describe "with valid params" do
+        it "assigns a newly created agent_merge_list as @agent_merge_list" do
+          post :create, :agent_merge_list => @attrs
+          assigns(:agent_merge_list).should be_valid
+        end
+
+        it "redirects to the created agent_merge_list" do
+          post :create, :agent_merge_list => @attrs
+          response.should redirect_to(agent_merge_list_url(assigns(:agent_merge_list)))
+        end
+      end
+
+      describe "with invalid params" do
+        it "assigns a newly created but unsaved agent_merge_list as @agent_merge_list" do
+          post :create, :agent_merge_list => @invalid_attrs
+          assigns(:agent_merge_list).should_not be_valid
+        end
+
+        it "re-renders the 'new' template" do
+          post :create, :agent_merge_list => @invalid_attrs
+          response.should render_template("new")
+        end
+      end
+    end
+
+    describe "When logged in as User" do
+      login_user
+
+      describe "with valid params" do
+        it "assigns a newly created agent_merge_list as @agent_merge_list" do
+          post :create, :agent_merge_list => @attrs
+          assigns(:agent_merge_list).should be_valid
+        end
+
+        it "should be forbidden" do
+          post :create, :agent_merge_list => @attrs
+          response.should be_forbidden
+        end
+      end
+
+      describe "with invalid params" do
+        it "assigns a newly created but unsaved agent_merge_list as @agent_merge_list" do
+          post :create, :agent_merge_list => @invalid_attrs
+          assigns(:agent_merge_list).should_not be_valid
+        end
+
+        it "should be forbidden" do
+          post :create, :agent_merge_list => @invalid_attrs
+          response.should be_forbidden
+        end
+      end
+    end
+
+    describe "When not logged in" do
+      describe "with valid params" do
+        it "assigns a newly created agent_merge_list as @agent_merge_list" do
+          post :create, :agent_merge_list => @attrs
+          assigns(:agent_merge_list).should be_valid
+        end
+
+        it "should be forbidden" do
+          post :create, :agent_merge_list => @attrs
+          response.should redirect_to(new_user_session_url)
+        end
+      end
+
+      describe "with invalid params" do
+        it "assigns a newly created but unsaved agent_merge_list as @agent_merge_list" do
+          post :create, :agent_merge_list => @invalid_attrs
+          assigns(:agent_merge_list).should_not be_valid
+        end
+
+        it "should be forbidden" do
+          post :create, :agent_merge_list => @invalid_attrs
+          response.should redirect_to(new_user_session_url)
+        end
+      end
+    end
+  end
+
+  describe "PUT update" do
+    before(:each) do
+      @agent_merge_list = FactoryGirl.create(:agent_merge_list)
+      @attrs = FactoryGirl.attributes_for(:agent_merge_list)
+      @invalid_attrs = {:title => ''}
+    end
+
+    describe "When logged in as Administrator" do
+      login_admin
+
+      describe "with valid params" do
+        it "updates the requested agent_merge_list" do
+          put :update, :id => @agent_merge_list.id, :agent_merge_list => @attrs
+        end
+
+        it "assigns the requested agent_merge_list as @agent_merge_list" do
+          put :update, :id => @agent_merge_list.id, :agent_merge_list => @attrs
+          assigns(:agent_merge_list).should eq(@agent_merge_list)
+          response.should redirect_to(@agent_merge_list)
+        end
+      end
+
+      describe "with invalid params" do
+        it "assigns the requested agent_merge_list as @agent_merge_list" do
+          put :update, :id => @agent_merge_list.id, :agent_merge_list => @invalid_attrs
+        end
+
+        it "re-renders the 'edit' template" do
+          put :update, :id => @agent_merge_list.id, :agent_merge_list => @invalid_attrs
+          response.should render_template("edit")
+        end
+      end
+    end
+
+    describe "When logged in as Librarian" do
+      login_librarian
+
+      describe "with valid params" do
+        it "updates the requested agent_merge_list" do
+          put :update, :id => @agent_merge_list.id, :agent_merge_list => @attrs
+        end
+
+        it "assigns the requested agent_merge_list as @agent_merge_list" do
+          put :update, :id => @agent_merge_list.id, :agent_merge_list => @attrs
+          assigns(:agent_merge_list).should eq(@agent_merge_list)
+          response.should redirect_to(@agent_merge_list)
+        end
+      end
+
+      describe "with invalid params" do
+        it "assigns the agent_merge_list as @agent_merge_list" do
+          put :update, :id => @agent_merge_list.id, :agent_merge_list => @invalid_attrs
+          assigns(:agent_merge_list).should_not be_valid
+        end
+
+        it "re-renders the 'edit' template" do
+          put :update, :id => @agent_merge_list.id, :agent_merge_list => @invalid_attrs
+          response.should render_template("edit")
+        end
+      end
+
+      it "should not merge agents without selected_agent_id" do
+        put :update, :id => agent_merge_lists(:agent_merge_list_00001).id, :mode => 'merge'
+        flash[:notice].should eq I18n.t('merge_list.specify_id', :model => I18n.t('activerecord.models.agent'))
+        response.should redirect_to agent_merge_list_url(assigns(:agent_merge_list))
+      end
+
+      it "should merge agents with selected_agent_idand merge_mode" do
+        put :update, :id => agent_merge_lists(:agent_merge_list_00001).id, :selected_agent_id => 3, :mode => 'merge'
+        flash[:notice].should eq I18n.t('merge_list.successfully_merged', :model => I18n.t('activerecord.models.agent'))
+        response.should redirect_to agent_merge_list_url(assigns(:agent_merge_list))
+      end
+    end
+
+    describe "When logged in as User" do
+      login_user
+
+      describe "with valid params" do
+        it "updates the requested agent_merge_list" do
+          put :update, :id => @agent_merge_list.id, :agent_merge_list => @attrs
+        end
+
+        it "assigns the requested agent_merge_list as @agent_merge_list" do
+          put :update, :id => @agent_merge_list.id, :agent_merge_list => @attrs
+          assigns(:agent_merge_list).should eq(@agent_merge_list)
+          response.should be_forbidden
+        end
+      end
+
+      describe "with invalid params" do
+        it "assigns the requested agent_merge_list as @agent_merge_list" do
+          put :update, :id => @agent_merge_list.id, :agent_merge_list => @invalid_attrs
+          response.should be_forbidden
+        end
+      end
+    end
+
+    describe "When not logged in" do
+      describe "with valid params" do
+        it "updates the requested agent_merge_list" do
+          put :update, :id => @agent_merge_list.id, :agent_merge_list => @attrs
+        end
+
+        it "should be forbidden" do
+          put :update, :id => @agent_merge_list.id, :agent_merge_list => @attrs
+          response.should redirect_to(new_user_session_url)
+        end
+      end
+
+      describe "with invalid params" do
+        it "assigns the requested agent_merge_list as @agent_merge_list" do
+          put :update, :id => @agent_merge_list.id, :agent_merge_list => @invalid_attrs
+          response.should redirect_to(new_user_session_url)
+        end
+      end
+    end
+  end
+
+  describe "DELETE destroy" do
+    before(:each) do
+      @agent_merge_list = FactoryGirl.create(:agent_merge_list)
+    end
+
+    describe "When logged in as Administrator" do
+      login_admin
+
+      it "destroys the requested agent_merge_list" do
+        delete :destroy, :id => @agent_merge_list.id
+      end
+
+      it "redirects to the agent_merge_lists list" do
+        delete :destroy, :id => @agent_merge_list.id
+        response.should redirect_to(agent_merge_lists_url)
+      end
+    end
+
+    describe "When logged in as Librarian" do
+      login_librarian
+
+      it "destroys the requested agent_merge_list" do
+        delete :destroy, :id => @agent_merge_list.id
+      end
+
+      it "redirects to the agent_merge_lists list" do
+        delete :destroy, :id => @agent_merge_list.id
+        response.should redirect_to(agent_merge_lists_url)
+      end
+    end
+
+    describe "When logged in as User" do
+      login_user
+
+      it "destroys the requested agent_merge_list" do
+        delete :destroy, :id => @agent_merge_list.id
+      end
+
+      it "should be forbidden" do
+        delete :destroy, :id => @agent_merge_list.id
+        response.should be_forbidden
+      end
+    end
+
+    describe "When not logged in" do
+      it "destroys the requested agent_merge_list" do
+        delete :destroy, :id => @agent_merge_list.id
+      end
+
+      it "should be forbidden" do
+        delete :destroy, :id => @agent_merge_list.id
+        response.should redirect_to(new_user_session_url)
+      end
+    end
+  end
+end