enju_biblio 0.1.0.pre66 → 0.1.0.pre67

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1509aa40842f40dd4416c2f181b9e5ac6ddd18c
-  data.tar.gz: f4109e7cf362bdba0cfd122c9736c4904397f9aa
+  metadata.gz: e7e9faf90d23891338d7804ceaa2b86045886e6c
+  data.tar.gz: 8a9bb0d6a8085690f585ccbc6e45cbf677bacd1a
 SHA512:
-  metadata.gz: c1a84d6f9a2b744ad46b9bb9f3f75274a5218c348e1f5a5aeec7e4024475442095b8f4b4eef5653356aead060887a81f5753f7d569a8cadebe3555e2b5eeb8d7
-  data.tar.gz: bc7d2d4b5e80e629d77e3546d4965990f5d81899dd5a6217d7b438590403a846095473565c1dcfd36e3faaff39624a768aaa5b35aace80970261c7fc8f1acfe6
+  metadata.gz: 55176d5e1130eee8b75c8efd03f42a98178ea342562972387edf4a46571581518fa93aa136809f29d6458709f16b4b14e62f398552dbf6c62d0eaa60e72b3875
+  data.tar.gz: 2f560a2ada3c29ccabb09cce58a823d33ea36ff2cb5c3c383a64b510fe46ffe03c5c4e0b037613191029ef283787b01dd915308a8871ffab557d937e7b24f257

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2012 Kosuke Tanabe
+Copyright 2015 Project Next-L
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/app/controllers/manifestations_controller.rb

@@ -96,7 +96,8 @@ class ManifestationsController < ApplicationController
       @query = query.dup
       query = query.gsub('　', ' ')
 
-      includes = [:items, :root_series_statement]
+      includes = [:root_series_statement]
+      includes << :classifications if defined?(EnjuSubject)
       includes << :bookmarks if defined?(EnjuBookmark)
       search = Manifestation.search(include: includes)
       case @reservable
@@ -419,7 +420,7 @@ class ManifestationsController < ApplicationController
       format.mods
       format.json { render json: @manifestation }
       #format.atom { render template: 'manifestations/oai_ore' }
-      #format.js
+      format.js
       format.download {
         if @manifestation.attachment.path
           if ENV['ENJU_STORAGE'] == 's3'

data/app/models/identifier.rb

@@ -8,6 +8,9 @@ class Identifier < ActiveRecord::Base
   validate :check_identifier
   before_validation :normalize
   before_save :convert_isbn
+  scope :id_type, -> type {
+    where(identifier_type: IdentifierType.where(name: type).first)
+  }
 
   acts_as_list scope: :manifestation_id
   normalize_attributes :body

data/app/models/item.rb

@@ -8,6 +8,11 @@ class Item < ActiveRecord::Base
   enju_inter_library_loan_item_model if defined?(EnjuInterLibraryLoan)
   scope :on_shelf, -> { where('shelf_id != 1') }
   scope :on_web, -> { where(shelf_id: 1) }
+  scope :available_for, -> user {
+    unless user.try(:has_role?, 'Librarian')
+      on_shelf
+    end
+  }
   delegate :display_name, to: :shelf, prefix: true
   has_many :owns
   has_many :agents, through: :owns

data/app/models/manifestation.rb

@@ -377,7 +377,7 @@ class Manifestation < ActiveRecord::Base
     else
       body = File.open(attachment.path).read
     end
-    client = Faraday.new(url: ENV['SOLR_URL']) do |conn|
+    client = Faraday.new(url: ENV['SOLR_URL'] || Sunspot.config.solr.url) do |conn|
       conn.request :multipart
       conn.adapter :net_http
     end
@@ -513,10 +513,15 @@ class Manifestation < ActiveRecord::Base
   end
 
   def identifier_contents(name)
-    if IdentifierType.where(name: name.to_s).exists?
-      identifiers.where(identifier_type_id: IdentifierType.where(name: name).first.id).order(:position).pluck(:body)
+    if Rails::VERSION::MAJOR > 3
+      identifiers.id_type(name).order(:position).pluck(:body)
     else
-      []
+      identifier_type = IdentifierType.where(name: name).first
+      if identifier_type
+        identifiers.where(identifier_type_id: identifier_type.id).order(:position).pluck(:body)
+      else
+        []
+      end
     end
   end
 
@@ -540,10 +545,10 @@ class Manifestation < ActiveRecord::Base
       shelf
       library
     ).join("\t")
