enju_biblio 0.3.10.rc.1 → 0.3.12

data/app/views/manifestation_custom_properties/new.html.erb

@@ -1,5 +1,12 @@
-<h1><%= t('page.new', model: t('activerecord.models.manifestation_custom_property')) -%></h1>
+<div id="content_detail" class="ui-corner-all ui-widget-content">
+  <h1 class="title"><%= t('page.new', model: t('activerecord.models.item_custom_property')) -%></h1>
+  <div id="content_list">
+    <%= render 'form', manifestation_custom_property: @manifestation_custom_property %>
+  </div>
+</div>
 
-<%= render 'form', manifestation_custom_property: @manifestation_custom_property %>
-
-<%= link_to t('page.back'), manifestation_custom_properties_path %>
+<div id="submenu" class="ui-corner-all ui-widget-content">
+  <ul>
+    <li><%= link_to t('page.back'), manifestation_custom_properties_path %></li>
+  </ul>
+</div>

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

@@ -1,21 +1,28 @@
-<h1><%= t('page.showing', model: t('activerecord.models.manifestation_custom_property')) -%></h1>
+<div id="content_detail" class="ui-corner-all ui-widget-content">
+  <h1 class="title"><%= t('page.showing', model: t('activerecord.models.manifestation_custom_property')) -%></h1>
+  <div id="content_list">
+    <p id="notice"><%= notice %></p>
 
-<p id="notice"><%= notice %></p>
+    <p>
+      <strong><%= t('activerecord.attributes.manifestation_custom_property.name') %>:</strong>
+      <%= @manifestation_custom_property.name %>
+    </p>
 
-<p>
-  <strong><%= t('activerecord.attributes.manifestation_custom_property.name') %>:</strong>
-  <%= @manifestation_custom_property.name %>
-</p>
+    <p>
+      <strong><%= t('activerecord.attributes.manifestation_custom_property.display_name') %>:</strong>
+      <%= @manifestation_custom_property.display_name.localize %>
+    </p>
 
-<p>
-  <strong><%= t('activerecord.attributes.manifestation_custom_property.display_name') %>:</strong>
-  <%= @manifestation_custom_property.display_name.localize %>
-</p>
+    <p>
+      <strong><%= t('activerecord.attributes.manifestation_custom_property.note') %>:</strong>
+      <%= @manifestation_custom_property.note %>
+    </p>
+  </div>
+</div>
 
-<p>
-  <strong><%= t('activerecord.attributes.manifestation_custom_property.note') %>:</strong>
-  <%= @manifestation_custom_property.note %>
-</p>
-
-<%= link_to t('page.edit'), edit_manifestation_custom_property_path(@manifestation_custom_property) %> |
-<%= link_to t('page.back'), manifestation_custom_properties_path %>
+<div id="submenu" class="ui-corner-all ui-widget-content">
+  <ul>
+    <li><%= link_to t('page.edit'), edit_manifestation_custom_property_path(@manifestation_custom_property) %></li>
+    <li><%= link_to t('page.back'), manifestation_custom_properties_path %></li>
+  </ul>
+</div>

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

@@ -4,4 +4,5 @@
   <li><%= link_to 'RDF/XML', manifestation_url(@manifestation, format: :rdf) %></li>
   <li><%= link_to 'MODS', manifestation_url(@manifestation, format: :mods) %></li>
   <li><%= link_to 'TSV', manifestation_url(@manifestation, format: :txt) %></li>
+  <li><%= link_to 'JSON', manifestation_url(@manifestation, format: :json) %></li>
 </ul>

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

@@ -3,4 +3,5 @@
   <li><%= link_to 'RDF/XML', url_for(filtered_params.merge(format: :rdf, only_path: true)) %>
   <li><%= link_to 'MODS', url_for(filtered_params.merge(format: :mods, only_path: true)) %></li>
   <li><%= link_to 'TSV', url_for(filtered_params.merge(format: :txt, only_path: true)) %></li>
+  <li><%= link_to 'JSON', url_for(filtered_params.merge(format: :json, only_path: true)) %></li>
 </ul>

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

@@ -201,6 +201,11 @@
   <% end %>
 
   <div class="field">
+    <%= f.label :abstract -%><br />
+    <%= f.text_area :abstract, class: 'resource_textarea' -%>
+  </div>
+
+  <div class="form-group">
     <%= f.label :description -%><br />
     <%= f.text_area :description, class: 'resource_textarea' -%>
   </div>

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

@@ -95,6 +95,12 @@
           <td><%= t('page.updated_at') -%>:</td>
           <td><%=l manifestation.updated_at if manifestation.updated_at -%></td>
         </tr>
