enju_loc 0.1.0.pre3 → 0.1.0.pre4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad30cc6720622987403d9a1fa651d5ef300b33bf
-  data.tar.gz: 89ff96361a63d8501792ce07083619941fbc6582
+  metadata.gz: 1d6f7ddad0b22f2b23741d4e91c73f27ad22827c
+  data.tar.gz: daa82be27e7d64aa3fef0a31d3b46ec5294721dc
 SHA512:
-  metadata.gz: f6f3baeff7a8b82f8c7d2cd552b39f1bf42a64e8378a5759984ae3becfd9f1744a8e29cbff89438848caeab60dfac1fb1be4c53424518588022542c0274c27e1
-  data.tar.gz: 62b0e0829caab8c2658e3c33ac88834cffbfa8d813fb74526bca1be9c4f4bf136b0b87a4c1b7665b45fb6daef61a1774cee9caee715ebb091b9ee09b6bb761e3
+  metadata.gz: 34eec96ca78e77b7f9304d1644bed1ca1ca7eb0e522ae6760e2f2e6cf4cc819ff4666f70cb0a2cd30162e13f5dd41dc5c97b547dd55671d0697265aea49fbe3e
+  data.tar.gz: 3971a831b8c62dee85e6ce3afde3901be6228371d78c5bbb44fdd5a4f5bb488495ea84f64401ecfc44d19b01bb3fa8d7919e9d615407fc14e3a47b6af8c0e0bc

data/README.rdoc

@@ -1,3 +1,11 @@
 = EnjuLoc
