om 1.6.0.rc2 → 1.6.0.rc3

data/lib/om/version.rb

@@ -1,3 +1,3 @@
 module Om
-  VERSION = "1.6.0.rc2"
+  VERSION = "1.6.0.rc3"
 end

data/lib/om/xml/document.rb

@@ -170,6 +170,7 @@ module OM::XML::Document
     if target.is_a?(Array)
       target = self.find_by_terms(*target)
     end
+    raise "You must call define_template before calling #{method}" if template_registry.nil?
     template_registry.send(method, target, *args, &block)
   end
 end

data/lib/om/xml/dynamic_node.rb

@@ -38,7 +38,7 @@ module OM
         self.parent = parent
       end
 
-      def method_missing (name, *args)
+      def method_missing (name, *args, &block)
         if /=$/.match(name.to_s)
           new_update_node(name, args)
         elsif args.length > 1
@@ -48,7 +48,7 @@ module OM
           if child
             OM::XML::DynamicNode.new(name, args.first, @document, child, self)
           else 
-            val.send(name, *args)
+            val.send(name, *args, &block)
           end
         end
       end

data/lib/om/xml/term_value_operators.rb

@@ -103,10 +103,11 @@ module OM::XML::TermValueOperators
     parent_node = node_from_set(parent_nodeset, parent_index)
     
     if parent_node.nil?
-      parent_node, parent_select = build_ancestors(parent_select, parent_index)
-      # parent_nodeset = find_by_terms(*parent_select)
-      # parent_node = node_from_set(parent_nodeset, :last)
-      # raise OM::XML::ParentNodeNotFoundError, "Failed to find a parent node to insert values into based on :parent_select #{parent_select.inspect} with :parent_index #{parent_index.inspect}"
+      if parent_select.empty?
+        parent_node = ng_xml.root
+      else
+        parent_node = build_ancestors(parent_select, parent_index)
+      end
     end
 
     insert_from_template(parent_node, new_values, template)
@@ -114,7 +115,7 @@ module OM::XML::TermValueOperators
     return parent_node
     
   end
-  
+
   # Insert xml containing +new_values+ into +parent_node+.  Generate the xml based on +template+ 
   # @param [Nokogiri::XML::Node] parent_node to insert new xml into
   # @param [Array] new_values to build the xml around
@@ -197,7 +198,7 @@ module OM::XML::TermValueOperators
     if parent_index > starting_point.length
       parent_index = starting_point.length - 1
     end
-    return node_from_set(starting_point, parent_index), parent_select
+    return node_from_set(starting_point, parent_index)
   end
   
   def term_value_update(node_select,node_index,new_value,opts={})

data/spec/unit/dynamic_node_spec.rb

@@ -2,106 +2,144 @@ 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
+  describe do
+    before do
+      class Sample
+        include OM::XML::Document
 
-    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
+        set_terminology do |t|
+          t.root(:path=>"dc", :xmlns=>"http://purl.org/dc/terms/")
+          t.creator(:xmlns=>"http://www.loc.gov/mods/v3", :namespace_prefix => "dcterms")
+        end
 
-    it "should be able to set first level elements" do
-      @article.abstract = "My Abstract"
-      @article.abstract.should == ["My Abstract"]
-    end
+        def self.xml_template
+          Nokogiri::XML::Document.parse("<dc xmlns:dcterms='http://purl.org/dc/terms/' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'/>")
+        end
 
-    it "should be able to set first level elements that are arrays" do
-      @article.abstract = ["My Abstract", "two"]
-      @article.abstract.should == ["My Abstract", 'two']
+      end
+      @sample = Sample.from_xml
     end
-
-    it "should delegate all methods (i.e. to_s, first, etc.) to the found array" do
-      @article.person.last_name.to_s.should == ["FAMILY NAME", "Gautama"].to_s
-      @article.person.last_name.first.should == "FAMILY NAME"
+    after do
+      Object.send(:remove_const, :Sample)
+    end
+    it "should create templates for dynamic nodes" do
+      @sample.creator = "Foo"
+      @sample.creator.should == ['Foo']
     end
+    it "should create templates for dynamic nodes with multiple values" do
+      @sample.creator = ["Foo", "Bar"]
+      @sample.creator.should == ['Foo', 'Bar']
+    end
+  end
+        
+  
+  describe "with a template" 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
 
