enju_biblio 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef18fa14001d13dc376788b697f3a871bdc09ebd9d7e4bbc6cf657624c223859
-  data.tar.gz: 388fe4512c27adfa434f439fefdb1abee267729ba23aeac192add823e62155d5
+  metadata.gz: d4aa7e9b399b5eee57078c7f9b563e0078f37cd032965aba1631edb1df7383a5
+  data.tar.gz: 1a3263a460b2698368f020117e5c406703b3ea7d62c405480d385e8d4fd6439a
 SHA512:
-  metadata.gz: 620e4e29cdae3c7e3fe3d35ab0b80597aa9a7eab8f153cc71f6b782a405a6b8908ba36bfd8c6b03d76d978449f7e3502297761a9b1b220f97c94fb4b5ce1a6c5
-  data.tar.gz: 49309d8ad2ee23c84564c6bcc6b4a5256778760a59e6ac0536d5489748acc61dca8011fdeec46ca5a1647bd1c17a9f7633a7889fdea292cd1695c12e4402b3ad
+  metadata.gz: c43ea21a6ee52dd3e4c5b5fcb52f50a2e2d2dba57bce56f22182d2b08231861d86ad38ec85b09a4daef980098bc1bfd6fa16a07b467e7efbc7c656c8d1d22277
+  data.tar.gz: 3489cd2bbb99548f80d6f435b7a02d139c67c6e27eb8b72f107c59d511d0a10771b0f76840d9addc9217b5bc127900dd85c61377e47f7be20575f68ec3b5b2ac

data/README.md

