enju_biblio 0.3.10.rc.3 → 0.3.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2d7203c658e7663f3cbac31e55722e0dae3f5ce6805105697470ef7998dc956
-  data.tar.gz: b0fccbbda78a90bdcc409f25673d137cdcaac5a50629d44eea35f27ad2690cc3
+  metadata.gz: afa249847e374fa2a87ea6801bfb851af30e99edc72fd982a32ce52d1674fa0c
+  data.tar.gz: 5ab7f1b8abd52e9c841c0445dd1a04db2d752fd077aada5672d70ea2ed2d8262
 SHA512:
-  metadata.gz: 8dbdc8cc98c98e26594cf4abe0cfdae324b187e94e45829e32de9668f798844155eecb7a37a389fa4b61306897c8861cc43f6d43974521f3483084754c57848f
-  data.tar.gz: 237824184eba2b78940b5fe20c67025e8c7bb694e5fbc12cc39320c0749b12bdc1c352d69313df60671ac6124085502a3b119ff39be8b408d6273a611102eeaf
+  metadata.gz: e937c7448b783f607e851da92fa21b38c7bb44677b572e47b7f11a3ef5cc9133e76e74a1b2a13657041acfbeef89ed9240fbbe8cc606179167606cfd8fd5075a
+  data.tar.gz: 42b259f6e9d84b40a93b66d649c171b1d8a6ec84cdffc773d8871223a5de707383e3e82dfaddb4ceb76d980001cb8e1ec6096b35d29647dd298d0426460a936a

data/app/controllers/agents_controller.rb

@@ -227,10 +227,4 @@ class AgentsController < ApplicationController
     @languages = Language.all
     @agent_type = AgentType.where(name: 'person').first
   end
-
-  def filtered_params
-    params.permit([:view, :format, :page, :language, :sort_by, :per_page])
-  end
-
-  helper_method :filtered_params
 end

data/app/controllers/items_controller.rb

@@ -51,6 +51,17 @@ class ItemsController < ApplicationController
 
     unless @inventory_file
       search = Sunspot.new_search(Item)
+      selected_attributes = [
+        :id, :item_identifier, :call_number, :manifestation_id, :acquired_at,
+        :binding_item_identifier, :binding_call_number, :binded_at,
+        :include_supplements, :url, :note,
+        :circulation_status_id, :shelf_id,
+        :created_at, :updated_at
+      ]
+      selected_attributes += [
+        :memo, :required_role_id, :budget_type_id, :bookstore_id, :price
+      ] if current_user.try(:has_role?, 'Librarian')
+      search.data_accessor_for(Item).select = selected_attributes
       set_role_query(current_user, search)
 
       @query = query.dup
@@ -122,7 +133,7 @@ class ItemsController < ApplicationController
 
     respond_to do |format|
       format.html # index.html.erb
-      format.json { render json: @items }
+      format.json
       format.txt  { render layout: false }
       format.atom
     end
@@ -137,7 +148,7 @@ class ItemsController < ApplicationController
 
     respond_to do |format|
       format.html # show.html.erb
-      format.json { render json: @item }
+      format.json
     end
   end
 
@@ -301,10 +312,4 @@ class ItemsController < ApplicationController
       end
     end
   end
-
-  def filtered_params
-    params.permit([:view, :format, :page, :library, :carrier_type, :reservable, :pub_date_from, :pub_date_until, :language, :sort_by, :per_page])
-  end
-
-  helper_method :filtered_params
 end

data/app/controllers/manifestations_controller.rb

@@ -33,25 +33,14 @@ class ManifestationsController < ApplicationController
         per_page = 65534
       end
 
-      if params[:format] == 'sru'
-        if params[:operation] == 'searchRetrieve'
-          sru = Sru.new(params)
-          query = sru.cql.to_sunspot
-          sort = sru.sort_by
-        else
-          render template: 'manifestations/explain', layout: false
-          return
-        end
+      if params[:api] == 'openurl'
+        openurl = Openurl.new(params)
+        @manifestations = openurl.search
+        query = openurl.query_text
+        sort = set_search_result_order(params[:sort_by], params[:order])
       else
