om 1.2.5 → 1.3.0

data/spec/unit/document_spec.rb

@@ -147,5 +147,17 @@ describe "OM::XML::Document" do
       @mods_article.find_by_terms('//oxns:name[@type="personal"][1]/oxns:namePart[1]').first.text.should == "FAMILY NAME"
     end
   end
+  
+  describe "node_exists?" do
+    it "should return true if any nodes are found" do
+      @mods_article.node_exists?( {:person=>1}, :first_name).should be_true
+    end
+    it "should return false if no nodes are found" do
+      @mods_article.node_exists?( {:person=>8}, :first_name ).should be_false
+    end
+    it "should support xpath queries" do
+      @mods_article.node_exists?('//oxns:name[@type="personal"][1]/oxns:namePart[1]').should be_true
+    end
+  end
    
 end

data/spec/unit/named_term_proxy_spec.rb

@@ -5,21 +5,29 @@ describe "OM::XML::NamedTermProxy" do
   
   before(:all) do
     
-    @test_terminology_builder = OM::XML::Terminology::Builder.new do |t|
-      t.parent {
-        t.foo {
-          t.bar
+    class NamedProxyTestDocument 
+      include OM::XML::Document
+      set_terminology do |t|
+        t.root(:path=>"mods", :xmlns=>"http://www.loc.gov/mods/v3", :schema=>"http://www.loc.gov/standards/mods/v3/mods-3-2.xsd")
+        t.parent {
+          t.foo {
+            t.bar
+          }
+          t.my_proxy(:proxy=>[:foo, :bar])
         }
-        t.my_proxy(:proxy=>[:foo, :bar])
-      }
-      t.adoptive_parent(:ref=>[:parent], :attributes=>{:type=>"adoptive"})
-      t.parentfoobarproxy(:proxy=>[:parent, :foo, :bar])
+        t.adoptive_parent(:ref=>[:parent], :attributes=>{:type=>"adoptive"})
+        t.parentfoobarproxy(:proxy=>[:parent, :foo, :bar])
+      end
+      def self.xml_template 
+        '<mods xmlns="http://www.loc.gov/mods/v3"><parent><foo/></parent></mods>'
+      end
     end
     
-    @test_terminology = @test_terminology_builder.build
+    @test_terminology = NamedProxyTestDocument.terminology
     @test_proxy = @test_terminology.retrieve_term(:parent, :my_proxy)
     @proxied_term = @test_terminology.retrieve_term(:parent, :foo, :bar)
     @adoptive_parent = @test_terminology.retrieve_term(:adoptive_parent)
+
   end
     
   it "should proxy all extra methods to the proxied object" do
@@ -40,4 +48,9 @@ describe "OM::XML::NamedTermProxy" do
   it "should support NamedTermProxies that point to root terms" do
     @test_terminology.xpath_for(:parentfoobarproxy).should == "//oxns:parent/oxns:foo/oxns:bar"
   end
+  it "should be usable in update_values" do
+    document = NamedProxyTestDocument.from_xml(NamedProxyTestDocument.xml_template)
+    document.update_values([:parentfoobarproxy] => "FOObar!")
+    document.term_values(:parentfoobarproxy).should == ["FOObar!"]
+  end
 end

data/spec/unit/term_builder_spec.rb

@@ -142,7 +142,7 @@ describe "OM::XML::Term::Builder" do
 	  end
     it "should raise an error if the referece points to a nonexistent term builder" do
       tb = OM::XML::Term::Builder.new("mork",@test_terminology_builder).ref(:characters, :aliens)
-      lambda { tb.lookup_refs }.should raise_error(OM::XML::Terminology::BadPointerError,"#{tb.name} refers to a Term Builder that doesn't exist.  The bad pointer is [:characters, :aliens]")
+      lambda { tb.lookup_refs }.should raise_error(OM::XML::Terminology::BadPointerError,"This TerminologyBuilder does not have a root TermBuilder defined that corresponds to \":characters\"")
     end
     it "should raise an error with informative error when given circular references" do
       lambda { @pineapple.lookup_refs }.should raise_error(OM::XML::Terminology::CircularReferenceError,"Circular reference in Terminology: :pineapple => :banana => :coconut => :pineapple")

data/spec/unit/term_spec.rb

@@ -163,16 +163,33 @@ describe "OM::XML::Term" do
   describe "#xml_builder_template" do
     
     it "should generate a template call for passing into the builder block (assumes 'xml' as the argument for the block)" do
-      @test_date.xml_builder_template.should == 'xml.namePart( \'#{builder_new_value}\', :type=>\'date\' )'
+      @test_date.xml_builder_template.should == 'xml.namePart( \'#{builder_new_value}\', \'type\'=>\'date\' )'
       @test_affiliation.xml_builder_template.should == 'xml.affiliation( \'#{builder_new_value}\' )'
     end
     it "should accept extra options" do
-      marcrelator_role_xml_builder_template = 'xml.roleTerm( \'#{builder_new_value}\', :type=>\'code\', :authority=>\'marcrelator\' )'  
+      marcrelator_role_xml_builder_template = 'xml.roleTerm( \'#{builder_new_value}\', \'type\'=>\'code\', \'authority\'=>\'marcrelator\' )'  
       @test_role_code.xml_builder_template(:attributes=>{"authority"=>"marcrelator"}).should == marcrelator_role_xml_builder_template
     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}' ) }"
