enju_biblio 0.3.8 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14f03cf53c6970882201d12cf5dce14dcd8299abe9b86a85395fc7a5469c0e65
-  data.tar.gz: 62953ed2450999eb1622b5552d84fd845e6332de65ba4bd4b853a95fff5c5af3
+  metadata.gz: 26edca170abbc3255a6a2f00579b4da714df3bbe174873e4b110c79da9c59a87
+  data.tar.gz: 2e7d74038d3e5bfb1f2fb44f54a6e86aad624b84e8f20c55cb818a4bf74e8bf0
 SHA512:
-  metadata.gz: ce8d9794d43731afcd91bdc6e84a5f49ef3f98ab17a80016b306956fc4ecfebec23a9f7ace9e992d1cea0eb8d76d2a12ef9c151edc773d587bf7db75787f642a
-  data.tar.gz: 6981d61da93ea05bb04bb3d218b6152bc2db9bbed3365049748fc7df5442d82ef2ae5de904d3cf3f479bdadd67346d31f52bba1f03fffe181cc2f6114dc79aa8
+  metadata.gz: b6e053f60b7a611c81ddc0b052def4209d96d1fd23044dc81296dc755e19409d64b625109f34da67588c7984fce670cc4b74973b99af927a459ea910b6d9f4c5
+  data.tar.gz: 1d920ee17e99acf17fd92e18ff3186139daf93940e1be813b5b1f99ffdc0d008029bde5735c05a4978363b185d32090b4f683f3abc63786d7641285f903924f2

data/app/controllers/items_controller.rb

@@ -274,10 +274,6 @@ class ItemsController < ApplicationController
       :binding_item_identifier, :binding_call_number, :binded_at,
       :use_restriction_id, :memo,
       {item_has_use_restriction_attributes: :use_restriction_id}, # EnjuCirculation
-      {custom_properties_attributes: [
-        :id, :label, :value,
-        :_destroy
-      ]}
     )
   end
 

data/app/controllers/manifestations_controller.rb

@@ -355,8 +355,8 @@ class ManifestationsController < ApplicationController
   # GET /manifestations/new.json
   def new
     @manifestation = Manifestation.new
-    @manifestation.language = Language.where(iso_639_1: @locale).first
-    @parent = Manifestation.where(id: params[:parent_id]).first if params[:parent_id].present?
+    @manifestation.language = Language.find_by(iso_639_1: @locale)
+    @parent = Manifestation.find_by(id: params[:parent_id]) if params[:parent_id].present?
     if @parent
       @manifestation.parent_id = @parent.id
       [ :original_title, :title_transcription,
@@ -549,10 +549,6 @@ class ManifestationsController < ApplicationController
       {identifiers_attributes: [
         :id, :body, :identifier_type_id,
         :_destroy
-      ]},
-      {custom_properties_attributes: [
-        :id, :label, :value,
-        :_destroy
       ]}
     )
   end
@@ -783,7 +779,7 @@ class ManifestationsController < ApplicationController
     if options[:pub_date_from].blank?
       pub_date[:from] = "*"
     else
-      year = options[:pub_date_from].rjust(4, "0")
+      year = options[:pub_date_from].to_s.gsub(/\D/, '').rjust(4, "0")
       if year.length == 4
         pub_date[:from] = Time.zone.parse(Time.utc(year).to_s).beginning_of_year.utc.iso8601
       else
@@ -797,7 +793,7 @@ class ManifestationsController < ApplicationController
     if options[:pub_date_until].blank?
       pub_date[:until] = "*"
     else
-      year = options[:pub_date_until].rjust(4, "0")
+      year = options[:pub_date_until].to_s.gsub(/\D/, '').rjust(4, "0")
       if year.length == 4
         pub_date[:until] = Time.zone.parse(Time.utc(year).to_s).end_of_year.utc.iso8601
       else
@@ -812,8 +808,6 @@ class ManifestationsController < ApplicationController
 
   def set_pub_date(query, options)
     unless options[:pub_date_from].blank? && options[:pub_date_until].blank?