@@ -0,0 +1,15 @@
+# EnjuBiblio
+[<img src="https://travis-ci.com/next-l/enju_biblio.svg?branch=1.3" alt="Build
+Status" />](https://travis-ci.com/next-l/enju_biblio) [<img
+src="https://coveralls.io/repos/next-l/enju_biblio/badge.svg?branch=1.3&servic
+e=github" alt="Coverage Status"
+/>](https://coveralls.io/github/next-l/enju_biblio?branch=1.3) [<img
+src="https://hakiri.io/github/next-l/enju_biblio/1.3.svg" alt="security"
+/>](https://hakiri.io/github/next-l/enju_biblio/1.3)
+
+This project rocks and uses MIT-LICENSE.
+
+## 製作者・貢献者 (Authors and contributors)
+* [TANABE, Kosuke](https://github.com/nabeta) ([@nabeta](https://twitter.com/nabeta))
+* [Project Next-L](https://www.next-l.jp) ([@ProjectNextL](https://twitter.com/ProjectNextL))
+

data/Rakefile

@@ -16,7 +16,7 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title    = 'EnjuBiblio'
   rdoc.options << '--line-numbers'
-  rdoc.rdoc_files.include('README.rdoc')
+  rdoc.rdoc_files.include('README.md')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 

data/app/models/manifestation.rb

@@ -182,6 +182,10 @@ class Manifestation < ApplicationRecord
         identifier_contents(:issn)
       end
     end
+    text :identifier do
+      other_identifiers = identifiers.joins(:identifier_type).merge(IdentifierType.where.not(name: [:isbn, :issn]))
+      other_identifiers.pluck(:body)
+    end
     string :sort_title
     string :doi, multiple: true do
       identifier_contents(:doi)

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

@@ -77,14 +77,6 @@
     <%- end -%>
   </ul>
   <% if defined?(EnjuCirculation) %>
-    <h4><%= t('activerecord.models.circulation_status') -%></h4>
-    <ul>
-      <%- @circulation_status_facet.each do |facet| -%>
-        <li><%= circulation_status_facet(facet) %></li>
-      <%- end -%>
-      <%- if params[:circulation_status] -%>
-        <li><%= link_to t('page.remove_this_facet'), url_for(filtered_params.merge(circulation_status: nil, page: nil, view: nil, only_path: true)) -%></li>
-      <%- end -%>
-    </ul>
+    <%= render 'items/circulation_status_facet' %>
   <% end %>
 </div>

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

@@ -41,15 +41,6 @@
       <%- end -%>
     <%- end -%>
   </p>
-
-  <p>
-    <strong><%= t('activerecord.models.use_restriction') -%>:</strong>
-    <% if @item.use_restriction %>
-      <ul>
-        <li><%= @item.use_restriction.display_name.localize %></li>
-      </ul>
-    <% end %>
-  </p>
 <% end %>
 
 <p>
@@ -57,30 +48,41 @@
   <%= localized_boolean(@item.include_supplements) -%>
 </p>
 
-<p>
-  <strong><%= t('activerecord.attributes.item.required_role_id') -%>:</strong>
-  <%= @item.required_role.name -%>
-</p>
-
 <p>
   <strong><%= t('activerecord.attributes.item.call_number') -%>:</strong>
   <%= @item.call_number -%>
 </p>
 
-<p>
-  <strong><%= t('activerecord.models.budget_type') -%>:</strong>
-  <%= @item.budget_type.try(:display_name).try(:localize) -%>
-</p>
+<% if current_user.try(:has_role?, 'Librarian') %>
+  <p>
+    <strong><%= t('activerecord.models.use_restriction') -%>:</strong>
+    <% if @item.use_restriction %>
+      <ul>
+        <li><%= @item.use_restriction.display_name.localize %></li>
+      </ul>
+    <% end %>
+  </p>
 
-<p>
-  <strong><%= t('activerecord.models.bookstore') -%>:</strong>
-  <%= @item.bookstore.try(:name) -%>
-</p>
+  <p>
+    <strong><%= t('activerecord.attributes.item.required_role_id') -%>:</strong>
+    <%= @item.required_role.name -%>
+  </p>
 
-<p>
-  <strong><%= t('activerecord.attributes.item.price') -%>:</strong>
-  <%= @item.price -%>
-</p>
+  <p>
+    <strong><%= t('activerecord.models.budget_type') -%>:</strong>
+    <%= @item.budget_type.try(:display_name).try(:localize) -%>
+  </p>
+
+  <p>
+    <strong><%= t('activerecord.models.bookstore') -%>:</strong>
+    <%= @item.bookstore.try(:name) -%>
+  </p>
+
+  <p>
+    <strong><%= t('activerecord.attributes.item.price') -%>:</strong>
+    <%= @item.price -%>
+  </p>
+<% end %>
 
 <p>
   <strong><%= t('activerecord.attributes.item.url') -%>:</strong>

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

@@ -30,20 +30,7 @@
         <%= item.call_number -%>
       </td>
       <% if defined?(EnjuCirculation) %>
-        <td>
-          <%= item.circulation_status.display_name.localize if item.circulation_status -%>
-          <% if item.retained? %>
-            <br />
-            <%= t('reserve.retained') %>
-          <% end %>
-          <% if item.rent? %>
-            <br />
-            (
-              <%= t('activerecord.attributes.checkout.due_date') -%>:
-              <%= l(item.latest_checkout.due_date, format: :short) -%>
-            )
-          <% end %>
-        </td>
+        <%= render 'manifestations/circulation_status', item: item %>
       <% end %>
     </tr>
     <% if policy(item).update? %>

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

@@ -51,22 +51,7 @@
 
         <%- unless @manifestation.carrier_type.name == 'file' -%>
           <% if defined?(EnjuCirculation) %>
-            <% if user_signed_in? %>
-              <% if @manifestation.is_reservable_by?(current_user) %>
-                <li><%= link_to_reservation(@manifestation, @reserve) %>
-                <br />
-                (<%= 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>
-                <% end %>
-              <%- end -%>
-            <% else %>
-              <% unless @manifestation.items.for_checkout.empty? %>
-                <li><%= link_to_reservation(@manifestation, @reserve) %><br />
-                (<%= t('page.number_of_reservations', count: @reserved_count) -%>)</li>
-              <% end %>
-            <% end %>
+            <%= render 'manifestations/reservation' %>
           <% end %>
         <%- end -%>
       </ul>

data/lib/enju_biblio/version.rb

@@ -1,3 +1,3 @@
 module EnjuBiblio
-  VERSION = "0.3.4"
+  VERSION = "0.3.5"
 end

data/spec/fixtures/identifier_types.yml

@@ -28,6 +28,13 @@ four:
   position: 4
   id: 4
 
+five:
+  name: custom
+  display_name: 独自識別子
+  note: 
+  position: 5
+  id: 5
+
 # == Schema Information
 #
 # Table name: identifier_types

data/spec/fixtures/identifiers.yml

@@ -104,6 +104,11 @@ identifier_00217:
   identifier_type_id: 4
   body: "BN15603730"
 
+identifier_00001a:
+  manifestation_id: 1
+  identifier_type_id: 5
+  body: "custom1111"
+
 # == Schema Information
 #
 # Table name: identifiers

data/spec/models/manifestation_spec.rb

@@ -201,6 +201,12 @@ describe Manifestation, solr: true do
     manifestation.should_not be_valid
   end
 
+  it "should search custom identifiers" do
+    Manifestation.search do
+      fulltext 'identifier_text:custom1111'
+    end.results.count.should eq 1
+  end
+
   # it "should set series_statement if the manifestation is periodical" do
   #  manifestation = series_statements(:two).manifestations.new
   #  manifestation.set_series_statements([series_statements(:two)])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enju_biblio
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Kosuke Tanabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-04 00:00:00.000000000 Z
+date: 2019-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: enju_library
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.4
+        version: 0.3.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.4
+        version: 0.3.5
 - !ruby/object:Gem::Dependency
   name: marc
   requirement: !ruby/object:Gem::Requirement
@@ -128,42 +128,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: 1.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: 1.3.3
 - !ruby/object:Gem::Dependency
   name: enju_manifestation_viewer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.3.3
 - !ruby/object:Gem::Dependency
   name: enju_subject
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: enju_inventory
   requirement: !ruby/object:Gem::Requirement
@@ -500,7 +500,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - MIT-LICENSE
-- README.rdoc
+- README.md
 - Rakefile
 - app/assets/config/enju_biblio_manifest.js
 - app/assets/images/icons/book.png

data/README.rdoc

@@ -1,10 +0,0 @@
-= EnjuBiblio
-{<img src="https://travis-ci.org/next-l/enju_biblio.svg?branch=1.3" alt="Build Status" />}[https://travis-ci.org/next-l/enju_biblio]
-{<img src="https://coveralls.io/repos/next-l/enju_biblio/badge.svg?branch=1.3&service=github" alt="Coverage Status" />}[https://coveralls.io/github/next-l/enju_biblio?branch=1.3]
-{<img src="https://hakiri.io/github/next-l/enju_biblio/1.3.svg" alt="security" />}[https://hakiri.io/github/next-l/enju_biblio/1.3]
-
-This project rocks and uses MIT-LICENSE.
-
-== 製作者・貢献者 (Authors and contributors)
-* {TANABE, Kosuke}[https://github.com/nabeta] ({@nabeta}[https://twitter.com/nabeta])
-* {Project Next-L}[https://www.next-l.jp] ({@ProjectNextL}[https://twitter.com/ProjectNextL])