om 1.3.0 → 1.4.0

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    om (1.2.4)
+    om (1.3.0)
+      mediashelf-loggable
       nokogiri (>= 1.4.2)
-      om
 
 GEM
   remote: http://rubygems.org/
@@ -12,15 +12,10 @@ GEM
     columnize (0.3.2)
     equivalent-xml (0.2.6)
       nokogiri (>= 1.4.3)
-    git (1.2.5)
-    jeweler (1.5.2)
-      bundler (~> 1.0.0)
-      git (>= 1.2.5)
-      rake
     linecache (0.43)
+    mediashelf-loggable (0.4.7)
     mocha (0.9.12)
     nokogiri (1.4.4)
-    rake (0.8.7)
     rcov (0.9.9)
     rspec (1.3.1)
     ruby-debug (0.10.4)
@@ -36,7 +31,6 @@ PLATFORMS
 DEPENDENCIES
   RedCloth
   equivalent-xml (>= 0.2.4)
-  jeweler
   mocha (>= 0.9.8)
   om!
   rcov

data/History.textile

@@ -1,3 +1,7 @@
+h3. 1.4.0
+
+  Added dynamic node access DSL. Added a warning when calling an index on a proxy term.
+
 h3. 1.3.0
 
   Document automatically includes Validation module, meaning that you can now call .validate on any document

data/lib/om.rb

@@ -34,12 +34,17 @@ module OM
     end
   end
   
-  # @pointers pointers array that you would pass into other Accessor methods
-  # @include_indices (default: true) if set to false, parent indices will be excluded from the array
-  # Converts an array of accessor pointers into a flat array.
-  # ie. [{:conference=>0}, {:role=>1}, :text] becomes [:conference, 0, :role, 1, :text]
-  #   if include_indices is set to false,
-  #     [{:conference=>0}, {:role=>1}, :text] becomes [:conference, :role, :text]
+  # Convert a Term pointer into a flat array without Hashes.
+  # If include_indices is set to false, node indices will be removed.
+  #
+  # @param [Array] pointers array that you would pass into other Accessor methods
+  # @param [Boolean] include_indices (default: true) if set to false, parent indices will be excluded from the array
+  # @example Turn a pointer into a flat array with node indices preserved
+  #   OM.pointers_to_flat_array( [{:conference=>0}, {:role=>1}, :text] ) 
+  #   => [:conference, 0, :role, 1, :text]
+  # @example Remove node indices by setting include_indices to false
+  #   OM.pointers_to_flat_array( [{:conference=>0}, {:role=>1}, :text], false ) 
+  #   => [:conference, :role, :text]
   def self.pointers_to_flat_array(pointers, include_indices=true)
     flat_array = []
     pointers.each do |pointer|

data/lib/om/version.rb

@@ -1,3 +1,3 @@
 module Om
-  VERSION = "1.3.0"
+  VERSION = "1.4.0"
 end

data/lib/om/xml.rb

@@ -8,6 +8,7 @@ require "om/xml/node_generator"
 require "om/xml/term_value_operators"
 require "om/xml/named_term_proxy"
 require "om/xml/document"
+require "om/xml/dynamic_node"
 
 require "om/xml/template_registry"
 

data/lib/om/xml/document.rb

@@ -44,15 +44,26 @@ module OM::XML::Document
     klass.send(:include, OM::XML::TermValueOperators)
     klass.send(:include, OM::XML::Validation)
   end
+
+  def method_missing(name, *args)
+    term = self.class.terminology.retrieve_term(name)
+    if (term)
+      OM::XML::DynamicNode.new(name, args.first, self, term)
+    else
+      super
+    end
+  end
+
+
+  def find_by_xpath(xpath)
+    ng_xml.xpath(xpath, ox_namespaces) 
+  end
+  
   
   # Applies the property's corresponding xpath query, returning the result Nokogiri::XML::NodeSet
   def find_by_terms_and_value(*term_pointer)
     xpath = self.class.terminology.xpath_for(*term_pointer)    
-    if xpath.nil?
-      return nil
-    else
-      return ng_xml.xpath(xpath, ox_namespaces) 
-    end
+    find_by_xpath(xpath) unless xpath.nil?
   end
   
 
@@ -64,11 +75,7 @@ module OM::XML::Document
   # Currently, indexes must be integers.
   def find_by_terms(*term_pointer)
     xpath = self.class.terminology.xpath_with_indexes(*term_pointer)   
-    if xpath.nil?
-      return nil
-    else
-      return ng_xml.xpath(xpath, ox_namespaces) 
-    end   
+    find_by_xpath(xpath) unless xpath.nil?
   end
   
   # Test whether the document has a node corresponding to the given term_pointer
@@ -146,4 +153,4 @@ module OM::XML::Document
     end
     template_registry.send(method, target, *args, &block)
   end
-end
+end