+        <tr>
+          <td><%= t('activerecord.attributes.manifestation.abstract') -%>:</td>
+          <td>
+            <%= raw simple_format(h(manifestation.abstract)) -%>
+          </td>
+        </tr>
         <tr>
           <td><%= t('activerecord.attributes.manifestation.description') -%>:</td>
           <td>

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

@@ -91,6 +91,14 @@
           <td><%= t('page.updated_at') -%>:</td>
           <td><%=l manifestation.updated_at if manifestation.updated_at -%></td>
         </tr>
+        <% if manifestation.abstract.present? %>
+          <tr>
+            <td><%= t('activerecord.attributes.manifestation.abstract') -%>:</td>
+            <td>
+              <%= raw simple_format(h(manifestation.abstract)) -%>
+            </td>
+          </tr>
+        <% end %>
         <% if manifestation.description.present? %>
           <tr>
             <td><%= t('activerecord.attributes.manifestation.description') -%>:</td>

data/app/views/manifestations/show.json.jbuilder

@@ -0,0 +1,2 @@
+json.partial!(@manifestation)
+

data/config/locales/translation_en.yml

@@ -88,6 +88,7 @@ en:
         lccn: LCCN
         issn: ISSN
         subscription_master: Subscription master
+        abstract: Abstract
         description: Description
         creator_string: Creator
         contributor_string: Contributor
@@ -104,6 +105,7 @@ en:
         extent: Extent
         dimensions: Dimensions
         fulltext_content: Fulltext content
+        date_copyrighted: Date copyrighted
       manifestation/subjects:
           term: Subject
       manifestation/classifications:

data/config/locales/translation_ja.yml

@@ -88,6 +88,7 @@ ja:
         lccn: LCCN
         issn: ISSN
         subscription_master: 購読マスタ
+        abstract: 内容細目
         description: 説明
         creator_string: 著者
         contributor_string: 協力者・編者
@@ -104,6 +105,7 @@ ja:
         extent: ページ数
         dimensions: 大きさ
         fulltext_content: 全文あり
+        date_copyrighted: 著作権発行日
       manifestation/subjects:
         term: 件名
       manifestation/classifications:

data/db/migrate/20081027150907_create_picture_files.rb

@@ -3,9 +3,7 @@ class CreatePictureFiles < ActiveRecord::Migration[4.2]
     create_table :picture_files do |t|
       t.integer :picture_attachable_id
       t.string :picture_attachable_type
-      t.string :content_type
       t.text :title
-      t.string :thumbnail
       t.integer :position
 
       t.timestamps

data/lib/enju_biblio.rb

@@ -1,7 +1,5 @@
 require "enju_biblio/engine"
 require "enju_biblio/openurl"
-require "enju_biblio/porta_cql"
-require "enju_biblio/sru"
 
 module EnjuBiblio
 end

data/lib/enju_biblio/openurl.rb

@@ -54,9 +54,13 @@ class Openurl
   # 検索
   def search
     search = Sunspot.new_search(Manifestation)
+    role = Role.default_role
     @query_text = build_query
     query = @query_text
-    search.build{ fulltext query }
+    search.build do
+      fulltext query
+      with(:required_role_id).less_than_or_equal_to role.id
+    end
     search.execute!.results
   end
 

data/lib/enju_biblio/version.rb

@@ -1,3 +1,3 @@
 module EnjuBiblio
-  VERSION = "0.3.10.rc.1".freeze
+  VERSION = "0.3.12".freeze
 end

data/spec/controllers/item_custom_properties_controller_spec.rb

