dor-services 4.22.3 → 4.22.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjI5NzlkM2JlOTJlYTIwYzM2YTg1MWY4ZWE1MTQyMzZiMmQ0YmM5Yw==
+    NGNmODk1OTA4MGVlYTZjMmVmYjBjOTRkMTk2MmMyOTk2ZDVhMDI5OA==
   data.tar.gz: !binary |-
-    N2VmNmU5NTRhYjY0MDgyYjBmNWVjMjgzNTcyODVkNjA1OGFjMmRiYQ==
+    OWMwZTg1ODA3ZGE1YTg0Njk1NmMzM2FmMWU0ZGJkNjQ5MzZmYmZkOQ==
 SHA512:
   metadata.gz: !binary |-
-    M2VhNWZiNGNjMWZiZDY1NGUyOWZhZDZlZDFmZWFlYTIzNTRlZDA3MzI2OTA1
-    MWQ3ZWUzOTQwMzUxYTBlZmIzZDcyMzNkMDA1ZTEzYWI2NjdmZmI0MTczYWVm
-    MGFkN2Q3MDIwYzRlNmEwMzg1YWJjYWI3ZTc1ZjdjNWExOWM1ZWI=
+    MjYwYzkwNTFjZmIxZGRlY2M5NjIyZTYzNTNkNTMyZGVmNzk2NGIwYjc0NjNk
+    NWUzMTExZDA1N2IyNWNjZTc0MTNkZWM3Y2M1ZDMzNjA1OGM1NzFjMjAwNDI0
+    MTkwYjlhMjVjMmQ4OTMzODIzZWM5MDNmYTA3MjkwYjc5MTEzODI=
   data.tar.gz: !binary |-
-    Y2E5NzY0NGZhYjk1ZWVmOGNiYzliYWE3Nzc1NmVhNTY1ZWEzODMwZTVhZDQ5
-    YTMyZDk5ODU2MDNiMTJiOTljYzMyNzE0ZjZlN2E2NDc0OWMzYTZmY2NhMmIw
-    ZmY4OGEzYjBmMjBlNDRkMjhlMTJmNWJmYWZmMjYwMTg1MTNjMWE=
+    ZTFkZWVjOTI2OTZjZjBlZjA2OTVjNmY1ODQ0MzE2NDM0ZjBiYzE1ZTNhMWM3
+    OTQ0NzYwOGIwYTA0NDRlMWVjM2JkODhmNzdiZGYyMDc3ZTA3ZGMxZjc5OTFl
+    YjVmYzIyMjI0MDU4MDliNDQ4ODk0YjAxNjU1OTY5ZDZkN2I3Mzk=

data/bin/dor-indexer

@@ -27,11 +27,11 @@ optparse = OptionParser.new do|opts|
   opts.on('-c', '--client-id ID', 'Stomp client ID') do |client_id|
     Dor::Config.stomp.client_id = client_id
   end
-  
+
   opts.on('-v', 'Verbose') do
     options[:log_level] -= 1 if options[:log_level] > 0
   end
-  
+
   opts.on('-h', '--help', 'Display this screen') do
     puts opts
     exit
@@ -53,16 +53,16 @@ begin
   @clientid = options[:client_id]
   @destination = options[:destination]
 
-  
+
   @conn = Dor::Config.stomp.connection
   $stderr.print Time.now.to_s + " Getting output from #{@destination}\n"
-  
+
   @conn.subscribe(@destination, {"activemq.subscriptionName" => @clientid, :ack =>"client" })
   while true
-    
+
       begin
-      	Timeout::timeout(300) do
-        	@msg = @conn.receive
+        Timeout::timeout(300) do
+          @msg = @conn.receive
         end
         if @msg.nil?
         $stderr.print 'nil message\n'
@@ -85,18 +85,18 @@ begin
         @conn.ack @msg.headers["message-id"]
         end
       rescue Timeout::Error
-				begin
-					$stderr.print Time.now.to_s +" Sending heartbeat\n"
-					@conn.begin('heartbeat')
-					@conn.commit('heartbeat')
-				rescue Exception => e
-					body = "Unable to send heartbeat to broker\n"
-					body << "\n\nExeption:\n" << he.inspect << "\n" << he.backtrace.join("\n")
-					$stderr.print(Time.now.to_s + " Unable to send heartbeat")
-					$stderr.print(body)
-				end
-			
-	      
+        begin
+          $stderr.print Time.now.to_s +" Sending heartbeat\n"
+          @conn.begin('heartbeat')
+          @conn.commit('heartbeat')
+        rescue Exception => e
+          body = "Unable to send heartbeat to broker\n"
+          body << "\n\nExeption:\n" << he.inspect << "\n" << he.backtrace.join("\n")
+          $stderr.print(Time.now.to_s + " Unable to send heartbeat")
+          $stderr.print(body)
+        end
+
+
       rescue Exception => e
         $stderr.print Time.now.to_s + " failed to update solr index for #{pid}: #<#{e.class.name}: #{e.message}>"
       end
@@ -105,4 +105,3 @@ begin
 rescue Exception => e
 p e
 end
-

data/bin/dor-indexerd

@@ -43,12 +43,12 @@ log_dir=nil
 if ARGV[3]=='--log_dir'
 log_dir=ARGV[4]
 else
-	puts "Log dir not specified"
+  puts "Log dir not specified"
 end
 
 
 if log_dir.empty?
-	File.join(Dir.pwd,'log')
+  File.join(Dir.pwd,'log')
 end
 
 
@@ -70,4 +70,3 @@ version = '>=0'
 #app = Gem.bin_path('dor-services','dor-indexer',version)
 app = File.expand_path('../dor-indexer',__FILE__)
 Daemons.run(app,options)
