dor-services 4.22.3 → 4.22.4

data/lib/dor/datastreams/datastream_spec_solrizer.rb

@@ -1,7 +1,7 @@
 module DatastreamSpecSolrizer
   extend ActiveSupport::Concern
   include SolrDocHelper
-  
+
   def datastream_spec_string
     s = begin
       controlGroup == 'E' ? content.to_s.length : size

data/lib/dor/datastreams/default_object_rights_ds.rb

@@ -1,20 +1,18 @@
 module Dor
-  class DefaultObjectRightsDS < ActiveFedora::OmDatastream 
+  class DefaultObjectRightsDS < ActiveFedora::OmDatastream
 
     set_terminology do |t|
       t.root :path => 'rightsMetadata', :index_as => [:not_searchable]
       t.copyright :path => 'copyright/human', :index_as => [:facetable]
       t.use_statement :path => '/use/human[@type=\'useAndReproduction\']', :index_as => [:facetable]
-      
+
       t.use do
         t.machine
         t.human
       end
-        
+
       t.creative_commons :path => '/use/machine', :type => 'creativeCommons'
       t.creative_commons_human :path => '/use/human[@type=\'creativeCommons\']'
-      
-      
     end
 
     define_template :creative_commons do |xml|
@@ -23,6 +21,7 @@ module Dor
         xml.machine(:type => "creativeCommons")
       }
     end
+
     def self.xml_template
       Nokogiri::XML::Builder.new do |xml|
         xml.rightsMetadata{
@@ -30,7 +29,7 @@ module Dor
             xml.machine{
               xml.world
             }
-          } 
+          }
           xml.access(:type => 'read'){
             xml.machine{
               xml.world
@@ -44,9 +43,8 @@ module Dor
           xml.copyright{
             xml.human
           }
-        
-      }
-    end.doc
+        }
+      end.doc
+    end
   end
 end
-end

data/lib/dor/datastreams/desc_metadata_ds.rb

@@ -1,39 +1,40 @@
 module Dor
-class DescMetadataDS < ActiveFedora::OmDatastream 
-  include SolrDocHelper
-  
-  MODS_NS = 'http://www.loc.gov/mods/v3'
-  set_terminology do |t|
-    t.root :path => 'mods', :xmlns => MODS_NS, :index_as => [:not_searchable]
-    t.originInfo :index_as => [:not_searchable] do
-      t.publisher :index_as => [:searchable, :displayable]
-      t.place :index_as => [:not_searchable] do
-        t.placeTerm :attributes => {:type => 'text'}, :index_as => [:searchable, :displayable]
+  class DescMetadataDS < ActiveFedora::OmDatastream
+    include SolrDocHelper
+
+    MODS_NS = 'http://www.loc.gov/mods/v3'
+    set_terminology do |t|
+      t.root :path => 'mods', :xmlns => MODS_NS, :index_as => [:not_searchable]
+      t.originInfo  :index_as => [:not_searchable] do
+        t.publisher :index_as => [:searchable, :displayable]
+        t.place     :index_as => [:not_searchable] do
+          t.placeTerm :attributes => {:type => 'text'}, :index_as => [:searchable, :displayable]
+        end
       end
+      t.title_info(:path => 'titleInfo') {
+        t.main_title(:index_as => [:facetable], :path => 'title', :label => 'title') {
+          t.main_title_lang(:path => {:attribute => 'xml:lang'})
+        }
+      }
+      t.language {
+        t.languageTerm :attributes => {:type => 'code', :authority => 'iso639-2b'}, :index_as => [:not_searchable]
+      }
+      t.coordinates :index_as => [:searchable]
+      t.extent      :index_as => [:searchable]
+      t.scale       :index_as => [:searchable]
+      t.topic       :index_as => [:searchable]
+      t.abstract    :index_as => [:displayable]
     end