+      @test_volume.xml_builder_template.should == "xml.detail( \'type\'=>'volume' ) { xml.number( '\#{builder_new_value}' ) }"
+    end
+    
+    it "should support terms that are attributes" do
+      pending "HYDRA-415"
+      @type_attribute_term = OM::XML::Term.new(:type_attribute, :path=>{:attribute=>:type})
+      @type_attribute_term.xml_builder_template.should == "TODO!"
+    end
+    
+    it "should support terms with namespaced attributes" do
+      @french_title = OM::XML::Term.new(:french_title, :path=>"title", :attributes=>{"xml:lang"=>"fre"})
+      @french_title.xml_builder_template.should == "xml.title( '\#{builder_new_value}', 'xml:lang'=>'fre' )"
+    end
+    
+    it "should support terms that are namespaced attributes" do
+      pending "HYDRA-415"
+      @xml_lang_attribute_term = OM::XML::Term.new(:xml_lang_attribute, :path=>{:attribute=>"xml:lang"})
+      @xml_lang_attribute_term.xml_builder_template.should == "TODO!"
     end
     
   end

data/spec/unit/term_value_operators_spec.rb

@@ -6,6 +6,7 @@ describe "OM::XML::TermValueOperators" 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") ) )
+    @empty_sample = OM::Samples::ModsArticle.from_xml("")
   end
   
   describe ".term_values" do
@@ -113,6 +114,23 @@ describe "OM::XML::TermValueOperators" do
       @article.term_values(:person, :description).should include(" 'phrul gyi lde mig")
     end
     
+    it "should support inserting nodes with namespaced attributes" do
+      @sample.update_values({['title_info', 'french_title']=>'Le Titre'})
+      @sample.term_values('title_info', 'french_title').should == ['Le Titre']
+    end
+
+    it "should support inserting attributes" do
+      pending "HYDRA-415"
+      @sample.update_values({['title_info', 'language']=>'Le Titre'})
+      @sample.term_values('title_info', 'french_title').should == ['Le Titre']
+    end
+    
+    it "should support inserting namespaced attributes" 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']
+    end
+    
     ### Examples copied over form nokogiri_datastream_spec
     
     it "should apply submitted hash to corresponding datastream field values" do
@@ -422,4 +440,10 @@ describe "OM::XML::TermValueOperators" do
     end
   end
   
+  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.") 
+    end
+  end
+  
 end

data/spec/unit/terminology_spec.rb

@@ -279,19 +279,19 @@ describe "OM::XML::Terminology" do
   describe "#xml_builder_template" do
     
     it "should generate a template call for passing into the builder block (assumes 'xml' as the argument for the block)" do
-      @test_full_terminology.xml_builder_template(:person,:date).should == 'xml.namePart( \'#{builder_new_value}\', :type=>\'date\' )'
+      @test_full_terminology.xml_builder_template(:person,:date).should == 'xml.namePart( \'#{builder_new_value}\', \'type\'=>\'date\' )'
       @test_full_terminology.xml_builder_template(:name,:affiliation).should == 'xml.affiliation( \'#{builder_new_value}\' )'
     end
     it "should accept extra options" do