-    items = Manifestation.all.map{|m|
+    lines = []
+    Manifestation.includes(:items, :identifiers => :identifier_type).find_each do |m|
       if m.items.exists?
-        lines = []
-        m.items.each do |i|
+        m.items.includes(:shelf => :library).each do |i|
           item_lines = []
           item_lines << m.id
           item_lines << m.original_title
@@ -562,25 +567,24 @@ class Manifestation < ActiveRecord::Base
           item_lines << i.circulation_status.try(:name)
           item_lines << i.shelf.name
           item_lines << i.shelf.library.name
-        lines << item_lines
+          lines << item_lines
         end
-        lines
       else
-        lines = []
-        lines << m.id
-        lines << m.original_title
-        lines << m.creators.pluck(:full_name).join("//")
-        lines << m.publishers.pluck(:full_name).join("//")
-        lines << m.pub_date
-        lines << m.price
-        lines << m.identifier_contents(:isbn).first
-        [lines]
+        line = []
+        line << m.id
+        line << m.original_title
+        line << m.creators.pluck(:full_name).join("//")
+        line << m.publishers.pluck(:full_name).join("//")
+        line << m.pub_date
+        line << m.price
+        line << m.identifier_contents(:isbn).first
+        lines << line
       end
-    }
+    end
     if options[:format] == :txt
-      items.map{|m| m.map{|i| i.join("\t")}}.flatten.unshift(header).join("\r\n")
+      lines.map{|i| i.join("\t")}.join("\r\n")
     else
-      items
+      lines
     end
   end
 end

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

@@ -23,7 +23,9 @@
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <li><%= link_to t('page.edit'), edit_agent_type_path(@agent_type) -%></li>
+    <%- if can? :update, @agent_type -%>
+      <li><%= link_to t('page.edit'), edit_agent_type_path(@agent_type) -%></li>
+    <%- end -%>
     <li><%= back_to_index(flash[:page_info]) -%></li>
   </ul>
 </div>

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

@@ -34,7 +34,9 @@
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <li><%= link_to t('page.edit'), edit_carrier_type_path(@carrier_type) -%></li>
+    <%- if can? :update, @carrier_type -%>
+      <li><%= link_to t('page.edit'), edit_carrier_type_path(@carrier_type) -%></li>
+    <%- end -%>
     <li><%= back_to_index(flash[:page_info]) -%></li>
   </ul>
 </div>

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

@@ -23,7 +23,9 @@
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <li><%= link_to t('page.edit'), edit_content_type_path(@content_type) -%></li>
+    <%- if can? :update, @content_type -%>
+      <li><%= link_to t('page.edit'), edit_content_type_path(@content_type) -%></li>
+    <%- end -%>
     <li><%= back_to_index(flash[:page_info]) -%></li>
   </ul>
 </div>

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

@@ -40,6 +40,8 @@
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <li><%= link_to t('page.new', model: t('activerecord.models.country')), new_country_path -%></li>
+    <%- if can? :create, Country -%>
+      <li><%= link_to t('page.new', model: t('activerecord.models.country')), new_country_path -%></li>
+    <%- end -%>
   </ul>
 </div>

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