data/lib/om/xml/dynamic_node.rb

@@ -0,0 +1,184 @@
+module OM
+  module XML
+    #
+    # Provides a natural syntax for using OM Terminologies to access values from xml Documents
+    # 
+    # @example Return an array of the value(s) "start page" node(s) from the second issue node within the first journal node
+    #   # Using DynamicNode syntax:
+    #   @article.journal(0).issue(1).pages.start
+    #   # Other ways to perform this query:
+    #   @article.find_by_terms({:journal => 0}, {:issue => 1}, :pages, :start)
+    #   @article.xpath("//oxns:relatedItem[@type=\"host\"]/oxns:part[2]/extent[@unit="pages"]")
+    #
+    # @example Return an NodeSet of the _first titles_ of all journal nodes
+    #   # Using DynamicNode syntax:
+    #   @article.journal.title(1)
+    #   # Other ways to perform this query:
+    #   @article.find_by_terms(:journal, {:title => 1})
+    #   @article.xpath("//oxns:relatedItem[@type=\"host\"]/oxns:titleInfo/oxns:title[1]")
+    #
+    # @example Find all of the titles from all journals & return the first title Node from that NodeSet
+    #   # Using DynamicNode syntax:
+    #   @article.journal.title[1]
+    #   # Other ways to perform this query:
+    #   @article.find_by_terms(:journal, :title)[1]
+    #   @article.xpath("//oxns:relatedItem[@type=\"host\"]/oxns:titleInfo/oxns:title")[1]
+    #
+    class DynamicNode
+      attr_accessor :key, :index, :parent, :addressed_node, :term
+      def initialize(key, index, document, term, parent=nil)  ##TODO a real term object in here would make it easier to lookup
+        self.key = key
+        self.index = index
+        @document = document
+        self.term = term
+        self.parent = parent
+      end
+
+      def method_missing (name, *args)
+        if /=$/.match(name.to_s)
+          new_update_node(name, args)
+        elsif args.length > 1
+          new_update_node_with_index(name, args)
+        else
+          child =  term_child_by_name(term.nil? ? parent.term : term, name)
+          if child
+            OM::XML::DynamicNode.new(name, args.first, @document, child, self)
+          else 
+            val.send(name, *args)
+          end
+        end
+      end
+
+      def new_update_node(name, args)
+        modified_name = name.to_s.chop.to_sym
+        child = term.retrieve_term(modified_name)
+        node = OM::XML::DynamicNode.new(modified_name, nil, @document, child, self)
+        node.val=args
+      end
+
+      def new_update_node_with_index(name, args)
+        index = args.shift
+        child = term.retrieve_term(name)
+        node = OM::XML::DynamicNode.new(name, index, @document, child, self)
+        node.val=args
+      end
+
+      def val=(args)
+        new_values = sanitize_new_values(args.first)
+        new_values.each do |y,z|   
+## If we pass something that already has an index on it, we should be able to add it.
+          if @document.find_by_xpath(xpath)[y.to_i].nil? || y.to_i == -1
+            @document.term_values_append(:parent_select=> parent.to_pointer,:parent_index=>0,:template=>to_pointer,:values=>z)
+          else
+            @document.term_value_update(xpath, y.to_i, z)
+          end
+        end
+      end
+
+      def sanitize_new_values(new_values)
+          # Sanitize new_values to always be a hash with indexes
+          case new_values
+          when Hash
+          when Array
+            nv = new_values.dup
+            new_values = {}
+            nv.each {|v| new_values[nv.index(v).to_s] = v}
+          else
+            new_values = {"0"=>new_values}
+          end
+          new_values
+      end
+
+      def term_child_by_name(term, name)
+        if (term.kind_of? NamedTermProxy)
+           @document.class.terminology.retrieve_node(*(term.proxy_pointer.dup << name)) 
+        else
+          term.retrieve_term(name)
+        end
+      end
+
+      def val 
+        query = xpath
+        trim_text = !query.index("text()").nil?
+        return @document.find_by_xpath(query).collect {|node| (trim_text ? node.text.strip : node.text) }
+      end
+      
+      def nodeset
+        query = xpath
+        trim_text = !query.index("text()").nil?
+        return @document.find_by_xpath(query)
+      end
+      
+      def inspect
+        val.inspect
+      end
+
+      def ==(other)
+        val == other
+      end
+
+      def eql?(other)
+        self == other
+      end
+
+      def to_pointer
+        if self.index
+          parent.nil? ?  [{key => index}] : parent.to_pointer << {key => index}
+        else ### A pointer
+          parent.nil? ? [key] : parent.to_pointer << key
+        end
+      end 
+
+      def xpath
+        if parent.nil?
+          @document.class.terminology.xpath_with_indexes(*(to_pointer << {})) ### last element is always filters
+        else
+          chain = retrieve_addressed_node( )
+          '//' + chain.map { |n| n.xpath}.join('/')
+        end
+        
+      end
+
+
+      class AddressedNode
+        attr_accessor :xpath, :key, :pointer
+        def initialize (pointer, xpath, key)
+          self.xpath = xpath
+          self.key = key
+          self.pointer = pointer
+        end
+      end
+     
+      ##
+      # This is very similar to Terminology#retrieve_term, however it expands proxy paths out into their cannonical paths
+      def retrieve_addressed_node()
+         chain = []
+            
+         if parent
+           chain += parent.retrieve_addressed_node()
+         end
+         if (self.index)
+           ### This is an index
+           node = AddressedNode.new(key, term.xpath_relative, self)
+           node.xpath = OM::XML::TermXpathGenerator.add_node_index_predicate(node.xpath, index)
+           chain << node
+         elsif (term.kind_of? NamedTermProxy)
+            proxy = term.proxy_pointer.dup
+            first = proxy.shift
+            p = @document.class.terminology.retrieve_node(*first)
+            chain << AddressedNode.new(p, p.xpath_relative, self)
+            while !proxy.empty?
+              first = proxy.shift
+              p = p.retrieve_term(first)
+              chain << AddressedNode.new(p, p.xpath_relative, self)
+            end
+         else 
+           chain << AddressedNode.new(key, term.xpath_relative, self)
+         end
+         chain
+      end
+
+
+    end
+  end
+end