@@ -0,0 +1,449 @@
+require 'rails_helper'
+require 'sunspot/rails/spec_helper'
+
+describe ItemCustomPropertiesController do
+  fixtures :all
+  disconnect_sunspot
+
+  def valid_attributes
+    @attrs = FactoryBot.attributes_for(:item_custom_property)
+  end
+
+  describe 'GET index' do
+    before(:each) do
+      FactoryBot.create(:item_custom_property)
+    end
+
+    describe 'When logged in as Administrator' do
+      login_fixture_admin
+
+      it 'assigns all item_custom_properties as @item_custom_properties' do
+        get :index
+        expect(assigns(:item_custom_properties)).to eq(ItemCustomProperty.order(:position))
+      end
+    end
+
+    describe 'When logged in as Librarian' do
+      login_fixture_librarian
+
+      it 'assigns all item_custom_properties as @item_custom_properties' do
+        get :index
+        expect(assigns(:item_custom_properties)).to eq(ItemCustomProperty.order(:position))
+      end
+    end
+
+    describe 'When logged in as User' do
+      login_fixture_user
+
+      it 'assigns all item_custom_properties as @item_custom_properties' do
+        get :index
+        expect(assigns(:item_custom_properties)).to eq nil
+      end
+    end
+
+    describe 'When not logged in' do
+      it 'assigns all item_custom_properties as @item_custom_properties' do
+        get :index
+        expect(assigns(:item_custom_properties)).to eq nil
+      end
+    end
+  end
+
+  describe 'GET show' do
+    describe 'When logged in as Administrator' do
+      login_fixture_admin
+
+      it 'assigns the requested item_custom_property as @item_custom_property' do
+        item_custom_property = FactoryBot.create(:item_custom_property)
+        get :show, params: { id: item_custom_property.id }
+        expect(assigns(:item_custom_property)).to eq(item_custom_property)
+      end
+    end
+
+    describe 'When logged in as Librarian' do
+      login_fixture_librarian
+
+      it 'assigns the requested item_custom_property as @item_custom_property' do
+        item_custom_property = FactoryBot.create(:item_custom_property)
+        get :show, params: { id: item_custom_property.id }
+        expect(assigns(:item_custom_property)).to eq(item_custom_property)
+      end
+    end
+
+    describe 'When logged in as User' do
+      login_fixture_user
+
+      it 'assigns the requested item_custom_property as @item_custom_property' do
+        item_custom_property = FactoryBot.create(:item_custom_property)
+        get :show, params: { id: item_custom_property.id }
+        expect(assigns(:item_custom_property)).to eq(item_custom_property)
+      end
+    end
+
+    describe 'When not logged in' do
+      it 'assigns the requested item_custom_property as @item_custom_property' do
+        item_custom_property = FactoryBot.create(:item_custom_property)
+        get :show, params: { id: item_custom_property.id }
+        expect(assigns(:item_custom_property)).to eq(item_custom_property)
+      end
+    end
+  end
+
+  describe 'GET new' do
+    describe 'When logged in as Administrator' do
+      login_fixture_admin
+
+      it 'assigns the requested item_custom_property as @item_custom_property' do
+        get :new
+        expect(assigns(:item_custom_property)).to be_a_new(ItemCustomProperty)
+        expect(response).to be_successful
+      end
+    end
+
+    describe 'When logged in as Librarian' do
+      login_fixture_librarian
+
+      it 'should not assign the requested item_custom_property as @item_custom_property' do
+        get :new
+        expect(assigns(:item_custom_property)).to be_nil
+        expect(response).to be_forbidden
+      end
+    end
+
+    describe 'When logged in as User' do
+      login_fixture_user
+
+      it 'should not assign the requested item_custom_property as @item_custom_property' do
+        get :new
+        expect(assigns(:item_custom_property)).to be_nil
+        expect(response).to be_forbidden
+      end
+    end
+
+    describe 'When not logged in' do
+      it 'should not assign the requested item_custom_property as @item_custom_property' do
+        get :new
+        expect(assigns(:item_custom_property)).to be_nil
+        expect(response).to redirect_to(new_user_session_url)
+      end
+    end
+  end
+
+  describe 'GET edit' do
+    describe 'When logged in as Administrator' do
+      login_fixture_admin
+
+      it 'assigns the requested item_custom_property as @item_custom_property' do
+        item_custom_property = FactoryBot.create(:item_custom_property)
+        get :edit, params: { id: item_custom_property.id }
+        expect(assigns(:item_custom_property)).to eq(item_custom_property)
+      end
+    end
+
+    describe 'When logged in as Librarian' do
+      login_fixture_librarian
+
+      it 'assigns the requested item_custom_property as @item_custom_property' do
+        item_custom_property = FactoryBot.create(:item_custom_property)
+        get :edit, params: { id: item_custom_property.id }
+        expect(assigns(:item_custom_property)).to eq(item_custom_property)
+      end
+    end
+
+    describe 'When logged in as User' do
+      login_fixture_user
+
+      it 'assigns the requested item_custom_property as @item_custom_property' do
+        item_custom_property = FactoryBot.create(:item_custom_property)
+        get :edit, params: { id: item_custom_property.id }
+        expect(response).to be_forbidden
+      end
+    end
+
+    describe 'When not logged in' do
+      it 'should not assign the requested item_custom_property as @item_custom_property' do
+        item_custom_property = FactoryBot.create(:item_custom_property)
+        get :edit, params: { id: item_custom_property.id }
+        expect(response).to redirect_to(new_user_session_url)
+      end
+    end
+  end
+
+  describe 'POST create' do
+    before(:each) do
+      @attrs = valid_attributes
+      @invalid_attrs = { name: '' }
+    end
+
+    describe 'When logged in as Administrator' do
+      login_fixture_admin
+
+      describe 'with valid params' do
+        it 'assigns a newly created item_custom_property as @item_custom_property' do
+          post :create, params: { item_custom_property: @attrs }
+          expect(assigns(:item_custom_property)).to be_valid
+        end
+
+        it 'redirects to the created item' do
+          post :create, params: { item_custom_property: @attrs }
+          expect(response).to redirect_to(assigns(:item_custom_property))
+        end
+      end
+
+      describe 'with invalid params' do
+        it 'assigns a newly created but unsaved item_custom_property as @item_custom_property' do
+          post :create, params: { item_custom_property: @invalid_attrs }
+          expect(assigns(:item_custom_property)).not_to be_valid
+        end
+
+        it "re-renders the 'new' template" do
+          post :create, params: { item_custom_property: @invalid_attrs }
+          expect(response).to render_template('new')
+        end
+      end
+    end
+
+    describe 'When logged in as Librarian' do
+      login_fixture_librarian
+
+      describe 'with valid params' do
+        it 'assigns a newly created item_custom_property as @item_custom_property' do
+          post :create, params: { item_custom_property: @attrs }
+          expect(assigns(:item_custom_property)).to be_nil
+        end
+
+        it 'redirects to the created item' do
+          post :create, params: { item_custom_property: @attrs }
+          expect(response).to be_forbidden
+        end
+      end
+
+      describe 'with invalid params' do
+        it 'assigns a newly created but unsaved item_custom_property as @item_custom_property' do
+          post :create, params: { item_custom_property: @invalid_attrs }
+          expect(assigns(:item_custom_property)).to be_nil
+        end
+
+        it "re-renders the 'new' template" do
+          post :create, params: { item_custom_property: @invalid_attrs }
+          expect(response).to be_forbidden
+        end
+      end
+    end
+
+    describe 'When logged in as User' do
+      login_fixture_user
+
+      describe 'with valid params' do
+        it 'assigns a newly created item_custom_property as @item_custom_property' do
+          post :create, params: { item_custom_property: @attrs }
+          expect(assigns(:item_custom_property)).to be_nil
+        end
+
+        it 'should be forbidden' do
+          post :create, params: { item_custom_property: @attrs }
+          expect(response).to be_forbidden
+        end
+      end
+
+      describe 'with invalid params' do
+        it 'assigns a newly created but unsaved item_custom_property as @item_custom_property' do
+          post :create, params: { item_custom_property: @invalid_attrs }
+          expect(assigns(:item_custom_property)).to be_nil
+        end
+
+        it 'should be forbidden' do
+          post :create, params: { item_custom_property: @invalid_attrs }
+          expect(response).to be_forbidden
+        end
+      end
+    end
+
+    describe 'When not logged in' do
+      describe 'with valid params' do
+        it 'assigns a newly created item_custom_property as @item_custom_property' do
+          post :create, params: { item_custom_property: @attrs }
+          expect(assigns(:item_custom_property)).to be_nil
+        end
+
+        it 'should be forbidden' do
+          post :create, params: { item_custom_property: @attrs }
+          expect(response).to redirect_to(new_user_session_url)
+        end
+      end
+
+      describe 'with invalid params' do
+        it 'assigns a newly created but unsaved item_custom_property as @item_custom_property' do
+          post :create, params: { item_custom_property: @invalid_attrs }
+          expect(assigns(:item_custom_property)).to be_nil
+        end
+
+        it 'should be forbidden' do
+          post :create, params: { item_custom_property: @invalid_attrs }
+          expect(response).to redirect_to(new_user_session_url)
+        end
+      end
+    end
+  end
+
+  describe 'PUT update' do
+    before(:each) do
+      @item_custom_property = FactoryBot.create(:item_custom_property)
+      @attrs = valid_attributes
+      @invalid_attrs = { name: '' }
+    end
+
+    describe 'When logged in as Administrator' do
+      login_fixture_admin
+
+      describe 'with valid params' do
+        it 'updates the requested item_custom_property' do
+          put :update, params: { id: @item_custom_property.id, item_custom_property: @attrs }
+        end
+
+        it 'assigns the requested item_custom_property as @item_custom_property' do
+          put :update, params: { id: @item_custom_property.id, item_custom_property: @attrs }
+          expect(assigns(:item_custom_property)).to eq(@item_custom_property)
+          expect(response).to redirect_to(@item_custom_property)
+        end
+      end
+
+      describe 'with invalid params' do
+        it 'assigns the requested item_custom_property as @item_custom_property' do
+          put :update, params: { id: @item_custom_property.id, item_custom_property: @invalid_attrs }
+          expect(response).to render_template('edit')
+        end
+      end
+
+      it 'moves its position when specified' do
+        item_custom_property = ItemCustomProperty.create! valid_attributes
+        position = item_custom_property.position
+        put :update, params: { id: item_custom_property.id, move: 'higher' }
+        expect(response).to redirect_to item_custom_properties_url
+        assigns(:item_custom_property).reload.position.should eq position - 1
+      end
+    end
+
+    describe 'When logged in as Librarian' do
+      login_fixture_librarian
+
+      describe 'with valid params' do
+        it 'updates the requested item_custom_property' do
+          put :update, params: { id: @item_custom_property.id, item_custom_property: @attrs }
+        end
+
+        it 'assigns the requested item_custom_property as @item_custom_property' do
+          put :update, params: { id: @item_custom_property.id, item_custom_property: @attrs }
+          expect(assigns(:item_custom_property)).to eq @item_custom_property
+          expect(response).to be_forbidden
+        end
+      end
+
+      describe 'with invalid params' do
+        it 'assigns the requested item_custom_property as @item_custom_property' do
+          put :update, params: { id: @item_custom_property.id, item_custom_property: @invalid_attrs }
+          expect(response).to be_forbidden
+        end
+      end
+    end
+
+    describe 'When logged in as User' do
+      login_fixture_user
+
+      describe 'with valid params' do
+        it 'updates the requested item_custom_property' do
+          put :update, params: { id: @item_custom_property.id, item_custom_property: @attrs }
+        end
+
+        it 'assigns the requested item_custom_property as @item_custom_property' do
+          put :update, params: { id: @item_custom_property.id, item_custom_property: @attrs }
+          expect(assigns(:item_custom_property)).to eq(@item_custom_property)
+          expect(response).to be_forbidden
+        end
+      end
+
+      describe 'with invalid params' do
+        it 'assigns the requested item_custom_property as @item_custom_property' do
+          put :update, params: { id: @item_custom_property.id, item_custom_property: @invalid_attrs }
+          expect(response).to be_forbidden
+        end
+      end
+    end
+
+    describe 'When not logged in' do
+      describe 'with valid params' do
+        it 'updates the requested item_custom_property' do
+          put :update, params: { id: @item_custom_property.id, item_custom_property: @attrs }
+        end
+
+        it 'should be forbidden' do
+          put :update, params: { id: @item_custom_property.id, item_custom_property: @attrs }
+          expect(response).to redirect_to(new_user_session_url)
+        end
+      end
+
+      describe 'with invalid params' do
+        it 'assigns the requested item_custom_property as @item_custom_property' do
+          put :update, params: { id: @item_custom_property.id, item_custom_property: @invalid_attrs }
+          expect(response).to redirect_to(new_user_session_url)
+        end
+      end
+    end
+  end
+
+  describe 'DELETE destroy' do
+    before(:each) do
+      @item_custom_property = FactoryBot.create(:item_custom_property)
+    end
+
+    describe 'When logged in as Administrator' do
+      login_fixture_admin
+
+      it 'destroys the requested item_custom_property' do
+        delete :destroy, params: { id: @item_custom_property.id }
+      end
+
+      it 'redirects to the item_custom_properties list' do
+        delete :destroy, params: { id: @item_custom_property.id }
+        expect(response).to redirect_to(item_custom_properties_url)
+      end
+    end
+
+    describe 'When logged in as Librarian' do
+      login_fixture_librarian
+
+      it 'destroys the requested item_custom_property' do
+        delete :destroy, params: { id: @item_custom_property.id }
+      end
+
+      it 'should be forbidden' do
+        delete :destroy, params: { id: @item_custom_property.id }
+        expect(response).to be_forbidden
+      end
+    end
+
+    describe 'When logged in as User' do
+      login_fixture_user
+
+      it 'destroys the requested item_custom_property' do
+        delete :destroy, params: { id: @item_custom_property.id }
+      end
+
+      it 'should be forbidden' do
+        delete :destroy, params: { id: @item_custom_property.id }
+        expect(response).to be_forbidden
+      end
+    end
+
+    describe 'When not logged in' do
+      it 'destroys the requested item_custom_property' do
+        delete :destroy, params: { id: @item_custom_property.id }
+      end
+
+      it 'should be forbidden' do
+        delete :destroy, params: { id: @item_custom_property.id }
+        expect(response).to redirect_to(new_user_session_url)
+      end
+    end
+  end
+end