-      marcrelator_role_xml_builder_template = 'xml.roleTerm( \'#{builder_new_value}\', :type=>\'code\', :authority=>\'marcrelator\' )'  
+      marcrelator_role_xml_builder_template = 'xml.roleTerm( \'#{builder_new_value}\', \'type\'=>\'code\', \'authority\'=>\'marcrelator\' )'  
       @test_full_terminology.xml_builder_template(:role, :code, {:attributes=>{"authority"=>"marcrelator"}} ).should == marcrelator_role_xml_builder_template
       @test_full_terminology.xml_builder_template(:person, :role, :code, {:attributes=>{"authority"=>"marcrelator"}} ).should == marcrelator_role_xml_builder_template      
     end
     
     it "should work with deeply nested properties" do      
-      @test_full_terminology.xml_builder_template(:issue, :volume).should == "xml.detail( :type=>'volume' ) { xml.number( '\#{builder_new_value}' ) }"
-      @test_full_terminology.xml_builder_template(:journal, :issue, :level).should == "xml.detail( :type=>'number' ) { xml.number( '\#{builder_new_value}' ) }"
-      @test_full_terminology.xml_builder_template(:journal, :issue, :volume).should == "xml.detail( :type=>'volume' ) { xml.number( '\#{builder_new_value}' ) }"
+      @test_full_terminology.xml_builder_template(:issue, :volume).should == "xml.detail( \'type\'=>'volume' ) { xml.number( '\#{builder_new_value}' ) }"
+      @test_full_terminology.xml_builder_template(:journal, :issue, :level).should == "xml.detail( \'type\'=>'number' ) { xml.number( '\#{builder_new_value}' ) }"
+      @test_full_terminology.xml_builder_template(:journal, :issue, :volume).should == "xml.detail( \'type\'=>'volume' ) { xml.number( '\#{builder_new_value}' ) }"
       @test_full_terminology.xml_builder_template(:journal, :issue, :pages, :start).should == "xml.start( '\#{builder_new_value}' )"
     end
     

data/spec/unit/xml_serialization_spec.rb

@@ -0,0 +1,63 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require "om"
+require "om/samples"
+
+describe "OM::XML::Terminology.to_xml" do
+  before(:all) do
+    @terminology = OM::Samples::ModsArticle.terminology
+  end
+  it "should put terminology details into the xml" do
+    expected_xml = "<namespaces>\n  <namespace>\n    <name>oxns</name>\n    <identifier>http://www.loc.gov/mods/v3</identifier>\n  </namespace>\n  <namespace>\n    <name>xmlns:foo</name>\n    <identifier>http://my.custom.namespace</identifier>\n  </namespace>\n  <namespace>\n    <name>xmlns</name>\n    <identifier>http://www.loc.gov/mods/v3</identifier>\n  </namespace>\n</namespaces>"
+    xml = @terminology.to_xml
+    xml.xpath("/terminology/schema").to_xml.should == "<schema>http://www.loc.gov/standards/mods/v3/mods-3-2.xsd</schema>"    
+    xml.xpath("/terminology/namespaces").to_xml.should be_equivalent_to expected_xml
+    # file = File.open(File.dirname(__FILE__)+"/../fixtures/mods_article_terminology.xml", "w")
+    # file.write(xml.to_xml)
+  end
+  it "should call .to_xml on all of the terms" do
+    options = {}
+    doc = Nokogiri::XML::Document.new
+    @terminology.terms.values.each {|term| term.expects(:to_xml) }
+    @terminology.to_xml(options,doc)
+  end
+end
+
+
+describe "OM::XML::Term.to_xml" do
+  before(:all) do
+    @terminology = OM::Samples::ModsArticle.terminology
+    @person =  @terminology.retrieve_term(:person)
+    @person_first_name =  @terminology.retrieve_term(:person, :first_name)
+  end
+  it "should return an xml representation of the Term" do
+    xml = @person_first_name.to_xml
+    xml.xpath("/term").first.attributes["name"].value.should == "first_name"
+    xml.xpath("/term/attributes/type").first.text.should == "given"
+    xml.xpath("/term/path").first.text.should == "namePart"
+    xml.xpath("/term/namespace_prefix").first.text.should == "oxns"
+    xml.xpath("/term/children/*").should be_empty
+    xml.xpath("/term/xpath/relative").first.text.should == "oxns:namePart[@type=\"given\"]"
+    xml.xpath("/term/xpath/absolute").first.text.should == "//oxns:name[@type=\"personal\"]/oxns:namePart[@type=\"given\"]"
+    xml.xpath("/term/xpath/constrained").first.text.should == "//oxns:name[@type=\\\"personal\\\"]/oxns:namePart[@type=\\\"given\\\" and contains(., \\\"\#{constraint_value}\\\")]"
+    xml.xpath("/term/index_as").first.text.should == ""
+    xml.xpath("/term/required").first.text.should == "false"
+    xml.xpath("/term/data_type").first.text.should == "string"
+  end
+  it "should capture root term info" do
+    xml = @terminology.root_terms.first.to_xml
+    xml.xpath("/term/is_root_term").text.should == "true"
+    @person_first_name.to_xml.xpath("/term/is_root_term").should be_empty
+  end
+  it "should allow you to pass in a document to add the term to" do
+    doc = Nokogiri::XML::Document.new
+    @person_first_name.to_xml({}, doc).should == doc
+  end
+  it "should include children" do
+    children = @person.to_xml.xpath("//term[@name=\"person\"]/children/*")
+    children.length.should == 12
+    children.each {|child| child.name.should == "term"}
+  end
+  it "should skip children if :children=>false" do
+    @person.to_xml(:children=>false).xpath("children").should be_empty
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: om
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 27
   prerelease: 
   segments: 
   - 1
