enju_biblio 0.1.0.pre63 → 0.1.0.pre64

data/app/views/manifestations/index.opds.builder

@@ -10,6 +10,9 @@ atom_feed(url: manifestations_url(format: :atom),
     feed.entry(manifestation) do |entry|
       entry.link rel: "http://opds-spec.org/acquisition/borrow", href: manifestation_url(manifestation), type: 'text/html'
       entry.title(manifestation.original_title)
+      if defined?(EnjuBookmark)
+        entry.content(manifestation.tags.join(' '), type: 'html')
+      end
 
       manifestation.creators.readable_by(current_user).each do |agent|
         entry.author do |author|

data/app/views/manifestations/show.html.erb

@@ -48,6 +48,9 @@
           <%- if current_user.email.present? -%>
             <li><%= link_to t('manifestation.send_email'), manifestation_path(mode: 'send_email'), data: {confirm: t('page.are_you_sure')} -%></li>
           <%- end -%>
+          <% if defined?(EnjuBookmark) %>
+            <li><%= link_to_bookmark(@manifestation) %></li>
+          <% end %>
         <% end %>
 
         <%- unless @manifestation.carrier_type.name == 'file' -%>
@@ -56,7 +59,7 @@
               <% if @manifestation.is_reservable_by?(current_user) %>
                 <li><%= link_to_reservation(@manifestation, @reserve) %>
                 <br />
-                (<%= t('page.number_of_reservations', count: @reserved_count) -%>)</li>
+                (<%= link_to_if(current_user.has_role?('Librarian'), t('page.number_of_reservations', count: @reserved_count), reserves_path(query: "manifestation_id_i:#{@manifestation.id}")) -%>)</li>
               <%- else -%>
                 <% if defined?(EnjuPurchaseRequest) %>
                   <li><%= link_to t('activerecord.models.purchase_request'), new_purchase_request_path(purchase_request: {url: manifestation_url(@manifestation)}) %></li>

data/app/views/resource_export_files/index.html.erb

@@ -19,13 +19,13 @@
         <td><%= link_to resource_export_file.id, resource_export_file %></td>
         <td><%= resource_export_file.user.try(:username) %></td>
         <td>
-          <%= link_to resource_export_file.resource_export_file_name, resource_export_file.resource_export.url if resource_export_file.resource_export.path %>
+          <%= link_to resource_export_file.resource_export_file_name, resource_export_file_path(resource_export_file, format: :download) if resource_export_file.resource_export.path %>
           <br />
           <%= resource_export_file.created_at %>
         </td>
         <td><%= localized_state(resource_export_file.current_state) -%></td>
         <td>
-          <%= link_to t('page.destroy'), resource_export_file, method: :delete, data: {confirm: t('page.are_you_sure')}, method: :delete -%>
+          <%= link_to t('page.destroy'), resource_export_file, data: {confirm: t('page.are_you_sure')}, method: :delete -%>
         </td>
       </tr>
     <% end %>

data/app/views/resource_export_files/show.html.erb

@@ -10,7 +10,7 @@
 
 <p>
   <strong><%= t('activerecord.attributes.resource_export_file.resource_export_file_name') -%></strong>
-  <%= link_to @resource_export_file.resource_export_file_name, @resource_export_file.resource_export.url if @resource_export_file.resource_export_file_name %>
+  <%= link_to @resource_export_file.resource_export_file_name, resource_export_file_path(@resource_export_file, format: :download) if @resource_export_file.resource_export_file_name %>
 </p>
 
 <p>

data/config/locales/translation_en.yml

@@ -410,6 +410,7 @@ en:
     add_series_statement: Add another series statement
     merge: "Merge!"
     merge_resource: "Merge %{model}"
+    new_acquisition: Acquisition
 
   merge_list:
     successfully_merged: "%{model} were merged successfully."

data/config/locales/translation_ja.yml

@@ -414,6 +414,7 @@ ja:
     add_series_statement: 別のシリーズ情報を追加する
     merge: "統合する（取り消しはできません）"
     merge_resource: "%{model}を統合する"
+    new_acquisition: 新規受入
 
   merge_list:
     successfully_merged: "%{model}は正常に統合されました。"

data/db/migrate/20150117111136_add_foreign_key_to_items_referencing_manifestations.rb

@@ -0,0 +1,5 @@
+class AddForeignKeyToItemsReferencingManifestations < ActiveRecord::Migration
+  def change
+    add_foreign_key :items, :manifestations
+  end
+end

data/lib/enju_biblio/biblio_helper.rb

@@ -64,6 +64,8 @@ module EnjuBiblio
         link_to identifier.body, "http://iss.ndl.go.jp/books/#{identifier.body}"
       when 'lccn'
         link_to identifier.body, "http://lccn.loc.gov/#{identifier.body}"
+      when 'ncid'
+        link_to identifier.body, "http://ci.nii.ac.jp/ncid/#{identifier.body}"
       else
         identifier.body
       end

data/lib/enju_biblio/engine.rb

@@ -1,4 +1,3 @@
-require 'enju_seed'
 require 'paper_trail'
 require 'paperclip'
 require 'paperclip-meta'

data/lib/enju_biblio/version.rb

@@ -1,3 +1,3 @@
 module EnjuBiblio
-  VERSION = "0.1.0.pre63"
+  VERSION = "0.1.0.pre64"
 end

data/spec/controllers/agent_import_files_controller_spec.rb

@@ -201,7 +201,7 @@ describe AgentImportFilesController do
       login_fixture_librarian
 
       it "should update agent_import_file" do
-        put :update, :id => agent_import_files(:agent_import_file_00003).id, :agent_import_file => { }
+        put :update, :id => agent_import_files(:agent_import_file_00003).id, :agent_import_file => {mode: "modify"}
         expect(response).to redirect_to agent_import_file_url(assigns(:agent_import_file))
       end
     end
@@ -210,14 +210,14 @@ describe AgentImportFilesController do
       login_fixture_user
 
       it "should not update agent_import_file" do
-        put :update, :id => agent_import_files(:agent_import_file_00003).id, :agent_import_file => { }
+        put :update, :id => agent_import_files(:agent_import_file_00003).id, :agent_import_file => {mode: "modify"}
         expect(response).to be_forbidden
       end
     end
 
     describe "When not logged in" do
       it "should not update agent_import_file" do
-        put :update, :id => agent_import_files(:agent_import_file_00003).id, :agent_import_file => { }
+        put :update, :id => agent_import_files(:agent_import_file_00003).id, :agent_import_file => {mode: "modify"}
         expect(response).to redirect_to new_user_session_url
       end
     end

data/spec/controllers/agent_merge_lists_controller_spec.rb

@@ -343,13 +343,13 @@ describe AgentMergeListsController do
 
       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'))
+        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'))
+        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

data/spec/controllers/agent_merges_controller_spec.rb

@@ -168,7 +168,7 @@ describe AgentMergesController do
   describe "POST create" do
     before(:each) do
       @attrs = FactoryGirl.attributes_for(:agent_merge)
-      @invalid_attrs = {:agent_merge_list_id => ''}
+      @invalid_attrs = {agent_id: 'invalid', agent_merge_list_id: 'invalid'}
     end
 
     describe "When logged in as Administrator" do

data/spec/controllers/agent_types_controller_spec.rb

@@ -84,15 +84,15 @@ describe AgentTypesController do
       it "assigns a newly created but unsaved agent_type as @agent_type" do
         # Trigger the behavior that occurs when invalid params are submitted
         AgentType.any_instance.stub(:save).and_return(false)
-        post :create, :agent_type => {}
+        post :create, :agent_type => {name: "test"}
         expect(assigns(:agent_type)).to be_a_new(AgentType)
       end
 
       it "re-renders the 'new' template" do
         # Trigger the behavior that occurs when invalid params are submitted
         AgentType.any_instance.stub(:save).and_return(false)
-        post :create, :agent_type => {}
-        #expect(response).to render_template("new")
+        post :create, :agent_type => {name: "test"}
+        expect(response).to render_template("new")
       end
     end
   end
@@ -105,8 +105,8 @@ describe AgentTypesController do
         # specifies that the AgentType created on the previous line
         # receives the :update_attributes message with whatever params are
         # submitted in the request.
-        AgentType.any_instance.should_receive(:update_attributes).with({'these' => 'params'})
-        put :update, :id => agent_type.id, :agent_type => {'these' => 'params'}
+        AgentType.any_instance.should_receive(:update_attributes).with({'name' => 'test'})
+        put :update, :id => agent_type.id, :agent_type => {'name' => 'test'}
       end
 
       it "assigns the requested agent_type as @agent_type" do
@@ -135,7 +135,7 @@ describe AgentTypesController do
         agent_type = AgentType.create! valid_attributes
         # Trigger the behavior that occurs when invalid params are submitted
         AgentType.any_instance.stub(:save).and_return(false)
-        put :update, :id => agent_type.id, :agent_type => {}
+        put :update, :id => agent_type.id, :agent_type => {name: "test"}
         expect(assigns(:agent_type)).to eq(agent_type)
       end
 
@@ -143,8 +143,8 @@ describe AgentTypesController do
         agent_type = AgentType.create! valid_attributes
         # Trigger the behavior that occurs when invalid params are submitted
         AgentType.any_instance.stub(:save).and_return(false)
-        put :update, :id => agent_type.id, :agent_type => {}
-        #expect(response).to render_template("edit")
+        put :update, :id => agent_type.id, :agent_type => {name: "test"}
+        expect(response).to render_template("edit")
       end
     end
   end

data/spec/controllers/carrier_types_controller_spec.rb

@@ -84,15 +84,15 @@ describe CarrierTypesController do
       it "assigns a newly created but unsaved carrier_type as @carrier_type" do
         # Trigger the behavior that occurs when invalid params are submitted
         CarrierType.any_instance.stub(:save).and_return(false)
-        post :create, :carrier_type => {}
+        post :create, :carrier_type => {name: "test"}
         expect(assigns(:carrier_type)).to be_a_new(CarrierType)
       end
 
       it "re-renders the 'new' template" do
         # Trigger the behavior that occurs when invalid params are submitted
         CarrierType.any_instance.stub(:save).and_return(false)
-        post :create, :carrier_type => {}
-        #expect(response).to render_template("new")
+        post :create, :carrier_type => {name: "test"}
+        expect(response).to render_template("new")
       end
     end
   end
@@ -105,8 +105,8 @@ describe CarrierTypesController do
         # specifies that the CarrierType created on the previous line
         # receives the :update_attributes message with whatever params are
         # submitted in the request.
-        CarrierType.any_instance.should_receive(:update_attributes).with({'these' => 'params'})
-        put :update, :id => carrier_type.id, :carrier_type => {'these' => 'params'}
+        CarrierType.any_instance.should_receive(:update_attributes).with({'name' => 'test'})
+        put :update, :id => carrier_type.id, :carrier_type => {'name' => 'test'}
       end
 
       it "assigns the requested carrier_type as @carrier_type" do
@@ -135,7 +135,7 @@ describe CarrierTypesController do
         carrier_type = CarrierType.create! valid_attributes
         # Trigger the behavior that occurs when invalid params are submitted
         CarrierType.any_instance.stub(:save).and_return(false)
-        put :update, :id => carrier_type.id, :carrier_type => {}
+        put :update, :id => carrier_type.id, :carrier_type => {name: "test"}
         expect(assigns(:carrier_type)).to eq(carrier_type)
       end
 
@@ -143,8 +143,8 @@ describe CarrierTypesController do
         carrier_type = CarrierType.create! valid_attributes
         # Trigger the behavior that occurs when invalid params are submitted
         CarrierType.any_instance.stub(:save).and_return(false)
-        put :update, :id => carrier_type.id, :carrier_type => {}
-        #expect(response).to render_template("edit")
+        put :update, :id => carrier_type.id, :carrier_type => {name: "test"}
+        expect(response).to render_template("edit")
       end
     end
   end

data/spec/controllers/content_types_controller_spec.rb

@@ -84,15 +84,15 @@ describe ContentTypesController do
       it "assigns a newly created but unsaved content_type as @content_type" do
         # Trigger the behavior that occurs when invalid params are submitted
         ContentType.any_instance.stub(:save).and_return(false)
-        post :create, :content_type => {}
+        post :create, :content_type => {name: "test"}
         expect(assigns(:content_type)).to be_a_new(ContentType)
       end
 
       it "re-renders the 'new' template" do
         # Trigger the behavior that occurs when invalid params are submitted
         ContentType.any_instance.stub(:save).and_return(false)
-        post :create, :content_type => {}
-        #expect(response).to render_template("new")
+        post :create, :content_type => {name: "test"}
+        expect(response).to render_template("new")
       end
     end
   end
@@ -105,8 +105,8 @@ describe ContentTypesController do
         # specifies that the ContentType created on the previous line
         # receives the :update_attributes message with whatever params are
         # submitted in the request.
-        ContentType.any_instance.should_receive(:update_attributes).with({'these' => 'params'})
-        put :update, :id => content_type.id, :content_type => {'these' => 'params'}
+        ContentType.any_instance.should_receive(:update_attributes).with({'name' => 'test'})
+        put :update, :id => content_type.id, :content_type => {'name' => 'test'}
       end
 
       it "assigns the requested content_type as @content_type" do
@@ -135,7 +135,7 @@ describe ContentTypesController do
         content_type = ContentType.create! valid_attributes
         # Trigger the behavior that occurs when invalid params are submitted
         ContentType.any_instance.stub(:save).and_return(false)
-        put :update, :id => content_type.id, :content_type => {}
+        put :update, :id => content_type.id, :content_type => {name: "test"}
         expect(assigns(:content_type)).to eq(content_type)
       end
 
@@ -143,8 +143,8 @@ describe ContentTypesController do
         content_type = ContentType.create! valid_attributes
         # Trigger the behavior that occurs when invalid params are submitted
         ContentType.any_instance.stub(:save).and_return(false)
-        put :update, :id => content_type.id, :content_type => {}
-        #expect(response).to render_template("edit")
+        put :update, :id => content_type.id, :content_type => {name: "test"}
+        expect(response).to render_template("edit")
       end
     end
   end

data/spec/controllers/create_types_controller_spec.rb

@@ -84,14 +84,14 @@ describe CreateTypesController do
       it "assigns a newly created but unsaved create_type as @create_type" do
         # Trigger the behavior that occurs when invalid params are submitted
         CreateType.any_instance.stub(:save).and_return(false)
-        post :create, :create_type => {}
+        post :create, :create_type => {name: "test"}
         expect(assigns(:create_type)).to be_a_new(CreateType)
       end
 
       it "re-renders the 'new' template" do
         # Trigger the behavior that occurs when invalid params are submitted
         CreateType.any_instance.stub(:save).and_return(false)
-        post :create, :create_type => {}
+        post :create, :create_type => {name: "test"}
         #expect(response).to render_template("new")
       end
     end
@@ -105,8 +105,8 @@ describe CreateTypesController do
         # specifies that the CreateType created on the previous line
         # receives the :update_attributes message with whatever params are
         # submitted in the request.
-        CreateType.any_instance.should_receive(:update_attributes).with({'these' => 'params'})
-        put :update, :id => create_type.id, :create_type => {'these' => 'params'}
+        CreateType.any_instance.should_receive(:update_attributes).with({'name' => 'test'})
+        put :update, :id => create_type.id, :create_type => {'name' => 'test'}
       end
 
       it "assigns the requested create_type as @create_type" do
@@ -135,7 +135,7 @@ describe CreateTypesController do
         create_type = CreateType.create! valid_attributes
         # Trigger the behavior that occurs when invalid params are submitted
         CreateType.any_instance.stub(:save).and_return(false)
-        put :update, :id => create_type.id, :create_type => {}
+        put :update, :id => create_type.id, :create_type => {name: "test"}
         expect(assigns(:create_type)).to eq(create_type)
       end
 
@@ -143,7 +143,7 @@ describe CreateTypesController do
         create_type = CreateType.create! valid_attributes
         # Trigger the behavior that occurs when invalid params are submitted
         CreateType.any_instance.stub(:save).and_return(false)
-        put :update, :id => create_type.id, :create_type => {}
+        put :update, :id => create_type.id, :create_type => {name: "test"}
         #expect(response).to render_template("edit")
       end
     end

data/spec/controllers/form_of_works_controller_spec.rb

@@ -84,14 +84,14 @@ describe FormOfWorksController do
       it "assigns a newly created but unsaved form_of_work as @form_of_work" do
         # Trigger the behavior that occurs when invalid params are submitted
         FormOfWork.any_instance.stub(:save).and_return(false)
-        post :create, :form_of_work => {}
+        post :create, :form_of_work => {name: "test"}
         expect(assigns(:form_of_work)).to be_a_new(FormOfWork)
       end
 
       it "re-renders the 'new' template" do
         # Trigger the behavior that occurs when invalid params are submitted
         FormOfWork.any_instance.stub(:save).and_return(false)
-        post :create, :form_of_work => {}
+        post :create, :form_of_work => {name: "test"}
         #expect(response).to render_template("new")
       end
     end
@@ -105,8 +105,8 @@ describe FormOfWorksController do
         # specifies that the FormOfWork created on the previous line
         # receives the :update_attributes message with whatever params are
         # submitted in the request.
-        FormOfWork.any_instance.should_receive(:update_attributes).with({'these' => 'params'})
-        put :update, :id => form_of_work.id, :form_of_work => {'these' => 'params'}
+        FormOfWork.any_instance.should_receive(:update_attributes).with({'name' => 'test'})
+        put :update, :id => form_of_work.id, :form_of_work => {'name' => 'test'}
       end
 
       it "assigns the requested form_of_work as @form_of_work" do
@@ -135,7 +135,7 @@ describe FormOfWorksController do
         form_of_work = FormOfWork.create! valid_attributes
         # Trigger the behavior that occurs when invalid params are submitted
         FormOfWork.any_instance.stub(:save).and_return(false)
-        put :update, :id => form_of_work.id, :form_of_work => {}
+        put :update, :id => form_of_work.id, :form_of_work => {name: "test"}
         expect(assigns(:form_of_work)).to eq(form_of_work)
       end
 
@@ -143,7 +143,7 @@ describe FormOfWorksController do
         form_of_work = FormOfWork.create! valid_attributes
         # Trigger the behavior that occurs when invalid params are submitted
         FormOfWork.any_instance.stub(:save).and_return(false)
-        put :update, :id => form_of_work.id, :form_of_work => {}
+        put :update, :id => form_of_work.id, :form_of_work => {name: "test"}
         #expect(response).to render_template("edit")
       end
     end

data/spec/controllers/frequencies_controller_spec.rb

@@ -84,15 +84,15 @@ describe FrequenciesController do
       it "assigns a newly created but unsaved frequency as @frequency" do
         # Trigger the behavior that occurs when invalid params are submitted
         Frequency.any_instance.stub(:save).and_return(false)
-        post :create, :frequency => {}
+        post :create, :frequency => {name: "test"}
         assigns(:frequency).should be_a_new(Frequency)
       end
 
       it "re-renders the 'new' template" do
         # Trigger the behavior that occurs when invalid params are submitted
         Frequency.any_instance.stub(:save).and_return(false)
-        post :create, :frequency => {}
-        #expect(response).to render_template("new")
+        post :create, :frequency => {name: "test"}
+        expect(response).to render_template("new")
       end
     end
   end
@@ -105,8 +105,8 @@ describe FrequenciesController do
         # specifies that the Frequency created on the previous line
         # receives the :update_attributes message with whatever params are
         # submitted in the request.
-        Frequency.any_instance.should_receive(:update_attributes).with({'these' => 'params'})
-        put :update, :id => frequency.id, :frequency => {'these' => 'params'}
+        Frequency.any_instance.should_receive(:update_attributes).with({'name' => 'test'})
+        put :update, :id => frequency.id, :frequency => {'name' => 'test'}
       end
 
       it "assigns the requested frequency as @frequency" do
@@ -135,7 +135,7 @@ describe FrequenciesController do
         frequency = Frequency.create! valid_attributes
         # Trigger the behavior that occurs when invalid params are submitted
         Frequency.any_instance.stub(:save).and_return(false)
-        put :update, :id => frequency.id, :frequency => {}
+        put :update, :id => frequency.id, :frequency => {name: "test"}
         assigns(:frequency).should eq(frequency)
       end
 
@@ -143,8 +143,8 @@ describe FrequenciesController do
         frequency = Frequency.create! valid_attributes
         # Trigger the behavior that occurs when invalid params are submitted
         Frequency.any_instance.stub(:save).and_return(false)
-        put :update, :id => frequency.id, :frequency => {}
-        #expect(response).to render_template("edit")
+        put :update, :id => frequency.id, :frequency => {name: "test"}
+        expect(response).to render_template("edit")
       end
     end
   end