enju_biblio 0.1.0.pre65 → 0.1.0.pre66

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c839ddf139ea8e9fc7d2926aa37afabf51fe325
-  data.tar.gz: 280ec8b0ea508ab3cd854ffc8f413f65963bd977
+  metadata.gz: f1509aa40842f40dd4416c2f181b9e5ac6ddd18c
+  data.tar.gz: f4109e7cf362bdba0cfd122c9736c4904397f9aa
 SHA512:
-  metadata.gz: e8c750255c7992b6af9e86b9359a8ef20c1f333486b20dc46ca553afdf8e1bf2506b343c32b92d2434897c19c6a46e985bb1188714e09efa57c80f62310aa0e8
-  data.tar.gz: 1360353ffe8e1d3b68ec1480d2f5ee0f17713a462924254610cb39b958071094b8ab9798504149428498f0d4be5fabcc6062cc21bcc490fe2fb94bffc8f5bc65
+  metadata.gz: c1a84d6f9a2b744ad46b9bb9f3f75274a5218c348e1f5a5aeec7e4024475442095b8f4b4eef5653356aead060887a81f5753f7d569a8cadebe3555e2b5eeb8d7
+  data.tar.gz: bc7d2d4b5e80e629d77e3546d4965990f5d81899dd5a6217d7b438590403a846095473565c1dcfd36e3faaff39624a768aaa5b35aace80970261c7fc8f1acfe6

data/app/controllers/agent_import_files_controller.rb

@@ -16,7 +16,7 @@ class AgentImportFilesController < ApplicationController
   # GET /agent_import_files/1.json
   def show
     if @agent_import_file.agent_import.path
-      unless Setting.uploaded_file.storage == :s3
+      unless ENV['ENJU_STORAGE'] == 's3'
         file = @agent_import_file.agent_import.path
       end
     end
@@ -25,7 +25,7 @@ class AgentImportFilesController < ApplicationController
       format.html # show.html.erb
       format.json { render json: @agent_import_file }
       format.download {
-        if Setting.uploaded_file.storage == :s3
+        if ENV['ENJU_STORAGE'] == 's3'
           redirect_to @agent_import_file.agent_import.expiring_url(10)
         else
           send_file file, filename: @agent_import_file.agent_import_file_name, type: 'application/octet-stream'

data/app/controllers/manifestations_controller.rb

@@ -186,6 +186,12 @@ class ManifestationsController < ApplicationController
       all_result = search.execute
       @count[:query_result] = all_result.total
       @reservable_facet = all_result.facet(:reservable).rows if defined?(EnjuCirculation)
+      max_number_of_results = @library_group.settings[:max_number_of_results].to_i
+      if max_number_of_results == 0
+        @max_number_of_results = Manifestation.search.total
+      else
+        @max_number_of_results = max_number_of_results
+      end
 
       if session[:search_params]
         unless search.query.to_params == session[:search_params]
@@ -208,7 +214,7 @@ class ManifestationsController < ApplicationController
           else
             flash[:search_query] = @search_query
             @manifestation_ids = search.build do
-              paginate page: 1, per_page: Setting.max_number_of_results
+              paginate page: 1, per_page: @max_number_of_results
             end.execute.raw_results.collect(&:primary_key).map{|id| id.to_i}
           end
         end
@@ -217,7 +223,7 @@ class ManifestationsController < ApplicationController
           if params[:view] == 'tag_cloud'
             unless @manifestation_ids
               @manifestation_ids = search.build do
-                paginate page: 1, per_page: Setting.max_number_of_results
+                paginate page: 1, per_page: @max_number_of_results
               end.execute.raw_results.collect(&:primary_key).map{|id| id.to_i}
             end
             #bookmark_ids = Bookmark.where(manifestation_id: flash[:manifestation_ids]).limit(1000).pluck(:id)
@@ -230,7 +236,11 @@ class ManifestationsController < ApplicationController
       end
 
       page ||= params[:page] || 1
-      per_page ||= Manifestation.default_per_page
+      if params[:per_page].to_i > 0
+        per_page = params[:per_page].to_i
+      else
+        per_page = Manifestation.default_per_page
+      end
       if params[:format] == 'sru'
         search.query.start_record(params[:startRecord] || 1, params[:maximumRecords] || 200)
       else
@@ -241,15 +251,15 @@ class ManifestationsController < ApplicationController
         else
           pub_date_range[:from] = Time.zone.parse(pub_dates[:from]).year
         end
-        if pub_dates[:to] == '*'
-          pub_date_range[:to] = 10000
+        if pub_dates[:until] == '*'
+          pub_date_range[:until] = 10000
         else
-          pub_date_range[:to] = Time.zone.parse(pub_dates[:to]).year
+          pub_date_range[:until] = Time.zone.parse(pub_dates[:until]).year
         end
         if params[:pub_year_range_interval]
           pub_year_range_interval = params[:pub_year_range_interval].to_i
         else
-          pub_year_range_interval = Setting.manifestation.facet.pub_year_range_interval
+          pub_year_range_interval = @library_group.settings[:pub_year_facet_range_interval] || 10
         end
 
         search.build do
@@ -257,20 +267,20 @@ class ManifestationsController < ApplicationController
           facet :carrier_type
           facet :library
           facet :language
-          facet :pub_year, range: pub_date_range[:from]..pub_date_range[:to], range_interval: pub_year_range_interval
+          facet :pub_year, range: pub_date_range[:from]..pub_date_range[:until], range_interval: pub_year_range_interval
           facet :subject_ids if defined?(EnjuSubject)
           paginate page: page.to_i, per_page: per_page
         end
       end
       search_result = search.execute
-      if @count[:query_result] > Setting.max_number_of_results
-        max_count = Setting.max_number_of_results
+      if @count[:query_result] > @max_number_of_results
+        max_count = @max_number_of_results
       else
         max_count = @count[:query_result]
       end
       @manifestations = Kaminari.paginate_array(
         search_result.results, total_count: max_count
-      ).page(page)
+      ).page(page).per(per_page)
 
       if params[:format].blank? or params[:format] == 'html'
         @carrier_type_facet = search_result.facet(:carrier_type).rows