-        if params[:api] == 'openurl'
-          openurl = Openurl.new(params)
-          @manifestations = openurl.search
-          query = openurl.query_text
-          sort = set_search_result_order(params[:sort_by], params[:order])
-        else
-          query = make_query(params[:query], params)
-          sort = set_search_result_order(params[:sort_by], params[:order])
-        end
+        query = make_query(params[:query], params)
+        sort = set_search_result_order(params[:sort_by], params[:order])
       end
 
       # 絞り込みを行わない状態のクエリ
@@ -191,37 +180,37 @@ class ManifestationsController < ApplicationController
       else
         per_page = Manifestation.default_per_page
       end
-      if params[:format] == 'sru'
-        #search.query.start_record(params[:startRecord] || 1, params[:maximumRecords] || 200)
+
+      pub_dates = parse_pub_date(params)
+      pub_date_range = {}
+
+      if pub_dates[:from] == '*'
+        pub_date_range[:from] = 0
       else
-        pub_dates = parse_pub_date(params)
-        pub_date_range = {}
-        if pub_dates[:from] == '*'
-          pub_date_range[:from] = 0
-        else
-          pub_date_range[:from] = Time.zone.parse(pub_dates[:from]).year
-        end
-        if pub_dates[:until] == '*'
-          pub_date_range[:until] = 10000
-        else
-          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 = @library_group.pub_year_facet_range_interval || 10
-        end
+        pub_date_range[:from] = Time.zone.parse(pub_dates[:from]).year
+      end
+      if pub_dates[:until] == '*'
+        pub_date_range[:until] = 10000
+      else
+        pub_date_range[:until] = Time.zone.parse(pub_dates[:until]).year
+      end
 
-        search.build do
-          facet :reservable if defined?(EnjuCirculation)
-          facet :carrier_type
-          facet :library
-          facet :language
-          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
+      if params[:pub_year_range_interval]
+        pub_year_range_interval = params[:pub_year_range_interval].to_i
+      else
+        pub_year_range_interval = @library_group.pub_year_facet_range_interval || 10
       end
+
+      search.build do
+        facet :reservable if defined?(EnjuCirculation)
+        facet :carrier_type
+        facet :library
+        facet :language
+        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
+
       search_result = search.execute
       if @count[:query_result] > @max_number_of_results
         max_count = @max_number_of_results
@@ -261,7 +250,6 @@ class ManifestationsController < ApplicationController
       format.html
       format.html.phone
       format.xml  { render xml: @manifestations }
-      format.sru  { render layout: false }
       format.rss  { render layout: false }
       format.txt  { render layout: false }
       format.rdf  { render layout: false }
@@ -394,11 +382,8 @@ class ManifestationsController < ApplicationController
   # POST /manifestations
   # POST /manifestations.json
   def create
-    creators_params = manifestation_params[:creators_attributes]
-    @manifestation = Manifestation.new(manifestation_params.delete_if{|k, v|
-      k == 'creators_attributes'
-    })
-    parent = Manifestation.where(id: @manifestation.parent_id).first
+    @manifestation = Manifestation.new(manifestation_params)
+    parent = Manifestation.find_by(id: @manifestation.parent_id)
     unless @manifestation.original_title?
       @manifestation.original_title = @manifestation.attachment_file_name
     end
@@ -406,14 +391,16 @@ class ManifestationsController < ApplicationController
     respond_to do |format|
       if @manifestation.save
         Manifestation.transaction do
-          @manifestation.creators = Agent.new_agents(creators_params)
-          parent.derived_manifestations << @manifestation if parent
-        end
-        if parent
-          parent.index
-          @manifestation.index
+          set_creators
+
+          if parent
+            parent.derived_manifestations << @manifestation
+            parent.index
+            @manifestation.index
+          end
+
+          Sunspot.commit
         end
-        Sunspot.commit
 
         format.html { redirect_to @manifestation, notice: t('controller.successfully_created', model: t('activerecord.models.manifestation')) }
         format.json { render json: @manifestation, status: :created, location: @manifestation }