-    t.title_info(:path=>"titleInfo") {
-           t.main_title(:index_as=>[:facetable],:path=>"title", :label=>"title") {
-             t.main_title_lang(:path=>{:attribute=> "xml:lang"})
-           }
-         }
-    t.coordinates :index_as => [:searchable]
-    t.extent :index_as => [:searchable]
-    t.scale :index_as => [:searchable]
-    t.topic :index_as => [:searchable]
-    t.abstract :index_as=>[:displayable]
-  end
-  
-  def self.xml_template
-    Nokogiri::XML::Builder.new do |xml|
-      xml.mods( 'xmlns' => 'http://www.loc.gov/mods/v3', 'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance',:version => '3.3', "xsi:schemaLocation" => 'http://www.loc.gov/mods/v3 http://www.loc.gov/standards/mods/v3/mods-3-3.xsd'){
-     		xml.titleInfo{
-     			xml.title 
-     			}
-   			}
-    end.doc
-  end
- 
- 
 
-end
+    def self.xml_template
+      Nokogiri::XML::Builder.new do |xml|
+        xml.mods( 'xmlns' => MODS_NS, 'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance', :version => '3.3', 'xsi:schemaLocation' => 'http://www.loc.gov/mods/v3 http://www.loc.gov/standards/mods/v3/mods-3-3.xsd'){
+        xml.titleInfo{
+          xml.title
+        }
+      }
+      end.doc
+    end
+
+  end
 end

data/lib/dor/datastreams/embargo_metadata_ds.rb

@@ -24,13 +24,13 @@ class EmbargoMetadataDS < ActiveFedora::OmDatastream
         xml.twentyPctVisibilityReleaseDate
       }
     end
-    return builder.doc
+    builder.doc
   end
 
   def to_solr solr_doc = {}, *args
     super
-    add_solr_value(solr_doc, 'embargo_release_date', self.release_date.utc.strftime('%FT%TZ') , :date, [:searchable]) rescue nil
-    add_solr_value(solr_doc, 'twenty_pct_visibility_release_date', self.twenty_pct_release_date.utc.strftime('%FT%TZ') , :date, [:searchable]) rescue nil
+    add_solr_value(solr_doc, 'embargo_release_date', release_date.utc.strftime('%FT%TZ') , :date, [:searchable]) rescue nil
+    add_solr_value(solr_doc, 'twenty_pct_visibility_release_date', twenty_pct_release_date.utc.strftime('%FT%TZ') , :date, [:searchable]) rescue nil
 
     solr_doc
   end
@@ -54,9 +54,9 @@ class EmbargoMetadataDS < ActiveFedora::OmDatastream
 
   # Sets the release date.  Converts the date to beginning-of-day, UTC to help with Solr indexing
   # @param [Time] rd A Time object represeting the release date.  By default, it is set to now
-  def release_date=(rd=Time.now)
-		update_values([:release_date] => rd.beginning_of_day.utc.xmlschema)
-    self.content=self.ng_xml.to_s
+  def release_date=(rd = Time.now)
+    update_values([:release_date] => rd.beginning_of_day.utc.xmlschema)
+    self.content=ng_xml.to_s
   end
 
   # Current releaseDate value
@@ -76,7 +76,7 @@ class EmbargoMetadataDS < ActiveFedora::OmDatastream
 
   # Sets the 20% visibility release date.  Converts the date to beginning-of-day, UTC to help with Solr indexing
   # @param [Time] rd A Time object represeting the release date.  By default, it is set to now
-  def twenty_pct_release_date=(rd=Time.now)
+  def twenty_pct_release_date=(rd = Time.now)
     update_values([:twenty_pct_release_date] => rd.beginning_of_day.utc.xmlschema)
     content_will_change!
   end

data/lib/dor/datastreams/events_ds.rb

@@ -1,7 +1,7 @@
 module Dor
 class EventsDS < ActiveFedora::OmDatastream
   before_create :ensure_non_versionable
-  
+
   set_terminology do |t|
     t.root(:path => "events")
     t.event do
@@ -11,30 +11,30 @@ class EventsDS < ActiveFedora::OmDatastream
       t.message :path => "text()", :index_as => [:displayable, :not_searchable]
     end
   end
