enju_biblio 0.1.0.pre55 → 0.1.0.pre56

data/app/models/resource_import_file.rb

@@ -2,19 +2,20 @@
 class ResourceImportFile < ActiveRecord::Base
   include Statesman::Adapters::ActiveRecordModel
   include ImportFile
-  attr_accessible :resource_import, :edit_mode, :user_encoding, :mode
+  attr_accessible :resource_import, :edit_mode, :user_encoding, :mode,
+    :default_shelf_id, :library_id
   default_scope {order('resource_import_files.id DESC')}
   scope :not_imported, -> {in_state(:pending)}
   scope :stucked, -> {in_state(:pending).where('created_at < ?', 1.hour.ago)}
 
   if Setting.uploaded_file.storage == :s3
-    has_attached_file :resource_import, :storage => :s3, :s3_credentials => "#{Setting.amazon}",
+    has_attached_file :resource_import, storage: :s3, s3_credentials: "#{Setting.amazon}",
       :s3_permissions => :private
   else
     has_attached_file :resource_import,
-      :path => ":rails_root/private/system/:class/:attachment/:id_partition/:style/:filename"
+      path: ":rails_root/private/system/:class/:attachment/:id_partition/:style/:filename"
   end
-  validates_attachment_content_type :resource_import, :content_type => [
+  validates_attachment_content_type :resource_import, content_type: [
     'text/csv',
     'text/plain',
     'text/tab-separated-values',
@@ -22,12 +23,13 @@ class ResourceImportFile < ActiveRecord::Base
     'application/vnd.ms-excel'
   ]
   validates_attachment_presence :resource_import
-  belongs_to :user, :validate => true
+  belongs_to :user, validate: true
+  belongs_to :default_shelf, class_name: 'Shelf'
   has_many :resource_import_results
   has_many :resource_import_file_transitions
 
   enju_import_file_model
-  attr_accessor :mode
+  attr_accessor :mode, :library_id
 
   def state_machine
     ResourceImportFileStateMachine.new(self, transition_class: ResourceImportFileTransition)
@@ -54,7 +56,7 @@ class ResourceImportFile < ActiveRecord::Base
   def import
     transition_to!(:started)
     num = {:manifestation_imported => 0, :item_imported => 0, :manifestation_found => 0, :item_found => 0, :failed => 0}
-    rows = open_import_file
+    rows = open_import_file(create_import_temp_file(resource_import))
     row_num = 1
 
     field = rows.first
@@ -65,10 +67,10 @@ class ResourceImportFile < ActiveRecord::Base
     rows.each do |row|
       row_num += 1
       next if row['dummy'].to_s.strip.present?
-      import_result = ResourceImportResult.create!(:resource_import_file_id => self.id, :body => row.fields.join("\t"))
+      import_result = ResourceImportResult.create!(:resource_import_file_id => self.id, body: row.fields.join("\t"))
 
       item_identifier = row['item_identifier'].to_s.strip
-      item = Item.where(:item_identifier => item_identifier).first
+      item = Item.where(item_identifier: item_identifier).first
       if item
         import_result.item = item
         import_result.manifestation = item.manifestation
@@ -84,21 +86,21 @@ class ResourceImportFile < ActiveRecord::Base
       unless manifestation
         if row['doi'].present?
           doi = URI.parse(row['doi']).path.gsub(/^\//, "")
-          manifestation = Manifestation.where(:doi => doi).first
+          manifestation = Manifestation.where(doi: doi).first
         end
       end
 
       unless manifestation
         if row['jpno'].present?
           jpno = row['jpno'].to_s.strip
-          manifestation = Identifier.where(:body => 'jpno', :identifier_type_id => IdentifierType.where(:name => 'jpno').first_or_create.id).first.try(:manifestation)
+          manifestation = Identifier.where(body: 'jpno', identifier_type_id: IdentifierType.where(name: 'jpno').first_or_create.id).first.try(:manifestation)
         end
       end
 
       unless manifestation
         if row['isbn'].present?
           isbn = StdNum::ISBN.normalize(row['isbn'])
-          m = Identifier.where(:body => isbn, :identifier_type_id => IdentifierType.where(:name => 'isbn').first_or_create.id).first.try(:manifestation)
+          m = Identifier.where(body: isbn, identifier_type_id: IdentifierType.where(name: 'isbn').first_or_create.id).first.try(:manifestation)
         end
         if m
           if m.series_statements.exists?
@@ -135,7 +137,7 @@ class ResourceImportFile < ActiveRecord::Base
       else
         if manifestation.try(:fulltext_content?)
           item = Item.new
-          item.circulation_status = CirculationStatus.where(:name => 'Available On Shelf').first
+          item.circulation_status = CirculationStatus.where(name: 'Available On Shelf').first
           item.shelf = Shelf.web
           begin
             item.acquired_at = Time.zone.parse(row['acquired_at'].to_s.strip)
@@ -148,7 +150,6 @@ class ResourceImportFile < ActiveRecord::Base
         num[:failed] += 1
       end
 
-      ExpireFragmentCache.expire_fragment_cache(manifestation)
       import_result.save!
       num[:item_imported] +=1 if import_result.item
 
@@ -161,34 +162,36 @@ class ResourceImportFile < ActiveRecord::Base
     Sunspot.commit
     rows.close
     transition_to!(:completed)
+    send_message
     Rails.cache.write("manifestation_search_total", Manifestation.search.total)
-    return num
+    num
   rescue => e
     self.error_message = "line #{row_num}: #{e.message}"
     transition_to!(:failed)
     raise e
   end
 
-  def self.import_work(title, agents, options = {:edit_mode => 'create'})
+  def self.import_work(title, agents, options = {edit_mode: 'create'})
     work = Manifestation.new(title)
     work.save
     work.creators = agents.uniq unless agents.empty?
     work
   end
 
-  def self.import_expression(work, agents, options = {:edit_mode => 'create'})
+  def self.import_expression(work, agents, options = {edit_mode: 'create'})
     expression = work
     expression.save
     expression.contributors = agents.uniq unless agents.empty?
     expression
   end
 
-  def self.import_manifestation(expression, agents, options = {}, edit_options = {:edit_mode => 'create'})
+  def self.import_manifestation(expression, agents, options = {}, edit_options = {edit_mode: 'create'})
     manifestation = expression
     manifestation.during_import = true
     manifestation.reload
     manifestation.update_attributes!(options)
     manifestation.publishers = agents.uniq unless agents.empty?
+    manifestation.reload
     manifestation
   end
 
@@ -249,23 +252,23 @@ class ResourceImportFile < ActiveRecord::Base
 
   def modify
     transition_to!(:started)
-    rows = open_import_file
+    rows = open_import_file(create_import_temp_file(resource_import))
     row_num = 1
 
     rows.each do |row|
       row_num += 1
       item_identifier = row['item_identifier'].to_s.strip
-      item = Item.where(:item_identifier => item_identifier).first if item_identifier.present?
+      item = Item.where(item_identifier: item_identifier).first if item_identifier.present?
       if item
         if item.manifestation
-          fetch(row, :edit_mode => 'update')
+          fetch(row, edit_mode: 'update')
         end
-        shelf = Shelf.where(:name => row['shelf']).first
-        circulation_status = CirculationStatus.where(:name => row['circulation_status']).first
-        checkout_type = CheckoutType.where(:name => row['checkout_type']).first
-        bookstore = Bookstore.where(:name => row['bookstore']).first
-        required_role = Role.where(:name => row['required_role']).first
-        use_restriction = UseRestriction.where(:name => row['use_restriction'].to_s.strip).first
+        shelf = Shelf.where(name: row['shelf'].to_s.strip).first
+        circulation_status = CirculationStatus.where(name: row['circulation_status']).first
+        checkout_type = CheckoutType.where(name: row['checkout_type']).first
+        bookstore = Bookstore.where(name: row['bookstore']).first
+        required_role = Role.where(name: row['required_role']).first
+        use_restriction = UseRestriction.where(name: row['use_restriction'].to_s.strip).first
 
         item.shelf = shelf if shelf
         item.circulation_status = circulation_status if circulation_status
@@ -273,21 +276,36 @@ class ResourceImportFile < ActiveRecord::Base
         item.bookstore = bookstore if bookstore
         item.required_role = required_role if required_role
         item.use_restriction = use_restriction if use_restriction
-        item.include_supplements = row['include_supplements'] if row['include_supplements']
-        item.call_number = row['call_number'] if row['call_number']
-        item.item_price = row['item_price'] if row['item_price']
-        item.acquired_at = row['acquired_at'] if row['acquired_at']
-        item.note = row['note'] if row['note']
+
+        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
+
+        item_columns = %w(
+          call_number item_price note
+          binding_item_identifier binding_call_number binded_at
+        )
+        item_columns.each do |column|
+          item.assign_attributes(:"#{column}" => row[column], as: :admin)
+        end
+
+        if row['include_supplements']
+          if %w(t true).include?(row['include_supplements'].downcase.strip)
+            item.include_supplements = true
+          else
+            item.include_supplements = false if item.include_supplements
+          end
+        end
         item.save!
-        ExpireFragmentCache.expire_fragment_cache(item.manifestation)
       else
         manifestation_identifier = row['manifestation_identifier'].to_s.strip
         manifestation = Manifestation.where(:manifestation_identifier => manifestation_identifier).first if manifestation_identifier.present?
         unless manifestation
-          manifestation = Manifestation.where(:id => row['manifestation_id']).first
+          manifestation = Manifestation.where(id: row['manifestation_id']).first
         end
         if manifestation
-          fetch(row, :edit_mode => 'update')
+          fetch(row, edit_mode: 'update')
         end
       end
     end
@@ -300,13 +318,13 @@ class ResourceImportFile < ActiveRecord::Base
 
   def remove
     transition_to!(:started)
-    rows = open_import_file
+    rows = open_import_file(create_import_temp_file(resource_import))
     row_num = 1
 
     rows.each do |row|
       row_num += 1
       item_identifier = row['item_identifier'].to_s.strip
-      item = Item.where(:item_identifier => item_identifier).first
+      item = Item.where(item_identifier: item_identifier).first
       if item
         item.destroy if item.removable?
       end
@@ -320,20 +338,20 @@ class ResourceImportFile < ActiveRecord::Base
 
   def update_relationship
     transition_to!(:started)
-    rows = open_import_file
+    rows = open_import_file(create_import_temp_file(resource_import))
     row_num = 2
 
     rows.each do |row|
       item_identifier = row['item_identifier'].to_s.strip
-      item = Item.where(:item_identifier => item_identifier).first
+      item = Item.where(item_identifier: item_identifier).first
       unless item
-        item = Item.where(:id => row['item_id'].to_s.strip).first
+        item = Item.where(id: row['item_id'].to_s.strip).first
       end
 
       manifestation_identifier = row['manifestation_identifier'].to_s.strip
       manifestation = Manifestation.where(:manifestation_identifier => manifestation_identifier).first
       unless manifestation
-        manifestation = Manifestation.where(:id => row['manifestation_id'].to_s.strip).first
+        manifestation = Manifestation.where(id: row['manifestation_id'].to_s.strip).first
       end
 
       if item and manifestation
@@ -341,7 +359,7 @@ class ResourceImportFile < ActiveRecord::Base
         item.save!
       end
 
-      import_result = ResourceImportResult.create!(:resource_import_file_id => self.id, :body => row.fields.join("\t"))
+      import_result = ResourceImportResult.create!(:resource_import_file_id => self.id, body: row.fields.join("\t"))
       import_result.item = item
       import_result.manifestation = manifestation
       import_result.save!
@@ -351,24 +369,36 @@ class ResourceImportFile < ActiveRecord::Base
   end
 
   private
-  def open_import_file
-    tempfile = Tempfile.new(self.class.name.underscore)
-    if Setting.uploaded_file.storage == :s3
-      uploaded_file_path = resource_import.expiring_url(10)
-    else
-      uploaded_file_path = resource_import.path
+  def open_import_file(tempfile)
+    file = CSV.open(tempfile, col_sep: "\t")
+    header_columns = %w(
+      original_title manifestation_identifier item_identifier shelf note
+      title_transcription title_alternative title_alternative_transcription
+      periodical manifestation_id publication_place
+      series_statement_identifier series_original_title series_creator_string
+      series_title_transcription creator creator_transcription publisher
+      publisher_transcription pub_date creator creator_transcription
+      contributor contributor_transcription description access_address
+      volume_number_string edition_string issue_number_string
+      edition serial_number isbn issn manifestation_price item_price
+      width height depth number_of_pages jpno lccn budget_type bookstore
+      language fulltext_content required_role doi
+      statement_of_responsibility acquired_at call_number circulation_status
+      binding_item_identifier binding_call_number binded_at
+      use_restriction include_supplements
+      dummy
+    )
+    if defined?(EnjuSubject)
+      header_columns += %w(subject classification)
     end
-    open(uploaded_file_path){|f|
-      f.each{|line|
-        tempfile.puts(convert_encoding(line))
-      }
-    }
-    tempfile.close
-
-    file = CSV.open(tempfile.path, 'r:utf-8', :col_sep => "\t")
     header = file.first
-    rows = CSV.open(tempfile.path, 'r:utf-8', :headers => header, :col_sep => "\t")
-    ResourceImportResult.create!(:resource_import_file_id => self.id, :body => header.join("\t"))
+    ignored_columns = header - header_columns
+    unless ignored_columns.empty?
+      self.error_message = I18n.t('import.following_column_were_ignored', column: ignored_columns.join(', '))
+      save!
+    end
+    rows = CSV.open(tempfile, headers: header, col_sep: "\t")
+    ResourceImportResult.create!(:resource_import_file_id => self.id, body: header.join("\t"))
     tempfile.close(true)
     file.close
     rows
@@ -379,8 +409,8 @@ class ResourceImportFile < ActiveRecord::Base
     row['subject'].to_s.split('//').each do |s|
       # TODO: Subject typeの設定
       subject = Subject.new(:term => s.to_s.strip)
-      subject.subject_type = SubjectType.where(:name => 'concept').first
-      subject.subject_heading_type = SubjectHeadingType.where(:name => 'unknown').first
+      subject.subject_type = SubjectType.where(name: 'concept').first
+      subject.subject_heading_type = SubjectHeadingType.where(name: 'unknown').first
       subjects << subject
     end
     subjects
@@ -391,7 +421,7 @@ class ResourceImportFile < ActiveRecord::Base
     classification_number = YAML.load(row['classification'].to_s)
     return nil unless classification_number
     classification_number.map{|k, v|
-      classification_type = ClassificationType.where(:name => k.downcase).first
+      classification_type = ClassificationType.where(name: k.downcase).first
       classification = Classification.new(:category => v.to_s)
       classification.classification_type = classification_type
       classification.save!
@@ -401,43 +431,54 @@ class ResourceImportFile < ActiveRecord::Base
   end
 
   def create_item(row, manifestation)
-    shelf = Shelf.where(:name => row['shelf'].to_s.strip).first || Shelf.web
-    bookstore = Bookstore.where(:name => row['bookstore'].to_s.strip).first
-    budget_type = BudgetType.where(:name => row['budget_type'].to_s.strip).first
+    shelf = Shelf.where(name: row['shelf'].to_s.strip).first
+    unless shelf
+      shelf = default_shelf || Shelf.web
+    end
+    bookstore = Bookstore.where(name: row['bookstore'].to_s.strip).first
+    budget_type = BudgetType.where(name: row['budget_type'].to_s.strip).first
     acquired_at = Time.zone.parse(row['acquired_at']) rescue nil
+    binded_at = Time.zone.parse(row['binded_at']) rescue nil
     item = self.class.import_item(manifestation, {
-      :manifestation_id => manifestation.id,
-      :item_identifier => row['item_identifier'],
-      :price => row['item_price'],
-      :call_number => row['call_number'].to_s.strip,
-      :acquired_at => acquired_at,
+      manifestation_id: manifestation.id,
+      item_identifier: row['item_identifier'],
+      price: row['item_price'],
+      call_number: row['call_number'].to_s.strip,
+      acquired_at: acquired_at,
+      binding_item_identifier: row['binding_item_identifier'],
+      binding_call_number: row['binding_call_number'],
+      binded_at: binded_at
     })
     if defined?(EnjuCirculation)
-      circulation_status = CirculationStatus.where(:name => row['circulation_status'].to_s.strip).first || CirculationStatus.where(:name => 'In Process').first
+      circulation_status = CirculationStatus.where(name: row['circulation_status'].to_s.strip).first || CirculationStatus.where(name: 'In Process').first
       item.circulation_status = circulation_status
-      use_restriction = UseRestriction.where(:name => row['use_restriction'].to_s.strip).first
+      use_restriction = UseRestriction.where(name: row['use_restriction'].to_s.strip).first
       unless use_restriction
-        use_restriction = UseRestriction.where(:name => 'Not For Loan').first
+        use_restriction = UseRestriction.where(name: 'Not For Loan').first
       end
       item.use_restriction = use_restriction
     end
     item.bookstore = bookstore
     item.budget_type = budget_type
     item.shelf = shelf
+
+    if %w(t true).include?(row['include_supplements'].to_s.downcase.strip)
+      item.include_supplements = true
+    end
     item
   end
 
-  def fetch(row, options = {:edit_mode => 'create'})
-    shelf = Shelf.where(:name => row['shelf'].to_s.strip).first || Shelf.web
+  def fetch(row, options = {edit_mode: 'create'})
+    shelf = Shelf.where(name: row['shelf'].to_s.strip).first || Shelf.web
     case options[:edit_mode]
     when 'create'
       manifestation = nil
     when 'update'
-      manifestation = Item.where(:item_identifier => row['item_identifier'].to_s.strip).first.try(:manifestation)
+      manifestation = Item.where(item_identifier: row['item_identifier'].to_s.strip).first.try(:manifestation)
       unless manifestation
         manifestation_identifier = row['manifestation_identifier'].to_s.strip
         manifestation = Manifestation.where(:manifestation_identifier => manifestation_identifier).first if manifestation_identifier
-        manifestation = Manifestation.where(:id => row['manifestation_id']).first unless manifestation
+        manifestation = Manifestation.where(id: row['manifestation_id']).first unless manifestation
       end
     end
 
@@ -467,25 +508,13 @@ class ResourceImportFile < ActiveRecord::Base
     height = NKF.nkf('-eZ1', row['height'].to_s).gsub(/\D/, '').to_i
     depth = NKF.nkf('-eZ1', row['depth'].to_s).gsub(/\D/, '').to_i
     end_page = NKF.nkf('-eZ1', row['number_of_pages'].to_s).gsub(/\D/, '').to_i
-    language = Language.where(:name => row['language'].to_s.strip.camelize).first
+    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
     
-    carrier_type = CarrierType.where(:name => row['carrier_type'].to_s.strip).first
+    carrier_type = CarrierType.where(name: row['carrier_type'].to_s.strip).first
 
-    identifier = {}
-    if row['isbn']
-      identifier[:isbn] = Identifier.new(:body => row['isbn'])
-      identifier[:isbn].identifier_type = IdentifierType.where(:name => 'isbn').first_or_create
-    end
-    if row['jpno']
-      identifier[:jpno] = Identifier.new(:body => row['jpno'])
-      identifier[:jpno].identifier_type = IdentifierType.where(:name => 'jpno').first_or_create
-    end
-    if row['issn']
-      identifier[:issn] = Identifier.new(:body => row['issn'])
-      identifier[:issn].identifier_type = IdentifierType.where(:name => 'issn').first_or_create
-    end
+    identifier = set_identifier(row)
 
     if end_page >= 1
       start_page = 1
@@ -494,11 +523,11 @@ class ResourceImportFile < ActiveRecord::Base
       end_page = nil
     end
 
-    if row['fulltext_content'].to_s.downcase.strip == "t"
+    if %w(t true).include?(row['fulltext_content'].to_s.downcase.strip)
       fulltext_content = true
     end
 
-    if row['periodical'].to_s.downcase.strip == "t"
+    if %w(t true).include?(row['periodical'].to_s.downcase.strip)
       periodical = true
     end
 
@@ -559,25 +588,26 @@ class ResourceImportFile < ActiveRecord::Base
         :end_page => end_page,
         :access_address => row['access_address'],
         :manifestation_identifier => row['manifestation_identifier'],
-        :fulltext_content => fulltext_content
+        :fulltext_content => fulltext_content,
+        :publication_place => row['publication_place']
       }.delete_if{|key, value| value.nil?}
       manifestation = self.class.import_manifestation(expression, publisher_agents, attributes,
       {
-        :edit_mode => options[:edit_mode]
+        edit_mode: options[:edit_mode]
       })
       manifestation.volume_number = volume_number if volume_number
 
-      required_role = Role.where(:name => row['required_role_name'].to_s.strip.camelize).first
+      required_role = Role.where(name: row['required_role_name'].to_s.strip.camelize).first
       if required_role and row['required_role_name'].present?
         manifestation.required_role = required_role
       else
-        manifestation.required_role = Role.where(:name => 'Guest').first unless manifestation.required_role
+        manifestation.required_role = Role.where(name: 'Guest').first unless manifestation.required_role
       end
 
       if language and row['language'].present?
         manifestation.language = language
       else
-        manifestation.language = Language.where(:name => 'unknown').first unless manifestation.language
+        manifestation.language = Language.where(name: 'unknown').first unless manifestation.language
       end
 
       manifestation.carrier_type = carrier_type if carrier_type
@@ -620,8 +650,8 @@ class ResourceImportFile < ActiveRecord::Base
 
       if options[:edit_mode] == 'create'
         manifestation.set_agent_role_type(creators_list)
-        manifestation.set_agent_role_type(contributors_list, :scope => :contributor)
-        manifestation.set_agent_role_type(publishers_list, :scope => :publisher)
+        manifestation.set_agent_role_type(contributors_list, scope: :contributor)
+        manifestation.set_agent_role_type(publishers_list, scope: :publisher)
       end
     end
     manifestation
@@ -630,6 +660,23 @@ class ResourceImportFile < ActiveRecord::Base
   def self.transition_class
     ResourceImportFileTransition
   end
+
+  def set_identifier(row)
+    identifier = {}
+    if row['isbn']
+      identifier[:isbn] = Identifier.new(body: row['isbn'])
+      identifier[:isbn].identifier_type = IdentifierType.where(name: 'isbn').first_or_create
+    end
+    if row['jpno']
+      identifier[:jpno] = Identifier.new(body: row['jpno'])
+      identifier[:jpno].identifier_type = IdentifierType.where(name: 'jpno').first_or_create
+    end
+    if row['issn']
+      identifier[:issn] = Identifier.new(body: row['issn'])
+      identifier[:issn].identifier_type = IdentifierType.where(name: 'issn').first_or_create
+    end
+    identifier
+  end
 end
 
 # == Schema Information
@@ -653,4 +700,5 @@ end
 #  resource_import_fingerprint  :string(255)
 #  error_message                :text
 #  user_encoding                :string(255)
+#  default_shelf_id             :integer
 #

data/app/models/resource_import_result.rb

@@ -1,6 +1,6 @@
 class ResourceImportResult < ActiveRecord::Base
   attr_accessible :resource_import_file_id, :manifestation_id, :item_id, :body
-  default_scope :order => 'resource_import_results.id'
+  default_scope order: 'resource_import_results.id'
   scope :file_id, proc{|file_id| where(:resource_import_file_id => file_id)}
   scope :failed, where(:manifestation_id => nil)
 

data/app/models/series_statement.rb

@@ -6,8 +6,8 @@ class SeriesStatement < ActiveRecord::Base
     :title_subseries_transcription, :creator_string, :volume_number_string
   attr_accessible :series_master
 
-  belongs_to :manifestation
-  belongs_to :root_manifestation, :foreign_key => :root_manifestation_id, :class_name => 'Manifestation'
+  belongs_to :manifestation, touch: true
+  belongs_to :root_manifestation, foreign_key: :root_manifestation_id, class_name: 'Manifestation', touch: true
   validates_presence_of :original_title
   before_save :create_root_series_statement
 
@@ -19,7 +19,7 @@ class SeriesStatement < ActiveRecord::Base
     text :numbering, :title_subseries, :numbering_subseries
     integer :manifestation_id
     integer :position
-    integer :series_statement_merge_list_ids, :multiple => true if defined?(EnjuResourceMerge)
+    integer :series_statement_merge_list_ids, multiple: true if defined?(EnjuResourceMerge)
   end
 
   attr_accessor :selected
@@ -37,12 +37,14 @@ class SeriesStatement < ActiveRecord::Base
   def create_root_series_statement
     if series_master? and root_manifestation.nil?
       self.root_manifestation = manifestation
+    else
+      self.root_manifestation = nil
     end
   end
 
   if defined?(EnjuResourceMerge)
-    has_many :series_statement_merges, :dependent => :destroy
-    has_many :series_statement_merge_lists, :through => :series_statement_merges
+    has_many :series_statement_merges, dependent: :destroy
+    has_many :series_statement_merge_lists, through: :series_statement_merges
   end
 end
 

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

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.editing', :model => t('activerecord.models.agent_import_file')) -%></h1>
+<h1 class="title"><%= t('page.editing', model: t('activerecord.models.agent_import_file')) -%></h1>
 <div id="content_list">
 
 <%= form_for(@agent_import_file) do |f| -%>

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

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.listing', :model => t('activerecord.models.agent_import_file')) -%></h1>
+<h1 class="title"><%= t('page.listing', model: t('activerecord.models.agent_import_file')) -%></h1>
 <div id="content_list">
 
 <table class="table table-striped index">
@@ -18,12 +18,12 @@
     <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><%= 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 -%></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>
     <td><%= localized_state(agent_import_file.current_state) -%></td>
     <td>
       <%= link_to t('page.show'), agent_import_file -%>
-      <%= link_to t('page.destroy'), agent_import_file, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
+      <%= link_to t('page.destroy'), agent_import_file, data: {confirm: t('page.are_you_sure')}, method: :delete -%>
     </td>
   </tr>
 <%- end -%>
@@ -35,6 +35,6 @@
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <li><%= link_to t('page.new', :model => t('activerecord.models.agent_import_file')), new_agent_import_file_path -%></li>
+    <li><%= link_to t('page.new', model: t('activerecord.models.agent_import_file')), new_agent_import_file_path -%></li>
   </ul>
 </div>

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

@@ -1,8 +1,8 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-  <h1 class="title"><%= t('page.new', :model => t('activerecord.models.agent_import_file')) -%></h1>
+  <h1 class="title"><%= t('page.new', model: t('activerecord.models.agent_import_file')) -%></h1>
 <div id="content_list">
 
-<%= form_for(@agent_import_file, :html => { :multipart => true }) do |f| -%>
+<%= form_for(@agent_import_file, html: { multipart: true }) do |f| -%>
   <%= f.error_messages -%>
 
   <div class="field">
@@ -12,24 +12,24 @@
 
   <div class="field">
     <%= f.label :edit_mode -%><br />
-    <%= f.radio_button :edit_mode, 'create', :checked => 'checked' %>
-    <%= f.label :edit_mode, t('page.create'), :value => 'create' %>
+    <%= f.radio_button :edit_mode, 'create', checked: 'checked' %>
+    <%= f.label :edit_mode, t('page.create'), value: 'create' %>
     <%= f.radio_button :edit_mode, 'update' %>
-    <%= f.label :edit_mode, t('page.update'), :value => 'update' %>
+    <%= f.label :edit_mode, t('page.update'), value: 'update' %>
     <%= f.radio_button :edit_mode, 'destroy' %>
-    <%= f.label :edit_mode, t('page.destroy'), :value => 'destroy' %>
+    <%= f.label :edit_mode, t('page.destroy'), value: 'destroy' %>
   </div>
 
   <div class="field">
     <%= f.label :user_encoding -%><br />
-    <%= f.radio_button :user_encoding, 'auto_detect', :checked => 'checked' %>
-    <%= f.label :user_encoding, t('import.auto_detect'), :value => 'auto_detect' %>
+    <%= f.radio_button :user_encoding, 'auto_detect', checked: 'checked' %>
+    <%= f.label :user_encoding, t('import.auto_detect'), value: 'auto_detect' %>
     <%= f.radio_button :user_encoding, 'utf-8' %>
-    <%= f.label :user_encoding, 'UTF-8', :value => 'utf-8' %>
+    <%= f.label :user_encoding, 'UTF-8', value: 'utf-8' %>
     <%= f.radio_button :user_encoding, 'shift_jis' %>
-    <%= f.label :user_encoding, 'Shift_JIS', :value => 'shift_jis' %>
-    <%= f.radio_button :user_encoding, 'euc-ho' %>
-    <%= f.label :user_encoding, 'EUC-JP', :value => 'euc-jp' %>
+    <%= f.label :user_encoding, 'Shift_JIS', value: 'shift_jis' %>
+    <%= f.radio_button :user_encoding, 'euc-jp' %>
+    <%= f.label :user_encoding, 'EUC-JP', value: 'euc-jp' %>
   </div>
 
   <div class="actions">