-

data/config/certs/robots-dor-dev.crt

@@ -0,0 +1,29 @@
+-----BEGIN CERTIFICATE-----
+MIIE9zCCAt8CCQCcUJVDTu7rTjANBgkqhkiG9w0BAQUFADCBvzELMAkGA1UEBhMC
+VVMxEzARBgNVBAgTCkNhbGlmb3JuaWExETAPBgNVBAcTCFN0YW5mb3JkMRwwGgYD
+VQQKExNTdGFuZm9yZCBVbml2ZXJzaXR5MRIwEAYDVQQLEwlMaWJyYXJpZXMxJTAj
+BgNVBAMTHFNVTCBET1IgKGRldi90ZXN0KSBhY2Nlc3MgQ0ExLzAtBgkqhkiG9w0B
+CQEWIHN1bC13ZWJtYXN0ZXJAbGlzdHMuc3RhbmZvcmQuZWR1MB4XDTEyMDkyNjE1
+NTQzNVoXDTIyMDkyNDE1NTQzNVowgboxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpD
+YWxpZm9ybmlhMREwDwYDVQQHEwhTdGFuZm9yZDEcMBoGA1UEChMTU3RhbmZvcmQg
+VW5pdmVyc2l0eTEyMDAGA1UEAxQpcm9ib3RzQHN1bC1seWJlcnNlcnZpY2VzLWRl
+di5zdGFuZm9yZC5lZHUxMTAvBgkqhkiG9w0BCQEWImRsc3MtZGV2ZWxvcGVyc0Bs
+aXN0cy5zdGFuZm9yZC5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQC1t+PPhLTDFQBuAf4f1GOj7jHdXMN0tvSHL1OCaibe0d8iKbXCMMIE0z8lbBpZ
+1pA+8terIvxoTlly92EEvGkywZb+DIxnjyG0b9ftDJ64pARJMcnvwJMW/w3WdHCd
+5uJ5HVM8ZCbEItUfskFukS6tfNBpG8ri6cIQ2ulJzOWYxPV5R2eRneM6vtFD0xtu
+RJb/uMwiOwB79qk4QazbEQtkeZsrvomDFkIuHO/nf9wmgYG99H7q1kXplIrzDDX+
+fvD+JHvuMr5YXfmBQ9wmaZf6YIL7CXj79HUF4uG/a0SjrLZyLh262zWJQFVpjSW8
+Brl/fAyjeZvWJMyCDXRqsedjAgMBAAEwDQYJKoZIhvcNAQEFBQADggIBAG0jIfTj
+1FJsxTzcD938vtKuNo5XEIX8phqW1MA2eJ5Ojgu1hpW5Jf7fmUHKVnamm7eya5QR
+356KCJzZzwdCS4xVFq/l43gCA2j8TYrwO6/0EfM/5psUZS3ecwahzcJXfHPHvd9u
+qaXRqbjJYi+Ls70uStTC/JBIIu48atDF0DeXJ21hAbstZ1OKKNzAcYgZk14GKxCi
+ArgAzdg8UDtC4KsdqgxP6vF8Vc/gcHSu9AkVHgPVXbITjV0/kaKNgFi0bVqP7bJD
+hrUFYrS+S+hflQJCmVrDwW0JU2HnJ3EJOFX5F4FYHL4vt6ZjVsMzucraMqiLyUaO
+s6DVaWO8WMlphmFUfb3ChQjrKxFZZ6vKJPD/ExnQHa0kWwOELyMJuXw2PLk7k+qD
+rmjX+K3Ed+JiJuiDG5k8f1BDZE24lvxDwye5fQyDWPfib1yTClYYy4PRh4AI688f
+qgMyv51Qx82o0IJ1On1rNg5/iB7OEVcYSol3U5xiY9gRUd3vq637agZzMuRQnKXs
+Uj0+Vl4OrZ54F8MVsUKfi7Je1oVUEhuHqFt/tSOGlHg1XyR/ExwulCNBKIVdhhrF
+rxZCYrGDSUCF6tteJXpOBTtFT9b7hbMmBohKyS4XjfPSPRh9QHx7wepqSp3aHpmR
+4gY8Go40mS83xHCKBooqsy2/Z9vQlSb9Cr8u
+-----END CERTIFICATE-----