-  - 2
-  - 5
-  version: 1.2.5
+  - 3
+  - 0
+  version: 1.3.0
 platform: ruby
 authors: 
 - Matt Zumwalt
@@ -15,7 +15,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-31 00:00:00 Z
+date: 2011-07-26 00:00:00 -05:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: nokogiri
@@ -121,7 +122,6 @@ files:
 - README.textile
 - Rakefile
 - UPDATING_DOCUMENTS.textile
-- VERSION
 - container_spec.rb
 - lib/om.rb
 - lib/om/samples.rb
@@ -145,6 +145,7 @@ files:
 - spec/fixtures/CBF_MODS/ARS0025_016.xml
 - spec/fixtures/RUBRIC_mods_article_template.xml
 - spec/fixtures/mods-3-2.xsd
+- spec/fixtures/mods_article_terminology.xml
 - spec/fixtures/mods_articles/hydrangea_article1.xml
 - spec/fixtures/test_dummy_mods.xml
 - spec/integration/rights_metadata_integration_example_spec.rb
@@ -164,7 +165,9 @@ files:
 - spec/unit/terminology_builder_spec.rb
 - spec/unit/terminology_spec.rb
 - spec/unit/validation_spec.rb
+- spec/unit/xml_serialization_spec.rb
 - spec/unit/xml_spec.rb
+has_rdoc: true
 homepage: http://github.com/mediashelf/om
 licenses: []
 
@@ -194,7 +197,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: "OM (Opinionated Metadata): A library to help you tame sprawling XML schemas like MODS."
@@ -202,6 +205,7 @@ test_files:
 - spec/fixtures/CBF_MODS/ARS0025_016.xml
 - spec/fixtures/RUBRIC_mods_article_template.xml
 - spec/fixtures/mods-3-2.xsd
+- spec/fixtures/mods_article_terminology.xml
 - spec/fixtures/mods_articles/hydrangea_article1.xml
 - spec/fixtures/test_dummy_mods.xml
 - spec/integration/rights_metadata_integration_example_spec.rb
@@ -221,5 +225,5 @@ test_files:
 - spec/unit/terminology_builder_spec.rb
 - spec/unit/terminology_spec.rb
 - spec/unit/validation_spec.rb
+- spec/unit/xml_serialization_spec.rb
 - spec/unit/xml_spec.rb
-has_rdoc: 

data/VERSION

@@ -1 +0,0 @@
-1.2.4