@@ -428,17 +415,11 @@ class ManifestationsController < ApplicationController
   # PUT /manifestations/1
   # PUT /manifestations/1.json
   def update
-    creators_params = manifestation_params[:creators_attributes]
-    @manifestation.assign_attributes(manifestation_params.delete_if{|k, v|
-      k == 'creators_attributes'
-    })
+    @manifestation.assign_attributes(manifestation_params)
 
     respond_to do |format|
-      if @manifestation.valid?
-        Manifestation.transaction do
-          @manifestation.creators = Agent.new_agents(creators_params)
-          @manifestation.save!
-        end
+      if @manifestation.save
+        set_creators
         
         format.html { redirect_to @manifestation, notice: t('controller.successfully_updated', model: t('activerecord.models.manifestation')) }
         format.json { head :no_content }
@@ -856,9 +837,20 @@ class ManifestationsController < ApplicationController
     query
   end
 
-  def filtered_params
-    params.permit([:view, :format, :library, :carrier_type, :reservable, :pub_date_from, :pub_date_until, :language, :sort_by, :per_page, :query])
-  end
+  def set_creators
+    creators_params = manifestation_params[:creators_attributes]
+    contributors_params = manifestation_params[:contributors_attributes]
+    publishers_params = manifestation_params[:publishers_attributes]
+
+    Manifestation.transaction do
+      @manifestation.creates.destroy_all
+      @manifestation.realizes.destroy_all
+      @manifestation.produces.destroy_all
+      @manifestation.reload
 
-  helper_method :filtered_params
+      @manifestation.creators = Agent.new_agents(creators_params)
+      @manifestation.contributors = Agent.new_agents(contributors_params)
+      @manifestation.publishers = Agent.new_agents(publishers_params)
+    end
+  end
 end

data/app/controllers/series_statements_controller.rb

@@ -133,10 +133,4 @@ class SeriesStatementsController < ApplicationController
       :series_master
     )
   end
-
-  def filtered_params
-    params.permit([:locale, :format, :page, :per_page])
-  end
-
-  helper_method :filtered_params
 end

data/app/helpers/manifestations_helper.rb

@@ -71,10 +71,10 @@ module ManifestationsHelper
     current = true if languages.include?(language.name)
     if current
       content_tag :strong do
-        link_to("#{language.display_name.localize} (" + facet.count.to_s + ")", url_for(filtered_params.merge(page: nil, language: language.name, view: nil, only_path: true)))
+        link_to("#{language.display_name.localize} (" + facet.count.to_s + ")", url_for(request.params.merge(page: nil, language: language.name, view: nil, only_path: true)))
       end
     else
-      link_to("#{language.display_name.localize} (" + facet.count.to_s + ")", url_for(filtered_params.merge(page: nil, language: language.name, view: nil, only_path: true)))
+      link_to("#{language.display_name.localize} (" + facet.count.to_s + ")", url_for(request.params.merge(page: nil, language: language.name, view: nil, only_path: true)))
     end
   end
 
@@ -86,10 +86,10 @@ module ManifestationsHelper
     content_tag :li do
       if current
         content_tag :strong do
-          link_to("#{library.display_name.localize} (" + facet.count.to_s + ")", url_for(filtered_params.merge(page: nil, library: (current_libraries << library.name).uniq.join(' '), view: nil, only_path: true)))
+          link_to("#{library.display_name.localize} (" + facet.count.to_s + ")", url_for(request.params.merge(page: nil, library: (current_libraries << library.name).uniq.join(' '), view: nil, only_path: true)))
         end
       else
-        link_to("#{library.display_name.localize} (" + facet.count.to_s + ")", url_for(filtered_params.merge(page: nil, library: (current_libraries << library.name).uniq.join(' '), view: nil, only_path: true)))
+        link_to("#{library.display_name.localize} (" + facet.count.to_s + ")", url_for(request.params.merge(page: nil, library: (current_libraries << library.name).uniq.join(' '), view: nil, only_path: true)))
       end
     end
   end
@@ -102,10 +102,10 @@ module ManifestationsHelper
       current = true if params[:carrier_type] == carrier_type.name
       if current
         content_tag :strong do
