enju_biblio 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 420146237b4ee065377d6d04b4d80a5b80da822d
-  data.tar.gz: 937a5994763dc2ea8563525ec7b2a1050a66bfc7
+  metadata.gz: ace895d7e5b14e0e728ce1d9d4a8f29c36371bed
+  data.tar.gz: ea20239fe978ec5dde3fea94a2d3ca3f3fda5a26
 SHA512:
-  metadata.gz: d68d8ecd5b4b97d2c7cd5ded4b3a4beb8414cbdf3e930d671520f147dea668dc8fc8e1398af5c636fd343cc708825de892700e128849d2ac7f402c7e6f5f05e3
-  data.tar.gz: b4f0a86ff49946e88f4c7fe4cc33be5dd24d0171809b61a7c6a2b4428589db9c406c2e4e4d7e9bdbe5d386a64cb3f0e9d7ceec1d120dbfbef3268fd9430a1b76
+  metadata.gz: 18a33b8a691b5da9847041b968437c7a3ddae772386fbe5131b22b6bc994d812ab126b781220f5c26acd5b5fd649c12ab9e99f7ab24c8eec9149e5549690db60
+  data.tar.gz: 8ec3f4441684a5f345c00b1b42ec018512ad44323ef83ea5d8c78d587798fc8cea2f19c61f003e3a082dec53b4c0d7b4d84c8920cd6434ceccf58eb2dde67bd7

data/app/controllers/manifestations_controller.rb

@@ -60,7 +60,7 @@ class ManifestationsController < ApplicationController
       @query = query.dup
       query = query.gsub('　', ' ')
 
-      includes = [:root_series_statement]
+      includes = [:series_statements]
       includes << :classifications if defined?(EnjuSubject)
       includes << :bookmarks if defined?(EnjuBookmark)
       search = Manifestation.search(include: includes)

data/app/models/manifestation.rb

@@ -27,7 +27,6 @@ class Manifestation < ActiveRecord::Base
   belongs_to :carrier_type
   belongs_to :manifestation_content_type, class_name: 'ContentType', foreign_key: 'content_type_id'
   has_many :series_statements
-  has_one :root_series_statement, foreign_key: 'root_manifestation_id', class_name: 'SeriesStatement'
   belongs_to :frequency
   belongs_to :required_role, class_name: 'Role', foreign_key: 'required_role_id', validate: true
   has_one :resource_import_result
@@ -69,7 +68,14 @@ class Manifestation < ActiveRecord::Base
     end
     string :isbn, multiple: true do
       identifier_contents(:isbn).map{|i|
-        [Lisbn.new(i).isbn10, Lisbn.new(i).isbn13]
+        isbn10 = isbn13 = isbn10_dash = isbn13_dash = nil
+        isbn10 = Lisbn.new(i).isbn10
+        isbn13 =  Lisbn.new(i).isbn13
+        isbn10_dash = Lisbn.new(isbn10).isbn_with_dash if isbn10
+        isbn13_dash = Lisbn.new(isbn13).isbn_with_dash if isbn13
+        [
+          isbn10, isbn13, isbn10_dash, isbn13_dash
+        ]
       }.flatten
     end
     string :issn, multiple: true do
@@ -235,10 +241,10 @@ class Manifestation < ActiveRecord::Base
   validates :manifestation_identifier, uniqueness: true, allow_blank: true
   validates :pub_date, format: {with: /\A\[{0,1}\d+([\/-]\d{0,2}){0,2}\]{0,1}\z/}, allow_blank: true
   validates :access_address, url: true, allow_blank: true, length: {maximum: 255}
-  validates :issue_number, numericality: {greater_than: 0}, allow_blank: true
-  validates :volume_number, numericality: {greater_than: 0}, allow_blank: true
-  validates :serial_number, numericality: {greater_than: 0}, allow_blank: true
-  validates :edition, numericality: {greater_than: 0}, allow_blank: true
+  validates :issue_number, numericality: {greater_than_or_equal_to: 0}, allow_blank: true
+  validates :volume_number, numericality: {greater_than_or_equal_to: 0}, allow_blank: true
+  validates :serial_number, numericality: {greater_than_or_equal_to: 0}, allow_blank: true
+  validates :edition, numericality: {greater_than_or_equal_to: 0}, allow_blank: true
   after_create :clear_cached_numdocs
   before_save :set_date_of_publication, :set_number
   after_save :index_series_statement, :extract_text!
@@ -530,6 +536,7 @@ class Manifestation < ActiveRecord::Base
       manifestation_id
       original_title
       creator
+      contributor
       publisher
       pub_date
       manifestation_price
@@ -567,6 +574,7 @@ class Manifestation < ActiveRecord::Base
           item_lines << m.id
           item_lines << m.original_title
           item_lines << m.creators.pluck(:full_name).join("//")
+          item_lines << m.contributors.pluck(:full_name).join("//")
           item_lines << m.publishers.pluck(:full_name).join("//")
           item_lines << m.pub_date
           item_lines << m.price
@@ -596,6 +604,7 @@ class Manifestation < ActiveRecord::Base
         line << m.id
         line << m.original_title
         line << m.creators.pluck(:full_name).join("//")
+        line << m.contributors.pluck(:full_name).join("//")
         line << m.publishers.pluck(:full_name).join("//")
         line << m.pub_date
         line << m.price
