dor-services 5.2.0 → 5.3.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MTIxOTE5NDBmNGMxNDI2OTg5ZWZiMzVhYWFlNmNlYWVkMjI0MTljZg==
-  data.tar.gz: !binary |-
-    YjMzM2M1ZThjYjZmZjdjMjJjY2VlODM3OTYzMDg1MjZiOTNjMDE4Yg==
+SHA1:
+  metadata.gz: 23867d4b182bfb98fe6e40f940fc7353080d446f
+  data.tar.gz: d57f27f17462ccea10c3ea4b6e2e48b2e4c88bb4
 SHA512:
-  metadata.gz: !binary |-
-    YzBjMzFiOTU0YmY3OGE5ZDA1NzZlYWM5ZjYwNTMxYmU3MDM4MzkwOWI0MzVi
-    N2UyM2U5MTUxMzJjNjFjMjRkM2U3NTFjNWFhMDVkYTg5M2UyYmUxYzkzOTQ2
-    MGM5MTYxMDM1ZTIyY2U0MDYwNDJkODhiNDc4YWZiZjlhNTNkZTc=
-  data.tar.gz: !binary |-
-    NmE4ZjZjNjMwYTM1YTBhY2Q0MzJmZjQxNGZkOGVhMzUxYWQ0MTRmNDYwMTYy
-    NDgxNWVmMzFlOTAwMDkzOTNiMWE4MjQ1ZmJhNjc0NGFlMTY1NzI5MzQ5MDVk
-    NWU1NmJlZWNmODIzNjA1NDVmNzJmODcwNDA5ZDFiZmQ3ZjRlN2I=
+  metadata.gz: d74d65c086f2a549ebff3abe402665166617225ff9f7ffa2cc2b43d10cd8506dd67928b0011ed35e0bc7231166faa5a85a04afeb2172885f054f096c1b01fcbd
+  data.tar.gz: f15acd410e5db8345bc38fdf7398c5b09301f03a3067010fc0aeb772c589048c063632040bdb369745b1f725e72e219920d2eddbacc36fa05b83321e1792bd21

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/config_defaults.yml

@@ -61,5 +61,7 @@
 :workflow:
   :url:
   :timeout: 60
+  :logfile: workflow_service.log
+  :shift_age: weekly
 :dor_services:
   :url:

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

@@ -1,5 +1,7 @@
 require 'active_fedora'
 require 'active_support/core_ext/module/attribute_accessors'
+require 'modsulator'
+require 'nokogiri-pretty'
 
 module Dor
   @@registered_classes = {}
@@ -8,7 +10,7 @@ module Dor
 
   class << self
 
-    def configure *args, &block
+    def configure(*args, &block)
       Dor::Config.configure *args, &block
     end
 
@@ -16,7 +18,7 @@ module Dor
     # to adapt it to. This is necessary when the object is not indexed, or the
     # index is missing the objectType property.
     # @param [String] pid The object's PID
-    def load_instance pid
+    def load_instance(pid)
       ensure_models_loaded!
       obj = Dor::Abstract.find pid
       return nil if obj.new_object?
@@ -27,14 +29,17 @@ module Dor
 
     # Get objectType information from solr and load the correct class the first time,
     # saving the overhead of using ActiveFedora::Base#adapt_to. It falls back to
-    # Dor.load_instance() if the item is not in the index, or is improperly
-    # indexed.
+    # 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)
+    # @return [Object] the ActiveFedora-modeled object
+    def find(pid, opts = {})
+      opts[:rows] = 1 # we know we are going to just pay attention to the .first doc anyway
+      find_all(%(id:"#{pid}"), opts).first || load_instance(pid)
     end
 
-    def find_all query, opts={}
+    # TODO: return enumerable and lazy load_instance
+    # TODO: restrict fieldlist (fl) for non-:lightweight queries
+    def find_all(query, opts = {})
       ensure_models_loaded!
       resp = SearchService.query query, opts
       resp.docs.collect do |solr_doc|
