om 1.6.1 → 1.7.0.rc1

data/spec/unit/term_value_operators_spec.rb

@@ -215,6 +215,27 @@ describe "OM::XML::TermValueOperators" do
       @article.term_values(:journal, :title_info).should == ['mork']
     end
 
+    describe "delete_on_update?" do
+
+      before(:each) do
+        att= {[:journal, :title_info]=>{"0"=>"york", "1"=>"mangle","2"=>"mork"}}
+        @article.update_values(att)
+        @article.term_values(:journal, :title_info).should == ['york', 'mangle', 'mork']
+      end
+
+      it "by default, setting to empty string deletes the node" do
+        @article.update_values({[:journal, :title_info]=>{"1"=>""}})
+        @article.term_values(:journal, :title_info).should == ['york', 'mork']
+      end
+
+      it "if delete_on_update? returns false, setting to empty string won't delete node" do
+        @article.stubs('delete_on_update?').returns(false)
+        @article.update_values({[:journal, :title_info]=>{"1"=>""}})
+        @article.term_values(:journal, :title_info).should == ['york', '', 'mork']
+      end
+
+    end
+
     it "should retain other child nodes when updating a text content term and shoud not append an additional text node but update text in place" do
       @article.term_values(:name,:name_content).should == ["Describes a person"]
       @article.update_values({[:name, :name_content]=>"Test text"})
@@ -259,7 +280,6 @@ describe "OM::XML::TermValueOperators" do
     it "should support adding attribute values" do
       pointer = [{:title_info=>0}, :language]
       test_val = "language value"
-debugger
       @article.term_values_append( 
         :parent_select => [{:title_info=>0}],
         :parent_index => 0,

data/spec/unit/terminology_builder_spec.rb

@@ -71,11 +71,13 @@ describe "OM::XML::Terminology::Builder" do
           t.main_title(:path=>"title", :label=>"title") 
           t.language(:path=>{:attribute=>"lang"}) 
         } 
-        t.title(:proxy=>[:title_info, :main_title]) 
+        t.title(:proxy=>[:title_info, :main_title], :index_as =>[:facetable, :not_searchable]) 
       end 
 
       terminology = t_builder.build 
       terminology.retrieve_term(:title).should be_kind_of OM::XML::NamedTermProxy
+      terminology.retrieve_term(:title).index_as.should == [:facetable, :not_searchable]
+      terminology.retrieve_term(:title_info, :main_title).index_as.should == []
       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'

data/spec/unit/terminology_spec.rb

@@ -319,10 +319,16 @@ describe "OM::XML::Terminology" do
       @test_full_terminology.xml_builder_template(:person,:person_id).should == 'xml.namePart( \'#{builder_new_value}\' )'
       @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\' )'
-      @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
+      # Expected marcrelator_role_xml_builder_template.
+      # Include both version to handle either ordering of the hash -- a band-aid hack to fix failing test.
+      e1 = %q{xml.roleTerm( '#{builder_new_value}', 'type'=>'code', 'authority'=>'marcrelator' )}
+      e2 = %q{xml.roleTerm( '#{builder_new_value}', 'authority'=>'marcrelator', 'type'=>'code' )}
+      got = @test_full_terminology.xml_builder_template(:role, :code, {:attributes=>{"authority"=>"marcrelator"}} )
+      [e1, e2].should include(got)
+      got = @test_full_terminology.xml_builder_template(:person, :role, :code, {:attributes=>{"authority"=>"marcrelator"}} )
+      [e1, e2].should include(got)
     end
 
     it "should work with deeply nested properties" do

metadata

@@ -1,16 +1,48 @@
 --- !ruby/object:Gem::Specification
 name: om
 version: !ruby/object:Gem::Version
-  version: 1.6.1
-  prerelease: 
+  version: 1.7.0.rc1
+  prerelease: 6
 platform: ruby
 authors:
 - Matt Zumwalt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-11 00:00:00.000000000 Z
+date: 2012-10-13 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: activemodel
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -75,6 +107,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: awesome_print
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -135,6 +183,7 @@ files:
 - Rakefile
 - UPDATING_DOCUMENTS.textile
 - container_spec.rb
+- devel/notes.txt
 - lib/om.rb
 - lib/om/samples.rb
 - lib/om/samples/mods_article.rb
@@ -168,6 +217,7 @@ files:
 - spec/integration/querying_documents_spec.rb
 - spec/integration/rights_metadata_integration_example_spec.rb
 - spec/integration/selective_querying_spec.rb
+- spec/integration/serialization_spec.rb
 - spec/integration/set_reentrant_terminology_spec.rb
 - spec/integration/xpathy_stuff_spec.rb
 - spec/spec.opts
@@ -204,12 +254,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: ! 'OM (Opinionated Metadata): A library to help you tame sprawling XML schemas
@@ -228,6 +278,7 @@ test_files:
 - spec/integration/querying_documents_spec.rb
 - spec/integration/rights_metadata_integration_example_spec.rb
 - spec/integration/selective_querying_spec.rb
+- spec/integration/serialization_spec.rb
 - spec/integration/set_reentrant_terminology_spec.rb
 - spec/integration/xpathy_stuff_spec.rb
 - spec/spec.opts