@@ -609,11 +618,15 @@ class Manifestation < ActiveRecord::Base
       end
     end
     if options[:format] == :txt
-      lines.map{|i| i.join("\t")}.join("\r\n")
+      lines.map{|i| i.to_csv(col_sep: "\t")}.join
     else
       lines
     end
   end
+
+  def root_series_statement
+    series_statements.where(root_manifestation_id: id).first
+  end
 end
 
 # == Schema Information

data/app/models/series_statement.rb

@@ -4,6 +4,7 @@ class SeriesStatement < ActiveRecord::Base
   belongs_to :manifestation, touch: true
   belongs_to :root_manifestation, foreign_key: :root_manifestation_id, class_name: 'Manifestation', touch: true
   validates_presence_of :original_title
+  validates :root_manifestation_id, uniqueness: true, allow_nil: true
   before_save :create_root_series_statement
 
   acts_as_list
@@ -30,7 +31,7 @@ class SeriesStatement < ActiveRecord::Base
   end
 
   def create_root_series_statement
-    if series_master? && root_manifestation.nil?
+    if series_master?
       self.root_manifestation = manifestation
     else
       self.root_manifestation = nil

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

@@ -16,7 +16,7 @@
     <%= search_field_tag 'query', h(@query), {id: 'search_form_top', class: 'search_form', placeholder: t('page.search_term')} -%>
     <%= hidden_field_tag 'parent_id', @parent.id -%>
     <%= hidden_field_tag 'reservable', h(@reservable) if @reservable -%>
-    <% if can? :update, Manifestation %>
+    <% if can? :update, @parent %>
       <%= render 'page/add' %>
     <% end %>
     <%= submit_tag t('page.search') -%>

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

@@ -112,8 +112,8 @@
         </tr>
       </table>
     <% end %>
-    <%- if manifestation.items.on_shelf.exists? -%>
-      <%= render 'manifestations/show_holding', manifestation: manifestation, items: manifestation.items.on_shelf -%>
+    <%- if manifestation.items.exists? -%>
+      <%= render 'manifestations/show_holding', manifestation: manifestation, items: manifestation.items %>
     <%- end -%>
     <%- if can? :create, Item -%>
       <p><%= link_to t('page.new', model: t('activerecord.models.item')), new_item_path(manifestation_id: manifestation.id) -%></p>

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

@@ -112,8 +112,8 @@
         <% end %>
       </table>
     <% end %>
-      <%- if manifestation.items.on_shelf.exists? -%>
-        <%= render 'manifestations/show_holding', manifestation: manifestation -%>
+      <%- if manifestation.items.for_checkout.on_shelf.exists? -%>
+        <%= render 'manifestations/show_holding', manifestation: manifestation, items: manifestation.items.for_checkout.on_shelf %>
       <%- end -%>
     </div>
     <%= render 'manifestations/tab_list', manifestation: manifestation %>

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

@@ -10,7 +10,7 @@
       <th><%= t('activerecord.models.circulation_status') -%></th>
     <% end %>
   </tr>
-  <%- items.each do |item| -%>
+  <%- manifestation.items.each do |item| -%>
     <tr>
       <td>
         <%- if item.item_identifier? -%>

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

@@ -17,7 +17,7 @@
     <li>
     <% if @resource_import_file %>
       <%= link_to((image_tag 'icons/page_white_excel.png', size: '16x16', alt: 'TSV', class: 'icon'), resource_import_results_path(resource_import_file_id: @resource_import_file.id, format: :txt)) -%>
-      (<%= link_to 'TSV', resource_import_results_path(resource_imporf_file_id: @resource_import_file.id, format: :txt) -%>)
+      (<%= link_to 'TSV', resource_import_results_path(resource_import_file_id: @resource_import_file.id, format: :txt) -%>)
     <% else %>
       <%= link_to((image_tag 'icons/page_white_excel.png', size: '16x16', alt: 'TSV', class: 'icon'), resource_import_results_path(format: :txt)) -%>
       (<%= link_to 'TSV', resource_import_results_path(format: :txt) -%>)

data/app/views/resource_import_results/index.txt.erb

@@ -1,4 +1,3 @@
-manifestation_id	item_id
 <%- @resource_import_results.each do |resource_import_result| -%>
 <%= resource_import_result.manifestation_id %>	<%= resource_import_result.item_id %>	<%= resource_import_result.body %>
 <%- end -%>

data/db/migrate/20151125004028_add_profile_id_to_agent.rb

@@ -0,0 +1,6 @@
+class AddProfileIdToAgent < ActiveRecord::Migration
+  def change
+    add_column :agents, :profile_id, :integer
+    add_index :agents, :profile_id
+  end
+end

data/lib/enju_biblio/biblio_helper.rb

@@ -66,6 +66,8 @@ module EnjuBiblio
         link_to identifier.body, "http://lccn.loc.gov/#{identifier.body}"
       when 'ncid'
         link_to identifier.body, "http://ci.nii.ac.jp/ncid/#{identifier.body}"
+      when 'isbn'
+        Lisbn.new(identifier.body).isbn_with_dash
       else
         identifier.body
       end

data/lib/enju_biblio/version.rb

@@ -1,3 +1,3 @@
 module EnjuBiblio
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end