-  
-  # Default EventsDS xml 
+
+  # Default EventsDS xml
   def self.xml_template
     builder = Nokogiri::XML::Builder.new do |xml|
       xml.events
     end
-    return builder.doc
+    builder.doc
   end
-  
+
   def ensure_non_versionable
     self.versionable = "false"
   end
-  
+
   # Adds an event to the datastream
   # @param [String] type a tag used to group events together. Sets the type attribute for the event
   # @param [String] who who is responsible for this event. Sets the who attribute for the event
   # @param [String] message what happened. Sets the content of the event with this message
   def add_event(type, who, message)
-    ev = ng_xml.create_element "event", message, 
+    ev = ng_xml.create_element "event", message,
       :type => type, :who => who, :when => Time.now.xmlschema
     ng_xml.root.add_child(ev)
     content_will_change!
   end
-  
+
   # Finds events with the desired type attribute
   # @param [String] tag events where type == tag will be returned
   # @yield [who, timestamp, message] The values of the current event
@@ -46,7 +46,7 @@ class EventsDS < ActiveFedora::OmDatastream
       block.call(node['who'], Time.parse(node['when']), node.content)
     end
   end
-  
+
   # Returns all the events in the datastream
   # @yield [type, who, timestamp, message] The values of the current event
   # @yieldparam [String] type tag for this particular event.  Value of the 'type' attribute
@@ -58,6 +58,6 @@ class EventsDS < ActiveFedora::OmDatastream
       block.call(node['type'], node['who'], Time.parse(node['when']), node.content)
     end
   end
-  
+
+end
 end
-end

data/lib/dor/datastreams/geo_metadata_ds.rb

@@ -9,11 +9,11 @@ module Dor
   # The datastream is packaged using RDF to identify the optional ISO 19139 feature catalog
   # @see http://www.isotc211.org
   # @author Darren Hardy
-  class GeoMetadataDS < ActiveFedora::NokogiriDatastream 
+  class GeoMetadataDS < ActiveFedora::NokogiriDatastream
     include SolrDocHelper
-    
+
     attr_accessor :geometryType, :zipName, :purl
-  
+
     # namespaces
     NS = {
       :rdf => 'http://www.w3.org/1999/02/22-rdf-syntax-ns#',
@@ -21,75 +21,74 @@ module Dor
       :gmd => 'http://www.isotc211.org/2005/gmd',
       :gfc => 'http://www.isotc211.org/2005/gfc'
     }
-    
+
     # hash with all namespaces
     XMLNS = Hash[NS.map {|k,v| ["xmlns:#{k}", v]}]
-    
+
     # schema locations
     NS_XSD = NS.keys.collect {|k| "#{NS[k]} #{NS[k]}/#{k}.xsd"}
 
     # [Nokogiri::XSLT::Stylesheet] for ISO 19139 to MODS
     XSLT_GEOMODS = Nokogiri::XSLT(File.read(
-                                    File.join(
-                                      File.dirname(__FILE__), 'geo2mods.xsl')))
-    
+                                  File.join(
+                                  File.dirname(__FILE__), 'geo2mods.xsl')))
+
     XSLT_DC = Nokogiri::XSLT(File.new(
-                               File.expand_path(
-                                 File.dirname(__FILE__) + '/../models/mods2dc.xslt')))
-    
+                             File.expand_path(
+                             File.dirname(__FILE__) + '/../models/mods2dc.xslt')))
+
     # @see http://ruby-doc.org/gems/docs/o/om-1.8.0/OM/XML/Document/ClassMethods.html#method-i-set_terminology
     set_terminology do |t|
-      t.root :path => '/rdf:RDF/rdf:Description/gmd:MD_Metadata', 
-        'xmlns:gmd' => NS[:gmd], 
-        'xmlns:gco' => NS[:gco], 
+      t.root :path => '/rdf:RDF/rdf:Description/gmd:MD_Metadata',
+        'xmlns:gmd' => NS[:gmd],
+        'xmlns:gco' => NS[:gco],
         'xmlns:rdf' => NS[:rdf]
 
       t.id_ :path => '/rdf:RDF/rdf:Description[1]/@rdf:about'
 
       p = './'