@@ -78,20 +83,20 @@ module Dor
   require 'druid-tools'
 
   # datastreams
-  autoload :AdministrativeMetadataDS,    'dor/datastreams/administrative_metadata_ds'
-  autoload :ContentMetadataDS,           'dor/datastreams/content_metadata_ds'
-  autoload :DescMetadataDS,              'dor/datastreams/desc_metadata_ds'
-  autoload :EmbargoMetadataDS,           'dor/datastreams/embargo_metadata_ds'
-  autoload :EventsDS,                    'dor/datastreams/events_ds'
-  autoload :GeoMetadataDS,               'dor/datastreams/geo_metadata_ds'
-  autoload :IdentityMetadataDS,          'dor/datastreams/identity_metadata_ds'
-  autoload :RightsMetadataDS,            'dor/datastreams/rights_metadata_ds'
-  autoload :RoleMetadataDS,              'dor/datastreams/role_metadata_ds'
-  autoload :WorkflowDefinitionDs,        'dor/datastreams/workflow_definition_ds'
-  autoload :WorkflowDs,                  'dor/datastreams/workflow_ds'
-  autoload :VersionMetadataDS,           'dor/datastreams/version_metadata_ds'
-  autoload :DefaultObjectRightsDS,       'dor/datastreams/default_object_rights_ds'
-  autoload :SimpleDublinCoreDs,          'dor/datastreams/simple_dublin_core_ds'
+  autoload :AdministrativeMetadataDS, 'dor/datastreams/administrative_metadata_ds'
+  autoload :ContentMetadataDS,        'dor/datastreams/content_metadata_ds'
+  autoload :DescMetadataDS,           'dor/datastreams/desc_metadata_ds'
+  autoload :EmbargoMetadataDS,        'dor/datastreams/embargo_metadata_ds'
+  autoload :EventsDS,                 'dor/datastreams/events_ds'
+  autoload :GeoMetadataDS,            'dor/datastreams/geo_metadata_ds'
+  autoload :IdentityMetadataDS,       'dor/datastreams/identity_metadata_ds'
+  autoload :RightsMetadataDS,         'dor/datastreams/rights_metadata_ds'
+  autoload :RoleMetadataDS,           'dor/datastreams/role_metadata_ds'
+  autoload :WorkflowDefinitionDs,     'dor/datastreams/workflow_definition_ds'
+  autoload :WorkflowDs,               'dor/datastreams/workflow_ds'
+  autoload :VersionMetadataDS,        'dor/datastreams/version_metadata_ds'
+  autoload :DefaultObjectRightsDS,    'dor/datastreams/default_object_rights_ds'
+  autoload :SimpleDublinCoreDs,       'dor/datastreams/simple_dublin_core_ds'
 
   # DOR Concerns
   autoload :Identifiable, 'dor/models/identifiable'
@@ -111,15 +116,14 @@ module Dor
   autoload :Editable,     'dor/models/editable'
   autoload :Discoverable, 'dor/models/discoverable'
   autoload :Geoable,      'dor/models/geoable'
-  autoload :Presentable,  'dor/models/presentable'
-  autoload :Releaseable,   'dor/models/releaseable'
+  autoload :Releaseable,  'dor/models/releaseable'
   autoload :Rightsable,   'dor/models/rightsable'
 
   # ActiveFedora Classes
-  autoload :Abstract,   'dor/models/item'
-  autoload :Item,       'dor/models/item'
-  autoload :Set,        'dor/models/set'
-  autoload :Collection, 'dor/models/collection'
+  autoload :Abstract,          'dor/models/item'
+  autoload :Item,              'dor/models/item'
+  autoload :Set,               'dor/models/set'
+  autoload :Collection,        'dor/models/collection'
   autoload :AdminPolicyObject, 'dor/models/admin_policy_object'
   autoload :WorkflowObject,    'dor/models/workflow_object'
 

data/lib/dor/config.rb

@@ -9,12 +9,12 @@ module Dor
     define_callbacks :initialize
     define_callbacks :configure
 
