enju_biblio 0.2.5 → 0.3.0.beta.2

data/app/models/resource_import_result.rb

@@ -5,8 +5,8 @@ class ResourceImportResult < ActiveRecord::Base
   scope :skipped, -> { where('error_message IS NOT NULL') }
 
   belongs_to :resource_import_file
-  belongs_to :manifestation
-  belongs_to :item
+  belongs_to :manifestation, optional: true
+  belongs_to :item, optional: true
 
   validates_presence_of :resource_import_file_id
 end

data/app/models/series_statement.rb

@@ -1,8 +1,8 @@
 class SeriesStatement < ActiveRecord::Base
   has_many :series_statement_merges, dependent: :destroy
   has_many :series_statement_merge_lists, through: :series_statement_merges
-  belongs_to :manifestation, touch: true
-  belongs_to :root_manifestation, foreign_key: :root_manifestation_id, class_name: 'Manifestation', touch: true
+  belongs_to :manifestation, touch: true, optional: true
+  belongs_to :root_manifestation, foreign_key: :root_manifestation_id, class_name: 'Manifestation', touch: true, optional: true
   validates_presence_of :original_title
   validates :root_manifestation_id, uniqueness: true, allow_nil: true
   before_save :create_root_series_statement

data/app/models/series_statement_merge.rb

@@ -1,6 +1,6 @@
 class SeriesStatementMerge < ActiveRecord::Base
-  belongs_to :series_statement, validate: true
-  belongs_to :series_statement_merge_list, validate: true
+  belongs_to :series_statement
+  belongs_to :series_statement_merge_list
   validates_presence_of :series_statement, :series_statement_merge_list
   validates_associated :series_statement, :series_statement_merge_list
 

data/app/views/agents/index.rss.builder