data/config/certs/robots-dor-dev.key

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpQIBAAKCAQEAtbfjz4S0wxUAbgH+H9Rjo+4x3VzDdLb0hy9Tgmom3tHfIim1
+wjDCBNM/JWwaWdaQPvLXqyL8aE5ZcvdhBLxpMsGW/gyMZ48htG/X7QyeuKQESTHJ
+78CTFv8N1nRwnebieR1TPGQmxCLVH7JBbpEurXzQaRvK4unCENrpSczlmMT1eUdn
+kZ3jOr7RQ9MbbkSW/7jMIjsAe/apOEGs2xELZHmbK76JgxZCLhzv53/cJoGBvfR+
+6tZF6ZSK8ww1/n7w/iR77jK+WF35gUPcJmmX+mCC+wl4+/R1BeLhv2tEo6y2ci4d
+uts1iUBVaY0lvAa5f3wMo3mb1iTMgg10arHnYwIDAQABAoIBAQCmlDzsZZ2C24S6
+U29OZFc21kq1vqyaGIEOT48BFSguyDsAyTWKH0IsRC41suRxCGTQn7KeegLh5zjO
+UAGK4uCYm6g7mOs4n5fpHUHWVuRFJG2dX1vbQTBVO1fHCJSX2ygumHhN+w0ibT/r
+v2+F2ObuOGWghM62tkylQNfsRD0QjalE8ST2xp9p4xwPrAwEuURlA04qnLYNi4+6
+qexDtrLG8E6JV/dd3dY95WjKPscadR1fAKm9sebD0XO31Lu6BGCvpmBU0OmYVfrY
+BN/ofhEmJh+Xgwfxx6PicRDvu9bPnffqbGhDO4ckGDlqXp1fDBgf1I7CclXdrVMH
+Qsxunh5pAoGBAN7929V1aw0S7Rqvuf4N+o1XwBExa2DL7EYI1Oea/nuBMPqvfeNh
+SrbM0gYejEzLmeRUUKRhMMoAgXQnxcg3Kz/5pUXT3b4YtzeskX8nkJ6/2gEU3M7E
+lJj7c5wW1otqMH19+iDNR4N8vjPh98kDJW1HZUHSAcdyE+dZiFP2ofMfAoGBANCe
+AJgA9EkdwZsom+I7Ty9LSrTWx6cKmNEbLVn1iSlyJx1kHoWyTMtuZszCWBjiXx70
+84WpX2B4MuJBq6sSoEiUahNsphks82glOd6i+eoE/I+NtZehOFnkAMyGux+FbMyG
+q/9ZlQgsbWpFHxS59vX/kvlNun2RpJkaF6QPBuc9AoGBAIGdscCb5cPNsoCGkGf6
+HB84WG4l+bJkFkyHKaoOT8neSGgOxe/7R4CGAbaI3yhsWGF+GPnTfJaOQLERxUch
+ukQPil/STNwIZcc4ycHNb6S3A7MJO2f8oBtkXcjnBYI4EUOAjHmwmNb3FV/3Ax6W
+c5TXoSXnOh2CU8twIWwcufolAoGATqnFf4uckZVu05rUbNIAYcz6NoZmck5EoVSm
+HS3Asqggp6yA9djtrCfNC5icr4VsaLfku5nKJQ4t4bLxkGhNmBCejwSA/S09+x9O
+Wu0JX3zR3y+IMczQ+tRGmNiU5qXhCJ4fbQHSeGqIN3Io7h/RR6E/QlJU59RrRG/a
+SjqAV+ECgYEA2mA5VFK3jECnLde+biEaXidIOuBMcqaP0VG6sBwz2wTGSTBE1WkG
+6prCD0McWVAgDTm3MMKxeuMaoW5eEi83+G+CywLaTBpc8Hz7qgRhBpKhRirCfHMW
+EfQV5k32vEGoSI+eG8zcGb9mwDeb/EWXAMGXrx2YuYFu7txtwC2mZXc=
+-----END RSA PRIVATE KEY-----

data/config/dev_console_env.rb

@@ -0,0 +1,77 @@
+cert_dir = File.join(File.dirname(__FILE__), 'certs')
+
+Dor::Config.configure do
+
+  ssl do
+    cert_file File.join(cert_dir, 'robots-dor-dev.crt')
+    key_file  File.join(cert_dir, 'robots-dor-dev.key')
+    key_pass  ''
+  end
+
+  suri do
+    mint_ids true
+    id_namespace 'druid'
+    url 'https://lyberservices-dev.stanford.edu'
+    user 'labware'
+    pass 'lyberteam'
+  end
+
+  metadata do
+    exist.url   'http://viewer:l3l%40nd@lyberapps-dev.stanford.edu/exist/rest/'
+    catalog.url 'http://lyberservices-prod.stanford.edu/catalog/mods'
+  end
+
+  stacks do
+    document_cache_host 'purl-dev.stanford.edu'
+    local_stacks_root         '/stacks'
+    local_document_cache_root '/purl/document_cache'
+    local_workspace_root      '/dor/workspace'
+  end
+
+  solrizer.url     'http://sul-solr.stanford.edu/solr/argo_test'
+  fedora.url       'https://sul-dor-test.stanford.edu/fedora'
+  workflow.url     'https://lyberservices-dev.stanford.edu/workflow/'
+  dor_services.url 'https://dorAdmin:dorAdmin@sul-lyberservices-dev.stanford.edu/dor'
+
+  cleanup do
+    local_workspace_root '/dor/workspace'
+    local_export_home    '/dor/export'
+  end
+
+  sdr do
+    url 'https://sdrAdmin:sdrAdmin@sdr-services-test.stanford.edu/sdr/'
+    local_workspace_root '/dor/workspace'
+    local_export_home    '/dor/export'
+    datastreams do
+      administrativeMetadata 'optional'
+      contentMetadata        'optional'
+      descMetadata           'required'
+      defaultObjectRights    'optional'
+      events                 'optional'
+      embargoMetadata        'optional'
+      identityMetadata       'required'
+      provenanceMetadata     'required'
+      relationshipMetadata   'required'
+      rightsMetadata         'optional'
+      roleMetadata           'optional'
+      sourceMetadata         'optional'
+      technicalMetadata      'optional'
+      versionMetadata        'required'
+      workflows              'optional'
+    end
+  end
+
+  accessioning_robot_sleep_time 30
+
+end
+
+#WORKFLOW_URI = 'http://lyberservices-test.stanford.edu/workflow'
+
+# Constants for Dor::WorkflowService
+#module Dor
+#  CREATE_WORKFLOW = DOR_CREATE_WORKFLOW = true
+#  WF_URI = 'http://lyberservices-test.stanford.edu/workflow'
+#end
+
+# External application locations
+JHOVE_HOME = File.join(ENV['HOME'], 'jhoveToolkit')

data/lib/dor-services.rb