-      t.dataset_id :path => p + 'gmd:dataSetURI/gco:CharacterString'
-      t.file_id :path => p + 'gmd:fileIdentifier/gco:CharacterString'
-      t.metadata_dt :path => p + 'gmd:dateStamp/gco:Date/text()' # XXX: Allow DateTime
+      t.dataset_id        :path => p + 'gmd:dataSetURI/gco:CharacterString'
+      t.file_id           :path => p + 'gmd:fileIdentifier/gco:CharacterString'
+      t.metadata_dt       :path => p + 'gmd:dateStamp/gco:Date/text()' # XXX: Allow DateTime
       t.metadata_language :path => p + 'gmd:MD_Metadata/gmd:language/gmd:LanguageCode[@codeSpace="ISO639-2"]/@codeListValue'
 
       p = 'gmd:identificationInfo/gmd:MD_DataIdentification/'
-      t.abstract :path => p + 'gmd:abstract/gco:CharacterString/text()'
-      t.purpose :path => p + 'gmd:purpose/gco:CharacterString/text()'
+      t.abstract  :path => p + 'gmd:abstract/gco:CharacterString/text()'
+      t.purpose   :path => p + 'gmd:purpose/gco:CharacterString/text()'
       t.publisher :path => p + 'gmd:pointOfContact/gmd:CI_ResponsibleParty[gmd:role/gmd:CI_RoleCode/@codeListValue="pointOfContact"]/gmd:organisationName/gco:CharacterString/text()'
 
       p = 'gmd:identificationInfo/gmd:MD_DataIdentification/gmd:citation/gmd:CI_Citation/'
-      t.title :path => p + 'gmd:title/gco:CharacterString/text()'
+      t.title      :path => p + 'gmd:title/gco:CharacterString/text()'
       t.publish_dt :path => p + 'gmd:date/gmd:CI_Date/gmd:date/gco:Date/text()'
       t.originator :path => p + 'gmd:citedResponsibleParty/gmd:CI_ResponsibleParty[gmd:role/gmd:CI_RoleCode/@codeListValue="originator"]/gmd:organisationName/gco:CharacterString/text()'
 
       p = 'gmd:distributionInfo/gmd:MD_Distribution/gmd:distributionFormat/gmd:MD_Format/'
       t.format :path => p + 'gmd:name/gco:CharacterString/text()'#, :index_as => [:facetable]
-      
+
       p = 'gmd:distributionInfo/gmd:MD_Distribution/gmd:transferOptions/gmd:MD_DigitalTransferOptions/gmd:onLine/gmd:CI_OnlineResource/'
       t.layername :path => p + 'gmd:name/gco:CharacterString/text()'
-      
+
       # XXX should define projection as codeSpace + ':' + code in terminology
       p = 'gmd:referenceSystemInfo/gmd:MD_ReferenceSystem/gmd:referenceSystemIdentifier/gmd:RS_Identifier/'
-      t.projection :path => p + 'gmd:code/gco:CharacterString/text()'
+      t.projection            :path => p + 'gmd:code/gco:CharacterString/text()'
       t.projection_code_space :path => p + 'gmd:codeSpace/gco:CharacterString/text()'
     end
-    
+
     # @return [Nokogiri::XML::Document] with gmd:MD_Metadata as root node
     # @raise [Dor::ParameterError] if MD_Metadata is missing
     def metadata
       root = ng_xml.xpath('/rdf:RDF/rdf:Description/gmd:MD_Metadata', XMLNS)
-      if root.nil? or root.empty?
-        raise Dor::ParameterError, "Invalid geoMetadata -- missing MD_Metadata: #{root}" 
+      if root.nil? || root.empty?
+        raise Dor::ParameterError, "Invalid geoMetadata -- missing MD_Metadata: #{root}"
       else
         Nokogiri::XML(root.first.to_xml)
       end
     end