-      options[:pub_date_from].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[:until]}]"
     end

data/app/models/agent.rb

@@ -76,7 +76,7 @@ class Agent < ApplicationRecord
   paginates_per 10
 
   def set_role_and_name
-    self.required_role = Role.where(name: 'Librarian').first if required_role_id.nil?
+    self.required_role = Role.find_by(name: 'Librarian') if required_role_id.nil?
     set_full_name
   end
 
@@ -202,15 +202,15 @@ class Agent < ApplicationRecord
   end
 
   def created(work)
-    creates.where(work_id: work.id).first
+    creates.find_by(work_id: work.id)
   end
 
   def realized(expression)
-    realizes.where(expression_id: expression.id).first
+    realizes.find_by(expression_id: expression.id)
   end
 
   def produced(manifestation)
-    produces.where(manifestation_id: manifestation.id).first
+    produces.find_by(manifestation_id: manifestation.id)
   end
 
   def owned(item)
@@ -222,7 +222,7 @@ class Agent < ApplicationRecord
     agent_lists.each do |agent_list|
       name_and_role = agent_list[:full_name].split('||')
       if agent_list[:agent_identifier].present?
-        agent = Agent.where(agent_identifier: agent_list[:agent_identifier]).first
+        agent = Agent.find_by(agent_identifier: agent_list[:agent_identifier])
       else
         agents_matched = Agent.where(full_name: name_and_role[0])
         agents_matched = agents_matched.where(place: agent_list[:place]) if agent_list[:place]
@@ -237,7 +237,7 @@ class Agent < ApplicationRecord
           place: agent_list[:place],
           language_id: 1,
         )
-        agent.required_role = Role.where(name: 'Guest').first
+        agent.required_role = Role.find_by(name: 'Guest')
         agent.save
       end
       agents << agent

data/app/models/agent_import_file.rb

@@ -116,7 +116,7 @@ class AgentImportFile < ApplicationRecord
     rows.each do |row|
       row_num += 1
       next if row['dummy'].to_s.strip.present?
-      agent = Agent.where(id: row['id']).first
+      agent = Agent.find_by(id: row['id'])
       if agent
         agent.full_name = row['full_name'] if row['full_name'].to_s.strip.present?
         agent.full_name_transcription = row['full_name_transcription'] if row['full_name_transcription'].to_s.strip.present?
@@ -151,7 +151,7 @@ class AgentImportFile < ApplicationRecord
     rows.each do |row|
       row_num += 1
       next if row['dummy'].to_s.strip.present?
-      agent = Agent.where(id: row['id'].to_s.strip).first
+      agent = Agent.find_by(id: row['id'].to_s.strip)
       if agent
         agent.picture_files.destroy_all
         agent.reload
@@ -225,15 +225,15 @@ class AgentImportFile < ApplicationRecord
 
     #if row['username'].to_s.strip.blank?
       agent.email = row['email'].to_s.strip
-      agent.required_role = Role.where(name: row['required_role'].to_s.strip.camelize).first || Role.where(name: 'Guest').first
+      agent.required_role = Role.find_by(name: row['required_role'].to_s.strip.camelize) || Role.find_by(name: 'Guest')
     #else
     #  agent.required_role = Role.where(name: row['required_role'].to_s.strip.camelize).first || Role.where('Librarian').first
     #end
-    language = Language.where(name: row['language'].to_s.strip.camelize).first
-    language = Language.where(iso_639_2: row['language'].to_s.strip.downcase).first unless language
-    language = Language.where(iso_639_1: row['language'].to_s.strip.downcase).first unless language
+    language = Language.find_by(name: row['language'].to_s.strip.camelize)
+    language = Language.find_by(iso_639_2: row['language'].to_s.strip.downcase) unless language
+    language = Language.find_by(iso_639_1: row['language'].to_s.strip.downcase) unless language
     agent.language = language if language