@@ -23,7 +23,9 @@
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <li><%= link_to t('page.edit'), edit_country_path(@country) %></li>
+    <%- if can? :update, @country %>
+      <li><%= link_to t('page.edit'), edit_country_path(@country) %></li>
+    <%- end -%>
     <li><%= back_to_index(flash[:page_info]) -%></li>
   </ul>
 </div>

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

@@ -23,7 +23,9 @@
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <li<%= link_to t('page.edit'), edit_form_of_work_path(@form_of_work) -%></li>
+    <%- if can? :update, @form_of_work -%>
+      <li><%= link_to t('page.edit'), edit_form_of_work_path(@form_of_work) -%></li>
+    <%- end -%>
     <li><%= back_to_index(flash[:page_info]) -%></li>
   </ul>
 </div>

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

@@ -23,7 +23,9 @@
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <li><%= link_to t('page.edit'), edit_frequency_path(@frequency) -%></li>
+    <%- if can? :update, @frequency -%>
+      <li><%= link_to t('page.edit'), edit_frequency_path(@frequency) -%></li>
+    <%- end -%>
     <li><%= back_to_index(flash[:page_info]) -%></li>
   </ul>
 </div>

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

@@ -23,7 +23,9 @@
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <li><%= link_to t('page.edit'), edit_identifier_type_path(@identifier_type) -%></li>
+    <%- if can? :update, @identifier_type -%>
+      <li><%= link_to t('page.edit'), edit_identifier_type_path(@identifier_type) -%></li>
+    <%- end -%>
     <li><%= back_to_index(flash[:page_info]) -%></li>
   </ul>
 </div>

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

@@ -20,17 +20,17 @@
 
 <p>
   <strong>ISO 639-1:</strong>
-  <td><%= language.iso_639_1 -%></td>
+  <td><%= @language.iso_639_1 -%></td>
 </p>
 
 <p>
   <strong>ISO 639-2:</strong>
-  <td><%= language.iso_639_2 -%></td>
+  <td><%= @language.iso_639_2 -%></td>
 </p>
 
 <p>
   <strong>ISO 639-3:</strong>
-  <td><%= language.iso_639_3 -%></td>
+  <td><%= @language.iso_639_3 -%></td>
 </p>
 
 <p>
@@ -43,7 +43,9 @@
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <li><%= link_to t('page.edit'), edit_language_path(@language) -%></li>
+    <%- if can? :update, @language -%>
+      <li><%= link_to t('page.edit'), edit_language_path(@language) -%></li>
+    <%- end -%>
     <li><%= back_to_index(flash[:page_info]) -%></li>
   </ul>
 </div>

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

@@ -0,0 +1,8 @@
+<%= render 'manifestations/carrier_type_facet' -%>
+<%= render 'manifestations/library_facet' -%>
+<%= render 'manifestations/language_facet' -%>
+<%= render 'manifestations/pub_year_facet' -%>
+<%=
+    #render 'manifestations/classification_facet'
+-%>
+<%= render 'manifestations/reservable_facet' if defined?(EnjuCirculation) -%>

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

@@ -0,0 +1,9 @@
+<h4><%= t('activerecord.models.carrier_type') -%></h4>
+<ul>
+  <%- @carrier_type_facet.each do |facet| -%>
+    <li><%= carrier_type_facet(facet) %></li>
+  <%- end -%>
+  <%- if params[:carrier_type] -%>
+    <li><%= link_to t('page.remove_this_facet'), url_for(params.merge(carrier_type: nil, page: nil, view: nil, only_path: true)) -%></li>
+  <%- end -%>
+</ul>

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