@@ -30,11 +30,11 @@ module Dor
     # Dor.load_instance() if the item is not in the index, or is improperly
     # indexed.
     # @param [String] pid The object's PID
-    def find pid, opts={}
-      self.find_all(%{id:"#{pid}"}, opts).first || self.load_instance(pid)
+    def find pid, opts = {}
+      find_all(%{id:"#{pid}"}, opts).first || load_instance(pid)
     end
 
-    def find_all query, opts={}
+    def find_all query, opts = {}
       ensure_models_loaded!
       af_version = Gem::Version.new(ActiveFedora::VERSION)
       if opts[:lightweight] and af_version < Gem::Version.new('4.0.0.rc9')

data/lib/dor/config.rb

@@ -29,27 +29,27 @@ module Dor
       params[:timeout] = result.workflow.timeout if result.workflow.timeout
     # params[:logger]  = Logger.new('logs/workflow_service.log', 'weekly') # if you want to control the logger, insert it here.
       Dor::WorkflowService.configure result.workflow.url, params
-      return result
+      result
     end
 
-    def autoconfigure(url, cert_file=Config.ssl.cert_file, key_file=Config.ssl.key_file, key_pass=Config.ssl.key_pass)
+    def autoconfigure(url, cert_file = Config.ssl.cert_file, key_file = Config.ssl.key_file, key_pass = Config.ssl.key_pass)
       client = make_rest_client(url, cert_file, key_file, key_pass)
       config = Confstruct::Configuration.symbolize_hash JSON.parse(client.get :accept => 'application/json')
-      self.configure(config)
+      configure(config)
     end
 
     def sanitize
-      self.dup
+      dup
     end
 
-    def make_rest_client(url, cert=Config.ssl.cert_file, key=Config.ssl.key_file, pass=Config.ssl.key_pass)
+    def make_rest_client(url, cert = Config.ssl.cert_file, key = Config.ssl.key_file, pass = Config.ssl.key_pass)
       params = {}
       params[:ssl_client_cert] = OpenSSL::X509::Certificate.new(File.read(cert)) if cert
       params[:ssl_client_key]  = OpenSSL::PKey::RSA.new(File.read(key), pass) if key
       RestClient::Resource.new(url, params)
     end
 
-    def make_solr_connection(add_opts={})
+    def make_solr_connection(add_opts = {})
       opts = Config.solrizer.opts.merge(add_opts).merge(
         :url => Config.solrizer.url
       )