@@ -11,11 +11,11 @@ xml.rss('version' => "2.0",
     xml.tag! "atom:link", rel: 'self', href: "#{request.protocol}#{request.host_with_port}#{url_for(filtered_params.merge(format: :rss, only_path: true))}"
     xml.tag! "atom:link", rel: 'alternate', href: agents_url
     xml.tag! "atom:link", rel: 'search', type: 'application/opensearchdescription+xml', href: page_opensearch_url
-    unless params[:query].blank?
+    if params[:query].present?
       xml.tag! "opensearch:totalResults", @count[:query_result]
       xml.tag! "opensearch:startIndex", @agents.offset + 1
       xml.tag! "opensearch:itemsPerPage", @agents.per_page
-      xml.tag! "opensearch:Query", role: 'request', :searchTerms => h(params[:query]), :startPage => (h(params[:page]) || 1)
+      xml.tag! "opensearch:Query", role: 'request', searchTerms: h(params[:query]), startPage: (h(params[:page]) || 1)
     end
     @agents.each do |agent|
       xml.item do
@@ -24,7 +24,7 @@ xml.rss('version' => "2.0",
         # rfc822
         xml.pubDate agent.created_at.utc.rfc822
         xml.link agent_url(agent)
-        xml.guid agent_url(agent), :isPermaLink => "true"
+        xml.guid agent_url(agent), isPermaLink: "true"
         #agent.tags.each do |tag|
         #  xml.category tag
         #end

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

@@ -113,7 +113,7 @@
 
 <p>
   <strong><%= t('activerecord.attributes.item.note') -%>:</strong>
-  <%= @item.note %>
+  <%= simple_format(@item.note) %>
 </p>
 
 <p>

data/app/views/manifestations/index.mods.builder

@@ -1,4 +1,4 @@
-xml.instruct! :xml, :version=>"1.0"
+xml.instruct! :xml, version: "1.0"
 xml.modsCollection(
         'xmlns:xsi' => "http://www.w3.org/2001/XMLSchema-instance",
         'xmlns' => "http://www.loc.gov/mods/v3"){

data/app/views/manifestations/index.rss.builder

@@ -12,7 +12,7 @@ xml.rss('version' => "2.0",
     xml.tag! "atom:link", rel: 'self', href: "#{request.protocol}#{request.host_with_port}#{url_for(filtered_params.merge(format: :rss, only_path: true))}"
     xml.tag! "atom:link", rel: 'alternate', href: manifestations_url
     xml.tag! "atom:link", rel: 'search', type: 'application/opensearchdescription+xml', href: page_opensearch_url
-    unless params[:query].blank?
+    if params[:query].present?
       xml.tag! "opensearch:totalResults", @manifestations.total_count
       xml.tag! "opensearch:startIndex", @manifestations.offset_value + 1
       xml.tag! "opensearch:itemsPerPage", @manifestations.limit_value

data/app/views/manifestations/index.sru.builder

@@ -18,7 +18,7 @@ if @sru
 end
 
 def search_retrieve_response!(xml)
-  xml.searchRetrieveResponse :xmlns => "http://www.loc.gov/zing/srw/" do
+  xml.searchRetrieveResponse xmlns: "http://www.loc.gov/zing/srw/" do
     xml.version @version
     xml.numberOfRecords @number_of_records
     extra_response_data!(xml) if @extra_response
@@ -48,9 +48,9 @@ def extra_response_data!(xml)
 end
 
 def lst_tag!(xml, lst_name, tag_name, hash)
-  xml.lst :name => lst_name do
+  xml.lst name: lst_name do
     value_sort(hash).each do |item|
-      xml.tag! tag_name, {:name => item[0]}, item[1]
+      xml.tag! tag_name, {name: item[0]}, item[1]
     end
   end
 end
@@ -96,6 +96,6 @@ def value_sort(hash)
   end
 end
 
-xml = Builder::XmlMarkup.new :indent => 2
-xml.instruct! directive_tag=:xml, :encoding => 'UTF-8'
+xml = Builder::XmlMarkup.new indent: 2
+xml.instruct! directive_tag=:xml, encoding: 'UTF-8'
 search_retrieve_response!(xml)

data/config/routes.rb

@@ -39,9 +39,9 @@ Rails.application.routes.draw do
   resources :manifestation_relationships
 
   resources :resource_import_files
-  resources :resource_import_results, :only => [:index, :show, :destroy]
+  resources :resource_import_results, only: [:index, :show, :destroy]
   resources :agent_import_files
-  resources :agent_import_results, :only => [:index, :show, :destroy]
+  resources :agent_import_results, only: [:index, :show, :destroy]
 
   resources :import_requests
 

data/db/migrate/001_create_agents.rb

@@ -1,4 +1,4 @@
-class CreateAgents < ActiveRecord::Migration
+class CreateAgents < ActiveRecord::Migration[4.2]
   def change
     create_table :agents do |t|
       t.string :last_name
@@ -32,13 +32,13 @@ class CreateAgents < ActiveRecord::Migration
       t.text :region
       t.datetime :date_of_birth
       t.datetime :date_of_death
-      t.integer :language_id, :default => 1, :null => false
-      t.integer :country_id, :default => 1, :null => false
-      t.integer :agent_type_id, :default => 1, :null => false
-      t.integer :lock_version, :default => 0, :null => false
+      t.integer :language_id, default: 1, null: false
+      t.integer :country_id, default: 1, null: false
+      t.integer :agent_type_id, default: 1, null: false
+      t.integer :lock_version, default: 0, null: false
       t.text :note
-      t.integer :required_role_id, :default => 1, :null => false
-      t.integer :required_score, :default => 0, :null => false
+      t.integer :required_role_id, default: 1, null: false
+      t.integer :required_score, default: 0, null: false
       t.text :email
       t.text :url
     end

data/db/migrate/005_create_manifestations.rb

@@ -1,7 +1,7 @@
-class CreateManifestations < ActiveRecord::Migration
+class CreateManifestations < ActiveRecord::Migration[4.2]
   def change
     create_table :manifestations do |t|
-      t.text :original_title, :null => false
+      t.text :original_title, null: false
       t.text :title_alternative
       t.text :title_transcription
       t.string :classification_number
@@ -11,8 +11,8 @@ class CreateManifestations < ActiveRecord::Migration
       t.timestamps
       t.datetime :deleted_at
       t.string :access_address
-      t.integer :language_id, :default => 1, :null => false
-      t.integer :carrier_type_id, :default => 1, :null => false
+      t.integer :language_id, default: 1, null: false
+      t.integer :carrier_type_id, default: 1, null: false
       t.integer :start_page
       t.integer :end_page
       t.integer :height
@@ -25,12 +25,12 @@ class CreateManifestations < ActiveRecord::Migration
       t.string :serial_number_string
       t.integer :edition
       t.text :note
-      t.boolean :repository_content, :default => false, :null => false
-      t.integer :lock_version, :default => 0, :null => false
-      t.integer :required_role_id, :default => 1, :null => false
-      t.integer :required_score, :default => 0, :null => false
-      t.integer :frequency_id, :default => 1, :null => false
-      t.boolean :subscription_master, :default => false, :null => false
+      t.boolean :repository_content, default: false, null: false
+      t.integer :lock_version, default: 0, null: false
+      t.integer :required_role_id, default: 1, null: false
+      t.integer :required_score, default: 0, null: false
+      t.integer :frequency_id, default: 1, null: false
+      t.boolean :subscription_master, default: false, null: false
     end
     #add_index :manifestations, :carrier_type_id
     #add_index :manifestations, :required_role_id

data/db/migrate/006_create_items.rb

@@ -1,18 +1,18 @@
-class CreateItems < ActiveRecord::Migration
+class CreateItems < ActiveRecord::Migration[4.2]
   def change
     create_table :items do |t|
       t.string :call_number
       t.string :item_identifier
       t.timestamps
       t.datetime :deleted_at
-      t.integer :shelf_id, :default => 1, :null => false
-      t.boolean :include_supplements, :default => false, :null => false
+      t.integer :shelf_id, default: 1, null: false
+      t.boolean :include_supplements, default: false, null: false
       t.text :note
       t.string :url
       t.integer :price
-      t.integer :lock_version, :default => 0, :null => false
-      t.integer :required_role_id, :default => 1, :null => false
-      t.integer :required_score, :default => 0, :null => false
+      t.integer :lock_version, default: 0, null: false
+      t.integer :required_role_id, default: 1, null: false
+      t.integer :required_score, default: 0, null: false
     end
     add_index :items, :shelf_id
     add_index :items, :item_identifier

data/db/migrate/012_create_owns.rb

@@ -1,8 +1,8 @@
-class CreateOwns < ActiveRecord::Migration
+class CreateOwns < ActiveRecord::Migration[4.2]
   def change
     create_table :owns do |t|
-      t.references :agent, :null => false
-      t.references :item, :null => false
+      t.references :agent, null: false
+      t.references :item, null: false
       t.integer :position
       t.timestamps
     end

data/db/migrate/015_create_creates.rb

@@ -1,8 +1,8 @@
-class CreateCreates < ActiveRecord::Migration
+class CreateCreates < ActiveRecord::Migration[4.2]
   def change
     create_table :creates do |t|
-      t.references :agent, :null => false
-      t.references :work, :null => false
+      t.references :agent, null: false
+      t.references :work, null: false
       t.integer :position
       t.timestamps
     end

data/db/migrate/047_create_produces.rb

@@ -1,8 +1,8 @@
-class CreateProduces < ActiveRecord::Migration
+class CreateProduces < ActiveRecord::Migration[4.2]
   def change
     create_table :produces do |t|
-      t.references :agent, :null => false
-      t.references :manifestation, :null => false
+      t.references :agent, null: false
+      t.references :manifestation, null: false
       t.integer :position
       t.timestamps
     end

data/db/migrate/073_create_carrier_types.rb

@@ -1,7 +1,7 @@
-class CreateCarrierTypes < ActiveRecord::Migration
+class CreateCarrierTypes < ActiveRecord::Migration[4.2]
   def change
     create_table :carrier_types do |t|
-      t.string :name, :null => false
+      t.string :name, null: false
       t.text :display_name
       t.text :note
       t.integer :position

data/db/migrate/112_create_frequencies.rb

@@ -1,7 +1,7 @@
-class CreateFrequencies < ActiveRecord::Migration
+class CreateFrequencies < ActiveRecord::Migration[4.2]
   def change
     create_table :frequencies do |t|
-      t.string :name, :null => false
+      t.string :name, null: false
       t.text :display_name
       t.text :note
       t.integer :position

data/db/migrate/117_create_form_of_works.rb

@@ -1,7 +1,7 @@
-class CreateFormOfWorks < ActiveRecord::Migration
+class CreateFormOfWorks < ActiveRecord::Migration[4.2]
   def change
     create_table :form_of_works do |t|
-      t.string :name, :null => false
+      t.string :name, null: false
       t.text :display_name
       t.text :note
       t.integer :position

data/db/migrate/125_create_donates.rb

@@ -1,8 +1,8 @@
-class CreateDonates < ActiveRecord::Migration
+class CreateDonates < ActiveRecord::Migration[4.2]
   def change
     create_table :donates do |t|
-      t.integer :agent_id, :null => false
-      t.integer :item_id, :null => false
+      t.integer :agent_id, null: false
+      t.integer :item_id, null: false
 
       t.timestamps
     end

data/db/migrate/133_create_agent_merges.rb

@@ -1,7 +1,7 @@
-class CreateAgentMerges < ActiveRecord::Migration
+class CreateAgentMerges < ActiveRecord::Migration[4.2]
   def self.up
     create_table :agent_merges do |t|
-      t.integer :agent_id, :agent_merge_list_id, :null => false
+      t.integer :agent_id, :agent_merge_list_id, null: false
 
       t.timestamps
     end

data/db/migrate/134_create_agent_merge_lists.rb

@@ -1,4 +1,4 @@
-class CreateAgentMergeLists < ActiveRecord::Migration
+class CreateAgentMergeLists < ActiveRecord::Migration[4.2]
   def self.up
     create_table :agent_merge_lists do |t|
       t.string :title

data/db/migrate/20080830154109_create_realizes.rb

@@ -1,8 +1,8 @@
-class CreateRealizes < ActiveRecord::Migration
+class CreateRealizes < ActiveRecord::Migration[4.2]
   def change
     create_table :realizes do |t|
-      t.references :agent, :null => false
-      t.references :expression, :null => false
+      t.references :agent, null: false
+      t.references :expression, null: false
       t.integer :position
 
       t.timestamps

data/db/migrate/20080905191442_create_agent_types.rb

@@ -1,7 +1,7 @@
-class CreateAgentTypes < ActiveRecord::Migration
+class CreateAgentTypes < ActiveRecord::Migration[4.2]
   def change
     create_table :agent_types do |t|
-      t.string :name, :null => false
+      t.string :name, null: false
       t.text :display_name
       t.text :note
       t.integer :position

data/db/migrate/20081025083323_create_countries.rb

@@ -1,4 +1,4 @@
-class CreateCountries < ActiveRecord::Migration
+class CreateCountries < ActiveRecord::Migration[4.2]
 
   # ISO 3166 is the International Standard for country codes.
   #
@@ -12,11 +12,11 @@ class CreateCountries < ActiveRecord::Migration
 
   def change
     create_table :countries do |t|
-      t.string :name,         :size => 80, :null => false
+      t.string :name,         size: 80, null: false
       t.text :display_name
-      t.string :alpha_2,      :size => 2
-      t.string :alpha_3,      :size => 3
-      t.string :numeric_3, :size => 3
+      t.string :alpha_2,      size: 2
+      t.string :alpha_3,      size: 3
+      t.string :numeric_3, size: 3
       t.text :note
       t.integer :position
     end

data/db/migrate/20081025083905_create_languages.rb

@@ -1,4 +1,4 @@
-class CreateLanguages < ActiveRecord::Migration
+class CreateLanguages < ActiveRecord::Migration[4.2]
 
   # ISO 639 is the set of international standards that lists short codes for language names.
   # Note this doesn't include macrolanguages (dialects)
@@ -6,16 +6,16 @@ class CreateLanguages < ActiveRecord::Migration
 
   def change
     create_table :languages do |t|
-      t.string :name, :null => false
+      t.string :name, null: false
       t.string :native_name
       t.text :display_name
-      t.string :iso_639_1,        :size => 3
-      t.string :iso_639_2,        :size => 3
-      t.string :iso_639_3,        :size => 3
+      t.string :iso_639_1,        size: 3
+      t.string :iso_639_2,        size: 3
+      t.string :iso_639_3,        size: 3
       t.text :note
       t.integer :position
     end
-    add_index :languages, :name, :unique => true
+    add_index :languages, :name, unique: true
     add_index :languages, :iso_639_1
     add_index :languages, :iso_639_2
     add_index :languages, :iso_639_3

data/db/migrate/20081027150907_create_picture_files.rb

@@ -1,4 +1,4 @@
-class CreatePictureFiles < ActiveRecord::Migration
+class CreatePictureFiles < ActiveRecord::Migration[4.2]
   def change
     create_table :picture_files do |t|
       t.integer :picture_attachable_id
@@ -10,6 +10,6 @@ class CreatePictureFiles < ActiveRecord::Migration
 
       t.timestamps
     end
-    add_index :picture_files, [:picture_attachable_id, :picture_attachable_type], :name => "index_picture_files_on_picture_attachable_id_and_type"
+    add_index :picture_files, [:picture_attachable_id, :picture_attachable_type], name: "index_picture_files_on_picture_attachable_id_and_type"
   end
 end

data/db/migrate/20081028083142_create_agent_import_files.rb

@@ -1,4 +1,4 @@
-class CreateAgentImportFiles < ActiveRecord::Migration
+class CreateAgentImportFiles < ActiveRecord::Migration[4.2]
   def change
     create_table :agent_import_files do |t|
       t.integer :parent_id

data/db/migrate/20081028083208_create_resource_import_files.rb

@@ -1,4 +1,4 @@
-class CreateResourceImportFiles < ActiveRecord::Migration
+class CreateResourceImportFiles < ActiveRecord::Migration[4.2]
   def change
     create_table :resource_import_files do |t|
       t.integer :parent_id

data/db/migrate/20090705133942_add_attachments_picture_to_picture_file.rb

@@ -1,4 +1,4 @@
-class AddAttachmentsPictureToPictureFile < ActiveRecord::Migration
+class AddAttachmentsPictureToPictureFile < ActiveRecord::Migration[4.2]
   def self.up
     add_column :picture_files, :picture_file_name, :string
     add_column :picture_files, :picture_content_type, :string

data/db/migrate/20090705212043_add_attachments_attachment_to_manifestation.rb

@@ -1,4 +1,4 @@
-class AddAttachmentsAttachmentToManifestation < ActiveRecord::Migration
+class AddAttachmentsAttachmentToManifestation < ActiveRecord::Migration[4.2]
   def self.up
     add_column :manifestations, :attachment_file_name, :string
     add_column :manifestations, :attachment_content_type, :string

data/db/migrate/20090720091106_create_medium_of_performances.rb

@@ -1,7 +1,7 @@
-class CreateMediumOfPerformances < ActiveRecord::Migration
+class CreateMediumOfPerformances < ActiveRecord::Migration[4.2]
   def change
     create_table :medium_of_performances do |t|
-      t.string :name, :null => false
+      t.string :name, null: false
       t.text :display_name
       t.text :note
       t.integer :position