data/lib/om/xml/template_registry.rb

@@ -140,6 +140,12 @@ class OM::XML::TemplateRegistry
   end
 
   private
+  
+  # Create a new Nokogiri::XML::Node based on the template for +node_type+
+  #
+  # @param [Nokogiri::XML::Node] builder_node The node to use as starting point for building the node using Nokogiri::XML::Builder.with(builder_node).  This provides namespace info, etc for constructing the new Node object. If nil, defaults to {OM::XML::TemplateRegistry#empty_root_node}.  This is just used to create the new node and will not be included in the response.
+  # @param node_type a pointer to the template to use when creating the node
+  # @param [Array] args any additional args
   def create_detached_node(builder_node, node_type, *args)
     proc = @templates[node_type]
     if proc.nil?
@@ -155,6 +161,13 @@ class OM::XML::TemplateRegistry
     builder_node.elements.last.remove
   end
 
+  # Create a new XML node of type +node_type+ and attach it to +target_node+ using the specified +method+
+  #
+  # @param [Symbol] method name that should be called on +target_node+, usually a Nokogiri::XML::Node instance method
+  # @param [Nokogiri::XML::Node or Nokogiri::XML::NodeSet with only one Node in it] target_node
+  # @param [Symbol] builder_node_offset Indicates node to use as the starting point for _constructing_ the new node using {OM::XML::TemplateRegistry#create_detached_node}. If this is set to :parent, target_node.parent will be used.  Otherwise, target_node will be used. 
+  # @param node_type
+  # @param [Array] args any additional arguments for creating the node
   def attach_node(method, target_node, builder_node_offset, node_type, *args, &block)
     if target_node.is_a?(Nokogiri::XML::NodeSet) and target_node.length == 1
       target_node = target_node.first

data/lib/om/xml/term.rb

@@ -126,12 +126,44 @@ class OM::XML::Term
     end
   end
   
-  # Term Class Definition
-  
-  attr_accessor :name, :xpath, :xpath_constrained, :xpath_relative, :path, :index_as, :required, :data_type, :variant_of, :path, :attributes, :default_content_path, :namespace_prefix, :is_root_term
+  #
+  # Class Definition for Term 
+  #
+
+  include OM::TreeNode
+
+  attr_accessor :name, :xpath, :xpath_constrained, :xpath_relative, :path, :index_as, :required, :data_type, :variant_of, :path, :default_content_path, :is_root_term
   attr_accessor :children, :internal_xml, :terminology
   