@@ -71,7 +71,7 @@ module Dor
           }
         },
         :sdr => {
-          :rest_client => Confstruct.deferred { |c| config.make_rest_client c.url },
+          :rest_client => Confstruct.deferred { |c| config.make_rest_client c.url }
         },
         :gsearch => {
           :rest_client => Confstruct.deferred { |c| config.make_rest_client c.rest_url },
@@ -101,11 +101,11 @@ module Dor
       if ActiveFedora.respond_to?(:configurator)
         if config.solrizer.url.present?
           ActiveFedora::SolrService.register
-          ActiveFedora::SolrService.instance.instance_variable_set :@conn, self.make_solr_connection
+          ActiveFedora::SolrService.instance.instance_variable_set :@conn, make_solr_connection
         end
       else
-        ActiveFedora::RubydoraConnection.connect self.fedora_config if self.fedora.url.present?
-        if self.solrizer.url.present?
+        ActiveFedora::RubydoraConnection.connect fedora_config if fedora.url.present?
+        if solrizer.url.present?
           ActiveFedora::SolrService.register config.solrizer.url, config.solrizer.opts
           conn = ActiveFedora::SolrService.instance.conn.connection
           if config.ssl.cert_file.present?
@@ -125,15 +125,15 @@ module Dor
     def init *args; end
 
     def fedora_config
-      fedora_uri = URI.parse(self.fedora.url)
-      connection_opts = { :url => self.fedora.safeurl, :user => fedora_uri.user, :password => fedora_uri.password }
-      connection_opts[:ssl_client_cert] = OpenSSL::X509::Certificate.new(File.read(self.ssl.cert_file)) if self.ssl.cert_file.present?
-      connection_opts[:ssl_client_key] = OpenSSL::PKey::RSA.new(File.read(self.ssl.key_file),self.ssl.key_pass) if self.ssl.key_file.present?
+      fedora_uri = URI.parse(fedora.url)
+      connection_opts = { :url => fedora.safeurl, :user => fedora_uri.user, :password => fedora_uri.password }
+      connection_opts[:ssl_client_cert] = OpenSSL::X509::Certificate.new(File.read(ssl.cert_file)) if ssl.cert_file.present?
+      connection_opts[:ssl_client_key] = OpenSSL::PKey::RSA.new(File.read(ssl.key_file),ssl.key_pass) if ssl.key_file.present?
       connection_opts
     end
 
     def solr_config
-      { :url => self.solrizer.url }
+      { :url => solrizer.url }
     end
 
     def predicate_config

data/lib/dor/datastreams/administrative_metadata_ds.rb

@@ -99,21 +99,21 @@ class AdministrativeMetadataDS < ActiveFedora::OmDatastream
   #################################################################################
 
   def default_workflow_lane= lane
-    self.defaults.initiate_workflow.lane = lane
+    defaults.initiate_workflow.lane = lane
   end
 
   def default_workflow_lane
-    self.defaults.initiate_workflow.lane.first
+    defaults.initiate_workflow.lane.first
   end
 
   def default_shelving_path= path
-    self.defaults.shelving.path = path
+    defaults.shelving.path = path
   end
 
   def default_shelving_path
-    self.defaults.shelving.path.first
+    defaults.shelving.path.first
   end
 
 end
 
-end
+end

data/lib/dor/datastreams/content_metadata_ds.rb

@@ -1,29 +1,29 @@
 module Dor
-  class ContentMetadataDS < ActiveFedora::OmDatastream 
+  class ContentMetadataDS < ActiveFedora::OmDatastream
     include Upgradable
     include SolrDocHelper
 
     set_terminology do |t|
-      t.root :path => 'contentMetadata', :index_as => [:not_searchable]
-      t.contentType :path => '/contentMetadata/@type', :index_as => [:not_searchable]
-      t.stacks :path=> '/contentMetadata/@stacks', :index_as => [:not_searchable]
+      t.root        :path => 'contentMetadata',          :index_as => [:not_searchable]
+      t.contentType :path => '/contentMetadata/@type',   :index_as => [:not_searchable]
+      t.stacks      :path => '/contentMetadata/@stacks', :index_as => [:not_searchable]
       t.resource(:index_as => [:not_searchable]) do
-        t.id_ :path => { :attribute => 'id' }
-        t.sequence :path => { :attribute => 'sequence' }#, :data_type => :integer
-        t.type_ :path => { :attribute => 'type' }, :index_as => [:displayable]
+        t.id_       :path => { :attribute => 'id' }
+        t.sequence  :path => { :attribute => 'sequence' } #, :data_type => :integer
+        t.type_     :path => { :attribute => 'type' }, :index_as => [:displayable]
         t.attribute(:path => 'attr', :index_as => [:not_searchable]) do
-          t.name :path => { :attribute => 'name' }, :index_as => [:not_searchable]
+          t.name    :path => { :attribute => 'name' }, :index_as => [:not_searchable]
         end
         t.file(:index_as => [:not_searchable]) do
-          t.id_ :path => { :attribute => 'id' }
+          t.id_      :path => { :attribute => 'id' }
           t.mimeType :path => { :attribute => 'mimeType' }, :index_as => [:displayable]
           t.dataType :path => { :attribute => 'dataType' }, :index_as => [:displayable]
-          t.size :path => { :attribute => 'size' }, :index_as => [:displayable]#, :data_type => :long
-          t.shelve :path => { :attribute => 'shelve' }, :index_as => [:not_searchable]#, :data_type => :boolean
-          t.publish :path => { :attribute => 'publish' }, :index_as => [:not_searchable]#, :data_type => :boolean
-          t.preserve :path => { :attribute => 'preserve' }, :index_as => [:not_searchable]#, :data_type => :boolean
+          t.size     :path => { :attribute => 'size' },     :index_as => [:displayable]    #, :data_type => :long
+          t.shelve   :path => { :attribute => 'shelve' },   :index_as => [:not_searchable] #, :data_type => :boolean
+          t.publish  :path => { :attribute => 'publish' },  :index_as => [:not_searchable] #, :data_type => :boolean
+          t.preserve :path => { :attribute => 'preserve' }, :index_as => [:not_searchable] #, :data_type => :boolean
           t.checksum do
-            t.type_ :path => { :attribute => 'type' }
+            t.type_  :path => { :attribute => 'type' }
           end
         end
         t.shelved_file(:path => 'file', :attributes => {:shelve=>'yes'}, :index_as => [:not_searchable]) do
@@ -34,305 +34,261 @@ module Dor
     end
 
     def public_xml
-      result = self.ng_xml.clone
-      result.xpath('/contentMetadata/resource[not(file[(@deliver="yes" or @publish="yes")])]').each { |n| n.remove }
-      result.xpath('/contentMetadata/resource/file[not(@deliver="yes" or @publish="yes")]').each { |n| n.remove }
+      result = ng_xml.clone
+      result.xpath('/contentMetadata/resource[not(file[(@deliver="yes" or @publish="yes")])]'   ).each { |n| n.remove }
+      result.xpath('/contentMetadata/resource/file[not(@deliver="yes" or @publish="yes")]'      ).each { |n| n.remove }
       result.xpath('/contentMetadata/resource/file').xpath('@preserve|@shelve|@publish|@deliver').each { |n| n.remove }
       result.xpath('/contentMetadata/resource/file/checksum').each { |n| n.remove }
       result
     end
+
     def add_file(file, resource_name)
-      xml=self.ng_xml
+      xml = ng_xml
       resource_nodes = xml.search('//resource[@id=\''+resource_name+'\']')
-      if resource_nodes.length==0
-        raise 'resource doesnt exist.'
-      end
-      node=resource_nodes.first
-      file_node=Nokogiri::XML::Node.new('file',xml)
-      file_node['id']=file[:name]
-      file_node['shelve']=file[:shelve] ? file[:shelve] : ''
-      file_node['publish']=file[:publish] ? file[:publish] : ''
-      file_node['preserve']=file[:preserve] ? file[:preserve] : ''
+      raise 'resource doesnt exist.' if resource_nodes.length == 0
+      node = resource_nodes.first
+      file_node = Nokogiri::XML::Node.new('file', xml)
+      file_node['id']       = file[:name]
+      file_node['shelve']   = file[:shelve  ] ? file[:shelve  ] : ''
+      file_node['publish']  = file[:publish ] ? file[:publish ] : ''
+      file_node['preserve'] = file[:preserve] ? file[:preserve] : ''
       node.add_child(file_node)
 
-      if file[:md5]
-        checksum_node=Nokogiri::XML::Node.new('checksum',xml)
-        checksum_node['type']='md5'
-        checksum_node.content=file[:md5]
+      [:md5, :sha1].each do |algo|
+        next unless file[algo]
+        checksum_node = Nokogiri::XML::Node.new('checksum', xml)
+        checksum_node['type'] = algo.to_s
+        checksum_node.content = file[algo]
         file_node.add_child(checksum_node)
       end
-      if file[:sha1]
-        checksum_node=Nokogiri::XML::Node.new('checksum',xml)
-        checksum_node['type']='sha1'
-        checksum_node.content=file[:sha1]
-        file_node.add_child(checksum_node)
-      end
-      if file[:size]
-        file_node['size']=file[:size]
-      end
-      if file[:mime_type]
-        file_node['mimetype']=file[:mime_type]
-      end
-      self.content=xml.to_s
-      self.save
+      file_node['size'    ] = file[:size     ] if file[:size]
+      file_node['mimetype'] = file[:mime_type] if file[:mime_type]
+      self.content = xml.to_s
+      save
     end
 
-    def add_resource(files,resource_name, position,type="file") 
-      xml=self.ng_xml
-      if xml.search('//resource[@id=\''+resource_name+'\']').length>0
-        raise 'resource '+resource_name+' already exists'
-      end
-      node=nil
-
-      max=-1
+    def add_resource(files,resource_name, position,type = "file")
+      xml = ng_xml
+      raise "resource #{resource_name} already exists" if xml.search('//resource[@id=\'' + resource_name + '\']').length > 0
+      max = -1
       xml.search('//resource').each do |node|
-        if node['sequence'].to_i>max
-          max=node['sequence'].to_i
-        end
+        max = node['sequence'].to_i if node['sequence'].to_i > max
       end
       #renumber all of the resources that will come after the newly added one
-      while max>position do
-        node=xml.search('//resource[@sequence=\'' + position + '\']')
-        if node.length>0
-          node=node.first
-          node[sequence]=max+1
+      while max > position do
+        node = xml.search('//resource[@sequence=\'' + position + '\']')
+        if node.length > 0
+          node = node.first
+          node[sequence] = max + 1
         end
-        max=max-1
+        max -= 1
       end
-      node=Nokogiri::XML::Node.new('resource',xml)
-      node['sequence']=position.to_s
-      node['id']=resource_name
-      node['type']=type
+      node = Nokogiri::XML::Node.new('resource',xml)
+      node['sequence'] = position.to_s
+      node['id'] = resource_name
+      node['type'] = type
       files.each do |file|
-        file_node=Nokogiri::XML::Node.new('file',xml)
-        file_node['shelve']=file[:shelve] ? file[:shelve] : ''
-        file_node['publish']=file[:publish] ? file[:publish] : ''
-        file_node['preserve']=file[:preserve] ? file[:preserve] : ''
-        file_node['id']=file[:name]
+        file_node = Nokogiri::XML::Node.new('file', xml)
+        file_node['shelve'  ] = file[:shelve  ] ? file[:shelve  ] : ''
+        file_node['publish' ] = file[:publish ] ? file[:publish ] : ''
+        file_node['preserve'] = file[:preserve] ? file[:preserve] : ''
+        file_node['id'      ] = file[:name]
         node.add_child(file_node)
-
-        if not file[:md5].nil?
-          checksum_node=Nokogiri::XML::Node.new('checksum',xml)
-          checksum_node['type']='md5'
-          checksum_node.content=file[:md5]
-          file_node.add_child(checksum_node)
-        end
-        if not file[:sha1].nil?
-          checksum_node=Nokogiri::XML::Node.new('checksum',xml)
-          checksum_node['type']='sha1'
-          checksum_node.content=file[:sha1]
+        [:md5, :sha1].each do |algo|
+          next unless file[algo]
+          checksum_node = Nokogiri::XML::Node.new('checksum', xml)
+          checksum_node['type'] = algo.to_s
+          checksum_node.content = file[algo]
           file_node.add_child(checksum_node)
         end
-        if file[:size]
-          file_node['size']=file[:size]
-        end
-      end    
+        file_node['size'] = file[:size] if file[:size]
+      end
       xml.search('//contentMetadata').first.add_child(node)
-      self.content=xml.to_s
-      self.save
+      self.content = xml.to_s
+      save
     end
 
     def remove_resource resource_name
-      xml=self.ng_xml
-      position=-1
-
-      resources=xml.search('//resource[@id=\''+resource_name+'\']')
-      if resources.length!=1
-        raise 'Resource is missing or duplicated!'
-      end
-      position=resources.first['sequence']
+      xml = ng_xml
+      position = -1
+      resources = xml.search('//resource[@id=\'' + resource_name + '\']')
+      raise 'Resource is missing or duplicated!' if resources.length != 1
+      position = resources.first['sequence']
       resources.first.remove
-      position=position.to_i+1
+      position = position.to_i + 1
       while true
-        res=xml.search('//resource[@sequence=\''+position.to_s+'\']')
-        if(res.length==0)
-          break
-        end
-        res['sequence']=position.to_s
-        position=position+1
+        res = xml.search('//resource[@sequence=\'' + position.to_s + '\']')
+        break if res.length == 0
+        res['sequence'] = position.to_s
+        position += 1
       end
-      self.content=xml.to_s
-      self.save
+      self.content = xml.to_s
+      save
     end
 
     def remove_file file_name
-      xml=self.ng_xml
-      xml.search('//file[@id=\''+file_name+'\']').each do |node|
+      xml = ng_xml
+      xml.search('//file[@id=\'' + file_name + '\']').each do |node|
         node.remove
       end
-      self.content=xml.to_s
-      self.save
+      self.content = xml.to_s
+      save
     end
+
     def update_attributes file_name, publish, shelve, preserve
-      xml=self.ng_xml
-      file_node=xml.search('//file[@id=\''+file_name+'\']').first
-      file_node['shelve']=shelve
-      file_node['publish']=publish
-      file_node['preserve']=preserve
-      self.content=xml.to_s
-      self.save
+      xml = ng_xml
+      file_node = xml.search('//file[@id=\'' + file_name + '\']').first
+      file_node['shelve'  ] = shelve
+      file_node['publish' ] = publish
+      file_node['preserve'] = preserve
+      self.content = xml.to_s
+      save
     end
+
     def update_file file, old_file_id
-      xml=self.ng_xml
-      file_node=xml.search('//file[@id=\''+old_file_id+'\']').first
-      file_node['id']=file[:name]
-      if not file[:md5].nil?
-        checksum_node=xml.search('//file[@id=\''+old_file_id+'\']/checksum[@type=\'md5\']').first
+      xml = ng_xml
+      file_node = xml.search('//file[@id=\'' + old_file_id + '\']').first
+      file_node['id'] = file[:name]
+      unless file[:md5].nil?
+        checksum_node = xml.search('//file[@id=\'' + old_file_id + '\']/checksum[@type=\'md5\']').first
         if checksum_node.nil?
-          checksum_node=Nokogiri::XML::Node.new('checksum',xml)
+          checksum_node = Nokogiri::XML::Node.new('checksum', xml)
           file_node.add_child(checksum_node)
         end
-        checksum_node['type']='md5'
-        checksum_node.content=file[:md5]
+        checksum_node['type'] = 'md5'
+        checksum_node.content = file[:md5]
       end
-      if not file[:sha1].nil?
-        checksum_node=xml.search('//file[@id=\''+old_file_id+'\']/checksum[@type=\'sha1\']').first
+      unless file[:sha1].nil?
+        checksum_node = xml.search('//file[@id=\'' + old_file_id + '\']/checksum[@type=\'sha1\']').first
         if checksum_node.nil?
-          checksum_node=Nokogiri::XML::Node.new('checksum',xml)
+          checksum_node = Nokogiri::XML::Node.new('checksum', xml)
           file_node.add_child(checksum_node)
         end
-        checksum_node['type']='sha1'
-        checksum_node.content=file[:sha1]
-      end
-      if file[:size]
-        file_node['size']=file[:size]
-      end
-      if file[:shelve]
-        file_node['shelve']=file[:shelve]
-      end
-      if file[:preserve]
-        file_node['preserve']=file[:preserve]
+        checksum_node['type'] = 'sha1'
+        checksum_node.content = file[:sha1]
       end
-      if file[:publish]
-        file_node['publish']=file[:publish]
-      end
-      self.content=xml.to_s
-      self.save
+
+      file_node['size'    ] = file[:size    ] if file[:size]
+      file_node['shelve'  ] = file[:shelve  ] if file[:shelve]
+      file_node['preserve'] = file[:preserve] if file[:preserve]
+      file_node['publish' ] = file[:publish ] if file[:publish]
+      self.content = xml.to_s
+      save
     end
+
     # Terminology-based solrization is going to be painfully slow for large
     # contentMetadata streams. Just select the relevant elements instead.
-    def to_solr(solr_doc=Hash.new, *args)
-      doc = self.ng_xml
+    def to_solr(solr_doc = {}, *args)
+      doc = ng_xml
       if doc.root['type']
-        shelved_file_count=0
-        content_file_count=0
-        resource_type_counts={}
-        resource_count=0
-        preserved_size=0
-        first_shelved_image=nil
+        shelved_file_count = 0
+        content_file_count = 0
+        resource_type_counts = {}
+        resource_count = 0
+        preserved_size = 0
+        first_shelved_image = nil
         add_solr_value(solr_doc, "content_type", doc.root['type'], :string, [:facetable])
-        doc.xpath('contentMetadata/resource').sort { |a,b| a['sequence'].to_i <=> b['sequence'].to_i }.each do |resource|
-          resource_count+=1
-          if(resource['type'])
+        doc.xpath('contentMetadata/resource').sort { |a, b| a['sequence'].to_i <=> b['sequence'].to_i }.each do |resource|
+          resource_count += 1
+          if resource['type']
             if resource_type_counts[resource['type']]
-              resource_type_counts[resource['type']]+=1        	
+              resource_type_counts[resource['type']] += 1
             else
-              resource_type_counts[resource['type']]=1
+              resource_type_counts[resource['type']] = 1
             end
           end
           resource.xpath('file').each do |file|
-            content_file_count+=1
+            content_file_count += 1
             if file['shelve'] == 'yes'
-              shelved_file_count+=1
-              if first_shelved_image.nil? and file['id'].match(/jp2$/)
-                first_shelved_image=file['id']
-              end
-            end
-            if file['preserve'] == 'yes'
-              preserved_size += file['size'].to_i
+              shelved_file_count += 1
+              first_shelved_image = file['id'] if first_shelved_image.nil? && file['id'].match(/jp2$/)
             end
+            preserved_size += file['size'].to_i if file['preserve'] == 'yes'
           end
         end
-        add_solr_value(solr_doc, "content_file_count", content_file_count.to_s, :string, [:searchable, :displayable])
-        add_solr_value(solr_doc, "shelved_content_file_count", shelved_file_count.to_s, :string, [:searchable, :displayable])
-        add_solr_value(solr_doc, "resource_count", resource_count.to_s, :string, [:searchable, :displayable])
-        add_solr_value(solr_doc, "preserved_size", preserved_size.to_s, :string, [:searchable, :displayable])
+        add_solr_value(solr_doc, 'content_file_count', content_file_count.to_s, :string, [:searchable, :displayable])
+        add_solr_value(solr_doc, 'shelved_content_file_count', shelved_file_count.to_s, :string, [:searchable, :displayable])
+        add_solr_value(solr_doc, 'resource_count', resource_count.to_s, :string, [:searchable, :displayable])
+        add_solr_value(solr_doc, 'preserved_size', preserved_size.to_s, :string, [:searchable, :displayable])
         resource_type_counts.each do |key, count|
-          add_solr_value(solr_doc, key+"_resource_count", count.to_s, :string, [:searchable, :displayable])
+          add_solr_value(solr_doc, key + '_resource_count', count.to_s, :string, [:searchable, :displayable])
         end
-        if not first_shelved_image.nil?
-          add_solr_value(solr_doc, "first_shelved_image", first_shelved_image, :string, [:displayable])
+        unless first_shelved_image.nil?
+          add_solr_value(solr_doc, 'first_shelved_image', first_shelved_image, :string, [:displayable])
         end
       end
       solr_doc
     end
+
     def rename_file old_name, new_name
-      xml=self.ng_xml
-      file_node=xml.search('//file[@id=\''+old_name+'\']').first
-      file_node['id']=new_name
-      self.content=xml.to_s
-      self.save
+      xml = ng_xml
+      file_node = xml.search('//file[@id=\'' + old_name + '\']').first
+      file_node['id'] = new_name
+      self.content = xml.to_s
+      save
     end
 
     def update_resource_label resource_name, new_label
-      xml=self.ng_xml
-      resource_node=xml.search('//resource[@id=\''+resource_name+'\']')
-      if(resource_node.length!=1)
-        raise 'Resource not found or duplicate found.'
-      end
-      labels=xml.search('//resource[@id=\''+resource_name+'\']/label')
-      if(labels.length==0)
+      xml = ng_xml
+      resource_node = xml.search('//resource[@id=\'' + resource_name + '\']')
+      raise 'Resource not found or duplicate found.' unless resource_node.length == 1
+      labels = xml.search('//resource[@id=\'' + resource_name + '\']/label')
+      if labels.length == 0
         #create a label
-        label_node = Nokogiri::XML::Node.new('label',xml)
-        label_node.content=new_label
+        label_node = Nokogiri::XML::Node.new('label', xml)
+        label_node.content = new_label
         resource_node.first.add_child(label_node)
       else
-        labels.first.content=new_label
+        labels.first.content = new_label
       end
     end
+
     def update_resource_type resource, new_type
-      xml=self.ng_xml
-      resource_node=xml.search('//resource[@id=\''+resource_name+'\']')
-      if(resource_node.length!=1)
-        raise 'Resource not found or duplicate found.'
-      end
-      resource_node.first['type']=new_type
+      xml = ng_xml
+      resource_node = xml.search('//resource[@id=\'' + resource_name + '\']')
+      raise 'Resource not found or duplicate found.' unless resource_node.length == 1
+      resource_node.first['type'] = new_type
     end
 
     def move_resource resource_name, new_position
-      xml=self.ng_xml
-      file_node=xml.search('//resource[@id=\''+resource_name+'\']')
-      if(file_node.length!=1)
-        raise 'Resource not found or duplicate found.'
-      end
-      position=file_node.first['sequence'].to_i
-      #is the resource being moved earlier in the sequence or later?
-      new_position=new_position.to_i
-      if new_position>position
-        counter=position
+      xml = ng_xml
+      file_node = xml.search('//resource[@id=\''+resource_name+'\']')
+      raise 'Resource not found or duplicate found.' unless file_node.length == 1
+      position = file_node.first['sequence'].to_i
+      # is the resource being moved earlier in the sequence or later?
+      new_position = new_position.to_i
+      if new_position > position
+        counter = position
         while true
-          if counter == position
-            break
-          end
-          item=xml.search('/resource[@id=\''+counter.to_s+'\']').first
-          counter=counter+1
-          item['sequence']=counter.to_s
+          break if counter == position
+          item = xml.search('/resource[@id=\'' + counter.to_s + '\']').first
+          counter += 1
+          item['sequence'] = counter.to_s
         end
       else
-        counter=position
+        counter = position
         while true
-          if counter == new_position
-            break
-          end
-          item=xml.search('/resource[@id=\''+counter.to_s+'\']').first
-          counter=counter-1
-          item['sequence']=counter.to_s
+          break if counter == new_position
+          item = xml.search('/resource[@id=\'' + counter.to_s + '\']').first
+          counter -= 1
+          item['sequence'] = counter.to_s
         end
       end
     end
-    #Set the content type to and the resource types for all resources
-    #@param new_type [String] the new content type, ex book
-    #@param new_resource_type [String] the new type for all resources, ex book
+
+    # Set the content type to and the resource types for all resources
+    # @param new_type [String] the new content type, ex book
+    # @param new_resource_type [String] the new type for all resources, ex book
     def set_content_type old_type, old_resource_type, new_type, new_resource_type
-      xml=self.ng_xml
-      xml.search('/contentMetadata[@type=\''+old_type+'\']').each do |node|
-        node['type']=new_type
-        xml.search('//resource[@type=\''+old_resource_type+'\']').each do |resource|
-          resource['type']=new_resource_type
+      xml = ng_xml
+      xml.search('/contentMetadata[@type=\'' + old_type + '\']').each do |node|
+        node['type'] = new_type
+        xml.search('//resource[@type=\'' + old_resource_type + '\']').each do |resource|
+          resource['type'] = new_resource_type
         end
       end
-      self.content=xml.to_s
+      self.content = xml.to_s
     end
   end
 
-end
+end