-    
-    # @return [Nokogiri::XML::Document] with gfc:FC_FeatureCatalogue as root node, 
-    #     or nil if not provided
+
+    # @return [Nokogiri::XML::Document] with gfc:FC_FeatureCatalogue as root node or nil if not provided
     def feature_catalogue
       root = ng_xml.xpath('/rdf:RDF/rdf:Description/gfc:FC_FeatureCatalogue', XMLNS)
-      if root.nil? or root.empty?
+      if root.nil? || root.empty?
         nil # Feature catalog is optional
       else
         Nokogiri::XML(root.first.to_xml)
@@ -101,7 +100,7 @@ module Dor
     #    Includes all possible xmlns for gmd and gfc
     def self.xml_template
       Nokogiri::XML::Builder.new do |xml|
-        xml['rdf'].RDF XMLNS, 
+        xml['rdf'].RDF XMLNS,
           'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance',
           "xsi:schemaLocation" => NS_XSD.join(' ') do
           xml['rdf'].Description 'rdf:about' => nil do
@@ -122,21 +121,21 @@ module Dor
     # Uses GML SimpleFeatures for the geometry type (e.g., Polygon, LineString, etc.)
     # @see http://portal.opengeospatial.org/files/?artifact_id=25355
     #
-    def to_mods(params = {})      
-      params = params.merge({ 
+    def to_mods(params = {})
+      params = params.merge({
         'geometryType' => "'#{@geometryType.nil?? 'Polygon' : @geometryType}'",
         'zipName' => "'#{@zipName.nil?? 'data.zip' : @zipName}'",
         'purl' => "'#{@purl}'"
       })
       doc = XSLT_GEOMODS.transform(metadata.document, params.to_a.flatten)
-      unless doc.root and doc.root.children.size > 0
+      unless doc.root && doc.root.children.size > 0
         raise CrosswalkError, 'to_mods produced incorrect xml'
       end
       # ap doc
-      doc.xpath('/mods:mods' + 
-        '/mods:subject' + 
-        '/mods:cartographics' + 
-        '/mods:projection', 
+      doc.xpath('/mods:mods' +
+        '/mods:subject' +
+        '/mods:cartographics' +
+        '/mods:projection',
         'xmlns:mods' => Dor::DescMetadataDS::MODS_NS).each do |e|
         # Retrieve this mapping from config file
         case e.content.downcase
@@ -149,62 +148,63 @@ module Dor
       doc.xpath('/mods:mods' +
         '/mods:subject' +
         '/mods:cartographics' +
-        '/mods:coordinates', 
+        '/mods:coordinates',
         'xmlns:mods' => Dor::DescMetadataDS::MODS_NS).each do |e|
         e.content = '(' + self.class.to_coordinates_ddmmss(e.content.to_s) + ')'
       end
       doc
     end
-    
+
     def to_dublin_core
       XSLT_DC.transform(to_mods)
     end
-    
+
     # @deprecated stub for GeoBlacklight (not Argo -- use to_solr as usual)
-    def to_solr_spatial(solr_doc=Hash.new, *args)
+    def to_solr_spatial(solr_doc = {}, *args)
       # There are a whole bunch of namespace-related things that can go
       # wrong with this terminology. Until it's fixed in OM, ignore them all.
       begin
-        doc = solr_doc#super solr_doc, *args
+        doc = solr_doc # super solr_doc, *args
         bb = to_bbox
         ap({:doc => doc, :bb => bb, :self => self}) if $DEBUG
+        # self is required once below, because format is a keyword
         {
-          :id => self.id.first,
-          :druid => URI(self.id.first).path.gsub(%r{^/}, ''),
-          :file_id_s => self.file_id.first,
+          :id => id.first,
+          :druid => URI(id.first).path.gsub(%r{^/}, ''),
+          :file_id_s => file_id.first,
           :geo_bbox => to_solr_bbox,
           :geo_data_type_s => 'vector',
-          :geo_format_s => self.format.first,
+          :geo_format_s => self.format.first, # rubocop:disable Style/RedundantSelf
           :geo_geometry_type_s => 'Polygon',
-          :geo_layername_s => File.basename(self.layername.first, '.shp'),
+          :geo_layername_s => File.basename(layername.first, '.shp'),
           :geo_ne_pt => Dor::GeoMetadataDS.to_wkt([bb.e, bb.n]),
           :geo_pt => to_solr_centroid,
           :geo_sw_pt => Dor::GeoMetadataDS.to_wkt([bb.w, bb.s]),
-          :geo_proj => self.projection.first,
+          :geo_proj => projection.first,
           :dc_coverage_t => to_dc_coverage,
-          :dc_creator_t => self.originator.first,
-          :dc_date_i => self.publish_dt.map {|i| i.to_s[0..3]},
-          :dc_description_t => [self.abstract.first, self.purpose.first].join(";\n"),
+          :dc_creator_t => originator.first,
+          :dc_date_i => publish_dt.map {|i| i.to_s[0..3]},
+          :dc_description_t => [abstract.first, purpose.first].join(";\n"),
           :dc_format_s => 'application/x-esri-shapefile',
-          :dc_language_s => self.metadata_language.first,
-          :dc_title_t => self.title.first,
-          :text => [self.title.first, self.abstract.first, self.purpose.first].join(";\n")
+          :dc_language_s => metadata_language.first,
+          :dc_title_t => title.first,
+          :text => [title.first, abstract.first, purpose.first].join(";\n")
         }.each do |id, v|
           ::Solrizer::Extractor.insert_solr_field_value(doc, id.to_s, v)
         end
 
         return doc
-      rescue 
+      rescue
         solr_doc
       end
     end
-  
-    # @return [Struct] in minX minY maxX maxY order 
+
+    # @return [Struct] in minX minY maxX maxY order
     #      with .w, .e, .n., .s for west, east, north, south as floats
     def to_bbox
       params = { 'xmlns:gmd' => NS[:gmd], 'xmlns:gco' => NS[:gco] }
       bb = metadata.xpath(
-        '//gmd:EX_Extent/gmd:geographicElement' + 
+        '//gmd:EX_Extent/gmd:geographicElement' +
         '/gmd:EX_GeographicBoundingBox', params).first
       Struct.new(:w, :e, :n, :s).new(
         bb.xpath('gmd:westBoundLongitude/gco:Decimal', params).text.to_f,
@@ -213,17 +213,17 @@ module Dor
         bb.xpath('gmd:southBoundLatitude/gco:Decimal', params).text.to_f
       )
     end
-    
+
     # @return [Array<Numeric>] (x y) coordinates of center point - assumes #to_bbox
     # @see http://wiki.apache.org/solr/SolrAdaptersForLuceneSpatial4
     def to_centroid
       bb = to_bbox
       [ (bb.w + bb.e)/2, (bb.n + bb.s)/2 ]
     end
-  
+
     # A lat-lon rectangle can be indexed with 4 numbers in minX minY maxX maxY order:
-    # 
-    #      <field name="geo">-74.093 41.042 -69.347 44.558</field> 
+    #
+    #      <field name="geo">-74.093 41.042 -69.347 44.558</field>
     #      <field name="geo">POLYGON((...))</field>
     #
     # @param [Symbol] either :solr3 or :solr4
@@ -231,7 +231,7 @@ module Dor
     # @see http://wiki.apache.org/solr/SolrAdaptersForLuceneSpatial4
     def to_solr_bbox format = :solr4
       bb = to_bbox
-      
+
       case format
       when :solr3
         [bb.w, bb.s, bb.e, bb.n].join(' ')
@@ -241,39 +241,39 @@ module Dor
         raise ArgumentError, "Unsupported format #{format}"
       end
     end
-    
+
     # @return [String] in Dublin Core Coverage format
     def to_dc_coverage
       bb = to_bbox
       "x.min=#{bb.w} x.max=#{bb.e} y.min=#{bb.s} y.max=#{bb.n}"
     end
-  
+
     # A lat-lon point for the centroid of the bounding box:
-    # 
-    #     <field name="geo">69.4325,-78.085007</field> 
+    #
+    #     <field name="geo">69.4325,-78.085007</field>
     #     <field name="geo">POINT(-78.085007 69.4325)</field>
     #
     # @param [Symbol] either :solr3 or :solr4
     # @return [String] minX minY maxX maxY for :solr3 or POLYGON((...)) for :solr4
     # @see http://wiki.apache.org/solr/SolrAdaptersForLuceneSpatial4
-  
+
     # @return [String] (y,x) coordinates of center point matching the LatLonType Solr type
     # @see http://wiki.apache.org/solr/SolrAdaptersForLuceneSpatial4
     def to_solr_centroid format = :solr4
       x, y = to_centroid
-      
+
       case format
       when :solr3
-        [y,x].join(',') # for solr.LatLonType
+        [y, x].join(',') # for solr.LatLonType
       when :solr4
         Dor::GeoMetadataDS.to_wkt [x, y]
       else
         raise ArgumentError, "Unsupported format #{format}"
       end
     end
-    
-    private
-    
+
+    # Class Methods
+
     # @param [Array<Numeric>] (x,y) coordinates for point or bounding box
     # @return [String] WKT for point or rectangle
     def self.to_wkt xy, xy2 = nil
@@ -287,23 +287,23 @@ module Dor
         "POINT(#{xy[0]} #{xy[1]})"
       end
     end
-    
+
     # Convert to MARC 255 DD into DDMMSS
     # westernmost longitude, easternmost longitude, northernmost latitude, and southernmost latitude
     # e.g., -109.758319 -- -88.990844/48.999336 -- 29.423028
     def self.to_coordinates_ddmmss s
       w, e, n, s = s.scanf('%f -- %f/%f -- %f')
-      raise ArgumentError, "Out of bounds latitude: #{n} #{s}" unless n >= -90 and n <= 90 and s >= -90 and s <= 90
-      raise ArgumentError, "Out of bounds longitude: #{w} #{e}" unless w >= -180 and w <= 180 and e >= -180 and e <= 180
+      raise ArgumentError, "Out of bounds latitude: #{n} #{s}"  unless n >= -90  && n <= 90  && s >= -90  && s <= 90
+      raise ArgumentError, "Out of bounds longitude: #{w} #{e}" unless w >= -180 && w <= 180 && e >= -180 && e <= 180
       w = "#{w < 0 ? 'W' : 'E'} #{Dor::GeoMetadataDS::dd2ddmmss_abs w}"
       e = "#{e < 0 ? 'W' : 'E'} #{Dor::GeoMetadataDS::dd2ddmmss_abs e}"
       n = "#{n < 0 ? 'S' : 'N'} #{Dor::GeoMetadataDS::dd2ddmmss_abs n}"
       s = "#{s < 0 ? 'S' : 'N'} #{Dor::GeoMetadataDS::dd2ddmmss_abs s}"
       "#{w}--#{e}/#{n}--#{s}"
     end
-    
+
     # Convert DD.DD to DD MM SS.SS
-    # e.g., 
+    # e.g.,
     # * -109.758319 => 109°45ʹ29.9484ʺ
     # * 48.999336 => 48°59ʹ57.609ʺ
     E = 1
@@ -312,13 +312,13 @@ module Dor
     QDEG = "\u00B0"
     def self.dd2ddmmss_abs f
       dd = f.to_f.abs
-      d = dd.floor
-      mm = ((dd - d) * 60)
-      m = mm.floor
-      s = ((mm - mm.floor) * 60).round
-      m, s = m+1, 0 if s >= 60
-      d, m = d+1, 0 if m >= 60
-      "#{d}#{QDEG}" + (m>0 ? "#{m}#{QMIN}" : '') + (s>0 ? "#{s}#{QSEC}" : '')
+      d  = dd.floor
+      mm = (dd - d) * 60
+      m  = mm.floor
+      s  = ((mm - mm.floor) * 60).round
+      m, s = m + 1, 0 if s >= 60
+      d, m = d + 1, 0 if m >= 60
+      "#{d}#{QDEG}" + (m > 0 ? "#{m}#{QMIN}" : '') + (s > 0 ? "#{s}#{QSEC}" : '')
     end
   end
 end