-    describe "setting attributes" do
-      it "when they exist" do
-        @article.title_info(0).main_title.main_title_lang = "ger"
-        @article.title_info(0).main_title.main_title_lang.should == ["ger"]
+      it "should be able to set first level elements" do
+        @article.abstract = "My Abstract"
+        @article.abstract.should == ["My Abstract"]
       end
-      it "when they don't exist" do
-        title = @article.title_info(0)
-        title.language = "rus"
-        @article.title_info(0).language.should == ["rus"]
+
+      it "should be able to set first level elements that are arrays" do
+        @article.abstract = ["My Abstract", "two"]
+        @article.abstract.should == ["My Abstract", 'two']
       end
 
-    end
+      it "should delegate all methods (i.e. to_s, first, etc.) to the found array" do
+        @article.person.last_name.to_s.should == ["FAMILY NAME", "Gautama"].to_s
+        @article.person.last_name.first.should == "FAMILY NAME"
+      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 delegate with blocks to the found array" do
+        arr = []
+        @article.person.last_name.each{|x| arr << x}
+        arr.should == ["FAMILY NAME", "Gautama"]
+      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
+      describe "setting attributes" do
+        it "when they exist" do
+          @article.title_info(0).main_title.main_title_lang = "ger"
+          @article.title_info(0).main_title.main_title_lang.should == ["ger"]
+        end
+        it "when they don't exist" do
+          title = @article.title_info(0)
+          title.language = "rus"
+          @article.title_info(0).language.should == ["rus"]
+        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']
+      end
 
-      @article.title(1).to_pointer.should == [{:title => 1}]
+      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
 
-      @article.journal_title.xpath.should == "//oxns:relatedItem[@type=\"host\"]/oxns:titleInfo/oxns:title"
-      @article.journal_title.should == ["TITLE OF HOST JOURNAL"]
-    end
+      it "should not find elements that don't  exist" do
+        lambda {@article.name.hedgehog}.should raise_exception NoMethodError
+      end
 
-    it "Should be addressable to a specific node" do
-      @article.update_values( {[{:journal=>0}, {:issue=>3}, :pages, :start]=>{"0"=>"434"} })
+      it "should allow you to call methods on the return value" do
+        @article.name.name_content.first.should == "Describes a person"
+      end
 
-      @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"
+      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.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.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"} })
-        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
+
+        @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
-    end
 
-    it "should append nodes at the specified index if possible, setting dirty to true if the object responds to dirty" do
-      @article.stubs(:respond_to?).with(:dirty=).returns(true)
-      @article.expects(:dirty=).with(true).twice
-      @article.journal.title_info = ["all", "for", "the"]
-      @article.journal.title_info(3, 'glory')
-      @article.term_values(:journal, :title_info).should == ["all", "for", "the", "glory"]
+      it "should append nodes at the specified index if possible, setting dirty to true if the object responds to dirty" do
+        @article.stubs(:respond_to?).with(:dirty=).returns(true)
+        @article.expects(:dirty=).with(true).twice
+        @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
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: om
 version: !ruby/object:Gem::Version
-  version: 1.6.0.rc2
+  version: 1.6.0.rc3
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-27 00:00:00.000000000 Z
+date: 2012-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70144026489500 !ruby/object:Gem::Requirement
+  requirement: &70192588062320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.4.2
   type: :runtime
   prerelease: false
-  version_requirements: *70144026489500
+  version_requirements: *70192588062320
 - !ruby/object:Gem::Dependency
   name: mediashelf-loggable
-  requirement: &70144026489060 !ruby/object:Gem::Requirement
+  requirement: &70192588061880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70144026489060
+  version_requirements: *70192588061880
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70144026488480 !ruby/object:Gem::Requirement
+  requirement: &70192588061300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *70144026488480
+  version_requirements: *70192588061300
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70144026487960 !ruby/object:Gem::Requirement
+  requirement: &70192588060780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 0.9.8
   type: :development
   prerelease: false
-  version_requirements: *70144026487960
+  version_requirements: *70192588060780
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
-  requirement: &70144026487460 !ruby/object:Gem::Requirement
+  requirement: &70192588060280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: 0.2.4
   type: :development
   prerelease: false
-  version_requirements: *70144026487460
+  version_requirements: *70192588060280
 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