-    country = Country.where(name: row['country'].to_s.strip).first
+    country = Country.find_by(name: row['country'].to_s.strip)
     agent.country = country if country
     agent
   end

data/app/models/item.rb

@@ -19,8 +19,6 @@ class Item < ApplicationRecord
   belongs_to :budget_type, optional: true
   has_one :accept, dependent: :destroy
   has_one :withdraw, dependent: :destroy
-  has_many :custom_properties, as: :resource, dependent: :destroy
-  accepts_nested_attributes_for :custom_properties, allow_destroy: true, reject_if: :all_blank
   scope :accepted_between, lambda{|from, to| includes(:accept).where('items.created_at BETWEEN ? AND ?', Time.zone.parse(from).beginning_of_day, Time.zone.parse(to).end_of_day)}
 
   belongs_to :shelf, counter_cache: true
@@ -124,16 +122,6 @@ class Item < ApplicationRecord
         memo: memo
       })
 
-      # 最もカスタム項目の多い資料について、カスタム項目の個数を取得する
-      ActiveRecord::Base.connection.execute('SELECT max(record_count) FROM (SELECT count(*) AS record_count, resource_id, resource_type FROM custom_properties GROUP BY resource_id, resource_type) AS type_count ;').first.values[0].to_i.times do |i|
-        property = custom_properties[i]
-        if property
-          record[:"item_custom_property_#{i + 1}"] = "#{property.label}: #{property.value}"
-        else
-          record[:"item_custom_property_#{i + 1}"] = nil
-        end
-      end
-
       if defined?(EnjuCirculation)
         record.merge!({
           use_restriction: use_restriction.try(:name),

data/app/models/manifestation.rb

@@ -25,13 +25,11 @@ class Manifestation < ApplicationRecord
   belongs_to :required_role, class_name: 'Role', foreign_key: 'required_role_id'
   has_one :resource_import_result
   has_many :identifiers, dependent: :destroy
-  has_many :custom_properties, as: :resource, dependent: :destroy
   accepts_nested_attributes_for :creators, allow_destroy: true, reject_if: :all_blank
   accepts_nested_attributes_for :contributors, allow_destroy: true, reject_if: :all_blank
   accepts_nested_attributes_for :publishers, allow_destroy: true, reject_if: :all_blank
   accepts_nested_attributes_for :series_statements, allow_destroy: true, reject_if: :all_blank
   accepts_nested_attributes_for :identifiers, allow_destroy: true, reject_if: :all_blank
-  accepts_nested_attributes_for :custom_properties, allow_destroy: true, reject_if: :all_blank
 
   searchable do
     text :title, default_boost: 2 do
@@ -608,16 +606,6 @@ class Manifestation < ApplicationRecord
       record.merge!({
         memo: memo
       })
-
-      # 最もカスタム項目の多い資料について、カスタム項目の個数を取得する
-      ActiveRecord::Base.connection.execute('SELECT max(record_count) FROM (SELECT count(*) AS record_count, resource_id, resource_type FROM custom_properties GROUP BY resource_id, resource_type) AS type_count ;').first.values[0].to_i.times do |i|
-        property = custom_properties[i]
-        if property
-          record[:"manifestation_custom_property_#{i + 1}"] = "#{property.label}: #{property.value}"
-        else
-          record[:"manifestation_custom_property_#{i + 1}"] = nil
-        end
-      end
     end
 
     if defined?(EnjuSubject)

data/app/models/resource_import_file.rb

@@ -318,28 +318,28 @@ class ResourceImportFile < ApplicationRecord
           fetch(row, edit_mode: 'update')
         end
 
-        if defined?(EnjuCirculation)
-          circulation_status = CirculationStatus.find_by(name: row['circulation_status'])
-          checkout_type = CheckoutType.find_by(name: row['checkout_type'])
-          use_restriction = UseRestriction.find_by(name: row['use_restriction'].to_s.strip)
-        end
-
         shelf = Shelf.find_by(name: row['shelf'].to_s.strip)
         bookstore = Bookstore.find_by(name: row['bookstore'])
         required_role = Role.find_by(name: row['required_role'])
 
         item.shelf = shelf if shelf
-        item.circulation_status = circulation_status if circulation_status
-        item.checkout_type = checkout_type if checkout_type
         item.bookstore = bookstore if bookstore
         item.required_role = required_role if required_role
-        item.use_restriction = use_restriction if use_restriction
 
         acquired_at = Time.zone.parse(row['acquired_at']) rescue nil
         binded_at = Time.zone.parse(row['binded_at']) rescue nil
         item.acquired_at = acquired_at if acquired_at
         item.binded_at = binded_at if binded_at
 
+        if defined?(EnjuCirculation)
+          circulation_status = CirculationStatus.find_by(name: row['circulation_status'])
+          checkout_type = CheckoutType.find_by(name: row['checkout_type'])
+          use_restriction = UseRestriction.find_by(name: row['use_restriction'].to_s.strip)
+          item.circulation_status = circulation_status if circulation_status
+          item.checkout_type = checkout_type if checkout_type
+          item.use_restriction = use_restriction if use_restriction
+        end
+
         item_columns = %w(
           call_number
           binding_item_identifier binding_call_number binded_at
@@ -608,13 +608,13 @@ class ResourceImportFile < ApplicationRecord
     end
 
     # TODO: 小数点以下の表現
-    language = Language.where(name: row['language'].to_s.strip.camelize).first
-    language = Language.where(iso_639_2: row['language'].to_s.strip.downcase).first unless language
-    language = Language.where(iso_639_1: row['language'].to_s.strip.downcase).first unless language
+    language = Language.find_by(name: row['language'].to_s.strip.camelize)
+    language = Language.find_by(iso_639_2: row['language'].to_s.strip.downcase) unless language
+    language = Language.find_by(iso_639_1: row['language'].to_s.strip.downcase) unless language
     
-    carrier_type = CarrierType.where(name: row['carrier_type'].to_s.strip).first
-    content_type = ContentType.where(name: row['content_type'].to_s.strip).first
-    frequency = Frequency.where(name: row['frequency'].to_s.strip).first
+    carrier_type = CarrierType.find_by(name: row['carrier_type'].to_s.strip)
+    content_type = ContentType.find_by(name: row['content_type'].to_s.strip)
+    frequency = Frequency.find_by(name: row['frequency'].to_s.strip)
 
     fulltext_content = serial = nil
     if %w(t true).include?(row['fulltext_content'].to_s.downcase.strip)

data/app/views/agent_import_results/index.txt.ruby

@@ -0,0 +1,5 @@
+CSV.generate(col_sep: "\t", row_sep: "\r\n") do |csv|
+  @agent_import_results.each_with_index do |result|
+    csv << result.body.split("\t")
+  end
+end

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

@@ -3,7 +3,7 @@
 
   <div class="field">
     <%= f.label :name %><br />
-    <%= f.text_field :name %>
+    <%= f.text_field :name, required: true %>
   </div>
   <div class="field">
     <%= f.label :display_name %><br />

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

@@ -4,7 +4,7 @@
 
   <div class="field">
     <%= f.label :name %><br />
-    <%= f.text_field :name %>
+    <%= f.text_field :name, required: true %>
   </div>
   <div class="field">
     <%= f.label :display_name %><br />

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

@@ -3,7 +3,7 @@
 
   <div class="field">
     <%= f.label :name %><br />
-    <%= f.text_field :name %>
+    <%= f.text_field :name, required: true %>
   </div>
   <div class="field">
     <%= f.label :display_name %><br />

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

@@ -3,7 +3,7 @@
 
   <div class="field">
     <%= f.label :name %><br />
-    <%= f.text_field :name %>
+    <%= f.text_field :name, required: true %>
   </div>
   <div class="field">
     <%= f.label :display_name %><br />

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

@@ -3,7 +3,7 @@
 
   <div class="field">
     <%= f.label :name %><br />
-    <%= f.text_field :name %>
+    <%= f.text_field :name, required: true %>
   </div>
   <div class="field">
     <%= f.label :display_name %><br />

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

@@ -3,7 +3,7 @@
 
   <div class="field">
     <%= f.label :name %><br />
-    <%= f.text_field :name %>
+    <%= f.text_field :name, required: true %>
   </div>
   <div class="field">
     <%= f.label :display_name %><br />

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

@@ -89,16 +89,6 @@
     <%= f.text_field :binding_item_identifier, class: 'resource_identifier' -%>
   </div>
 
-  <div class="field">
-    <%= f.label :custom_property -%><br />
-    <%= f.fields_for :custom_properties do |custom_property_form| %>
-      <%= render 'custom_property_fields', f: custom_property_form %>
-    <% end %>
-    <div class="links">
-      <p><%= link_to_add_association t('page.add'), f, :custom_properties %></p>
-    </div>
-  </div>
-
   <div class="field">
     <%= f.label :note -%><br />
     <%= f.text_area :note, class: 'resource_textarea' -%>

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

@@ -112,13 +112,6 @@
 </p>
 
 <% if current_user.try(:has_role?, 'Librarian') %>
-  <% @item.custom_properties.each do |custom_property| %>
-    <p>
-      <strong><%= custom_property.label -%>:</strong>
-      <%= custom_property.value -%>
-    </p>
-  <% end %>
-
   <p>
     <strong><%= t('activerecord.attributes.item.memo') -%>:</strong>
     <%= simple_format(@item.memo) %>

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

@@ -3,7 +3,7 @@
 
   <div class="field">
     <%= f.label :name %><br />
-    <%= f.text_field :name %>
+    <%= f.text_field :name, required: true %>
   </div>
   <div class="field">
     <%= f.label :display_name %><br />

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

@@ -3,7 +3,7 @@
 
   <div class="field">
     <%= f.label :name %><br />
-    <%= f.text_field :name %>
+    <%= f.text_field :name, required: true %>
   </div>
   <div class="field">
     <%= f.label :display_name %><br />

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

@@ -192,16 +192,6 @@
     <%= f.text_area :description, class: 'resource_textarea' -%>
   </div>
 
-  <div class="field">
-    <%= f.label :custom_property -%><br />
-    <%= f.fields_for :custom_properties do |custom_property_form| %>
-      <%= render 'custom_property_fields', f: custom_property_form %>
-    <% end %>
-    <div class="links">
-      <p><%= link_to_add_association t('page.add'), f, :custom_properties %></p>
-    </div>
-  </div>
-
   <div class="field">
     <%= f.label :note -%><br />
     <%= f.text_area :note, class: 'resource_textarea' -%>

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

@@ -101,14 +101,6 @@
             <%= raw simple_format(h(manifestation.description)) -%>
           </td>
         </tr>
-        <% @manifestation.custom_properties.each do |custom_property| %>
-          <tr>
-            <td><%= custom_property.label -%>:</td>
-            <td>
-              <%= custom_property.value -%>
-            </td>
-          </tr>
-        <% end %>
         <tr>
           <td><%= t('activerecord.attributes.manifestation.note') -%>:</td>
           <td>

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

@@ -3,7 +3,7 @@
 
   <div class="field">
     <%= f.label :name %><br />
-    <%= f.text_field :name %>
+    <%= f.text_field :name, required: true %>
   </div>
   <div class="field">
     <%= f.label :display_name %><br />

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

@@ -3,7 +3,7 @@
 
   <div class="field">
     <%= f.label :name %><br />
-    <%= f.text_field :name %>
+    <%= f.text_field :name, required: true %>
   </div>
   <div class="field">
     <%= f.label :display_name %><br />

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

@@ -3,7 +3,7 @@
 
   <div class="field">
     <%= f.label :name %><br />
-    <%= f.text_field :name %>
+    <%= f.text_field :name, required: true %>
   </div>
   <div class="field">
     <%= f.label :display_name %><br />