-  include OM::TreeNode
+  # Any XML attributes that qualify the Term.
+  #
+  # @example Declare a Term that has a given attribute (ie. //title[@xml:lang='eng'])
+  #   t.english_title(:path=>"title", :attributes=>{"xml:lang"=>"eng"}
+  # @example Use nil to point to nodes that do not have a given attribute (ie. //title[not(@xml:lang)])
+  #   t.title_without_lang_attribute(:path=>"title", :attributes=>{"xml:lang"=>nil})
+  attr_accessor :attributes
+  
+  # Namespace Prefix (xmlns) for the Term.
+  #
+  # By default, OM assumes that all terms in a Terminology have the namespace set in the root of the document.  If you want to set a different namespace for a Term, pass :namespace_prefix into its initializer (or call .namespace_prefix= on its builder)
+  # If a node has _no_ namespace, you must explicitly set namespace_prefix to nil.  Currently you have to do this on _each_ term, you can't set namespace_prefix to nil for an entire Terminology.
+  # 
+  # @example
+  #   # For xml like this
+  #   <foo xmlns="http://foo.com/schemas/fooschema" xmlns:bar="http://bar.com/schemas/barschema">
+  #     <address>1400 Pennsylvania Avenue</address>
+  #     <bar:latitude>56</bar:latitude>
+  #   </foo>
+  #   
+  #   # The Terminology would look like this
+  #   OM::XML::Terminology::Builder.new do |t|
+  #     t.root(:name=>:foo, :path=>"foo", :xmlns=>"http://foo.com/schemas/fooschema", "xmlns:bar"=>"http://bar.com/schemas/barschema")
+  #     t.address
+  #     t.latitude(:namespace_prefix=>"bar")
+  #   end
+  #
+  attr_accessor :namespace_prefix
+  
   
   # h2. Namespaces
   # By default, OM assumes that all terms in a Terminology have the namespace set in the root of the document.  If you want to set a different namespace for a Term, pass :namespasce_prefix into its initializer (or call .namespace_prefix= on its builder)
@@ -215,7 +247,15 @@ class OM::XML::Term
         node_options << "\'#{k}\'=>\'#{v}\'"
       end
     end
-    template = "xml.#{self.path}( #{OM::XML.delimited_list(node_options)} )" + node_child_template
+    if self.path.include?(":")
+      ns_prefix = self.path[0..path.index(":")-1]
+      path_name = self.path[path.index(":")+1..-1]
+      template = "xml[\"#{ns_prefix}\"].#{path_name}( #{OM::XML.delimited_list(node_options)} )" + node_child_template
+    elsif !self.namespace_prefix.nil? and self.namespace_prefix != 'oxns'
+      template = "xml[\"#{self.namespace_prefix}\"].#{self.path}( #{OM::XML.delimited_list(node_options)} )" + node_child_template
+    else
+      template = "xml.#{self.path}( #{OM::XML.delimited_list(node_options)} )" + node_child_template
+    end
     return template.gsub( /:::(.*?):::/ ) { '#{'+$1+'}' }
   end
   
@@ -285,4 +325,4 @@ class OM::XML::Term
   
   # private :update_xpath_values
   
-end
+end

data/lib/om/xml/term_value_operators.rb

@@ -162,7 +162,7 @@ module OM::XML::TermValueOperators
       to_build = [parent_select.pop] + to_build
       starting_point = find_by_terms(*parent_select)
       if starting_point.empty? && parent_select.empty? 
-        raise OM::XML::TemplateMissingException, "Cannot insert nodes into the document because it is empty."
+        raise OM::XML::TemplateMissingException, "Cannot insert nodes into the document because it is empty.  Try defining self.xml_template on the #{self.class} class."
       end
     end
     to_build.each do |term_pointer|      
@@ -187,7 +187,7 @@ module OM::XML::TermValueOperators
       starting_point = find_by_terms(*parent_select+[{}])
       # If pointers in parent_select don't match with the indexes of built ancestors, correct the hash
       if starting_point.empty?
-        raise StandardError "Oops.  Something went wrong adding #{term_pointer} to #{parent_select} while building ancestors"
+        raise ::StandardError, "Oops.  Something went wrong adding #{term_pointer.inspect} to #{parent_select.inspect} while building ancestors.  Expected to find something at #{self.class.terminology.xpath_for(*parent_select)}. The current xml is\n #{self.to_xml}"
       end
     end
     if parent_index > starting_point.length

data/lib/om/xml/term_xpath_generator.rb

@@ -1,4 +1,6 @@
+require 'loggable'
 module OM::XML::TermXpathGenerator
+  include Loggable
   
   # Generate relative xpath for a term
   # @param [OM::XML::Term] term that you want to generate relative xpath for
@@ -161,11 +163,12 @@ module OM::XML::TermXpathGenerator
       
       term = terminology.retrieve_term(*keys)  
       # Return nil if there is no term to work with
-      if term.nil? then return nil end
+      return if term.nil?
       
-      # If we've encountered a NamedTermProxy, insert path sections corresponding to 
-      # terms corresponding to each entry in its proxy_pointer rather than just the final term that it points to.
+      # If we've encountered a NamedTermProxy, insert path sections corresponding to each entry in its proxy_pointer (rather than just the final term that it points to).
+      # TODO Looks like this only works if the last key is a NamedTermProxy, what if we cross proxies on the way there?
       if term.kind_of? OM::XML::NamedTermProxy
+        logger.warn "You attempted to call an index value of #{index} on the term \"#{k.inspect}\". However \"#{k.inspect}\" is a proxy so we are ignoring the index. See https://jira.duraspace.org/browse/HYDRA-643" if index
         current_location = term.parent.nil? ? term.terminology : term.parent
         relative_path = ""
         term.proxy_pointer.each_with_index do |proxy_pointer, proxy_pointer_index|