-          link_to("#{carrier_type.display_name.localize} (" + facet.count.to_s + ")", url_for(filtered_params.merge(carrier_type: carrier_type.name, page: nil, view: nil, only_path: true)))
+          link_to("#{carrier_type.display_name.localize} (" + facet.count.to_s + ")", url_for(request.params.merge(carrier_type: carrier_type.name, page: nil, view: nil, only_path: true)))
         end
       else
-        link_to("#{carrier_type.display_name.localize} (" + facet.count.to_s + ")", url_for(filtered_params.merge(carrier_type: carrier_type.name, page: nil, view: nil, only_path: true)))
+        link_to("#{carrier_type.display_name.localize} (" + facet.count.to_s + ")", url_for(request.params.merge(carrier_type: carrier_type.name, page: nil, view: nil, only_path: true)))
       end
     end
   end
@@ -115,10 +115,10 @@ module ManifestationsHelper
     current = true if facet.value.first.to_i == pub_date_from.to_i and facet.value.last.to_i - 1 == pub_date_until.to_i
     if current
       content_tag :strong do
-        link_to("#{facet.value.first.to_i} - #{facet.value.last.to_i - 1} (" + facet.count.to_s + ")", url_for(filtered_params.merge(pub_date_from: facet.value.first.to_i, pub_date_until: facet.value.last.to_i - 1, page: nil, view: nil, only_path: true)))
+        link_to("#{facet.value.first.to_i} - #{facet.value.last.to_i - 1} (" + facet.count.to_s + ")", url_for(request.params.merge(pub_date_from: facet.value.first.to_i, pub_date_until: facet.value.last.to_i - 1, page: nil, view: nil, only_path: true)))
       end
     else
-      link_to("#{facet.value.first.to_i} - #{facet.value.last.to_i - 1} (" + facet.count.to_s + ")", url_for(filtered_params.merge(pub_date_from: facet.value.first.to_i, pub_date_until: facet.value.last.to_i - 1, page: nil, view: nil, only_path: true)))
+      link_to("#{facet.value.first.to_i} - #{facet.value.last.to_i - 1} (" + facet.count.to_s + ")", url_for(request.params.merge(pub_date_from: facet.value.first.to_i, pub_date_until: facet.value.last.to_i - 1, page: nil, view: nil, only_path: true)))
     end
   end
 

data/app/models/agent.rb

@@ -256,17 +256,26 @@ class Agent < ApplicationRecord
     Agent.transaction do
       agents_params.each do |k, v|
         next if v['_destroy'] == '1'
+
+        agent = nil
+
         if v['agent_id'].present?
           agent = Agent.find(v['agent_id'])
         elsif v['id'].present?
           agent = Agent.find(v['id'])
-        else
+        end
+
+        if !agent or agent.full_name != v['full_name']
+          v.delete('id')
+          v.delete('agent_id')
           v.delete('_destroy')
           agent = Agent.create(v)
         end
+
         agents << agent
       end
     end
+
     agents
   end
 end

data/app/models/form_of_work.rb

@@ -1,6 +1,6 @@
 class FormOfWork < ApplicationRecord
   include MasterModel
-  has_many :works, class_name: 'Manifestation'
+  has_many :works, class_name: 'Manifestation' #, dependent: :restrict_with_exception
 end
 
 # == Schema Information

data/app/models/frequency.rb

@@ -1,6 +1,6 @@
 class Frequency < ApplicationRecord
   include MasterModel
-  has_many :manifestations
+  has_many :manifestations, dependent: :restrict_with_exception
 end
 
 # == Schema Information

data/app/models/identifier.rb

@@ -8,7 +8,7 @@ class Identifier < ApplicationRecord
   before_validation :normalize
   before_save :convert_isbn
   scope :id_type, -> type {
-    where(identifier_type: IdentifierType.where(name: type).first)
+    where(identifier_type: IdentifierType.find_by(name: type))
   }
 
   acts_as_list scope: :manifestation_id

data/app/models/import_request.rb