@@ -0,0 +1,17 @@
+<h4><%= t('activerecord.models.classification') -%></h4>
+<%- unless @classification_facet.blank? -%>
+  <ul>
+    <% @classification_facet.each do |category| %>
+      <li>
+        <% if category.value == params[:classification].to_s.downcase %><strong><% end %>
+        <%= link_to "#{t('classification.category', number: category.value)} #{category_name(category.value)} (#{category.count})", url_for(params.merge(classification: category.value, page: nil, view: nil, only_path: true)) %>
+        <% if category.value == params[:classification].to_s.downcase %></strong><% end %>
+      </li>
+    <% end %>
+    <%- if params[:classification] -%>
+      <li><%= link_to t('page.remove_this_facet'), url_for(params.merge(classification: nil, page: nil, view: nil, only_path: true)) -%></li>
+    <%- end -%>
+  </ul>
+<%- else -%>
+  <p><%= t('page.no_subject') -%></p>
+<%- end -%>

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

@@ -146,6 +146,11 @@
     <p><%= f.link_to_add t('page.add'), :identifiers %></p>
   </div>
 
+  <div class="field">
+    <%= f.label :manifestation_identifier -%><br />
+    <%= f.text_field :manifestation_identifier, class: 'resource_identifier_body', style: 'ime-mode: disabled' -%>
+  </div>
+
   <% if defined?(EnjuSubject) %>
     <%= render 'manifestations/subject_form', f: f %>
   <% end %>

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

@@ -1,3 +1,15 @@
-<div class="holding_index" id="holding_<%= manifestation.id -%>" style="display: none">
-  <%= render 'manifestations/show_holding', manifestation: manifestation -%>
-</div>
+<% if manifestation.items.available_for(current_user).count >= 1 %>
+  <div id="holding_link_<%= manifestation.id %>">
+    (<%= link_to t('page.holding'), manifestation_path(manifestation), remote: true %>)
+  </div>
+<% end %>
+<% if defined?(EnjuBookmark) %>
+  <%- if manifestation.tags.first -%>
+    (<%= link_to "#", { onclick: "$('#tag_#{manifestation.id}').toggle(); return false;" } do t('activerecord.models.tag') end %>)
+  <%- end -%>
+  <%= render 'manifestations/show_tag', manifestation: manifestation -%>
+<% end %>
+<div id="holding_<%= manifestation.id -%>"></div>
+<%- if can? :create, Item -%>
+  <p><%= link_to t('page.new', model: t('activerecord.models.item')), new_item_path(manifestation_id: manifestation.id) -%></p>
+<%- end -%>

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

@@ -0,0 +1,16 @@
+<h4><%= t('activerecord.models.language') -%></h4>
+<ul>
+  <%- languages = params[:language].to_s.split -%>
+  <%- current_languages = languages.dup -%>
+  <%- @language_facet.each do |facet| -%>
+    <%- language = Language.where(name: facet.value).select([:name, :display_name]).first -%>
+    <%- if language -%>
+      <li>
+        <%= language_facet(language, current_languages, facet) %>
+      </li>
+    <%- end -%>
+  <%- end -%>
+  <%- if params[:language] -%>
+    <li><%= link_to t('page.remove_this_facet'), url_for(params.merge(language: nil, page: nil, view: nil, only_path: true)) -%></li>
+  <%- end -%>
+</ul>

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

@@ -0,0 +1,11 @@
+<h4><%= t('activerecord.models.library') -%></h4>
+<ul>
+  <%- libraries = params[:library].to_s.split -%>
+  <%- @library_facet.each do |facet| -%>
+    <%- current_libraries = libraries.dup -%>
+    <%= library_facet(current_libraries, facet) %>
+  <%- end -%>
+  <%- if params[:library] -%>
+    <li><%= link_to t('page.remove_this_facet'), url_for(params.merge(library: nil, page: nil, view: nil, only_path: true)) -%></li>
+  <%- end -%>
+</ul>

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

@@ -9,21 +9,6 @@
               <div class="access_address">
                 <%= link_to manifestation.access_address, manifestation.access_address if manifestation.access_address.present? -%>
               </div>