data/lib/om/xml/terminology.rb

@@ -140,6 +140,7 @@ class OM::XML::Terminology
   end
   
   # Returns the Term corresponding to the given _pointer_.
+  # Proxies are not expanded
   def retrieve_term(*args)
     args_cp = args.dup
     current_term = terms[args_cp.delete_at(0)]
@@ -155,40 +156,61 @@ class OM::XML::Terminology
     end
     return current_term
   end
-  
+
+  def retrieve_node_subsequent(args, context)
+    current_term = context.children[args.shift]
+    if current_term.kind_of? OM::XML::NamedTermProxy
+      args = (current_term.proxy_pointer + args).flatten
+      current_term = context.children[args.shift]
+    end 
+    args.empty? ? current_term : retrieve_node_subsequent(args, current_term)
+  end
+
+ 
+  ##
+  # This is very similar to retrieve_term, however it expands proxy paths out into their cannonical paths
+  def retrieve_node(*args)
+    current_term = terms[args.shift]
+    if current_term.kind_of? OM::XML::NamedTermProxy
+      args = (current_term.proxy_pointer + args).flatten
+      current_term = terms[args.shift]
+    end 
+    args.empty? ? current_term : retrieve_node_subsequent(args, current_term)
+  end
+
+
   # Return the appropriate xpath query for retrieving nodes corresponding to the term identified by +pointers+.
   # If the last argument is a String or a Hash, it will be used to add +constraints+ to the resulting xpath query.
   # If you provide an xpath query as the argument, it will be returne untouched.
   def xpath_for(*pointers)
     if pointers.length == 1 && pointers.first.instance_of?(String)
-      xpath_query = pointers.first
-    else
-      query_constraints = nil
-      
-      if pointers.length > 1 && !pointers.last.kind_of?(Symbol)
-        query_constraints = pointers.pop
-      end
+      return pointers.first
+    end
+    query_constraints = nil
+    
+    if pointers.length > 1 && !pointers.last.kind_of?(Symbol)
+      query_constraints = pointers.pop
+    end
 
-      term = retrieve_term( *pointers )
+    term = retrieve_node( *pointers )
 
-      if !term.nil?
-        if query_constraints.kind_of?(String)
-          constraint_value = query_constraints
-          xpath_template = term.xpath_constrained
-          xpath_query = eval( '"' + xpath_template + '"' )
-        elsif query_constraints.kind_of?(Hash) && !query_constraints.empty?       
-          key_value_pair = query_constraints.first 
-          constraint_value = key_value_pair.last
-          xpath_template = term.children[key_value_pair.first].xpath_constrained
-          xpath_query = eval( '"' + xpath_template + '"' )          
-        else 
-          xpath_query = term.xpath
-        end
-      else
-        xpath_query = nil
+    if !term.nil?
+      if query_constraints.kind_of?(String)
+        constraint_value = query_constraints
+        xpath_template = term.xpath_constrained
+        xpath_query = eval( '"' + xpath_template + '"' )
+      elsif query_constraints.kind_of?(Hash) && !query_constraints.empty?       
+        key_value_pair = query_constraints.first 
+        constraint_value = key_value_pair.last
+        xpath_template = term.children[key_value_pair.first].xpath_constrained
+        xpath_query = eval( '"' + xpath_template + '"' )          
+      else 
+        xpath_query = term.xpath
       end
+    else
+      xpath_query = nil
     end
-    return xpath_query
+    xpath_query
   end
   
   # Use the current terminology to generate an xpath with (optional) node indexes for each of the term pointers.

data/lib/tasks/om.rake

@@ -40,7 +40,7 @@ namespace :om do
       yt.files   = Dir.glob(File.join(project_root, 'lib', '**', '*.rb')) + textile_docs
                    # [ File.join(project_root, 'README.textile') ]
                    # [ File.join(project_root, 'README.textile'),'-', File.join(project_root,'GETTING_STARTED.textile') ]
-      yt.options = ['--output-dir', doc_destination, '--readme', readme_filename]
+      yt.options = ['--private', '--protected', '--output-dir', doc_destination, '--readme', readme_filename]
     end
   rescue LoadError
     desc "Generate YARD Documentation"

data/om.gemspec

@@ -13,6 +13,7 @@ Gem::Specification.new do |s|
   s.description = %q{OM (Opinionated Metadata): A library to help you tame sprawling XML schemas like MODS.  Wraps Nokogiri documents in objects with miscellaneous helper methods for doing things like retrieve generated xpath queries or look up properties based on a simplified DSL}
 
   s.add_dependency('nokogiri', ">= 1.4.2")
+  s.add_dependency('mediashelf-loggable')
   s.add_development_dependency "rspec", "<2.0.0"
   s.add_development_dependency "mocha", ">= 0.9.8"
   s.add_development_dependency "ruby-debug"