-    def initialize *args
+    def initialize(*args)
       super *args
       run_callbacks(:initialize) { }
     end
 
-    def configure *args
+    def configure(*args)
       result = self
       temp_v = $-v
       $-v = nil
@@ -26,29 +26,35 @@ module Dor
         $-v = temp_v
       end
       params = { :dor_services_url => result.dor_services.url }
+
+      if result.workflow.logfile && result.workflow.shift_age
+        params[:logger] = Logger.new(result.workflow.logfile, result.workflow.shift_age)
+      elsif result.workflow.logfile
+        params[:logger] = Logger.new(result.workflow.logfile)
+      end
       params[:timeout] = result.workflow.timeout if result.workflow.timeout
       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
       )
@@ -99,17 +105,17 @@ 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?
             conn.use_ssl = true
             conn.cert = OpenSSL::X509::Certificate.new(File.read(config.ssl.cert_file))
-            conn.key = OpenSSL::PKey::RSA.new(File.read(config.ssl.key_file),config.ssl.key_pass) if config.ssl.key_file.present?
+            conn.key = OpenSSL::PKey::RSA.new(File.read(config.ssl.key_file), config.ssl.key_pass) if config.ssl.key_file.present?
             conn.verify_mode = OpenSSL::SSL::VERIFY_NONE
           end
         end
@@ -120,22 +126,22 @@ module Dor
 
     # Act like an ActiveFedora.configurator
 
-    def init *args; end
+    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
-      YAML.load(File.read(File.expand_path('../../../config/predicate_mappings.yml',__FILE__)))
+      YAML.load(File.read(File.expand_path('../../../config/predicate_mappings.yml', __FILE__)))
     end
   end
 

data/lib/dor/datastreams/administrative_metadata_ds.rb

@@ -43,8 +43,8 @@ class AdministrativeMetadataDS < ActiveFedora::OmDatastream
   end
 
   define_template :default_collection do |xml|
-    xml.administrativeMetadata{
-      xml.registration{
+    xml.administrativeMetadata {
+      xml.registration {
         xml.collection(:id => '')
       }
     }
@@ -52,37 +52,37 @@ class AdministrativeMetadataDS < ActiveFedora::OmDatastream
 
   define_template :agreementId do |xml|
     xml.administrativeMetadata {
-      xml.registration{
+      xml.registration {
         xml.agreementId
       }
     }
   end
 
   define_template :metadata_format do |xml|
-     xml.descMetadata{
-       xml.format
-     }
+    xml.descMetadata {
+      xml.format
+    }
   end
 
   define_template :metadata_source do |xml|
-    xml.administrativeMetadata{
-      xml.descMetadata{
-       xml.source
+    xml.administrativeMetadata {
+      xml.descMetadata {
+        xml.source
       }
     }
   end
 
   define_template :registration do |xml|
     xml.administrativeMetadata {
-      xml.registration{
-        xml.workflow(:id=> '')
+      xml.registration {
+        xml.workflow(:id => '')
       }
     }
   end
 
   define_template :default_collection do |xml|
     xml.administrativeMetadata {
-      xml.registration{
+      xml.registration {
         xml.collection
       }
     }
@@ -90,7 +90,7 @@ class AdministrativeMetadataDS < ActiveFedora::OmDatastream
 
   def self.xml_template
     Nokogiri::XML::Builder.new do |xml|
-      xml.administrativeMetadata{ }
+      xml.administrativeMetadata { }
     end.doc
   end
 
@@ -99,22 +99,21 @@ class AdministrativeMetadataDS < ActiveFedora::OmDatastream
   # Hides complexity/verbosity of OM TermOperators for simple, non-repeating values
   #################################################################################
 
-  def default_workflow_lane= lane
-    self.defaults.initiate_workflow.lane = lane
+  def default_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
+  def default_shelving_path=(path)
+    defaults.shelving.path = path
   end
 
   def default_shelving_path
-    self.defaults.shelving.path.first
+    defaults.shelving.path.first
   end
 
 end
-
 end