+{<img src="https://secure.travis-ci.org/next-l/enju_loc.png?branch=1.1" alt="Build Status" />}[http://travis-ci.org/next-l/enju_loc]
+{<img src="https://coveralls.io/repos/next-l/enju_loc/badge.png?branch=1.1" alt="Coverage Status" />}[https://coveralls.io/r/next-l/enju_loc?branch=1.1]
+{<img src="https://hakiri.io/github/next-l/enju_loc/1.1.svg" alt="security" />}[https://hakiri.io/github/next-l/enju_loc/1.1]
 
-This project rocks and uses MIT-LICENSE.
+This project rocks and uses MIT-LICENSE.
+
+== 製作者・貢献者 (Authors and contributors)
+* {TAKAKU, Masao}[https://github.com/masao] ({@tmasao}[https://twitter.com/tmasao])
+* {TANABE, Kosuke}[https://github.com/nabeta] ({@nabeta}[https://twitter.com/nabeta])
+* {Project Next-L}[http://www.next-l.jp] ({@ProjectNextL}[https://twitter.com/ProjectNextL])

data/app/models/loc_search.rb

@@ -85,7 +85,9 @@ class LocSearch
   end
 
   def self.import_from_sru_response(lccn)
-    identifier = Identifier.where(body: lccn, identifier_type_id: IdentifierType.where(name: 'lccn').first_or_create.id).first
+    identifier_type_lccn = IdentifierType.where(name: 'lccn').first
+    identifier_type_lccn = IdentifierType.create!(name: 'lccn') unless identifier_type_lccn
+    identifier = Identifier.where(body: lccn, identifier_type_id: identifier_type_lccn.id).first
     return if identifier
     url = make_sru_request_uri("bath.lccn=#{ lccn }")
     response = Nokogiri::XML(Faraday.get(url).body).at( '//zs:recordData', {"zs" => "http://www.loc.gov/zing/srw/"} )

data/lib/enju_loc/engine.rb

@@ -1,4 +1,3 @@
-require 'enju_seed'
 require 'nokogiri'
 require 'faraday'
 

data/lib/enju_loc/loc_search.rb

@@ -21,8 +21,8 @@ module EnjuLoc
 
       def import_record_from_loc_isbn(options)
         #if options[:isbn]
-          lisbn = Lisbn.new(options[:isbn])
-          raise EnjuLoc::InvalidIsbn unless lisbn.valid?
+        lisbn = Lisbn.new(options[:isbn])
+        raise EnjuLoc::InvalidIsbn unless lisbn.valid?
         #end
 
         manifestation = Manifestation.find_by_isbn(lisbn.isbn)
@@ -36,7 +36,9 @@ module EnjuLoc
       NS = {"mods"=>"http://www.loc.gov/mods/v3"}
       def import_record_from_loc( doc )
         record_identifier = doc.at( '//mods:recordInfo/mods:recordIdentifier', NS ).try(:content)
-        loc_identifier = Identifier.where(:body => record_identifier, :identifier_type_id => IdentifierType.where(:name => 'loc_identifier').first_or_create.id).first
+        identifier_type = IdentifierType.where(name: 'loc_identifier').first
+        identifier_type = IdentifierType.create!(name: 'loc_identifier') unless identifier_type
+        loc_identifier = Identifier.where(:body => record_identifier, :identifier_type_id => identifier_type.id).first
         return loc_identifier.manifestation if loc_identifier
 
         publishers = []
@@ -67,25 +69,25 @@ module EnjuLoc
         issn = StdNum::ISSN.normalize(doc.at('/mods:mods/mods:identifier[@type="issn"]',NS).try(:content).to_s)
         issn_l = StdNum::ISSN.normalize(doc.at('/mods:mods/mods:identifier[@type="issn-l"]',NS).try(:content).to_s)
 
-	types = get_mods_carrier_and_content_types( doc )
-	content_type = types[ :content_type ]
-	carrier_type = types[ :carrier_type ]
+        types = get_mods_carrier_and_content_types( doc )
+        content_type = types[ :content_type ]
+        carrier_type = types[ :carrier_type ]
 
-	record_identifier = doc.at('//mods:recordInfo/mods:recordIdentifier',NS).try(:content)
+        record_identifier = doc.at('//mods:recordInfo/mods:recordIdentifier',NS).try(:content)
         description = doc.xpath('//mods:abstract',NS).collect(&:content).join("\n")
         edition_string = doc.at('//mods:edition',NS).try(:content)
         extent = get_mods_extent(doc)
-	note = get_mods_note(doc)
+        note = get_mods_note(doc)
         frequency = get_mods_frequency(doc)
-	issuance = doc.at('//mods:issuance',NS).try(:content)
-	is_serial = true if issuance == "serial"
+        issuance = doc.at('//mods:issuance',NS).try(:content)
+        is_serial = true if issuance == "serial"
         statement_of_responsibility = get_mods_statement_of_responsibility(doc)
-	access_address = get_mods_access_address(doc)
-	publication_place = get_mods_publication_place(doc)
+        access_address = get_mods_access_address(doc)
+        publication_place = get_mods_publication_place(doc)
 
         manifestation = nil
         Agent.transaction do
-	  creator_agents = Agent.import_agents(creators)
+          creator_agents = Agent.import_agents(creators)
           publisher_agents = Agent.import_agents(publishers)
 
           manifestation = Manifestation.new(
@@ -95,51 +97,51 @@ module EnjuLoc
             :language_id => language_id,
             :pub_date => date,
             :description => description,
-	    :edition_string => edition_string,
+            :edition_string => edition_string,
             :statement_of_responsibility => statement_of_responsibility,
             :start_page => extent[:start_page],
             :end_page => extent[:end_page],
             :height => extent[:height],
-	    :access_address => access_address,
-	    :note => note,
-	    :publication_place => publication_place,
-	    :serial => is_serial,
+            :access_address => access_address,
+            :note => note,
+            :publication_place => publication_place,
+            :serial => is_serial,
           )
           identifier = {}
           if isbn
             identifier[:isbn] = Identifier.new(:body => isbn)
-            identifier[:isbn].identifier_type = IdentifierType.where(:name => 'isbn').first_or_create
+            identifier[:isbn].identifier_type = IdentifierType.where(name: 'isbn').first || IdnetifierType.create!(name: 'isbn')
           end
           if loc_identifier
             identifier[:loc_identifier] = Identifier.new(:body => loc_identifier)
-            identifier[:loc_identifier].identifier_type = IdentifierType.where(:name => 'loc_identifier').first_or_create
+            identifier[:loc_identifier].identifier_type = IdentifierType.where(name: 'loc_identifier').first || IdnetifierType.create!(name: 'loc_identifier')
           end
           if lccn
             identifier[:lccn] = Identifier.new(:body => lccn)
-            identifier[:lccn].identifier_type = IdentifierType.where(:name => 'lccn').first_or_create
+            identifier[:lccn].identifier_type = IdentifierType.where(name: 'lccn').first || IdentifierType.create!(name: 'lccn')
           end
           if issn
             identifier[:issn] = Identifier.new(:body => issn)
-            identifier[:issn].identifier_type = IdentifierType.where(:name => 'issn').first_or_create
+            identifier[:issn].identifier_type = IdentifierType.where(name: 'issn').first || IdentifierType.create!(name: 'issn')
           end
           if issn_l
             identifier[:issn_l] = Identifier.new(:body => issn_l)
-            identifier[:issn_l].identifier_type = IdentifierType.where(:name => 'issn_l').first_or_create
+            identifier[:issn_l].identifier_type = IdentifierType.where(name: 'issn_l').first || IdentifierType.create!(name: 'issn_l')
           end
           manifestation.carrier_type = carrier_type if carrier_type
           manifestation.manifestation_content_type = content_type if content_type
-	  manifestation.frequency = frequency if frequency
+          manifestation.frequency = frequency if frequency
           if manifestation.save
             identifier.each do |k, v|
               manifestation.identifiers << v if v.valid?
             end
             manifestation.publishers << publisher_agents
-	    manifestation.creators << creator_agents
-	    create_subject_related_elements(doc, manifestation)
+            manifestation.creators << creator_agents
+            create_subject_related_elements(doc, manifestation)
             create_series_statement(doc, manifestation)
-	    if is_serial
+            if is_serial
               create_series_master(doc, manifestation)
-	    end
+            end
           end
         end
         return manifestation
@@ -147,31 +149,31 @@ module EnjuLoc
 
       private
       def create_subject_related_elements(doc, manifestation)
-	subjects = get_mods_subjects(doc)
-	classifications = get_mods_classifications(doc)
-	if defined?(EnjuSubject)
-          subject_heading_type = SubjectHeadingType.where(:name => 'lcsh').first_or_create
+        subjects = get_mods_subjects(doc)
+        classifications = get_mods_classifications(doc)
+        if defined?(EnjuSubject)
+          subject_heading_type = SubjectHeadingType.where(name: 'lcsh').first || SubjectHeadingType.create!(name: 'lcsh')
           subjects.each do |term|
             subject = Subject.where(:term => term[:term]).first
             unless subject
               subject = Subject.new(term)
               subject.subject_heading_type = subject_heading_type
-              subject.subject_type = SubjectType.where(:name => 'concept').first_or_create
+              subject.subject_type = SubjectType.where(name: 'concept').first || SubjectType.create!(name: 'concept')
             end
             manifestation.subjects << subject
           end
           if classifications
-            classification_type = ClassificationType.where(:name => 'ddc').first_or_create
-	    classifications.each do |ddc|
+            classification_type = ClassificationType.where(name: 'ddc').first || ClassificationType.create!(name: 'ddc')
+            classifications.each do |ddc|
               classification = Classification.where(:category => ddc).first
-	      unless classification
+              unless classification
                 classification = Classification.new(:category => ddc)
                 classification.classification_type = classification_type
-	      end
+              end
               manifestation.classifications << classification if classification.valid?
             end
           end
-	end
+        end
       end
 
       def create_series_statement(doc, manifestation)
@@ -181,7 +183,7 @@ module EnjuLoc
             series_title = title.split(';')[0].strip
           end
           if series_title
-            series_statement = SeriesStatement.where(:original_title => series_title).first_or_create
+            series_statement = SeriesStatement.where(:original_title => series_title).first || SeriesStatement.create!(original_title: series_title)
             if series_statement.try(:save)
               manifestation.series_statements << series_statement
             end
@@ -191,335 +193,337 @@ module EnjuLoc
       
       def create_series_master(doc, manifestation)
         titles = get_mods_titles(doc)
-	series_statement = SeriesStatement.new(
-	  :original_title => titles[:original_title],
-	  :title_alternative => titles[:title_alternative],
-	  :series_master => true,
-	)
-	if series_statement.try(:save)
-	  manifestation.series_statements << series_statement
-	end
+        series_statement = SeriesStatement.new(
+          :original_title => titles[:original_title],
+          :title_alternative => titles[:title_alternative],
+          :series_master => true,
+        )
+        if series_statement.try(:save)
+          manifestation.series_statements << series_statement
+        end
       end
 
       def get_mods_titles(doc)
-	original_title = ""
-	title_alternatives = []
-	doc.xpath('//mods:mods/mods:titleInfo',NS).each do |e|
-	  type = e.attributes["type"].try(:content)
-	  case type
-	  when "alternative", "translated", "abbreviated", "uniform"
-	    title_alternatives << e.at('./mods:title',NS).content
-	  else
-	    nonsort = e.at('./mods:nonSort',NS).try(:content)
-	    original_title << nonsort if nonsort
-	    original_title << e.at('./mods:title',NS).try(:content)
-	    subtitle = e.at('./mods:subTitle',NS).try(:content)
-	    original_title << " : #{ subtitle }" if subtitle
-	    partnumber = e.at('./mods:partNumber',NS).try(:content)
-	    partname = e.at('./mods:partName',NS).try(:content)
-	    partname = [ partnumber, partname ].compact.join( ": " )
-	    original_title << ". #{ partname }" unless partname.blank?
-	  end
-	end
-	{ :original_title => original_title, :title_alternative => title_alternatives.join( " ; " ) }
+        original_title = ""
+        title_alternatives = []
+        doc.xpath('//mods:mods/mods:titleInfo',NS).each do |e|
+          type = e.attributes["type"].try(:content)
+          case type
+          when "alternative", "translated", "abbreviated", "uniform"
+          title_alternatives << e.at('./mods:title',NS).content
+        else
+          nonsort = e.at('./mods:nonSort',NS).try(:content)
+          original_title << nonsort if nonsort
+          original_title << e.at('./mods:title',NS).try(:content)
+          subtitle = e.at('./mods:subTitle',NS).try(:content)
+          original_title << " : #{ subtitle }" if subtitle
+          partnumber = e.at('./mods:partNumber',NS).try(:content)
+          partname = e.at('./mods:partName',NS).try(:content)
+          partname = [ partnumber, partname ].compact.join( ": " )
+          original_title << ". #{ partname }" unless partname.blank?
+        end
       end
+      { :original_title => original_title, :title_alternative => title_alternatives.join( " ; " ) }
+    end
 
-      def get_mods_language(doc)
-	language = doc.at('//mods:language/mods:languageTerm[@authority="iso639-2b"]',NS).try(:content)
-      end
+    def get_mods_language(doc)
+      language = doc.at('//mods:language/mods:languageTerm[@authority="iso639-2b"]',NS).try(:content)
+    end
 
-      def get_mods_access_address(doc)
-	access_address = nil
-	url = doc.at('//mods:location/mods:url',NS)
-	if url
-	  usage = url.attributes["usage"].try(:content)
-	  case usage
-	  when "primary display", "primary"
-	    access_address = url.try(:content)
-	  end
-	end
-	access_address
+    def get_mods_access_address(doc)
+      access_address = nil
+      url = doc.at('//mods:location/mods:url',NS)
+      if url
+        usage = url.attributes["usage"].try(:content)
+        case usage
+        when "primary display", "primary"
+        access_address = url.try(:content)
       end
+    end
+    access_address
+  end
 
-      def get_mods_publication_place(doc)
-	place = doc.at('//mods:originInfo/mods:place/mods:placeTerm[@type="text"]',NS).try(:content)
-      end
+  def get_mods_publication_place(doc)
+    place = doc.at('//mods:originInfo/mods:place/mods:placeTerm[@type="text"]',NS).try(:content)
+  end
 
-      def get_mods_extent(doc)
-        extent = doc.at('//mods:extent',NS).try(:content)
-        value = {:start_page => nil, :end_page => nil, :height => nil}
-        if extent
-          extent = extent.split(';')
-          page = extent[0].try(:strip)
-          if page =~ /(\d+)\s*(p|page)/
-            value[:start_page] = 1
-            value[:end_page] = $1.dup.to_i
-          end
-          height = extent[1].try(:strip)
-          if height =~ /(\d+)\s*cm/
-            value[:height] = $1.dup.to_i
-          end
-        end
-        value
+  def get_mods_extent(doc)
+    extent = doc.at('//mods:extent',NS).try(:content)
+    value = {:start_page => nil, :end_page => nil, :height => nil}
+    if extent
+      extent = extent.split(';')
+      page = extent[0].try(:strip)
+      if page =~ /(\d+)\s*(p|page)/
+        value[:start_page] = 1
+        value[:end_page] = $1.dup.to_i
       end
-
-      def get_mods_statement_of_responsibility(doc)
-	note = doc.at('//mods:note[@type="statement of responsibility"]',NS).try(:content)
-	if note.blank?
-	  note = get_mods_creators(doc).map{|e| e[:full_name] }.join( " ; " )
-	end
-	note
+      height = extent[1].try(:strip)
+      if height =~ /(\d+)\s*cm/
+        value[:height] = $1.dup.to_i
       end
-      def get_mods_note(doc)
-        notes = []
-	doc.xpath('//mods:note',NS).each do |note|
-	  type = note.attributes['type'].try(:content)
-	  next if type == "statement of responsibility"
-	  note_s = note.try( :content )
-	  notes << note_s unless note_s.blank?
-	end
-	if notes.empty?
-	  nil
-	else
-	  notes.join( ";\n" )
-	end
+    end
+    value
+  end
+
+  def get_mods_statement_of_responsibility(doc)
+    note = doc.at('//mods:note[@type="statement of responsibility"]',NS).try(:content)
+    if note.blank?
+      note = get_mods_creators(doc).map{|e| e[:full_name] }.join( " ; " )
+    end
+    note
+  end
+
+  def get_mods_note(doc)
+    notes = []
+    doc.xpath('//mods:note',NS).each do |note|
+      type = note.attributes['type'].try(:content)
+      next if type == "statement of responsibility"
+      note_s = note.try( :content )
+      notes << note_s unless note_s.blank?
+    end
+    if notes.empty?
+      nil
+    else
+      notes.join( ";\n" )
+    end
+  end
+
+  def get_mods_date_of_publication(doc)
+    dates = []
+    doc.xpath('//mods:dateIssued',NS).each do |pub_date|
+      pub_date = pub_date.content.sub( /\A[cp]/, '' )
+      next unless pub_date =~ /^\d+(-\d\d?){0,2}$/
+      date = pub_date.split('-')
+      if date[0] and date[1]
+        dates << sprintf("%04d-%02d", date[0], date[1])
+      else
+        dates << pub_date
       end
-      def get_mods_date_of_publication(doc)
-        dates = []
-	doc.xpath('//mods:dateIssued',NS).each do |pub_date|
-	  pub_date = pub_date.content.sub( /\A[cp]/, '' )
-          next unless pub_date =~ /^\d+(-\d\d?){0,2}$/
-          date = pub_date.split('-')
-          if date[0] and date[1]
-            dates << sprintf("%04d-%02d", date[0], date[1])
-          else
-            dates << pub_date
-	  end
+    end
+    dates.compact.first
+  end
+
+  # derived from marcfrequency: http://www.loc.gov/standards/valuelist/marcfrequency.html
+  MARCFREQUENCY = [
+    "Continuously updated",
+    "Daily",
+    "Semiweekly",
+    "Three times a week",
+    "Weekly",
+    "Biweekly",
+    "Three times a month",
+    "Semimonthly",
+    "Monthly",
+    "Bimonthly",
+    "Quarterly",
+    "Three times a year",
+    "Semiannual",
+    "Annual",
+    "Biennial",
+    "Triennial",
+    "Completely irregular",
+  ]
+  def get_mods_frequency(doc)
+    frequencies = []
+    doc.xpath('//mods:frequency',NS).each do |freq|
+      frequency = freq.try(:content)
+      MARCFREQUENCY.each do |freq_regex|
+        if /\A(#{freq_regex})/ =~ frequency
+          frequency_name = freq_regex.downcase.gsub( /\s+/, "_" )
+          frequencies << Frequency.where( name: frequency_name ).first
         end
-	dates.compact.first
       end
+    end
+    frequencies.compact.first
+  end
 
-      # derived from marcfrequency: http://www.loc.gov/standards/valuelist/marcfrequency.html
-      MARCFREQUENCY = [
-        "Continuously updated",
-        "Daily",
-        "Semiweekly",
-        "Three times a week",
-        "Weekly",
-        "Biweekly",
-        "Three times a month",
-        "Semimonthly",
-        "Monthly",
-        "Bimonthly",
-        "Quarterly",
-        "Three times a year",
-        "Semiannual",
-        "Annual",
-        "Biennial",
-        "Triennial",
-        "Completely irregular",
-      ]
-      def get_mods_frequency(doc)
-        frequencies = []
-	doc.xpath('//mods:frequency',NS).each do |freq|
-	  frequency = freq.try(:content)
-	  MARCFREQUENCY.each do |freq_regex|
-	    if /\A(#{freq_regex})/ =~ frequency
-	      frequency_name = freq_regex.downcase.gsub( /\s+/, "_" )
-	      frequencies << Frequency.where( :name => frequency_name ).first
-	    end
-	  end
-	end
-	frequencies.compact.first
-      end
+  def get_mods_creators(doc)
+    creators = []
+    doc.xpath('/mods:mods/mods:name',NS).each do |creator|
+      creators << {
+        :full_name => creator.xpath('./mods:namePart',NS).collect(&:content).join( ", " ),
+      }
+    end
+    creators.uniq
+  end
 
-      def get_mods_creators(doc)
-	creators = []
-        doc.xpath('/mods:mods/mods:name',NS).each do |creator|
-	  creators << {
-	    :full_name => creator.xpath('./mods:namePart',NS).collect(&:content).join( ", " ),
-	  }
+  # TODO:only LCSH-based parsing...
+  def get_mods_subjects(doc)
+    subjects = []
+    doc.xpath('//mods:subject[@authority="lcsh"]',NS).each do |s|
+      subject = []
+      s.xpath('./*',NS).each do |subelement|
+        type = subelement.name
+        case subelement.name
+        when "topic", "geographic", "genre", "temporal"
+          subject << { :type => type , :term => subelement.try(:content) }
+        when "titleInfo"
+          subject << { :type => type, :term => subelement.at('./mods:title',NS).try(:content) }
+        when "name"
+          name = subelement.xpath('./mods:namePart',NS).map{|e| e.try(:content) }.join( ", " )
+          subject << { :type => type, :term => name }
         end
-	creators.uniq
       end
-
-      # TODO:only LCSH-based parsing...
-      def get_mods_subjects(doc)
-	subjects = []
-	doc.xpath('//mods:subject[@authority="lcsh"]',NS).each do |s|
-	  subject = []
-	  s.xpath('./*',NS).each do |subelement|
-	    type = subelement.name
-	    case subelement.name
-	    when "topic", "geographic", "genre", "temporal"
-	      subject << { :type => type , :term => subelement.try(:content) }
-	    when "titleInfo"
-	      subject << { :type => type, :term => subelement.at('./mods:title',NS).try(:content) }
-	    when "name"
-	      name = subelement.xpath('./mods:namePart',NS).map{|e| e.try(:content) }.join( ", " )
-	      subject << { :type => type, :term => name }
-	    end
-	  end
-	  next if subject.compact.empty?
-	  if subject.size > 1 and subject[0][:type] == "name" and subject[1][:type] == "titleInfo"
-	    subject[0..1] = { :term => subject[0..1].map{|e|e[:term]}.join( ". " ) }
-	  end
-	  subjects << {
-	    :term => subject.map{|e|e[:term]}.compact.join( "--" )
-	  }
-	end
-	subjects
+      next if subject.compact.empty?
+      if subject.size > 1 and subject[0][:type] == "name" and subject[1][:type] == "titleInfo"
+        subject[0..1] = { :term => subject[0..1].map{|e|e[:term]}.join( ". " ) }
       end
+      subjects << {
+        :term => subject.map{|e|e[:term]}.compact.join( "--" )
+      }
+    end
+    subjects
+  end
 
-      # TODO:support only DDC.
-      def get_mods_classifications(doc)
-	classifications = []
-	doc.xpath('//mods:classification[@authority="ddc"]',NS).each do|c|
-	  ddc = c.content
-	  if ddc
-	    classifications << ddc.split(/[^\d\.]/).first.try(:strip)
-	  end
-	end
-	classifications.compact
+  # TODO:support only DDC.
+  def get_mods_classifications(doc)
+    classifications = []
+    doc.xpath('//mods:classification[@authority="ddc"]',NS).each do|c|
+      ddc = c.content
+      if ddc
+        classifications << ddc.split(/[^\d\.]/).first.try(:strip)
       end
+    end
+    classifications.compact
+  end
 
-      def get_mods_carrier_and_content_types(doc)
-        carrier_type = content_type = nil
-        doc.xpath('//mods:form',NS).each do |e|
-          authority = e.attributes['authority'].try(:content)
-	  case authority
-	  when "gmd"
-	    case e.content
-	    when "electronic resource"
-	      carrier_type = CarrierType.where(:name => 'online_resource').first
-	    when "videorecording", "motion picture", "game"
-              content_type = ContentType.where(:name => 'two_dimensional_moving_image').first
-	    when "sound recording"
-              content_type = ContentType.where(:name => 'performed_music').first
-	    when "graphic", "picture"
-	      content_type = ContentType.where(:name => 'still_image').first
-	    #TODO: Enju needs more specific mappings...
-	    when "art original",
-	    	 "microscope slides",
-	    	 "art reproduction",
-	    	 "model",
-	    	 "chart",
-	    	 "diorama",
-	    	 "realia",
-	    	 "filmstrip",
-	    	 "slide",
-	    	 "flash card",
-	    	 "technical drawing",
-	    	 "toy",
-	    	 "kit",
-	    	 "transparency",
-	    	 "microform"
-	      content_type = ContentType.where(:name => 'other').first
-	    end
-	  when "marcsmd" # cf.http://www.loc.gov/standards/valuelist/marcsmd.html
-	    case e.content
-            when "text", "large print", "regular print", "text in looseleaf binder"
-              carrier_type = CarrierType.where(:name => 'volume').first
-              content_type = ContentType.where(:name => 'text').first
-	    when "braille"
-              carrier_type = CarrierType.where(:name => 'volume').first
-              content_type = ContentType.where(:name => 'tactile_text').first
-	    when "videodisc"
-              carrier_type = CarrierType.where(:name => 'videodisc').first
-              content_type = ContentType.where(:name => 'two_dimensional_moving_image').first
-	    when "videorecording", "videocartridge", "videocassette", "videoreel"
-              carrier_type = CarrierType.where(:name => 'other').first
-              content_type = ContentType.where(:name => 'two_dimensional_moving_image').first
-	    when "electronic resource"
-	      carrier_type = CarrierType.where(:name => 'online_resource').first
-	    when "chip cartridge", "computer optical disc cartridge", "magnetic disk", "magneto-optical disc", "optical disc", "remote", "tape cartridge", "tape cassette", "tape reel"
-	      #carrier_type = CarrierType.where(:name => 'other').first
-	    when "motion picture", "film cartridge", "film cassette", "film reel"
-              content_type = ContentType.where(:name => 'two_dimensional_moving_image').first
-	    when "sound recording", "cylinder", "roll", "sound cartridge", "sound cassette","sound-tape reel", "sound-track film", "wire recording" 
-	      content_type = ContentType.where(:name => 'performed_music').first
-	    when "sound disc"
-	      content_type = ContentType.where(:name => 'performed_music').first
-	      carrier_type = CarrierType.where(:name => 'audio_disc').first
-	    when "nonprojected graphic", "chart", "collage", "drawing", "flash card", "painting", "photomechanical print", "photonegative", "photoprint", "picture", "print", "technical drawing", "projected graphic", "filmslip", "filmstrip cartridge", "filmstrip roll", "other filmstrip type ", "slide", "transparency"
-              content_type = ContentType.where(:name => 'still_image').first
-	    when "tactile material", "braille", "tactile, with no writing system"
-	      content_type = ContentType.where(:name => 'tactile_text').first
-	    #TODO: Enju needs more specific mappings...
-	    when "globe",
-	    	 "celestial globe",
-		 "earth moon globe",
-		 "planetary or lunar globe",
-		 "terrestrial globe",
-		 "map",
-		 "atlas",
-		 "diagram",
-		 "map",
-		 "model",
-		 "profile",
-		 "remote-sensing image",
-		 "section",
-		 "view",
-		 "microform",
-		 "aperture card",
-		 "microfiche",
-		 "microfiche cassette",
-		 "microfilm cartridge",
-		 "microfilm cassette",
-		 "microfilm reel",
-		 "microopaque",
-		 "combination",
-		 "moon"
-              content_type = ContentType.where(:name => 'other').first
-	    end
-	  when "marcform" # cf. http://www.loc.gov/standards/valuelist/marcform.html
-	    case e.content
-	    when "print", "large print"
-              carrier_type = CarrierType.where(:name => 'volume').first
-              content_type = ContentType.where(:name => 'text').first
-	    when "electronic"
-              carrier_type = CarrierType.where(:name => 'online_resource').first
-	    when "braille"
-	      content_type = ContentType.where(:name => 'tactile_text').first
-	    #TODO: Enju needs more specific mappings...
-	    when "microfiche", "microfilm"
-	      content_type = ContentType.where(:name => 'other').first
-	    end
-	  end
-	end
+  def get_mods_carrier_and_content_types(doc)
+    carrier_type = content_type = nil
+    doc.xpath('//mods:form',NS).each do |e|
+      authority = e.attributes['authority'].try(:content)
+      case authority
+      when "gmd"
+        case e.content
+        when "electronic resource"
+          carrier_type = CarrierType.where(name: 'online_resource').first
+        when "videorecording", "motion picture", "game"
+          content_type = ContentType.where(name: 'two_dimensional_moving_image').first
+        when "sound recording"
+          content_type = ContentType.where(name: 'performed_music').first
+        when "graphic", "picture"
+          content_type = ContentType.where(name: 'still_image').first
+        #TODO: Enju needs more specific mappings...
+        when "art original",
+        "microscope slides",
+        "art reproduction",
+        "model",
+        "chart",
+        "diorama",
+        "realia",
+        "filmstrip",
+        "slide",
+        "flash card",
+        "technical drawing",
+        "toy",
+        "kit",
+        "transparency",
+        "microform"
+          content_type = ContentType.where(name: 'other').first
+        end
+        when "marcsmd" # cf.http://www.loc.gov/standards/valuelist/marcsmd.html
+          case e.content
+          when "text", "large print", "regular print", "text in looseleaf binder"
+            carrier_type = CarrierType.where(name: 'volume').first
+            content_type = ContentType.where(name: 'text').first
+          when "braille"
+            carrier_type = CarrierType.where(name: 'volume').first
+            content_type = ContentType.where(name: 'tactile_text').first
+          when "videodisc"
+            carrier_type = CarrierType.where(name: 'videodisc').first
+            content_type = ContentType.where(name: 'two_dimensional_moving_image').first
+          when "videorecording", "videocartridge", "videocassette", "videoreel"
+            carrier_type = CarrierType.where(name: 'other').first
+            content_type = ContentType.where(name: 'two_dimensional_moving_image').first
+          when "electronic resource"
+            carrier_type = CarrierType.where(name: 'online_resource').first
+          when "chip cartridge", "computer optical disc cartridge", "magnetic disk", "magneto-optical disc", "optical disc", "remote", "tape cartridge", "tape cassette", "tape reel"
+            #carrier_type = CarrierType.where(name: 'other').first
+          when "motion picture", "film cartridge", "film cassette", "film reel"
+            content_type = ContentType.where(name: 'two_dimensional_moving_image').first
+          when "sound recording", "cylinder", "roll", "sound cartridge", "sound cassette","sound-tape reel", "sound-track film", "wire recording" 
+            content_type = ContentType.where(name: 'performed_music').first
+          when "sound disc"
+            content_type = ContentType.where(name: 'performed_music').first
+            carrier_type = CarrierType.where(name: 'audio_disc').first
+          when "nonprojected graphic", "chart", "collage", "drawing", "flash card", "painting", "photomechanical print", "photonegative", "photoprint", "picture", "print", "technical drawing", "projected graphic", "filmslip", "filmstrip cartridge", "filmstrip roll", "other filmstrip type ", "slide", "transparency"
+            content_type = ContentType.where(name: 'still_image').first
+          when "tactile material", "braille", "tactile, with no writing system"
+            content_type = ContentType.where(name: 'tactile_text').first
+          #TODO: Enju needs more specific mappings...
+          when "globe",
+          "celestial globe",
+          "earth moon globe",
+          "planetary or lunar globe",
+          "terrestrial globe",
+          "map",
+          "atlas",
+          "diagram",
+          "map",
+          "model",
+          "profile",
+          "remote-sensing image",
+          "section",
+          "view",
+          "microform",
+          "aperture card",
+          "microfiche",
+          "microfiche cassette",
+          "microfilm cartridge",
+          "microfilm cassette",
+          "microfilm reel",
+          "microopaque",
+          "combination",
+          "moon"
+            content_type = ContentType.where(name: 'other').first
+          end
+          when "marcform" # cf. http://www.loc.gov/standards/valuelist/marcform.html
+            case e.content
+            when "print", "large print"
+              carrier_type = CarrierType.where(name: 'volume').first
+              content_type = ContentType.where(name: 'text').first
+            when "electronic"
+              carrier_type = CarrierType.where(name: 'online_resource').first
+            when "braille"
+              content_type = ContentType.where(name: 'tactile_text').first
+            #TODO: Enju needs more specific mappings...
+            when "microfiche", "microfilm"
+              content_type = ContentType.where(name: 'other').first
+            end
+          end
+        end
         doc.xpath('//mods:genre',NS).each do |e|
           authority = e.attributes['authority'].try(:content)
-	  case authority
-	  when "rdacontent"
-	    content_type = ContentType.where(:name => e.content.gsub(/\W+/, "_")).first
-	    content_type = ContentType.where(:name => 'other').first unless content_type
+          case authority
+          when "rdacontent"
+            content_type = ContentType.where(name: e.content.gsub(/\W+/, "_")).first
+            content_type = ContentType.where(name: 'other').first unless content_type
           end
         end
-	type = doc.at('//mods:typeOfResource',NS).try(:content)
-	case type
-	when "text"
-	  content_type = ContentType.where(:name => 'text').first
-	when "sound recording"
-	  content_type = ContentType.where(:name => 'sounds').first
-	when"sound recording-musical"
-	  content_type = ContentType.where(:name => 'performed_music').first
-	when"sound recording-nonmusical"
-	  content_type = ContentType.where(:name => 'spoken_word').first
-	when "moving image"
-	  content_type = ContentType.where(:name => 'two_dimensional_moving_image').first
-	when "software, multimedia"
-	  content_type = ContentType.where(:name => 'other').first
-	when "cartographic "
-	  content_type = ContentType.where(:name => 'cartographic_image').first
-	when "notated music"
-	  content_type = ContentType.where(:name => 'notated_music').first
-	when "still image"
-	  content_type = ContentType.where(:name => 'still_image').first
-	when "three dimensional object"
-	  content_type = ContentType.where(:name => 'other').first
-	when "mixed material"
-	  content_type = ContentType.where(:name => 'other').first
-	end
+        type = doc.at('//mods:typeOfResource',NS).try(:content)
+        case type
+        when "text"
+          content_type = ContentType.where(name: 'text').first
+        when "sound recording"
+          content_type = ContentType.where(name: 'sounds').first
+        when"sound recording-musical"
+          content_type = ContentType.where(name: 'performed_music').first
+        when"sound recording-nonmusical"
+          content_type = ContentType.where(name: 'spoken_word').first
+        when "moving image"
+          content_type = ContentType.where(name: 'two_dimensional_moving_image').first
+        when "software, multimedia"
+          content_type = ContentType.where(name: 'other').first
+        when "cartographic "
+          content_type = ContentType.where(name: 'cartographic_image').first
+        when "notated music"
+          content_type = ContentType.where(name: 'notated_music').first
+        when "still image"
+          content_type = ContentType.where(name: 'still_image').first
+        when "three dimensional object"
+          content_type = ContentType.where(name: 'other').first
+        when "mixed material"
+          content_type = ContentType.where(name: 'other').first
+        end
         { :carrier_type => carrier_type, :content_type => content_type }
       end
     end