data/spec/fixtures/mods_articles/hydrangea_article1.xml

@@ -3,7 +3,7 @@
 
     <titleInfo>
         <nonSort>THE</nonSort>
-        <title>ARTICLE TITLE HYDRANGEA ARTICLE 1</title>
+        <title xml:lang="eng">ARTICLE TITLE HYDRANGEA ARTICLE 1</title>
         <subTitle>SUBTITLE</subTitle>
     </titleInfo>
     <titleInfo lang="finnish">
@@ -89,4 +89,4 @@
     <accessCondition type="restrictionOnAccess">EMBARGO NOTE</accessCondition>
     <accessCondition type="use and reproduction">OPEN ACCESS</accessCondition>
 
-</mods>
+</mods>

data/spec/unit/dynamic_node_spec.rb

@@ -0,0 +1,76 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require "om"
+
+describe "OM::XML::DynamicNode" do
+  
+  before(:each) do
+    @sample = OM::Samples::ModsArticle.from_xml( fixture( File.join("test_dummy_mods.xml") ) )
+    @article = OM::Samples::ModsArticle.from_xml( fixture( File.join("mods_articles","hydrangea_article1.xml") ) )
+  end
+  
+  describe "dynamically created nodes" do
+
+    it "should return build an array of values from the nodeset corresponding to the given term" do
+      expected_values = ["Berners-Lee", "Jobs", "Wozniak", "Klimt"]
+      result = @sample.person.last_name
+      result.length.should == expected_values.length
+      expected_values.each {|v| result.should include(v)}
+    end
+
+    it "should find elements two deep" do
+      #TODO reimplement so that method_missing with name is only called once.  Create a new method for name.
+      @article.name.name_content.val.should == ["Describes a person"]
+      @article.name.name_content.should == ["Describes a person"]
+      @article.name.name_content(0).should == ["Describes a person"]
+    end
+
+    it "should not find elements that don't  exist" do
+      lambda {@article.name.hedgehog}.should raise_exception NoMethodError
+    end
+
+    it "should allow you to call methods on the return value" do
+      @article.name.name_content.first.should == "Describes a person"
+    end
+
+    it "Should work with proxies" do
+      @article.title.should == ["ARTICLE TITLE HYDRANGEA ARTICLE 1", "Artikkelin otsikko Hydrangea artiklan 1", "TITLE OF HOST JOURNAL"]
+      @article.title.main_title_lang.should == ['eng']
+
+      @article.title(1).to_pointer.should == [{:title => 1}]
+
+      @article.journal_title.xpath.should == "//oxns:relatedItem[@type=\"host\"]/oxns:titleInfo/oxns:title"
+      @article.journal_title.should == ["TITLE OF HOST JOURNAL"]
+    end
+
+    it "Should be addressable to a specific node" do
+      @article.update_values( {[{:journal=>0}, {:issue=>3}, :pages, :start]=>{"0"=>"434"} })
+
+      @article.subject.topic(1).to_pointer == [:subject, {:topic => 1}]
+      @article.journal(0).issue.length.should == 2
+      @article.journal(0).issue(1).pages.to_pointer == [{:journal=>0}, {:issue=>1}, :pages]
+      @article.journal(0).issue(1).pages.length.should == 1
+      @article.journal(0).issue(1).pages.start.length.should == 1
+      @article.journal(0).issue(1).pages.start.first.should == "434"
+
+      @article.subject.topic(1).should == ["TOPIC 2"]
+      @article.subject.topic(1).xpath.should == "//oxns:subject/oxns:topic[2]"
+    end
+    
+    describe ".nodeset" do
+      it "should return a Nokogiri NodeSet" do
+        @article.update_values( {[{:journal=>0}, {:issue=>3}, :pages, :start]=>{"0"=>"434"} })
+        nodeset = @article.journal(0).issue(1).pages.start.nodeset
+        nodeset.should be_kind_of Nokogiri::XML::NodeSet
+        nodeset.length.should == @article.journal(0).issue(1).pages.start.length
+        nodeset.first.text.should == @article.journal(0).issue(1).pages.start.first
+      end
+    end
+
+    it "should append nodes at the specified index if possible" do
+      @article.journal.title_info = ["all", "for", "the"]
+      @article.journal.title_info(3, 'glory')
+      @article.term_values(:journal, :title_info).should == ["all", "for", "the", "glory"]
+    end
+  
+  end
+end

data/spec/unit/named_term_proxy_spec.rb

@@ -53,4 +53,4 @@ describe "OM::XML::NamedTermProxy" do
     document.update_values([:parentfoobarproxy] => "FOObar!")
     document.term_values(:parentfoobarproxy).should == ["FOObar!"]
   end
-end
+end

data/spec/unit/term_spec.rb