@@ -27,9 +27,8 @@ class ImportRequest < ApplicationRecord
 
   def check_imported
     if isbn.present?
-      identifier_type = IdentifierType.where(name: 'isbn').first
-      identifier_type = IdentifierType.where(name: 'isbn').create! unless identifier_type
-      if Identifier.where(body: isbn, identifier_type_id: identifier_type.id).first.try(:manifestation)
+      identifier_type = IdentifierType.find_by_or_create!(name: 'isbn')
+      if Identifier.find_by(body: isbn, identifier_type_id: identifier_type.id)&.manifestation
         errors.add(:isbn, I18n.t('import_request.isbn_taken'))
       end
     end

data/app/models/item.rb

@@ -66,23 +66,23 @@ class Item < ApplicationRecord
   paginates_per 10
 
   def title
-    manifestation.try(:original_title)
+    manifestation&.original_title
   end
 
   def creator
-    manifestation.try(:creator)
+    manifestation&.creator
   end
 
   def contributor
-    manifestation.try(:contributor)
+    manifestation&.contributor
   end
 
   def publisher
-    manifestation.try(:publisher)
+    manifestation&.publisher
   end
 
   def owned(agent)
-    owns.where(agent_id: agent.id).first
+    owns.find_by(agent_id: agent.id)
   end
 
   def manifestation_url

data/app/models/item_custom_value.rb

@@ -1,6 +1,6 @@
 class ItemCustomValue < ApplicationRecord
   belongs_to :item_custom_property
-  belongs_to :item, required: false
+  belongs_to :item, optional: true
   validates :item_custom_property, uniqueness: {scope: :item_id}
 end
 

data/app/models/manifestation.rb

@@ -5,12 +5,12 @@ class Manifestation < ApplicationRecord
   enju_nii_cinii_books if defined?(EnjuNii)
   enju_bookmark_manifestation_model if defined?(EnjuBookmark)
 
-  has_many :creates, dependent: :destroy, foreign_key: 'work_id'
-  has_many :creators, through: :creates, source: :agent #, order: 'creates.position'
-  has_many :realizes, dependent: :destroy, foreign_key: 'expression_id'
-  has_many :contributors, through: :realizes, source: :agent #, order: 'realizes.position'
-  has_many :produces, dependent: :destroy, foreign_key: 'manifestation_id'
-  has_many :publishers, through: :produces, source: :agent #, order: 'produces.position'
+  has_many :creates, -> { order('creates.position') }, dependent: :destroy, foreign_key: 'work_id'
+  has_many :creators, through: :creates, source: :agent
+  has_many :realizes, -> { order('realizes.position') }, dependent: :destroy, foreign_key: 'expression_id'
+  has_many :contributors, through: :realizes, source: :agent
+  has_many :produces, -> { order('produces.position') }, dependent: :destroy, foreign_key: 'manifestation_id'
+  has_many :publishers, through: :produces, source: :agent
   has_many :items, dependent: :destroy
   has_many :children, foreign_key: 'parent_id', class_name: 'ManifestationRelationship', dependent: :destroy
   has_many :parents, foreign_key: 'child_id', class_name: 'ManifestationRelationship', dependent: :destroy
@@ -518,16 +518,7 @@ class Manifestation < ApplicationRecord
   end
 
   def identifier_contents(name)
-    if Rails::VERSION::MAJOR > 3
-      identifiers.id_type(name).order(:position).pluck(:body)
-    else
-      identifier_type = IdentifierType.find_by(name: name)
-      if identifier_type
-        identifiers.where(identifier_type_id: identifier_type.id).order(:position).pluck(:body)
-      else
-        []
-      end
-    end
+    identifiers.id_type(name).order(:position).pluck(:body)
   end
 
   # CSVのヘッダ
@@ -549,7 +540,7 @@ class Manifestation < ApplicationRecord
       manifestation_identifier: manifestation_identifier,
       creator: creates.map{|create|
         if create.create_type
-          "#{create.agent.full_name}||#{create.creator_type.name}"
+          "#{create.agent.full_name}||#{create.create_type.name}"
         else
           "#{create.agent.full_name}"
         end