-              <% if current_user.try(:has_role?, 'Librarian') %>
-                <%- unless manifestation.items.empty? -%>
-                  (<%= link_to "#", { onclick: "$('#holding_#{manifestation.id}').toggle(); return false;"} do t('page.holding') end %>)
-                <% end %>
-              <% else %>
-                <%- unless manifestation.items.for_checkout.on_shelf.empty? -%>
-                  (<%= link_to "#", { onclick: "$('#holding_#{manifestation.id}').toggle(); return false;"} do t('page.holding') end %>)
-                <%- end -%>
-              <%- end -%>
-              <% if defined?(EnjuBookmark) %>
-                <%- if manifestation.tags.first -%>
-                  (<%= link_to "#", { onclick: "$('#tag_#{manifestation.id}').toggle(); return false;" } do t('activerecord.models.tag') end %>)
-                <%- end -%>
-                <%= render 'manifestations/show_tag', manifestation: manifestation -%>
-              <% end %>
             <% end %>
             <%= render 'manifestations/holding', manifestation: manifestation -%>
           </td>
@@ -34,12 +19,11 @@
                   <% if manifestation.is_reservable_by?(current_user) %>
                     <%- reserve = manifestation.is_reserved_by?(current_user) -%>
                     <%- if reserve -%>
-                      <%= link_to t('reserve.show'), reserve -%>
+                      <%= link_to t('reserve.show'), reserve -%><br />
                     <%- else -%>
-                      <%= link_to t('activerecord.models.reserve'), new_reserve_path(manifestation_id: manifestation.id) if can? :create, Reserve -%>
+                      <%= link_to t('activerecord.models.reserve'), new_reserve_path(manifestation_id: manifestation.id) if can? :create, Reserve -%><br />
                     <%- end -%>
                   <% end %>
-                  <br />
                 <% end %>
               <% end %>
               <%- if can? :update, manifestation -%>

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

@@ -0,0 +1,11 @@
+<h4><%= t('activerecord.attributes.manifestation.date_of_publication') -%></h4>
+<ul>
+  <%- @pub_year_facet.each do |facet| -%>
+    <li>
+      <%= pub_year_facet(params[:pub_date_from].to_s, params[:pub_date_until].to_s, facet) %>
+    </li>
+  <%- end -%>
+  <%- if params[:pub_date_from] and params[:pub_date_until] -%>
+    <li><%= link_to t('page.remove_this_facet'), url_for(params.merge(pub_date_from: nil, pub_date_until: nil, page: nil, view: nil, only_path: true)) -%></li>
+  <%- end -%>
+</ul>

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

@@ -0,0 +1,14 @@
+<h4><%= t('manifestation.reservable') -%></h4>
+<ul>
+  <%- @reservable_facet.each do |facet| -%>
+    <% facet.value ? facet_reservable = true : facet_reservable = false %>
+    <li>
+      <%- if @reservable == facet_reservable -%><strong><%- end -%>
+      <%= link_to "#{localized_boolean(facet.value)} (#{facet.count})", url_for(params.merge(page: nil, reservable: facet.value.to_s, view: nil, only_path: true)) -%>
+      <%- if @reservable == facet_reservable -%></strong><%- end -%>
+    </li>
+  <%- end -%>
+  <%- unless @reservable.nil? -%>
+    <li><%= link_to t('page.remove_this_facet'), url_for(params.merge(reservable: nil, page: nil, view: nil, only_path: true)) -%></li>
+  <%- end -%>
+</ul>

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

@@ -16,8 +16,8 @@
     (<%= manifestation.pub_date -%>)
   <%- end -%>
   <% if defined?(EnjuSubject) %>
-    ;
-    <% manifestation.classifications.each do |classification| %>
+    <%= ';' if manifestation.classifications.count >= 1 %>
+    <% manifestation.classifications.each_with_index do |classification| %>
       <%= link_to "#{classification.classification_type.display_name.localize}: #{classification.category}", manifestations_path(query: "classification_sm:#{classification.classification_type.name}_#{classification.category}") %>
     <% end %>
   <% end %>