@@ -171,6 +171,13 @@ describe "OM::XML::Term" do
       @test_role_code.xml_builder_template(:attributes=>{"authority"=>"marcrelator"}).should == marcrelator_role_xml_builder_template
     end
     
+    it "should work for namespaced nodes" do
+      @ical_date = OM::XML::Term.new(:ical_date, :path=>"ical:date")
+      @ical_date.xml_builder_template.should == "xml[\"ical\"].date( '\#{builder_new_value}' )"
+      @ical_date = OM::XML::Term.new(:ical_date, :path=>"date", :namespace_prefix=>"ical")
+      @ical_date.xml_builder_template.should == "xml[\"ical\"].date( '\#{builder_new_value}' )"
+    end
+    
     it "should work for nodes with default_content_path" do      
       @test_volume.xml_builder_template.should == "xml.detail( \'type\'=>'volume' ) { xml.number( '\#{builder_new_value}' ) }"
     end
@@ -194,4 +201,4 @@ describe "OM::XML::Term" do
     
   end
   
-end
+end

data/spec/unit/term_value_operators_spec.rb

@@ -105,6 +105,9 @@ describe "OM::XML::TermValueOperators" do
       @article.find_by_terms({:journal=>0}, {:issue=>1}, :pages).length.should == 1
       @article.find_by_terms({:journal=>0}, {:issue=>1}, :pages, :start).length.should == 1
       @article.find_by_terms({:journal=>0}, {:issue=>1}, :pages, :start).first.text.should == "434"
+      #Last argument is a filter, we must explicitly pass no filter
+      @article.class.terminology.xpath_with_indexes(:subject, {:topic=>1}, {}).should == '//oxns:subject/oxns:topic[2]'
+      @article.find_by_terms(:subject, {:topic => 1}, {}).text.should == "TOPIC 2"
 	  end
 	  
 	  it "should accommodate appending term values with apostrophes in them"  do
@@ -129,6 +132,8 @@ describe "OM::XML::TermValueOperators" do
       pending "HYDRA-415"
       @sample.update_values({['title_info', 'main_title', 'main_title_lang']=>'eng'})
       @sample.term_values('title_info', 'main_title', 'main_title_lang').should == ['eng']
+      ## After a proxy
+      @article.term_values(:title,:main_title_lang).should == ['eng']
     end
     
     ### Examples copied over form nokogiri_datastream_spec
@@ -442,7 +447,7 @@ describe "OM::XML::TermValueOperators" do
   
   describe "build_ancestors" do
     it "should raise an error if it cant find a starting point for building from" do
-      lambda { @empty_sample.build_ancestors( [:journal, :issue], 0) }.should raise_error(OM::XML::TemplateMissingException, "Cannot insert nodes into the document because it is empty.") 
+      lambda { @empty_sample.build_ancestors( [:journal, :issue], 0) }.should raise_error(OM::XML::TemplateMissingException, "Cannot insert nodes into the document because it is empty.  Try defining self.xml_template on the OM::Samples::ModsArticle class.") 
     end
   end
   

data/spec/unit/term_xpath_generator_spec.rb

@@ -12,6 +12,7 @@ describe "OM::XML::TermXpathGeneratorSpec" do
       }
       # lookup :person, :first_name        
       t.person(:ref=>:name, :attributes=>{:type=>"personal"})
+      t.family_name(:proxy=>[:name, :family_name])
     end
     @sample_terminology = builder.build 
     @rootless_terminology = OM::XML::Terminology.new   
@@ -106,6 +107,12 @@ describe "OM::XML::TermXpathGeneratorSpec" do
     end
     it "should destringify term pointers before using them" do
       generated_xpath = OM::XML::TermXpathGenerator.generate_xpath_with_indexes( @sample_terminology, {"person"=>"1"}, "first_name" ).should == '//oxns:name[@type="personal"][2]/oxns:namePart[@type="given"]'
+      ### Last argument is a filter, we are passing no filters
+      @sample_terminology.xpath_with_indexes(:name, {:family_name=>1},{}).should == '//oxns:name/oxns:namePart[@type="family"][2]'
+    end
+    it "should warn about indexes on a proxy" do
+      Logger.any_instance.expects(:warn).with("You attempted to call an index value of 1 on the term \":family_name\". However \":family_name\" is a proxy so we are ignoring the index. See https://jira.duraspace.org/browse/HYDRA-643")
+      @sample_terminology.xpath_with_indexes({:family_name=>1}).should == "//oxns:name/oxns:namePart[@type=\"family\"]"
     end
   end
   

data/spec/unit/terminology_builder_spec.rb

@@ -79,6 +79,8 @@ describe "OM::XML::Terminology::Builder" do
       terminology.retrieve_term(:title).should be_kind_of OM::XML::NamedTermProxy
       terminology.xpath_for(:title).should == '//oxns:titleInfo/oxns:title'
       terminology.xpath_with_indexes({:title=>0}).should == "//oxns:titleInfo/oxns:title"