@@ -387,8 +397,8 @@ class ManifestationsController < ApplicationController
     end
 
     if @manifestation.attachment.path
-      if Setting.uploaded_file.storage == :s3
-        data = Faraday.get(@manifestation.attachment.url).body.force_encoding('UTF-8')
+      if ENV['ENJU_STORAGE'] == 's3'
+        data = Faraday.get(@manifestation.attachment.expiring_url).body.force_encoding('UTF-8')
       else
         file = @manifestation.attachment.path
       end
@@ -412,7 +422,7 @@ class ManifestationsController < ApplicationController
       #format.js
       format.download {
         if @manifestation.attachment.path
-          if Setting.uploaded_file.storage == :s3
+          if ENV['ENJU_STORAGE'] == 's3'
             send_data data, filename: File.basename(@manifestation.attachment_file_name), type: 'application/octet-stream'
           else
             if File.exist?(file) && File.file?(file)
@@ -617,10 +627,10 @@ class ManifestationsController < ApplicationController
     #  query = "#{query} carrier_type_s:#{options[:carrier_type]}"
     #end
 
-    #unless options[:library].blank?
-    #  library_list = options[:library].split.uniq.join(' && ')
-    #  query = "#{query} library_sm:#{library_list}"
-    #end
+    unless options[:library_adv].blank?
+      library_list = options[:library_adv].split.uniq.join(' OR ')
+      query = "#{query} library_sm:(#{library_list})"
+    end
 
     #unless options[:language].blank?
     #  query = "#{query} language_sm:#{options[:language]}"
@@ -670,6 +680,10 @@ class ManifestationsController < ApplicationController
       query = "#{query} publisher_text:#{options[:publisher]}"
     end
 
+    if options[:call_number].present?
+      query = "#{query} call_number_sm:#{options[:call_number]}*"
+    end
+
     if options[:item_identifier].present?
       query = "#{query} item_identifier_sm:#{options[:item_identifier]}"
     end
@@ -811,36 +825,36 @@ class ManifestationsController < ApplicationController
       end
     end
 
-    if options[:pub_date_to].blank?
-      pub_date[:to] = "*"
+    if options[:pub_date_until].blank?
+      pub_date[:until] = "*"
     else
-      year = options[:pub_date_to].rjust(4, "0")
+      year = options[:pub_date_until].rjust(4, "0")
       if year.length == 4
-        pub_date[:to] = Time.zone.parse(Time.utc(year).to_s).end_of_year.utc.iso8601
+        pub_date[:until] = Time.zone.parse(Time.utc(year).to_s).end_of_year.utc.iso8601
       else
-        pub_date[:to] = Time.zone.parse(options[:pub_date_to]).end_of_day.utc.iso8601 rescue nil
+        pub_date[:until] = Time.zone.parse(options[:pub_date_until]).end_of_day.utc.iso8601 rescue nil
       end
-      unless pub_date[:to]
-        pub_date[:to] = Time.zone.parse(Time.utc(options[:pub_date_to]).to_s).end_of_year.utc.iso8601
+      unless pub_date[:until]
+        pub_date[:until] = Time.zone.parse(Time.utc(options[:pub_date_until]).to_s).end_of_year.utc.iso8601
       end
     end
     pub_date
   end
 
   def set_pub_date(query, options)
-    unless options[:pub_date_from].blank? && options[:pub_date_to].blank?
+    unless options[:pub_date_from].blank? && options[:pub_date_until].blank?
       options[:pub_date_from].to_s.gsub!(/\D/, '')
-      options[:pub_date_to].to_s.gsub!(/\D/, '')
+      options[:pub_date_until].to_s.gsub!(/\D/, '')
       pub_date = parse_pub_date(options)
-      query = "#{query} date_of_publication_d:[#{pub_date[:from]} TO #{pub_date[:to]}]"
+      query = "#{query} date_of_publication_d:[#{pub_date[:from]} TO #{pub_date[:until]}]"
     end
     query
   end
 
   def set_acquisition_date(query, options)
-    unless options[:acquired_from].blank? && options[:acquired_to].blank?
+    unless options[:acquired_from].blank? && options[:acquired_until].blank?
       options[:acquired_from].to_s.gsub!(/\D/, '')
-      options[:acquired_to].to_s.gsub!(/\D/, '')
+      options[:acquired_until].to_s.gsub!(/\D/, '')
 
       acquisition_date = {}
       if options[:acquired_from].blank?
@@ -857,21 +871,21 @@ class ManifestationsController < ApplicationController
         end
       end
 
-      if options[:acquired_to].blank?
-        acquisition_date[:to] = "*"
+      if options[:acquired_until].blank?
+        acquisition_date[:until] = "*"
       else
-        year = options[:acquired_to].rjust(4, "0")
+        year = options[:acquired_until].rjust(4, "0")
         if year.length == 4
-          acquisition_date[:to] = Time.zone.parse(Time.utc(year).to_s).end_of_year.utc.iso8601
+          acquisition_date[:until] = Time.zone.parse(Time.utc(year).to_s).end_of_year.utc.iso8601
         else
-          acquisition_date[:to] = Time.zone.parse(options[:acquired_to]).end_of_day.utc.iso8601 rescue nil
+          acquisition_date[:until] = Time.zone.parse(options[:acquired_until]).end_of_day.utc.iso8601 rescue nil
         end
-        unless acquisition_date[:to]
-          pub_date[:to] = Time.zone.parse(Time.utc(options[:acquired_to]).to_s).end_of_year.utc.iso8601
+        unless acquisition_date[:until]
+          acquisition_date[:until] = Time.zone.parse(Time.utc(options[:acquired_until]).to_s).end_of_year.utc.iso8601
         end
       end
 
-      query = "#{query} acquired_at_d:[#{acquisition_date[:from]} TO #{acquisition_date[:to]}]"
+      query = "#{query} acquired_at_d:[#{acquisition_date[:from]} TO #{acquisition_date[:until]}]"
     end
     query
   end

data/app/controllers/picture_files_controller.rb

@@ -30,7 +30,7 @@ class PictureFilesController < ApplicationController
     end
 
     if @picture_file.picture.path
-      if Setting.uploaded_file.storage == :s3
+      if ENV['ENJU_STORAGE'] == 's3'
         file = Faraday.get(@picture_file.picture.expiring_url).body.force_encoding('UTF-8')
       else
         file = @picture_file.picture.path(size)
@@ -195,7 +195,7 @@ class PictureFilesController < ApplicationController
     end
 
     if @picture_file.picture.path
-      if Setting.uploaded_file.storage == :s3
+      if ENV['ENJU_STORAGE'] == 's3'
         send_data file, filename: File.basename(@picture_file.picture_file_name), type: @picture_file.picture_content_type, disposition: disposition
       else
         if File.exist?(file) && File.file?(file)

data/app/controllers/resource_export_files_controller.rb

@@ -16,7 +16,7 @@ class ResourceExportFilesController < ApplicationController
   # GET /resource_export_files/1.json
   def show
     if @resource_export_file.resource_export.path
-      unless Setting.uploaded_file.storage == :s3
+      unless ENV['ENJU_STORAGE'] == 's3'
         file = @resource_export_file.resource_export.path
       end
     end
@@ -25,8 +25,9 @@ class ResourceExportFilesController < ApplicationController
       format.html # show.html.erb
       format.json { render json: @resource_export_file }
       format.download {
-        if Setting.uploaded_file.storage == :s3
-          redirect_to @resource_export_file.resource_export.expiring_url(10)
+        if ENV['ENJU_STORAGE'] == 's3'
+          send_data Faraday.get(@resource_export_file.resource_export.expiring_url).body.force_encoding('UTF-8'),
+            filename: File.basename(@resource_export_file.resource_export_file_name), type: 'application/octet-stream'
         else
           send_file file, filename: @resource_export_file.resource_export_file_name, type: 'application/octet-stream'
         end

data/app/controllers/resource_import_files_controller.rb

@@ -17,7 +17,7 @@ class ResourceImportFilesController < ApplicationController
   # GET /resource_import_files/1.json
   def show
     if @resource_import_file.resource_import.path
-      unless Setting.uploaded_file.storage == :s3
+      unless ENV['ENJU_STORAGE'] == 's3'
         file = @resource_import_file.resource_import.path
       end
     end
@@ -26,7 +26,7 @@ class ResourceImportFilesController < ApplicationController
       format.html # show.html.erb
       format.json { render json: @resource_import_file }
       format.download {
-        if Setting.uploaded_file.storage == :s3
+        if ENV['ENJU_STORAGE'] == 's3'
           redirect_to @resource_import_file.resource_import.expiring_url(10)
         else
           send_file file, filename: @resource_import_file.resource_import_file_name, type: 'application/octet-stream'

data/app/helpers/manifestations_helper.rb

@@ -138,6 +138,12 @@ module ManifestationsHelper
     title
   end
 
+  def holding_item_sort_criteria( item )
+    own_library = 2
+    own_library = 1 if signed_in? and current_user.profile.library_id == item.shelf.library_id
+    [ own_library, Library.find(item.shelf.library_id).position, item.shelf.position, item.id ]
+  end
+
   if defined?(EnjuBookmark)
     def link_to_bookmark(manifestation)
       if manifestation.bookmarked?(current_user)

data/app/models/agent.rb

@@ -80,7 +80,7 @@ class Agent < ActiveRecord::Base
 
   def set_full_name
     if full_name.blank?
-      if last_name.to_s.strip && first_name.to_s.strip && Setting.family_name_first == true
+      if LibraryGroup.site_config.settings[:family_name_first]
         self.full_name = [last_name, middle_name, first_name].compact.join(" ").to_s.strip
       else
         self.full_name = [first_name, last_name, middle_name].compact.join(" ").to_s.strip

data/app/models/agent_import_file.rb

@@ -5,9 +5,14 @@ class AgentImportFile < ActiveRecord::Base
   scope :not_imported, -> { in_state(:pending) }
   scope :stucked, -> { in_state(:pending).where('agent_import_files.created_at < ?', 1.hour.ago) }
 
-  if Setting.uploaded_file.storage == :s3
+  if ENV['ENJU_STORAGE'] == 's3'
     has_attached_file :agent_import, storage: :s3,
-      s3_credentials: Setting.amazon,
+      s3_credentials: {
+        access_key: ENV['AWS_ACCESS_KEY_ID'],
+        secret_access_key: ENV['AWS_SECRET_ACCESS_KEY'],
+        bucket: ENV['S3_BUCKET_NAME'],
+        s3_host_name: ENV['S3_HOST_NAME']
+      },
       s3_permissions: :private
   else
     has_attached_file :agent_import,
@@ -163,7 +168,7 @@ class AgentImportFile < ActiveRecord::Base
 
   def open_import_file
     tempfile = Tempfile.new(self.class.name.underscore)
-    if Setting.uploaded_file.storage == :s3
+    if ENV['ENJU_STORAGE'] == 's3'
       uploaded_file_path = agent_import.expiring_url(10)
     else
       uploaded_file_path = agent_import.path

data/app/models/manifestation.rb

@@ -51,6 +51,9 @@ class Manifestation < ActiveRecord::Base
         items.pluck(:item_identifier)
       end
     end
+    string :call_number, multiple: true do
+      items.pluck(:call_number)
+    end
     string :title, multiple: true
     # text フィールドだと区切りのない文字列の index が上手く作成
     #できなかったので。 downcase することにした。
@@ -207,9 +210,14 @@ class Manifestation < ActiveRecord::Base
     time :acquired_at
   end
 
-  if Setting.uploaded_file.storage == :s3
+  if ENV['ENJU_STORAGE'] == 's3'
     has_attached_file :attachment, storage: :s3,
-      s3_credentials: Setting.amazon,
+      s3_credentials: {
+        access_key: ENV['AWS_ACCESS_KEY_ID'],
+        secret_access_key: ENV['AWS_SECRET_ACCESS_KEY'],
+        bucket: ENV['S3_BUCKET_NAME'],
+        s3_host_name: ENV['S3_HOST_NAME']
+      },
       s3_permissions: :private
   else
     has_attached_file :attachment,
@@ -233,7 +241,7 @@ class Manifestation < ActiveRecord::Base
   validates :edition, numericality: {greater_than: 0}, allow_blank: true
   after_create :clear_cached_numdocs
   before_save :set_date_of_publication, :set_number
-  after_save :index_series_statement
+  after_save :index_series_statement, :extract_text!
   after_destroy :index_series_statement
   after_touch do |manifestation|
     manifestation.index
@@ -363,11 +371,26 @@ class Manifestation < ActiveRecord::Base
   end
 
   def extract_text
-    return nil unless attachment.path
-    # TODO: S3 support
-    response = `curl "#{Sunspot.config.solr.url}/update/extract?&extractOnly=true&wt=json" --data-binary @#{attachment.path} -H "Content-type:text/html"`
-    self.fulltext = JSON.parse(response)["responseHeader"][""]
-    save(validate: false)
+    return nil if attachment.path.nil?
+    if ENV['ENJU_STORAGE'] == 's3'
+      body = Faraday.get(attachment.expiring_url(10)).body.force_encoding('UTF-8')
+    else
+      body = File.open(attachment.path).read
+    end
+    client = Faraday.new(url: ENV['SOLR_URL']) do |conn|
+      conn.request :multipart
+      conn.adapter :net_http
+    end
+    response = client.post('update/extract?extractOnly=true&wt=json&extractFormat=text') do |req|
+      req.headers['Content-type'] = 'text/html'
+      req.body = body
+    end
+    update_column(:fulltext, JSON.parse(response.body)[""])
+  end
+
+  def extract_text!
+    extract_text
+    index!
   end
 
   def created(agent)
@@ -405,7 +428,7 @@ class Manifestation < ActiveRecord::Base
   end
 
   def index_series_statement
-    series_statements.map{|s| s.index}
+    series_statements.map{|s| s.index; s.root_manifestation.try(:index)}
   end
 
   def acquired_at

data/app/models/picture_file.rb

@@ -2,9 +2,14 @@ class PictureFile < ActiveRecord::Base
   scope :attached, -> { where('picture_attachable_id IS NOT NULL') }
   belongs_to :picture_attachable, polymorphic: true, validate: true
 
-  if Setting.uploaded_file.storage == :s3
+  if ENV['ENJU_STORAGE'] == 's3'
     has_attached_file :picture, storage: :s3, styles: { medium: "600x600>", thumb: "100x100>" },
-      s3_credentials: Setting.amazon,
+      s3_credentials: {
+        access_key: ENV['AWS_ACCESS_KEY_ID'],
+        secret_access_key: ENV['AWS_SECRET_ACCESS_KEY'],
+        bucket: ENV['S3_BUCKET_NAME'],
+        s3_host_name: ENV['S3_HOST_NAME']
+      },
       s3_permissions: :private
   else
     has_attached_file :picture, styles: { medium: "600x600>", thumb: "100x100>" },

data/app/models/resource_export_file.rb

@@ -2,9 +2,15 @@ class ResourceExportFile < ActiveRecord::Base
   include Statesman::Adapters::ActiveRecordQueries
   include ExportFile
   enju_export_file_model
-  if Setting.uploaded_file.storage == :s3
+
+  if ENV['ENJU_STORAGE'] == 's3'
     has_attached_file :resource_export, storage: :s3,
-      s3_credentials: Setting.amazon,
+      s3_credentials: {
+        access_key: ENV['AWS_ACCESS_KEY_ID'],
+        secret_access_key: ENV['AWS_SECRET_ACCESS_KEY'],
+        bucket: ENV['S3_BUCKET_NAME'],
+        s3_host_name: ENV['S3_HOST_NAME']
+      },
       s3_permissions: :private
   else
     has_attached_file :resource_export,

data/app/models/resource_import_file.rb

@@ -6,9 +6,14 @@ class ResourceImportFile < ActiveRecord::Base
   scope :not_imported, -> { in_state(:pending) }
   scope :stucked, -> { in_state(:pending).where('resource_import_files.created_at < ?', 1.hour.ago) }
 
-  if Setting.uploaded_file.storage == :s3
+  if ENV['ENJU_STORAGE'] == 's3'
     has_attached_file :resource_import, storage: :s3,
-      s3_credentials: Setting.amazon,
+      s3_credentials: {
+        access_key: ENV['AWS_ACCESS_KEY_ID'],
+        secret_access_key: ENV['AWS_SECRET_ACCESS_KEY'],
+        bucket: ENV['S3_BUCKET_NAME'],
+        s3_host_name: ENV['S3_HOST_NAME']
+      },
       s3_permissions: :private
   else
     has_attached_file :resource_import,
@@ -225,7 +230,7 @@ class ResourceImportFile < ActiveRecord::Base
   end
 
   def import_marc(marc_type)
-    file = File.open(self.resource_import.path)
+    file = File.open(resource_import.path)
     case marc_type
     when 'marcxml'
       reader = MARC::XMLReader.new(file)

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

@@ -17,7 +17,9 @@
 <%- @agent_import_files.each do |agent_import_file| -%>
   <tr class="line<%= cycle("0", "1") -%>">
     <td><%= link_to agent_import_file.id, agent_import_file -%></td>
-    <td><%= link_to agent_import_file.agent_import_file_name, agent_import_file -%></td>
+    <td>
+      <%= link_to agent_import_file.agent_import_file_name, agent_import_file_path(agent_import_file, format: :download) if agent_import_file.agent_import_file_name %>
+    </td>
     <td><%= l(agent_import_file.executed_at) if agent_import_file.executed_at -%></td>
     <td><%= link_to agent_import_file.user.username, agent_import_file.user.profile if agent_import_file.user.try(:profile) -%></td>
     <td><%= agent_import_file.edit_mode -%></td>

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

@@ -10,7 +10,7 @@
 
 <p>
   <strong><%= t('activerecord.attributes.agent_import_file.agent_import_file_name') -%>:</strong>
-  <%= link_to @agent_import_file.agent_import_file_name, agent_import_file_path(@agent_import_file, format: :download) -%>
+  <%= link_to @agent_import_file.agent_import_file_name, agent_import_file_path(@agent_import_file, format: :download) if @agent_import_file.agent_import_file_name %>
 </p>
 
 <p>

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

@@ -9,7 +9,7 @@
 
   <div class="field">
     <span id="name_person">
-      <%- if Setting.family_name_first == true -%>
+      <%- if @library_group.settings[:family_name_first] -%>
         <%= render 'agents/form_family_name_first', f: f -%>
       <%- else -%>
         <%= render 'agents/form_family_name_last', f: f -%>

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

@@ -13,6 +13,6 @@
     <% if can? :delete, @item %>
       <li><%= link_to t('page.destroy'), @item, data: {confirm: t('page.are_you_sure')}, method: :delete -%></li>
     <% end %>
-    <li><%= link_to t('page.back'), items_path(@item.manifestation.id) -%></li>
+    <li><%= link_to t('page.back'), items_path(manifestation_id: @item.manifestation.id) -%></li>
   </ul>
 </div>

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

@@ -16,7 +16,7 @@
     <%= t('activerecord.attributes.item.acquired_at') %>:
     <%= t('advanced_search.from') %>
     <%= text_field_tag 'acquired_from', @acquired_from, {class: 'date_field', placeholder: "#{t('page.example')}: 2012-04-12"} -%>
-    <%= t('advanced_search.to') %> <%= text_field_tag 'acquired_to', @acquired_to, {class: 'date_field', placeholder: "#{t('page.example')}: 2012-05-11"} -%>
+    <%= t('advanced_search.to') %> <%= text_field_tag 'acquired_until', @acquired_until, {class: 'date_field', placeholder: "#{t('page.example')}: 2012-05-11"} -%>
   </p>
 <%- end -%>
 </div>

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

@@ -5,11 +5,7 @@
   <%= render 'page/include' %>
   <title><%= title(controller.controller_name) %></title>
   <% if %w(index show new edit).include?(controller.action_name) %>
-    <%= book_jacket_header(Setting.book_jacket.source) %>
-    <% if Setting.book_jacket.source == :google %>
-      <script type="text/javascript" src="https://www.google.com/jsapi"></script>
-      <%= render 'manifestations/google_book_thumbnail_header', manifestation: @manifestation if @manifestation %>
-    <% end %>
+    <%= book_jacket_header(@library_group.settings[:book_jacket_source]) %>
   <% end %>
 </head>
 <body itemscope itemtype="http://schema.org/WebPage">

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

@@ -9,10 +9,7 @@
     <%= auto_discovery_link_tag(:atom, url_for(params.merge(format: :atom, page: nil, commit: nil, only_path: true)), title: (t('manifestation.library_group_manifestation', library_group_name: @library_group.display_name.localize) + " (Atom)")) %>
   <%- end -%>
   <% if %w(show edit).include?(controller.action_name) %>
-    <% if Setting.book_jacket.source == :google %>
-      <script type="text/javascript" src="https://www.google.com/jsapi"></script>
-      <%= render 'manifestations/google_book_thumbnail_header' %>
-    <% end %>
+    <%= book_jacket_header(@library_group.settings[:book_jacket_source]) %>
   <% end %>
   <link rel="search" type="application/opensearchdescription+xml" title="<%= LibraryGroup.site_config.display_name.localize %>" href="<%= page_opensearch_url(format: :xml) %>" />
 </head>

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

@@ -15,3 +15,9 @@
   <%- if manifestation.pub_date.present? -%>
     (<%= manifestation.pub_date -%>)
   <%- end -%>
+  <% if defined?(EnjuSubject) %>
+    ;
+    <% manifestation.classifications.each 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 %>

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

@@ -29,9 +29,9 @@
   <%- if @manifestations.total_count > 0 -%>
     <p>
       <%= t('page.number_of_search_results', count: @count[:query_result], numdocs: Manifestation.search.total, seconds: sprintf("%.3f", @seconds)) -%>
-      <%- if @count[:query_result] > Setting.max_number_of_results -%>
+      <% if @count[:query_result] > @max_number_of_results %>
         <br />
-        <%= t('page.limit_exceeded', count: Setting.max_number_of_results) -%>
+        <%= t('page.limit_exceeded', count: @max_number_of_results) %>
       <%- end -%>
     </p>
 

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

@@ -19,7 +19,7 @@
         <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_path(resource_export_file, format: :download) 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_file_name %>
           <br />
           <%= resource_export_file.created_at %>
         </td>

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

@@ -18,6 +18,11 @@
   <%= localized_state(@resource_export_file.current_state) -%>
 </p>
 
+<p>
+  <strong><%= t('page.created_at') -%>:</strong>
+  <%= l(@resource_export_file.created_at) if @resource_export_file.created_at -%>
+</p>
+
 </div>
 </div>
 

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

@@ -20,9 +20,10 @@
       <tr class="line<%= cycle("0", "1") -%>">
         <td><%= link_to (resource_import_file.id), resource_import_file -%></td>
         <td>
-          <%= link_to resource_import_file.resource_import_file_name, resource_import_file -%>
+          <%= link_to resource_import_file.resource_import_file_name, resource_import_file_path(resource_import_file, format: :download) if resource_import_file.resource_import_file_name %>
           <br />
-          <%= t('activerecord.models.user') -%>: <%= link_to resource_import_file.user.username, resource_import_file.user.profile if resource_import_file.user.try(:profile) -%></td>
+          <%= t('activerecord.models.user') -%>: <%= link_to resource_import_file.user.username, resource_import_file.user.profile if resource_import_file.user.try(:profile) -%>
+        </td>
         <td><%= resource_import_file.edit_mode -%></td>
         <td><%= l(resource_import_file.executed_at) if resource_import_file.executed_at -%></td>
         <td><%= localized_state(resource_import_file.current_state) -%></td>

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

@@ -10,7 +10,7 @@
 
 <p>
   <strong><%= t('activerecord.attributes.resource_import_file.resource_import_file_name') -%>:</strong>
-  <%= link_to @resource_import_file.resource_import_file_name, resource_import_file_path(@resource_import_file, format: :download) -%>
+  <%= link_to @resource_import_file.resource_import_file_name, resource_import_file_path(@resource_import_file, format: :download) if @resource_import_file.resource_import_file_name %>
 </p>
 
 <p>

data/app/workers/agent_import_file_queue.rb

@@ -1,5 +1,5 @@
 class AgentImportFileQueue
-  @queue = :agent_import_file
+  @queue = :enju_leaf
 
   def self.perform(agent_import_file_id)
     AgentImportFile.find(agent_import_file_id).import_start

data/app/workers/resource_export_file_queue.rb

@@ -1,5 +1,5 @@
 class ResourceExportFileQueue
-  @queue = :resource_export_file
+  @queue = :enju_leaf
 
   def self.perform(resource_export_id)
     ResourceExportFile.find(resource_export_id).export!

data/app/workers/resource_import_file_queue.rb

@@ -1,5 +1,5 @@
 class ResourceImportFileQueue
-  @queue = :resource_import_file
+  @queue = :enju_leaf
 
   def self.perform(resource_import_file_id)
     ResourceImportFile.find(resource_import_file_id).import_start

data/lib/enju_biblio/version.rb

@@ -1,3 +1,3 @@
 module EnjuBiblio
-  VERSION = "0.1.0.pre65"
+  VERSION = "0.1.0.pre66"
 end

data/lib/generators/enju_biblio/setup/setup_generator.rb

@@ -5,7 +5,6 @@ class EnjuBiblio::SetupGenerator < Rails::Generators::Base
   def copy_setup_files
     directory("db/fixtures", "db/fixtures/enju_biblio")
     return if file == 'fixture'
-    rake("enju_biblio_engine:install:migrations")
     append_to_file("config/schedule.rb", File.open(File.expand_path('../templates', __FILE__) + '/config/schedule.rb').read)
   end
 end

data/lib/tasks/item.rb

@@ -1,7 +1,9 @@
 def update_item
-  Exemplify.find_each do |exemplify|
-    if exemplify.item
-      exemplify.item.update_column(:manifestation_id, exemplify.manifestation_id) unless exemplify.item.manifestation_id
+  if defined?(Exemplify)
+    Exemplify.find_each do |exemplify|
+      if exemplify.item
+        exemplify.item.update_column(:manifestation_id, exemplify.manifestation_id) unless exemplify.item.manifestation_id
+      end
     end
   end
 end

data/spec/controllers/manifestations_controller_spec.rb

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 require 'spec_helper'
 
 describe ManifestationsController do
@@ -82,32 +84,32 @@ describe ManifestationsController do
         expect(assigns(:manifestations)).to_not be_nil
       end
 
-      it "assigns all manifestations as @manifestations when pub_date_from and pub_date_to are specified" do
-        get :index, :pub_date_from => '2000', :pub_date_to => '2007'
-        assigns(:query).should eq "date_of_publication_d:[#{Time.zone.parse('2000-01-01').utc.iso8601} TO #{Time.zone.parse('2007-12-31').end_of_year.utc.iso8601}]"
+      it "assigns all manifestations as @manifestations when pub_date_from and pub_date_until are specified" do
+        get :index, :pub_date_from => '2000', :pub_date_until => '2007'
+        assigns(:query).should eq "date_of_publication_d:[#{Time.zone.parse('2000-01-01').beginning_of_day.utc.iso8601} TO #{Time.zone.parse('2007-12-31').end_of_year.utc.iso8601}]"
         expect(assigns(:manifestations)).to_not be_nil
       end
 
-      it "assigns all manifestations as @manifestations when old pub_date_from and pub_date_to are specified" do
-        get :index, :pub_date_from => '200', :pub_date_to => '207'
+      it "assigns all manifestations as @manifestations when old pub_date_from and pub_date_until are specified" do
+        get :index, :pub_date_from => '200', :pub_date_until => '207'
         assigns(:query).should eq "date_of_publication_d:[#{Time.zone.parse('200-01-01').utc.iso8601} TO #{Time.zone.parse('207-12-31').end_of_year.utc.iso8601}]"
         expect(assigns(:manifestations)).to_not be_nil
       end
 
-      it "assigns all manifestations as @manifestations when acquired_from and pub_date_to are specified" do
-        get :index, :acquired_from => '2000', :acquired_to => '2007'
-        assigns(:query).should eq "acquired_at_d:[#{Time.zone.parse('2000-01-01').utc.iso8601} TO #{Time.zone.parse('2007-12-31').end_of_day.utc.iso8601}]"
+      it "assigns all manifestations as @manifestations when acquired_from and pub_date_until are specified" do
+        get :index, :acquired_from => '2000', :acquired_until => '2007'
+        assigns(:query).should eq "acquired_at_d:[#{Time.zone.parse('2000-01-01').beginning_of_day.utc.iso8601} TO #{Time.zone.parse('2007-12-31').end_of_year.utc.iso8601}]"
         expect(assigns(:manifestations)).to_not be_nil
       end
 
-      it "assigns all manifestations as @manifestations when old acquired_from and pub_date_to are specified" do
-        get :index, :acquired_from => '200', :acquired_to => '207'
+      it "assigns all manifestations as @manifestations when old acquired_from and pub_date_until are specified" do
+        get :index, :acquired_from => '200', :acquired_until => '207'
         assigns(:query).should eq "acquired_at_d:[#{Time.zone.parse('200-01-01').utc.iso8601} TO #{Time.zone.parse('207-12-31').end_of_day.utc.iso8601}]"
         expect(assigns(:manifestations)).to_not be_nil
       end
 
       it "assigns all manifestations as @manifestations when number_of_pages_at_least and number_of_pages_at_most are specified" do
-        get :index, :number_of_pages_at_least => '100', :number_of_pages_at_least => '200'
+        get :index, :number_of_pages_at_least => '100', :number_of_pages_at_most => '200'
         expect(assigns(:manifestations)).to_not be_nil
       end
 
@@ -149,8 +151,8 @@ describe ManifestationsController do
         assigns(:query).should eq '2005 date_of_publication_d:[1999-12-31T15:00:00Z TO *]'
       end
 
-      it "should get index with pub_date_to" do
-        get :index, :query => '2005', :pub_date_to => '2000'
+      it "should get index with pub_date_until" do
+        get :index, :query => '2005', :pub_date_until => '2000'
         expect(response).to be_success
         expect(assigns(:manifestations)).to be_truthy
         assigns(:query).should eq '2005 date_of_publication_d:[* TO 2000-12-31T14:59:59Z]'
@@ -173,6 +175,30 @@ describe ManifestationsController do
         expect(response).to be_success
         expect(assigns(:manifestations)).to be_empty
       end
+
+      it "should show manifestation with library 3", :solr => true do
+        get :index, :library_adv => ["hachioji"]
+        expect(response).to be_success
+        expect(assigns(:manifestations).size).to eq 1
+      end
+
+      it "should show manifestation with library 2 or 3", :solr => true do
+        get :index, :library_adv => ["hachioji", "kamata"]
+        expect(response).to be_success
+        expect(assigns(:manifestations).size).to eq 2
+      end
+
+      it "should show manifestation with call_number", :solr => true do
+        get :index, :call_number => "547|ヤ"
+        expect(response).to be_success
+        expect(assigns(:manifestations)).not_to be_empty
+      end
+
+      it "should accept per_page params" do
+        get :index, per_page: 3
+        expect(assigns(:manifestations).count).to eq 3
+        expect(assigns(:manifestations).total_count).to eq 119
+      end
     end
   end
 

data/spec/dummy/db/migrate/20150221063719_add_settings_to_library_group.rb

@@ -0,0 +1,5 @@
+class AddSettingsToLibraryGroup < ActiveRecord::Migration
+  def change
+    add_column :library_groups, :settings, :text
+  end
+end

data/spec/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20150117111136) do
+ActiveRecord::Schema.define(version: 20150221063719) do
 
   create_table "accepts", force: :cascade do |t|
     t.integer  "basket_id"
@@ -764,6 +764,7 @@ ActiveRecord::Schema.define(version: 20150117111136) do
     t.text     "admin_networks"
     t.boolean  "allow_bookmark_external_url", default: false,                    null: false
     t.string   "url",                         default: "http://localhost:3000/"
+    t.text     "settings"
   end
 
   add_index "library_groups", ["short_name"], name: "index_library_groups_on_short_name"

data/spec/fixtures/items.yml

@@ -252,6 +252,28 @@ item_00023:
   id: 23
   include_supplements: false
   created_at: 2007-08-24 23:46:20.484813 +09:00
+item_00024: 
+  updated_at: 2007-08-24 23:46:08.607081 +09:00
+  item_identifier: '00024'
+  circulation_status_id: 2
+  checkout_type_id: 1
+  shelf_id: 3
+  call_number: 
+  manifestation_id: 102
+  id: 24
+  include_supplements: false
+  created_at: 2007-08-24 23:46:08.607081 +09:00
+item_00025: 
+  updated_at: 2007-08-24 23:46:08.607081 +09:00
+  item_identifier: '00025'
+  circulation_status_id: 2
+  checkout_type_id: 1
+  shelf_id: 3
+  call_number: '547|ヤ'
+  manifestation_id: 102
+  id: 25
+  include_supplements: false
+  created_at: 2007-08-24 23:46:08.607081 +09:00
 
 # == Schema Information
 #

data/spec/fixtures/library_groups.yml

@@ -1,31 +1,37 @@
 # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
 one:
   id: 1
-  name: enju_library
-  display_name: "<%= I18n.locale %>: Enju Library"
-  short_name: enju
+  name: unknown
+  display_name: unknown
+  short_name: unknown
   note: 
-  my_networks: 0.0.0.0/0
+  my_networks: "0.0.0.0/0\r\n\
+    ::/0"
   url: "http://localhost:3000/"
-
-
+  position: 1
+  login_banner: "*Next-L Enju*"
+  admin_networks: "0.0.0.0/0\r\n\
+    ::/0"
+  settings: <% if Rails::VERSION::MAJOR > 3 %>
+    "{\"max_number_of_results\":200,\"family_name_first\":true}"
+  <% else %>
+    "---\n:max_number_of_results: 200\n:family_name_first: true\n"
+  <% end %>
 # == Schema Information
 #
 # Table name: library_groups
 #
-#  id                          :integer         not null, primary key
-#  name                        :string(255)     not null
-#  display_name                :text
-#  short_name                  :string(255)     not null
-#  my_networks                 :text
-#  login_banner                :text
-#  note                        :text
-#  country_id                  :integer
-#  created_at                  :datetime        not null
-#  updated_at                  :datetime        not null
-#  admin_networks              :text
-#  allow_bookmark_external_url :boolean         default(FALSE), not null
-#  position                    :integer
-#  url                         :string(255)     default("http://localhost:3000/")
+#  id             :integer          not null, primary key
+#  name           :string(255)      not null
+#  display_name   :text
+#  short_name     :string(255)      not null
+#  my_networks    :text
+#  login_banner   :text
+#  note           :text
+#  country_id     :integer
+#  position       :integer
+#  created_at     :datetime         not null
+#  updated_at     :datetime         not null
+#  admin_networks :text
+#  url            :string(255)      default("http://localhost:3000/")
 #
-

data/spec/spec_helper.rb

@@ -5,6 +5,7 @@ Coveralls.wear!
 
 # This file is copied to spec/ when you run 'rails generate rspec:install'
 ENV["RAILS_ENV"] ||= 'test'
+ENV["SOLR_URL"] ||= 'http://localhost:8981/solr/test'
 require File.expand_path("../../spec/dummy/config/environment", __FILE__)
 require 'rspec/rails'
 require 'vcr'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enju_biblio
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre65
+  version: 0.1.0.pre66
 platform: ruby
 authors:
 - Kosuke Tanabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-17 00:00:00.000000000 Z
+date: 2015-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paperclip
@@ -282,28 +282,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: enju_leaf
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0.rc17
+        version: 1.1.0.rc18
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0.rc17
+        version: 1.1.0.rc18
 - !ruby/object:Gem::Dependency
   name: enju_subject
   requirement: !ruby/object:Gem::Requirement
@@ -352,14 +352,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.17.pre24
+        version: 0.1.17.pre25
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.17.pre24
+        version: 0.1.17.pre25
 - !ruby/object:Gem::Dependency
   name: enju_manifestation_viewer
   requirement: !ruby/object:Gem::Requirement
@@ -380,28 +380,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre42
+        version: 0.1.0.pre44
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre42
+        version: 0.1.0.pre44
 - !ruby/object:Gem::Dependency
   name: enju_ndl
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre35
+        version: 0.1.0.pre36
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre35
+        version: 0.1.0.pre36
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -472,6 +472,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Bibliographic record module for Next-L Enju
 email:
 - nabeta@fastmail.fm
@@ -1195,6 +1209,7 @@ files:
 - spec/dummy/db/migrate/20141003181336_add_full_name_transcription_to_profile.rb
 - spec/dummy/db/migrate/20141003182825_add_date_of_birth_to_profile.rb
 - spec/dummy/db/migrate/20141014065831_add_shelf_id_to_checkout.rb
+- spec/dummy/db/migrate/20150221063719_add_settings_to_library_group.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
@@ -1667,6 +1682,7 @@ test_files:
 - spec/dummy/db/migrate/20141003181336_add_full_name_transcription_to_profile.rb
 - spec/dummy/db/migrate/20141003182825_add_date_of_birth_to_profile.rb
 - spec/dummy/db/migrate/20141014065831_add_shelf_id_to_checkout.rb
+- spec/dummy/db/migrate/20150221063719_add_settings_to_library_group.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html