dor-services 5.2.0 → 5.3.0

data/lib/dor/datastreams/rights_metadata_ds.rb

@@ -20,32 +20,33 @@ module Dor
         t.human
       end
 
-      t.creative_commons :path => '/use/machine', :type => 'creativeCommons'
+      t.creative_commons :path => '/use/machine[@type=\'creativeCommons\']', :type => 'creativeCommons' do
+        t.uri :path => '@uri'
+      end
       t.creative_commons_human :path => '/use/human[@type=\'creativeCommons\']'
-    end
-
-    define_template :creative_commons do |xml|
-      xml.use {
-        xml.human(:type => "creativeCommons")
-        xml.machine(:type => "creativeCommons")
-      }
+      t.open_data_commons :path => '/use/machine[@type=\'openDataCommons\']', :type => 'openDataCommons' do
+        t.uri :path => '@uri'
+      end
+      t.open_data_commons_human :path => '/use/human[@type=\'openDataCommons\']'
     end
 
     def self.xml_template
       Nokogiri::XML::Builder.new do |xml|
-        xml.rightsMetadata{
-          xml.access(:type => 'discover'){
-            xml.machine{ xml.none }
+        xml.rightsMetadata {
+          xml.access(:type => 'discover') {
+            xml.machine { xml.none }
           }
-          xml.access(:type => 'read'){
-            xml.machine{ xml.none }   # dark default
+          xml.access(:type => 'read') {
+            xml.machine { xml.none }   # dark default
           }
-          xml.use{
+          xml.use {
             xml.human(:type => 'useAndReproduction')
-            xml.human(:type => "creativeCommons")
-            xml.machine(:type => "creativeCommons")
+            xml.human(:type => 'creativeCommons')
+            xml.machine(:type => 'creativeCommons', :uri => '')
+            xml.human(:type => 'openDataCommons')
+            xml.machine(:type => 'openDataCommons', :uri => '')
           }
-          xml.copyright{ xml.human }
+          xml.copyright { xml.human }
         }
       end.doc
     end
@@ -57,7 +58,7 @@ module Dor
     end
 
     def dra_object
-      @dra_object ||= Dor::RightsAuth.parse(self.ng_xml, true)
+      @dra_object ||= Dor::RightsAuth.parse(ng_xml, true)
     end
 
     # @param rights [string] archetypical rights to assign: 'world', 'stanford', 'none' or 'dark'
@@ -66,44 +67,54 @@ module Dor
     # TODO: convert xpath reads to dra_object calls
     def set_read_rights(rights)
       raise(ArgumentError, "Argument '#{rights}' is not a recognized value") unless %w(world stanford none dark).include? rights
-      rights_xml = self.ng_xml
-      if (rights_xml.search('//rightsMetadata/access[@type=\'read\']').length==0)
+      rights_xml = ng_xml
+      if rights_xml.search('//rightsMetadata/access[@type=\'read\']').length == 0
         raise('The rights metadata stream doesnt contain an entry for machine read permissions. Consider populating it from the APO before trying to change it.')
       end
-      label = rights=='dark' ? 'none' : 'world'
+      label = rights == 'dark' ? 'none' : 'world'
       @dra_object = nil # until TODO complete, we'll expect to have to reparse after modification
       rights_xml.search('//rightsMetadata/access[@type=\'discover\']/machine').each do |node|
         node.children.remove
-        node.add_child Nokogiri::XML::Node.new(label,rights_xml)
+        node.add_child Nokogiri::XML::Node.new(label, rights_xml)
       end
       rights_xml.search('//rightsMetadata/access[@type=\'read\']').each do |node|
         node.children.remove
-        machine_node = Nokogiri::XML::Node.new('machine',rights_xml)
+        machine_node = Nokogiri::XML::Node.new('machine', rights_xml)
         node.add_child(machine_node)
         if rights == 'world'
-          machine_node.add_child Nokogiri::XML::Node.new(rights,rights_xml)
+          machine_node.add_child Nokogiri::XML::Node.new(rights, rights_xml)
         elsif rights == 'stanford'
-          group_node = Nokogiri::XML::Node.new('group',rights_xml)
-          group_node.content = "Stanford"
+          group_node = Nokogiri::XML::Node.new('group', rights_xml)
+          group_node.content = 'Stanford'
           machine_node.add_child(group_node)
         else  # we know it is none or dark by the argument filter (first line)
-          machine_node.add_child Nokogiri::XML::Node.new('none',rights_xml)
+          machine_node.add_child Nokogiri::XML::Node.new('none', rights_xml)
         end
       end
+      self.content = rights_xml.to_xml
+      content_will_change!
     end
 
-    def to_solr(solr_doc=Hash.new, *args)
+    def to_solr(solr_doc = {}, *args)
       super(solr_doc, *args)
-      dra = self.dra_object
+      dra = dra_object
       solr_doc['rights_primary_ssi'] = dra.index_elements[:primary]
       solr_doc['rights_errors_ssim'] = dra.index_elements[:errors] if dra.index_elements[:errors].size > 0
       solr_doc['rights_characteristics_ssim'] = dra.index_elements[:terms] if dra.index_elements[:terms].size > 0
       # suppress empties
-      %w[use_statement_ssim copyright_ssim].each do |key|
-        solr_doc[key] = solr_doc[key].reject{ |val| val.nil? || val == '' }.flatten unless solr_doc[key].nil?
+      %w(use_statement_ssim copyright_ssim).each do |key|
+        solr_doc[key] = solr_doc[key].reject { |val| val.nil? || val == '' }.flatten unless solr_doc[key].nil?
       end
+      add_solr_value(solr_doc, 'use_license_machine', use_license, :string, [:stored_sortable])
+
       solr_doc
     end
 
-  end #class
+    def use_license
+      return creative_commons unless ['', nil].include?(creative_commons)
+      return open_data_commons unless ['', nil].include?(open_data_commons)
+      ''
+    end
+
+  end # class
 end

data/lib/dor/datastreams/role_metadata_ds.rb

@@ -28,19 +28,19 @@ class RoleMetadataDS < ActiveFedora::OmDatastream
 
   def self.xml_template
     Nokogiri::XML::Builder.new do |xml|
-      xml.roleMetadata{
+      xml.roleMetadata {
       }
     end.doc
   end
 
-  def to_solr(solr_doc=Hash.new, *args)
-    self.find_by_xpath('/roleMetadata/role/*').each do |actor|
+  def to_solr(solr_doc = {}, *args)
+    find_by_xpath('/roleMetadata/role/*').each do |actor|
       role_type = actor.parent['type']
       val = [actor.at_xpath('identifier/@type'), actor.at_xpath('identifier/text()')].join ':'
       add_solr_value(solr_doc, "apo_role_#{actor.name}_#{role_type}", val, :string, [:symbol])
       add_solr_value(solr_doc, "apo_role_#{role_type}", val, :string, [:symbol])
-      if ['dor-apo-manager','dor-apo-depositor'].include? role_type
-        add_solr_value(solr_doc, "apo_register_permissions", val, :string, [:symbol, :stored_searchable])
+      if ['dor-apo-manager', 'dor-apo-depositor'].include? role_type
+        add_solr_value(solr_doc, 'apo_register_permissions', val, :string, [:symbol, :stored_searchable])
       end
     end
     solr_doc

data/lib/dor/datastreams/simple_dublin_core_ds.rb

@@ -2,37 +2,36 @@ module Dor
 class SimpleDublinCoreDs < ActiveFedora::OmDatastream
 
   set_terminology do |t|
-    t.root(:path=>"dc", :xmlns=>"http://www.openarchives.org/OAI/2.0/oai_dc/", :schema=>"http://cosimo.stanford.edu/standards/oai_dc/v2/oai_dc.xsd", :namespace_prefix => 'oai_dc', :index_as => [:not_searchable])
-    t.title(     :index_as=>[:stored_sortable, :stored_searchable], :xmlns => "http://purl.org/dc/elements/1.1/", :namespace_prefix => 'dc')
-    t.creator(   :index_as=>[:stored_sortable, :stored_searchable], :xmlns => "http://purl.org/dc/elements/1.1/", :namespace_prefix => 'dc')
-    t.identifier(:index_as=>[:symbol, :stored_searchable],          :xmlns => "http://purl.org/dc/elements/1.1/", :namespace_prefix => 'dc')
+    t.root(:path => 'dc', :xmlns => 'http://www.openarchives.org/OAI/2.0/oai_dc/', :schema => 'http://cosimo.stanford.edu/standards/oai_dc/v2/oai_dc.xsd', :namespace_prefix => 'oai_dc', :index_as => [:not_searchable])
+    t.title(     :index_as => [:stored_sortable, :stored_searchable], :xmlns => 'http://purl.org/dc/elements/1.1/', :namespace_prefix => 'dc')
+    t.creator(   :index_as => [:stored_sortable, :stored_searchable], :xmlns => 'http://purl.org/dc/elements/1.1/', :namespace_prefix => 'dc')
+    t.identifier(:index_as => [:symbol, :stored_searchable],          :xmlns => 'http://purl.org/dc/elements/1.1/', :namespace_prefix => 'dc')
   end
 
   def self.xml_template
     builder = Nokogiri::XML::Builder.new do |xml|
-      xml.dc(:xmlns=>"http://www.openarchives.org/OAI/2.0/oai_dc/",
-        'xmlns:dc'=>'http://purl.org/dc/elements/1.1/') {
-          xml['dc'].title
-          xml['dc'].creator
-          xml['dc'].identifier
+      xml.dc(:xmlns => 'http://www.openarchives.org/OAI/2.0/oai_dc/', 'xmlns:dc' => 'http://purl.org/dc/elements/1.1/') {
+        xml['dc'].title
+        xml['dc'].creator
+        xml['dc'].identifier
       }
     end
 
-    return builder.doc
+    builder.doc
   end
 
-  def to_solr(solr_doc=Hash.new, *args)
+  def to_solr(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.
 
     doc = super solr_doc, *args
 
-    add_solr_value(doc, 'dc_title',   self.title.first,   :string, [:stored_sortable, :stored_searchable])
-    add_solr_value(doc, 'dc_creator', self.creator.first, :string, [:stored_sortable, :stored_searchable])
+    add_solr_value(doc, 'dc_title',   title.first,   :string, [:stored_sortable, :stored_searchable])
+    add_solr_value(doc, 'dc_creator', creator.first, :string, [:stored_sortable, :stored_searchable])
 
     identifiers = {}
 
-    self.identifier.each { |i| ns, val = i.split(":"); identifiers[ns] ||= val }
+    identifier.each { |i| ns, val = i.split(':'); identifiers[ns] ||= val }
 
     identifiers.each do |ns, val|
       add_solr_value(doc, "dc_identifier_#{ns}", val, :string, [:stored_sortable, :stored_searchable])

data/lib/dor/datastreams/version_metadata_ds.rb

@@ -1,16 +1,15 @@
 module Dor
-
   class VersionTag
     include Comparable
 
     attr_reader :major, :minor, :admin
 
-    def <=>(anOther)
-      diff = @major <=> anOther.major
+    def <=>(other)
+      diff = @major <=> other.major
       return diff if diff != 0
-      diff = @minor <=> anOther.minor
+      diff = @minor <=> other.minor
       return diff if diff != 0
-      @admin <=> anOther.admin
+      @admin <=> other.admin
     end
 
     # @param [String] raw_tag the value of the tag attribute from a Version node
@@ -51,10 +50,10 @@ module Dor
     before_create :ensure_non_versionable
 
     set_terminology do |t|
-      t.root(:path => "versionMetadata")
+      t.root(:path => 'versionMetadata')
       t.version do
-        t.version_id :path => { :attribute => "versionID" }
-        t.tag :path => { :attribute => "tag" }
+        t.version_id :path => { :attribute => 'versionID' }
+        t.tag :path => { :attribute => 'tag' }
         t.description
       end
     end
@@ -68,21 +67,21 @@ module Dor
           }
         }
       end
-      return builder.doc
+      builder.doc
     end
 
     def ensure_non_versionable
-      self.versionable = "false"
+      self.versionable = 'false'
     end
 
     # @param [String] description optional text describing version change
     # @param [Symbol] significance optional which part of the version tag to increment
     #  :major, :minor, :admin (see VersionTag#increment)
     def increment_version(description = nil, significance = nil)
-      if ( find_by_terms(:version).size == 0)
-        v = ng_xml.create_element "version",
+      if  find_by_terms(:version).size == 0
+        v = ng_xml.create_element 'version',
         :versionId => '1', :tag => '1.0.0'
-        d = ng_xml.create_element "description", "Initial Version"
+        d = ng_xml.create_element 'description', 'Initial Version'
         ng_xml.root['objectId'] = pid
         ng_xml.root.add_child(v)
         v.add_child d
@@ -91,7 +90,7 @@ module Dor
         current_id = current[:versionId].to_i
         current_tag = VersionTag.parse(current[:tag])
 
-        v = ng_xml.create_element "version", :versionId => (current_id + 1).to_s
+        v = ng_xml.create_element 'version', :versionId => (current_id + 1).to_s
         if significance && current_tag
           v[:tag] = current_tag.increment(significance).to_s
         end
@@ -99,7 +98,7 @@ module Dor
         ng_xml.root.add_child(v)
 
         if description
-          d = ng_xml.create_element "description", description
+          d = ng_xml.create_element 'description', description
           v.add_child d
         end
       end
@@ -107,7 +106,7 @@ module Dor
 
     # @return [String] value of the most current versionId
     def current_version_id
-      current_version=current_version_node
+      current_version = current_version_node
       if current_version.nil?
         return '1'
       else
@@ -129,7 +128,7 @@ module Dor
         if d
           d.content = opts[:description]
         else
-          d_node = ng_xml.create_element "description", opts[:description]
+          d_node = ng_xml.create_element 'description', opts[:description]
           current.add_child d_node
         end
       end
@@ -140,7 +139,7 @@ module Dor
         else
           # get rid of the current tag
           tags = find_by_terms(:version, :tag)
-          sorted_tags = tags.map{|t| VersionTag.parse(t.value)}.sort
+          sorted_tags = tags.map {|t| VersionTag.parse(t.value)}.sort
           current_tag = sorted_tags[sorted_tags.length - 2]           # Get the second greatest tag since we are dropping the current, greatest
           current[:tag] = current_tag.increment(opts[:significance]).to_s
         end
@@ -165,7 +164,7 @@ module Dor
     end
 
     def tag_for_version(versionId)
-      nodes=self.ng_xml.search('//version[@versionId=\''+versionId+'\']')
+      nodes = ng_xml.search('//version[@versionId=\'' + versionId + '\']')
       if nodes.length == 1
         nodes.first['tag'].to_s
       else
@@ -175,7 +174,7 @@ module Dor
 
     # @return [String] The description for the specified version, or empty string if there is no description
     def description_for_version(versionId)
-      nodes=self.ng_xml.search('//version[@versionId=\''+versionId+'\']')
+      nodes = ng_xml.search('//version[@versionId=\'' + versionId + '\']')
       if nodes.length == 1 && nodes.first.at_xpath('description')
         nodes.first.at_xpath('description').content.to_s
       else
@@ -185,7 +184,7 @@ module Dor
 
     # @return [String] The description for the current version
     def current_description
-      desc_node=current_version_node.at_xpath('description')
+      desc_node = current_version_node.at_xpath('description')
       return desc_node.content if desc_node
       ''
     end
@@ -200,7 +199,7 @@ module Dor
     # @param [Hash] opts optional parameters
     # @option opts [String] :description describes the version change
     # @option opts [Symbol] :significance which part of the version tag to increment
-    def sync_then_increment_version known_version, opts = {}
+    def sync_then_increment_version(known_version, opts = {})
       cv = current_version_id.to_i
       raise Dor::Exception.new("Cannot sync to a version greater than current: #{cv}, requested #{known_version}") if cv < known_version
 
@@ -222,7 +221,7 @@ module Dor
 
     def newest_tag
       tags = find_by_terms(:version, :tag)
-      tags.map{|t| VersionTag.parse(t.value)}.max
+      tags.map {|t| VersionTag.parse(t.value)}.max
     end
 
   end

data/lib/dor/datastreams/workflow_definition_ds.rb

@@ -3,17 +3,17 @@ class WorkflowDefinitionDs < ActiveFedora::OmDatastream
   include SolrDocHelper
 
   set_terminology do |t|
-    t.root(:path => "workflow-def", :index_as => [:not_searchable])
+    t.root(:path => 'workflow-def', :index_as => [:not_searchable])
     t.process(:index_as => [:not_searchable])
   end
 
-  define_template :process do |builder,workflow,attrs|
+  define_template :process do |builder, workflow, attrs|
     prereqs = attrs.delete('prerequisite')
     prereqs = prereqs.split(/\s*,\s*/) if prereqs.is_a?(String)
     attrs.keys.each { |k| attrs[k.to_s.dasherize.to_sym] = attrs.delete(k) }
     builder.process(attrs) do |node|
       Array(prereqs).each do |prereq|
-        (repo,wf,prereq_name) = prereq.split(/:/)
+        (repo, wf, prereq_name) = prereq.split(/:/)
         if prereq_name.nil?
           prereq_name = repo
           repo = nil
@@ -37,13 +37,13 @@ class WorkflowDefinitionDs < ActiveFedora::OmDatastream
   end
 
   def graph(parent = nil)
-    Workflow::Graph.from_processes(self.repo, self.name, self.processes, parent)
+    Workflow::Graph.from_processes(repo, name, processes, parent)
   end
 
   def processes
     ng_xml.xpath('/workflow-def/process').collect do |node|
-      Workflow::Process.new(self.repo, self.name, node)
-    end.sort { |a,b| (a.sequence || 0) <=> (b.sequence || 0) }
+      Workflow::Process.new(repo, name, node)
+    end.sort { |a, b| (a.sequence || 0) <=> (b.sequence || 0) }
   end
 
   def name
@@ -63,17 +63,17 @@ class WorkflowDefinitionDs < ActiveFedora::OmDatastream
   end
 
   def configuration=(hash)
-    self.ng_xml = Nokogiri::XML(%{<workflow-def id="#{hash['name']}" repository="#{hash['repository']}"/>})
+    self.ng_xml = Nokogiri::XML(%(<workflow-def id="#{hash['name']}" repository="#{hash['repository']}"/>))
     i = 0
-    hash.each_pair do |k,v|
-      add_process(v.merge({:name => k, :sequence => i+=1})) if v.is_a?(Hash)
+    hash.each_pair do |k, v|
+      add_process(v.merge({:name => k, :sequence => i += 1})) if v.is_a?(Hash)
     end
   end
 
   # Creates the xml used by Dor::WorkflowService.create_workflow
   # @return [String] An object's initial workflow as defined by the <workflow-def> in content
   def initial_workflow
-    doc = Nokogiri::XML("<workflow/>")
+    doc = Nokogiri::XML('<workflow/>')
     root = doc.root
     root['id'] = name
     processes.each { |proc|
@@ -92,17 +92,17 @@ class WorkflowDefinitionDs < ActiveFedora::OmDatastream
     Nokogiri::XML(doc.to_xml) { |x| x.noblanks }.to_xml { |config| config.no_declaration }
   end
 
-  def to_solr(solr_doc=Hash.new,*args)
-    super(solr_doc,*args)
-    add_solr_value(solr_doc, "workflow_name", self.name, :symbol, [:symbol])
+  def to_solr(solr_doc = {}, *args)
+    super(solr_doc, *args)
+    add_solr_value(solr_doc, 'workflow_name', name, :symbol, [:symbol])
     processes.each do |p|
-      add_solr_value(solr_doc, "process", "#{p.name}|#{p.label}", :symbol, [:displayable])
+      add_solr_value(solr_doc, 'process', "#{p.name}|#{p.label}", :symbol, [:displayable])
     end
     solr_doc
   end
 
   def to_yaml
-    YAML.dump(self.configuration)
+    YAML.dump(configuration)
   end
 
 end

data/lib/dor/datastreams/workflow_ds.rb

@@ -1,85 +1,79 @@
 module Dor
-class WorkflowDs < ActiveFedora::OmDatastream
+  # TODO: class docs
+  class WorkflowDs < ActiveFedora::OmDatastream
 
-  set_terminology do |t|
-    t.root(:path=>"workflows")
-    t.workflow {
-      t.workflowId(:path=>{:attribute => "id"})
-      t.process {
-        t.name_(:path=>{:attribute=>"name"}, :index_as => [:displayable, :not_searchable])
-        t.status(:path=>{:attribute=>"status"}, :index_as => [:displayable, :not_searchable])
-        t.timestamp(:path=>{:attribute=>"datetime"}, :index_as => [:displayable, :not_searchable]) #, :data_type => :date)
-        t.elapsed(:path=>{:attribute=>"elapsed"}, :index_as => [:displayable, :not_searchable])
-        t.lifecycle(:path=>{:attribute=>"lifecycle"}, :index_as => [:displayable, :not_searchable])
-        t.attempts(:path=>{:attribute=>"attempts"}, :index_as => [:displayable, :not_searchable])
+    set_terminology do |t|
+      t.root(:path => 'workflows')
+      t.workflow {
+        t.workflowId( :path => {:attribute => 'id'} )
+        t.process {
+          t.name_(    :path => {:attribute => 'name'     }, :index_as => [:displayable, :not_searchable] )
+          t.status(   :path => {:attribute => 'status'   }, :index_as => [:displayable, :not_searchable] )
+          t.timestamp(:path => {:attribute => 'datetime' }, :index_as => [:displayable, :not_searchable] ) # , :data_type => :date)
+          t.elapsed(  :path => {:attribute => 'elapsed'  }, :index_as => [:displayable, :not_searchable] )
+          t.lifecycle(:path => {:attribute => 'lifecycle'}, :index_as => [:displayable, :not_searchable] )
+          t.attempts( :path => {:attribute => 'attempts' }, :index_as => [:displayable, :not_searchable] )
+        }
       }
-    }
-  end
-
-  def get_workflow(wf, repo = 'dor')
-    xml = Dor::WorkflowService.get_workflow_xml(repo, self.pid, wf)
-    xml = Nokogiri::XML(xml)
-    return nil if xml.xpath('workflow').length == 0
-    Workflow::Document.new(xml.to_s)
-  end
+    end
 
-  def [](wf)
-    xml = Dor::WorkflowService.get_workflow_xml('dor', self.pid, wf)
-    xml = Nokogiri::XML(xml)
-    return nil if xml.xpath('workflow').length == 0
-    Workflow::Document.new(xml.to_s)
-  end
+    def get_workflow(wf, repo = 'dor')
+      xml = Dor::WorkflowService.get_workflow_xml(repo, pid, wf)
+      xml = Nokogiri::XML(xml)
+      return nil if xml.xpath('workflow').length == 0
+      Workflow::Document.new(xml.to_s)
+    end
 
-  def ensure_xml_loaded
-    ng_xml
-    self.xml_loaded = true
-  end
+    alias_method :[], :get_workflow
 
-  def ng_xml
-    @ng_xml ||= Nokogiri::XML::Document.parse(content)
-  end
+    def ng_xml
+      @ng_xml ||= Nokogiri::XML::Document.parse(content)
+    end
 
-  def content
-    @content ||= Dor::WorkflowService.get_workflow_xml 'dor', self.pid, nil
-  rescue RestClient::ResourceNotFound
-    xml = Nokogiri::XML(%{<?xml version="1.0" encoding="UTF-8" standalone="yes"?>\n<workflows objectId="#{self.pid}"/>})
-    self.digital_object.datastreams.keys.each do |dsid|
-      next unless dsid =~ /WF$/
-      ds_content = Nokogiri::XML(Dor::WorkflowService.get_workflow_xml 'dor', self.pid, dsid)
-      xml.root.add_child(ds_content.root)
+    # @param [Boolean] refresh The WorkflowDS caches the content retrieved from the workflow
+    # service. This flag will invalidate the cached content and refetch it from the workflow
+    # service directly
+    def content(refresh = false)
+      @content = nil if refresh
+      @content ||= Dor::WorkflowService.get_workflow_xml 'dor', pid, nil
+    rescue RestClient::ResourceNotFound
+      xml = Nokogiri::XML(%(<?xml version="1.0" encoding="UTF-8" standalone="yes"?>\n<workflows objectId="#{pid}"/>))
+      digital_object.datastreams.keys.each do |dsid|
+        next unless dsid =~ /WF$/
+        ds_content = Nokogiri::XML(Dor::WorkflowService.get_workflow_xml 'dor', pid, dsid)
+        xml.root.add_child(ds_content.root)
+      end
+      @content ||= xml.to_xml
     end
-    @content ||= xml.to_xml
-  end
 
-  def workflows
-    @workflows ||= self.workflow.nodeset.collect { |wf_node| Workflow::Document.new wf_node.to_xml }
-  end
+    def workflows
+      @workflows ||= workflow.nodeset.collect { |wf_node| Workflow::Document.new wf_node.to_xml }
+    end
 
-  def graph(dir = nil)
-    result = GraphViz.digraph(self.pid)
-    sg = result.add_graph('rank') { |g| g[:rank => 'same'] }
-    workflows.reject(&:nil?).each do |wf|
-      g = wf.graph(result)
-      sg.add_node(g.root.id) unless g.nil?
+    def graph(dir = nil)
+      result = GraphViz.digraph(pid)
+      sg = result.add_graph('rank') { |g| g[:rank => 'same'] }
+      workflows.reject(&:nil?).each do |wf|
+        g = wf.graph(result)
+        sg.add_node(g.root.id) unless g.nil?
+      end
+      result['rankdir'] = dir || 'TB'
+      result
     end
-    result['rankdir'] = dir || 'TB'
-    result
-  end
 
-  # Finds the first workflow that is expedited, then returns the value of its priority
-  #
-  # @return [Integer] value of the priority.  Defaults to 0 if none of the workflows are expedited
-  def current_priority
-    cp = workflows.detect { |wf| wf.expedited? }
-    return 0 if cp.nil?
-    cp.priority.to_i
-  end
+    # Finds the first workflow that is expedited, then returns the value of its priority
+    #
+    # @return [Integer] value of the priority.  Defaults to 0 if none of the workflows are expedited
+    def current_priority
+      cp = workflows.detect &:expedited?
+      return 0 if cp.nil?
+      cp.priority.to_i
+    end
 
-  def to_solr(solr_doc=Hash.new, *args)
-#    super solr_doc, *args
-    self.workflows.each { |wf| wf.to_solr(solr_doc, *args) }
-    solr_doc
+    def to_solr(solr_doc = {}, *args)
+      # super solr_doc, *args
+      workflows.each { |wf| wf.to_solr(solr_doc, *args) }
+      solr_doc
+    end
   end
-
-end
 end