+      # @builder_with_block.build.xpath_for_pointer(:issue).should == '//oxns:part'
+      # terminology.xpath_for_pointer(:title).should == '//oxns:titleInfo/oxns:title'
     end
     
     describe '#new' do
@@ -198,4 +200,4 @@ describe "OM::XML::Terminology::Builder" do
       end
     end
     
-end
+end

data/spec/unit/terminology_spec.rb

@@ -17,7 +17,9 @@ describe "OM::XML::Terminology" do
       t.root(:path=>"mods", :xmlns=>"http://www.loc.gov/mods/v3", :schema=>"http://www.loc.gov/standards/mods/v3/mods-3-2.xsd")
 
       t.title_info(:path=>"titleInfo") {
-        t.main_title(:path=>"title", :label=>"title")
+        t.main_title(:path=>"title", :label=>"title") {
+          t.main_title_lang(:path=>{:attribute=> "xml:lang"})
+        }
         t.language(:path=>{:attribute=>"lang"})
       }          
       # t.title(:path=>"titleInfo", :default_content_path=>"title") {
@@ -65,6 +67,7 @@ describe "OM::XML::Terminology" do
         t.start_page(:proxy=>[:pages, :start])
         t.end_page(:proxy=>[:pages, :end])
       }
+      t.title(:proxy=>[:title_info, :main_title])
     end
 
     @test_full_terminology = @builder_with_block.build
@@ -82,6 +85,10 @@ describe "OM::XML::Terminology" do
       @test_full_terminology.retrieve_term(:person, :person_id).xpath_relative.should == 'oxns:namePart[not(@type)]'
     end
 
+    it "should expand proxy and get sub terms" do
+      @test_full_terminology.retrieve_node(:title, :main_title_lang).xpath.should == '//oxns:titleInfo/oxns:title/@xml:lang'
+    end
+
     it "constructs templates for value-driven searches" do
       @test_full_terminology.retrieve_term(:name).xpath_constrained.should == '//oxns:name[contains(., "#{constraint_value}")]'.gsub('"', '\"')  
       @test_full_terminology.retrieve_term(:person).xpath_constrained.should == '//oxns:name[@type="personal" and contains(., "#{constraint_value}")]'.gsub('"', '\"')
@@ -324,4 +331,4 @@ describe "OM::XML::Terminology" do
     end
   end
   
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: om
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 7
   prerelease: 
   segments: 
   - 1
-  - 3
+  - 4
   - 0
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors: 
 - Matt Zumwalt
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-26 00:00:00 -05:00
+date: 2011-08-29 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -35,9 +35,23 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: mediashelf-loggable
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - <
@@ -49,11 +63,11 @@ dependencies:
         - 0
         version: 2.0.0
   type: :development
-  version_requirements: *id002
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: mocha
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -65,11 +79,11 @@ dependencies:
         - 8
         version: 0.9.8
   type: :development
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: ruby-debug
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -79,11 +93,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: equivalent-xml
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -95,7 +109,7 @@ dependencies:
         - 4
         version: 0.2.4
   type: :development
-  version_requirements: *id005
+  version_requirements: *id006
 description: "OM (Opinionated Metadata): A library to help you tame sprawling XML schemas like MODS.  Wraps Nokogiri documents in objects with miscellaneous helper methods for doing things like retrieve generated xpath queries or look up properties based on a simplified DSL"
 email: matt.zumwalt@yourmediashelf.com
 executables: []
@@ -131,6 +145,7 @@ files:
 - lib/om/xml.rb
 - lib/om/xml/container.rb
 - lib/om/xml/document.rb
+- lib/om/xml/dynamic_node.rb
 - lib/om/xml/named_term_proxy.rb
 - lib/om/xml/node_generator.rb
 - lib/om/xml/template_registry.rb
@@ -153,6 +168,7 @@ files:
 - spec/spec_helper.rb
 - spec/unit/container_spec.rb
 - spec/unit/document_spec.rb
+- spec/unit/dynamic_node_spec.rb
 - spec/unit/named_term_proxy_spec.rb
 - spec/unit/node_generator_spec.rb
 - spec/unit/nokogiri_sanity_spec.rb
@@ -197,7 +213,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: "OM (Opinionated Metadata): A library to help you tame sprawling XML schemas like MODS."
@@ -213,6 +229,7 @@ test_files:
 - spec/spec_helper.rb
 - spec/unit/container_spec.rb
 - spec/unit/document_spec.rb
+- spec/unit/dynamic_node_spec.rb
 - spec/unit/named_term_proxy_spec.rb
 - spec/unit/node_generator_spec.rb
 - spec/unit/nokogiri_sanity_spec.rb