enju_biblio 0.1.0.pre58 → 0.1.0.pre59

data/app/controllers/series_statement_merges_controller.rb

@@ -0,0 +1,90 @@
+class SeriesStatementMergesController < ApplicationController
+  load_and_authorize_resource
+  before_filter :get_series_statement, :get_series_statement_merge_list
+
+  # GET /series_statement_merges
+  # GET /series_statement_merges.json
+  def index
+    if @series_statement
+      @series_statement_merges = @series_statement.series_statement_merges.order('series_statement_merges.id').page(params[:page])
+    elsif @series_statement_merge_list
+      @series_statement_merges = @series_statement_merge_list.series_statement_merges.order('series_statement_merges.id').includes(:series_statement).page(params[:page])
+    else
+      @series_statement_merges = SeriesStatementMerge.page(params[:page])
+    end
+
+    respond_to do |format|
+      format.html # index.html.erb
+      format.json { render json: @series_statement_merges }
+    end
+  end
+
+  # GET /series_statement_merges/1
+  # GET /series_statement_merges/1.json
+  def show
+    respond_to do |format|
+      format.html # show.html.erb
+      format.json { render json: @series_statement_merge }
+    end
+  end
+
+  # GET /series_statement_merges/new
+  # GET /series_statement_merges/new.json
+  def new
+    @series_statement_merge = SeriesStatementMerge.new
+    @series_statement_merge.series_statement = @series_statement
+    @series_statement_merge.series_statement_merge_list = @series_statement_merge_list
+
+    respond_to do |format|
+      format.html # new.html.erb
+      format.json { render json: @series_statement_merge }
+    end
+  end
+
+  # GET /series_statement_merges/1/edit
+  def edit
+  end
+
+  # POST /series_statement_merges
+  # POST /series_statement_merges.json
+  def create
+    @series_statement_merge = SeriesStatementMerge.new(params[:series_statement_merge])
+
+    respond_to do |format|
+      if @series_statement_merge.save
+        flash[:notice] = t('controller.successfully_created', model: t('activerecord.models.series_statement_merge'))
+        format.html { redirect_to(@series_statement_merge) }
+        format.json { render json: @series_statement_merge, status: :created, location: @series_statement_merge }
+      else
+        format.html { render action: "new" }
+        format.json { render json: @series_statement_merge.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # PUT /series_statement_merges/1
+  # PUT /series_statement_merges/1.json
+  def update
+    respond_to do |format|
+      if @series_statement_merge.update_attributes(params[:series_statement_merge])
+        flash[:notice] = t('controller.successfully_updated', model: t('activerecord.models.series_statement_merge'))
+        format.html { redirect_to(@series_statement_merge) }
+        format.json { head :no_content }
+      else
+        format.html { render action: "edit" }
+        format.json { render json: @series_statement_merge.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # DELETE /series_statement_merges/1
+  # DELETE /series_statement_merges/1.json
+  def destroy
+    @series_statement_merge.destroy
+
+    respond_to do |format|
+      format.html { redirect_to(series_statement_merges_url) }
+      format.json { head :no_content }
+    end
+  end
+end

data/app/controllers/series_statements_controller.rb

@@ -3,9 +3,7 @@ class SeriesStatementsController < ApplicationController
   load_and_authorize_resource
   before_filter :get_manifestation, except: [:create, :update, :destroy]
   after_filter :solr_commit, only: [:create, :update, :destroy]
-  if defined?(EnjuResourceMerge)
-    before_filter :get_series_statement_merge_list, except: [:create, :update, :destroy]
-  end
+  before_filter :get_series_statement_merge_list, except: [:create, :update, :destroy]
 
   # GET /series_statements
   # GET /series_statements.json

data/app/helpers/manifestations_helper.rb

@@ -14,13 +14,13 @@ module ManifestationsHelper
 
   def back_to_manifestation_index
     if session[:params]
-      params = session[:params].merge(:view => nil, :controller => :manifestations)
+      params = session[:params].merge(view: nil, controller: :manifestations)
       link_to t('page.back_to_search_results'), url_for(params)
     else
       link_to t('page.back'), :back
     end
   #rescue
-  #  link_to t('page.listing', :model => t('activerecord.models.manifestation')), manifestations_path
+  #  link_to t('page.listing', model: t('activerecord.models.manifestation')), manifestations_path
   end
 
   def call_number_label(item)
@@ -32,7 +32,7 @@ module ManifestationsHelper
         numbers.each do |number|
           call_numbers << h(number.to_s)
         end
-        render :partial => 'manifestations/call_number', :locals => {:item => item, :call_numbers => call_numbers}
+        render partial: 'manifestations/call_number', locals: { item: item, call_numbers: call_numbers }
       end
     end
   end
@@ -71,54 +71,54 @@ 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(params.merge(:page => nil, :language => language.name, :view => nil, :only_path => true)))
+        link_to("#{language.display_name.localize} (" + facet.count.to_s + ")", url_for(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(params.merge(:page => nil, :language => language.name, :view => nil, :only_path => true)))
+      link_to("#{language.display_name.localize} (" + facet.count.to_s + ")", url_for(params.merge(page: nil, language: language.name, view: nil, only_path: true)))
     end
   end
 
   def library_facet(current_libraries, facet)
-    library = Library.where(:name => facet.value).select([:name, :display_name]).first
+    library = Library.where(name: facet.value).select([:name, :display_name]).first
     return nil unless library
     string = ''
     current = true if current_libraries.include?(library.name)
     content_tag :li do
       if current
         content_tag :strong do
-          link_to("#{library.display_name.localize} (" + facet.count.to_s + ")", url_for(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(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(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(params.merge(page: nil, library: (current_libraries << library.name).uniq.join(' '), view: nil, only_path: true)))
       end
     end
   end
 
   def carrier_type_facet(facet)
     string = ''
-    carrier_type = CarrierType.where(:name => facet.value).select([:name, :display_name]).first
+    carrier_type = CarrierType.where(name: facet.value).select([:name, :display_name]).first
     if carrier_type
       string << form_icon(carrier_type)
       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(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(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(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(params.merge(carrier_type: carrier_type.name, page: nil, view: nil, only_path: true)))
       end
     end
   end
 
   def pub_year_facet(pub_date_from, pub_date_to, facet)
     string = ''
-    current = true if facet.value.first.to_i == pub_date_from.to_i and facet.value.last.to_i - 1 == pub_date_to.to_i
+    current = true if facet.value.first.to_i == pub_date_from.to_i && facet.value.last.to_i - 1 == pub_date_to.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(params.merge(:pub_date_from => facet.value.first.to_i, :pub_date_to => 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(params.merge(pub_date_from: facet.value.first.to_i, pub_date_to: 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(params.merge(:pub_date_from => facet.value.first.to_i, :pub_date_to => 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(params.merge(pub_date_from: facet.value.first.to_i, pub_date_to: facet.value.last.to_i - 1, page: nil, view: nil, only_path: true)))
     end
   end
 
@@ -127,7 +127,7 @@ module ManifestationsHelper
     if manifestation.volume_number_string?
       title << " " + manifestation.volume_number_string
     end
-    if manifestation.periodical?
+    if manifestation.serial?
       if manifestation.issue_number_string?
         title <<  " (#{manifestation.issue_number_string})"
       end
@@ -141,9 +141,9 @@ module ManifestationsHelper
   if defined?(EnjuBookmark)
     def link_to_bookmark(manifestation)
       if manifestation.bookmarked?(current_user)
-        link_to t('bookmark.remove_from_my_bookmark'), bookmark_path(Bookmark.where(:user_id => current_user.id, :manifestation_id => manifestation.id).first), :confirm => t('page.are_you_sure'), :method => :delete
+        link_to t('bookmark.remove_from_my_bookmark'), bookmark_path(Bookmark.where(user_id: current_user.id, manifestation_id: manifestation.id).first), confirm: t('page.are_you_sure'), method: :delete
       else
-        link_to t('bookmark.add_to_my_bookmark'), new_bookmark_path(:bookmark => {:url => manifestation_url(manifestation)})
+        link_to t('bookmark.add_to_my_bookmark'), new_bookmark_path(bookmark: {url: manifestation_url(manifestation)})
       end
     end
   end

data/app/models/agent.rb

@@ -10,7 +10,7 @@ class Agent < ActiveRecord::Base
     :full_name_alternative_transcription, :title,
     :agent_identifier
 
-  scope :readable_by, lambda{|user| {:conditions => ['required_role_id <= ?', user.try(:user_has_role).try(:role_id) || Role.where(name: 'Guest').select(:id).first.id]}}
+  scope :readable_by, lambda{ |user| where('required_role_id <= ?', user.try(:user_has_role).try(:role_id)) || Role.where(name: 'Guest').select(:id).first.id }
   has_many :creates, dependent: :destroy
   has_many :works, through: :creates
   has_many :realizes, dependent: :destroy
@@ -26,10 +26,8 @@ class Agent < ActiveRecord::Base
   has_many :donated_items, through: :donates, source: :item
   has_many :owns, dependent: :destroy
   has_many :items, through: :owns
-  if defined?(EnjuResourceMerge)
-    has_many :agent_merges, dependent: :destroy
-    has_many :agent_merge_lists, through: :agent_merges
-  end
+  has_many :agent_merges, dependent: :destroy
+  has_many :agent_merge_lists, through: :agent_merges
   belongs_to :agent_type
   belongs_to :required_role, class_name: 'Role', foreign_key: 'required_role_id', validate: true
   belongs_to :language
@@ -38,10 +36,10 @@ class Agent < ActiveRecord::Base
 
   validates_presence_of :language, :agent_type, :country
   validates_associated :language, :agent_type, :country
-  validates :full_name, presence: true, length: {:maximum => 255}
-  validates :birth_date, format: {with: /\A\d+(-\d{0,2}){0,2}\z/}, allow_blank: true
-  validates :death_date, format: {with: /\A\d+(-\d{0,2}){0,2}\z/}, allow_blank: true
-  validates :email, format: {with: /\A([\w\.%\+\-]+)@([\w\-]+\.)+([\w]{2,})\z/i}, allow_blank: true
+  validates :full_name, presence: true, length: { maximum: 255 }
+  validates :birth_date, format: { with: /\A\d+(-\d{0,2}){0,2}\z/ }, allow_blank: true
+  validates :death_date, format: { with: /\A\d+(-\d{0,2}){0,2}\z/ }, allow_blank: true
+  validates :email, format: { with: /\A([\w\.%\+\-]+)@([\w\-]+\.)+([\w]{2,})\z/i }, allow_blank: true
   validate :check_birth_date
   before_validation :set_role_and_name, on: :create
   before_save :set_date_of_birth, :set_date_of_death
@@ -71,7 +69,7 @@ class Agent < ActiveRecord::Base
     integer :work_ids, multiple: true
     integer :expression_ids, multiple: true
     integer :manifestation_ids, multiple: true
-    integer :agent_merge_list_ids, multiple: true if defined?(EnjuResourceMerge)
+    integer :agent_merge_list_ids, multiple: true
     integer :original_agent_ids, multiple: true
     integer :required_role_id
     integer :agent_type_id
@@ -80,22 +78,22 @@ class Agent < ActiveRecord::Base
   paginates_per 10
 
   def set_role_and_name
-    self.required_role = Role.where(name: 'Librarian').first if self.required_role_id.nil?
+    self.required_role = Role.where(name: 'Librarian').first if required_role_id.nil?
     set_full_name
   end
 
   def set_full_name
-    if self.full_name.blank?
-      if self.last_name.to_s.strip and self.first_name.to_s.strip and Setting.family_name_first == true
+    if full_name.blank?
+      if last_name.to_s.strip && first_name.to_s.strip && Setting.family_name_first == true
         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
       end
     end
-    if self.full_name_transcription.blank?
+    if full_name_transcription.blank?
       self.full_name_transcription = [last_name_transcription, middle_name_transcription, first_name_transcription].join(" ").to_s.strip
     end
-    [self.full_name, self.full_name_transcription]
+    [full_name, full_name_transcription]
   end
 
   def set_date_of_birth
@@ -136,7 +134,7 @@ class Agent < ActiveRecord::Base
   end
 
   def check_birth_date
-    if date_of_birth.present? and date_of_death.present?
+    if date_of_birth.present? && date_of_death.present?
       if date_of_birth > date_of_death
         errors.add(:birth_date)
         errors.add(:death_date)
@@ -206,19 +204,19 @@ class Agent < ActiveRecord::Base
   end
 
   def created(work)
-    creates.where(:work_id => work.id).first
+    creates.where(work_id: work.id).first
   end
 
   def realized(expression)
-    realizes.where(:expression_id => expression.id).first
+    realizes.where(expression_id: expression.id).first
   end
 
   def produced(manifestation)
-    produces.where(:manifestation_id => manifestation.id).first
+    produces.where(manifestation_id: manifestation.id).first
   end
 
   def owned(item)
-    owns.where(:item_id => item.id)
+    owns.where(item_id: item.id)
   end
 
   def self.import_agents(agent_lists)
@@ -226,17 +224,17 @@ class Agent < ActiveRecord::Base
     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.where(agent_identifier: agent_list[:agent_identifier]).first
       else
-        agent = Agent.where(:full_name => name_and_role[0]).first
+        agent = Agent.where(full_name: name_and_role[0]).first
       end
       role_type = name_and_role[1].to_s.strip
       unless agent
         agent = Agent.new(
-          :full_name => name_and_role[0],
-          :full_name_transcription => agent_list[:full_name_transcription],
-          :agent_identifier => agent_list[:agent_identifier],
-          :language_id => 1
+          full_name: name_and_role[0],
+          full_name_transcription: agent_list[:full_name_transcription],
+          agent_identifier: agent_list[:agent_identifier],
+          language_id: 1
         )
         agent.required_role = Role.where(name: 'Guest').first
         agent.save

data/app/models/agent_import_file.rb

@@ -2,9 +2,9 @@ class AgentImportFile < ActiveRecord::Base
   include Statesman::Adapters::ActiveRecordModel
   include ImportFile
   attr_accessible :agent_import, :edit_mode, :user_encoding, :mode
-  default_scope {order('agent_import_files.id DESC')}
-  scope :not_imported, -> {in_state(:pending)}
-  scope :stucked, -> {in_state(:pending).where('agent_import_files.created_at < ?', 1.hour.ago)}
+  default_scope { order('agent_import_files.id DESC') }
+  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
     has_attached_file :agent_import, :storage => :s3, :s3_credentials => "#{Setting.amazon}",

data/app/models/agent_import_result.rb

@@ -1,8 +1,8 @@
 class AgentImportResult < ActiveRecord::Base
   attr_accessible :agent_import_file_id, :agent_id, :body
-  default_scope order: 'agent_import_results.id'
+  default_scope { order('agent_import_results.id') }
   scope :file_id, proc{|file_id| where(:agent_import_file_id => file_id)}
-  scope :failed, where(agent_id: nil)
+  scope :failed, -> { where(agent_id: nil) }
 
   belongs_to :agent_import_file
   belongs_to :agent

data/app/models/agent_merge.rb

@@ -0,0 +1,21 @@
+class AgentMerge < ActiveRecord::Base
+  attr_accessible :agent_id, :agent_merge_list_id
+  belongs_to :agent, validate: true
+  belongs_to :agent_merge_list, validate: true
+  validates_presence_of :agent, :agent_merge_list
+  validates_associated :agent, :agent_merge_list
+
+  paginates_per 10
+end
+
+# == Schema Information
+#
+# Table name: agent_merges
+#
+#  id                  :integer          not null, primary key
+#  agent_id            :integer          not null
+#  agent_merge_list_id :integer          not null
+#  created_at          :datetime         not null
+#  updated_at          :datetime         not null
+#
+

data/app/models/agent_merge_list.rb

@@ -0,0 +1,29 @@
+class AgentMergeList < ActiveRecord::Base
+  attr_accessible :title
+  has_many :agent_merges, dependent: :destroy
+  has_many :agents, through: :agent_merges
+  validates_presence_of :title
+
+  paginates_per 10
+
+  def merge_agents(selected_agent)
+    self.agents.each do |agent|
+      Create.update_all(['agent_id = ?', selected_agent.id], ['agent_id = ?', agent.id])
+      Produce.update_all(['agent_id = ?', selected_agent.id], ['agent_id = ?', agent.id])
+      Own.update_all(['agent_id = ?', selected_agent.id], ['agent_id = ?', agent.id])
+      Donate.update_all(['agent_id = ?', selected_agent.id], ['agent_id = ?', agent.id])
+      agent.destroy unless agent == selected_agent
+    end
+  end
+end
+
+# == Schema Information
+#
+# Table name: agent_merge_lists
+#
+#  id         :integer          not null, primary key
+#  title      :string(255)
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
+#
+

data/app/models/agent_relationship_type.rb

@@ -1,7 +1,7 @@
 class AgentRelationshipType < ActiveRecord::Base
   attr_accessible :name, :display_name, :note
   include MasterModel
-  default_scope order: 'agent_relationship_types.position'
+  default_scope { order('agent_relationship_types.position') }
   has_many :agent_relationships
 end
 

data/app/models/agent_type.rb

@@ -1,7 +1,7 @@
 class AgentType < ActiveRecord::Base
   attr_accessible :name, :display_name, :note
   include MasterModel
-  default_scope order: "agent_types.position"
+  default_scope { order('agent_types.position') }
   has_many :agents
 end
 

data/app/models/carrier_type.rb

@@ -1,13 +1,13 @@
 class CarrierType < ActiveRecord::Base
   attr_accessible :name, :display_name, :note, :position
   include MasterModel
-  default_scope order: "carrier_types.position"
+  default_scope { order("carrier_types.position") }
   has_many :manifestations
   if defined?(EnjuCirculation)
     attr_accessible :carrier_type_has_checkout_types_attributes
     has_many :carrier_type_has_checkout_types, dependent: :destroy
     has_many :checkout_types, through: :carrier_type_has_checkout_types
-    accepts_nested_attributes_for :carrier_type_has_checkout_types, :allow_destroy => true, reject_if: :all_blank
+    accepts_nested_attributes_for :carrier_type_has_checkout_types, allow_destroy: true, reject_if: :all_blank
   end
 
   def mods_type