om 3.0.6 → 3.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d22a3f6b7dc5a7d6c75dac4d1bf14c60f5e0fc0c
-  data.tar.gz: 22198afe29d16339742f4ef4a9735121afa31136
+  metadata.gz: 3a06b8c699f06fb0cb851e7b4e66110738a00cf7
+  data.tar.gz: 36671447b086cdb74d25ac39cf50d35573a94c72
 SHA512:
-  metadata.gz: a32c99b5587ae306791119c7e4e0c0b9e6d7ae7f8bb36e9ad4102c6de90c6a892daebc680083ab2609e9bf261f608f0d15d67dd66f30ec5263fc143d376f71b5
-  data.tar.gz: 4a4cb65a378cbef9ce02f38f05309916c6703978962112a01d7a08ff51ccad389f5efd78425b43531fada607b1cb25888f04f652e568f4e020f1e006e4999886
+  metadata.gz: d159dd3d980dc79f7aed168c4f621941819ce89efca387b50ca34781a119da2490d07fd210e69dadd5e700cc5c8ec66cb0fa8ada329f490330dcf72137d4d0eb
+  data.tar.gz: c388b9688995e643be94e472e804daf31e227d69746fd65c10cfd09ab824fdf1fd4426912eba5beaaca4137066f1faae097268c8ce239553bfc661bcb22dad47

data/.rspec

@@ -0,0 +1 @@
+--colour

data/lib/om/version.rb

@@ -1,3 +1,3 @@
 module Om
-  VERSION = "3.0.6"
+  VERSION = "3.0.7"
 end

data/lib/om/xml/dynamic_node.rb

@@ -84,7 +84,11 @@ module OM
         new_values.each_with_index do |z, y|
 ## If we pass something that already has an index on it, we should be able to add it.
           if existing_nodes[y.to_i].nil?
-            parent_pointer = parent ? parent.to_pointer : nil
+            parent_pointer = if parent
+              parent.to_pointer
+            elsif term.is_a? NamedTermProxy
+              term.proxy_pointer[0..-2]
+            end
             @document.term_values_append(:parent_select=> parent_pointer,:parent_index=>0,:template=>to_pointer,:values=>z)
           else
             @document.term_value_update(xpath, y.to_i, z)

data/spec/integration/proxies_and_ref_spec.rb

@@ -33,49 +33,57 @@ describe "an example with :proxy and :ref" do
         t.image_size(:proxy=>[:image, :file, :size])
         t.image_md5(:proxy=>[:image, :file, :md5])
         t.image_sha1(:proxy=>[:image, :file, :sha1])
-        end
+      end
     end
   end
 
-  subject do
-    ExampleProxyAndRefTerminology.from_xml <<-EOF
-<outer outerId="hypatia:outer" type="outer type">
-  <resource type="ead" id="coll.ead" objectId="hypatia:ead_file_asset_fixture">
-    <file id="my_ead.xml" format="XML" mimetype="text/xml" size="47570">
-      <checksum type="md5">123</checksum>
-      <checksum type="sha1">456</checksum>
-    </file>
-  </resource>
-  <resource type="image" id="image" objectId="hypatia:coll_img_file_asset_fixture">
-    <file id="my_image.jpg" format="JPG" mimetype="image/jpeg" size="302080">
-      <checksum type="md5">789</checksum>
-      <checksum type="sha1">666</checksum>
-    </file>
-  </resource>
-</outer>
+  context 'with empty content' do
+    subject { ExampleProxyAndRefTerminology.from_xml "<outer/>" }
+    it "should build the parent nodes when setting a proxy term" do
+      subject.image_sha1 = '123'
+      expect(subject.ng_xml).to be_equivalent_to "<outer><resource type=\"image\"><file><checksum type=\"sha1\">123</checksum></file></resource></outer>"
+    end
+  end
 
-EOF
-end
+  context "with existing content" do
+    subject do
+      ExampleProxyAndRefTerminology.from_xml <<-EOF
+  <outer outerId="hypatia:outer" type="outer type">
+    <resource type="ead" id="coll.ead" objectId="hypatia:ead_file_asset_fixture">
+      <file id="my_ead.xml" format="XML" mimetype="text/xml" size="47570">
+        <checksum type="md5">123</checksum>
+        <checksum type="sha1">456</checksum>
+      </file>
+    </resource>
+    <resource type="image" id="image" objectId="hypatia:coll_img_file_asset_fixture">
+      <file id="my_image.jpg" format="JPG" mimetype="image/jpeg" size="302080">
+        <checksum type="md5">789</checksum>
+        <checksum type="sha1">666</checksum>
+      </file>
+    </resource>
+  </outer>
 
-  describe "image" do
-    it "should have the right proxy terms" do
-      subject.ead_fedora_pid.should include "hypatia:ead_file_asset_fixture"
-      subject.ead_ds_label.should include "my_ead.xml"
-      subject.ead_size.should include "47570"
-      subject.ead_md5.should include "123"
-      subject.ead_sha1.should include "456"
-    end
+  EOF
   end
 
-  describe "ead" do
-    it "should have the right proxy terms" do
-      subject.image_fedora_pid.should include "hypatia:coll_img_file_asset_fixture"
-      subject.image_ds_label.should include "my_image.jpg"
-      subject.image_size.should include "302080"
-      subject.image_md5.should include "789"
-      subject.image_sha1.should include "666"
+    describe "image" do
+      it "should have the right proxy terms" do
+        subject.ead_fedora_pid.should include "hypatia:ead_file_asset_fixture"
+        subject.ead_ds_label.should include "my_ead.xml"
+        subject.ead_size.should include "47570"
+        subject.ead_md5.should include "123"
+        subject.ead_sha1.should include "456"
+      end
     end
 
+    describe "ead" do
+      it "should have the right proxy terms" do
+        subject.image_fedora_pid.should include "hypatia:coll_img_file_asset_fixture"
+        subject.image_ds_label.should include "my_image.jpg"
+        subject.image_size.should include "302080"
+        subject.image_md5.should include "789"
+        subject.image_sha1.should include "666"
+      end
+    end
   end
-
 end

data/spec/integration/rights_metadata_integration_example_spec.rb

@@ -65,7 +65,7 @@ describe "OM::XML::Accessors" do
   
   describe "update_properties" do
     it "should update the declared properties" do
-      pending "nesting is too deep..."
+      skip "nesting is too deep..."
       @sample.retrieve(*[:edit_access, :machine, :person]).length.should == 0
       @sample.update_properties([:edit_access, :machine, :person]=>"user id").should == {"edit_access_machine_person"=>{"-1"=>"user id"}}
       @sample.retrieve(*[:edit_access, :machine, :person]).length.should == 1

data/spec/integration/xpathy_stuff_spec.rb

@@ -120,13 +120,13 @@ describe "an example of xpath-y stuff, also using :proxy and :ref and namespaces
     end
 
     it "should have the terms :author_given and :author_family to get the author name" do
-      pending "This doesn't seem to work?"
+      skip "This doesn't seem to work?"
       subject.author_given.should include("Mary")
       subject.author_family.should include("Pickral")
     end
 
     it "should have the terms :advisor_given and :advisor_family to get the advisor name" do
-      pending "This doesn't seem to work?"
+      skip "This doesn't seem to work?"
       subject.advisor_given.should include("David")
       subject.advisor_family.should include("Small")
     end

data/spec/unit/document_spec.rb

@@ -89,7 +89,7 @@ describe "OM::XML::Document" do
   
   describe ".find_by_terms_and_value" do
     it "should fail gracefully if you try to look up nodes for an undefined property" do
-      pending "better to get an informative error?"
+      skip "better to get an informative error?"
       @fixturemods.find_by_terms_and_value(:nobody_home).should == []
     end
     it "should use Nokogiri to retrieve a NodeSet corresponding to the term pointers" do
@@ -123,7 +123,7 @@ describe "OM::XML::Document" do
       @mods_article.find_by_terms( {:person=>1}, :person_id).first.text.should == "123987"
     end
     it "should support accessors whose relative_xpath is a lookup array instead of an xpath string" do
-      # pending "this only impacts scenarios where we want to display & edit"
+      # skip "this only impacts scenarios where we want to display & edit"
       DocumentTest.terminology.retrieve_term(:title_info, :language).path.should == {:attribute=>"lang"}
       # @sample.retrieve( :title, 1 ).first.text.should == "Artikkelin otsikko Hydrangea artiklan 1"
       @mods_article.find_by_terms( {:title_info=>1}, :language ).first.text.should == "finnish"
@@ -134,7 +134,7 @@ describe "OM::XML::Document" do
     end
     
     it "should return nil if the xpath fails to generate" do
-      pending "Can't decide if it's better to return nil or raise an error.  Choosing informative errors for now."
+      skip "Can't decide if it's better to return nil or raise an error.  Choosing informative errors for now."
       @mods_article.find_by_terms( {:foo=>20}, :bar ).should == nil
     end
     

data/spec/unit/term_spec.rb

@@ -35,14 +35,14 @@ describe OM::XML::Term do
 
     describe 'inner_xml' do
       it "should be a kind of Nokogiri::XML::Node" do
-        pending
+        skip
         @test_mapping.inner_xml.should be_kind_of(Nokogiri::XML::Node)
       end
     end
 
     describe '#from_node' do
       it "should create a mapper from a nokogiri node" do
-        pending "probably should do this in the Builder"
+        skip "probably should do this in the Builder"
         ng_builder = Nokogiri::XML::Builder.new do |xml|
           xml.mapper(:name=>"person", :path=>"name") {
             xml.attribute(:name=>"type", :value=>"personal")
@@ -87,7 +87,7 @@ describe OM::XML::Term do
 
     describe 'inner_xml' do
       it "should be a kind of Nokogiri::XML::Node" do
-        pending
+        skip
         @test_name_part.inner_xml.should be_kind_of(Nokogiri::XML::Node)
       end
     end

data/spec/unit/term_value_operators_spec.rb

@@ -138,13 +138,13 @@ describe "OM::XML::TermValueOperators" do
     end
 
     it "should support inserting attributes" do
-      pending "HYDRA-415"
+      skip "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"
+      skip "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
@@ -329,7 +329,7 @@ describe "OM::XML::TermValueOperators" do
     end
 	  
 	  it "should support more complex mixing & matching" do
-	    pending "not working because builder_template is not returning the correct template (returns builder for role instead of roleTerm)"
+	    skip "not working because builder_template is not returning the correct template (returns builder for role instead of roleTerm)"
       @sample.ng_xml.xpath('//oxns:name[@type="personal"][2]/oxns:role[1]/oxns:roleTerm', @sample.ox_namespaces).length.should == 2
 	    @sample.term_values_append(
         :parent_select =>'//oxns:name[@type="personal"][2]/oxns:role',
@@ -389,7 +389,7 @@ describe "OM::XML::TermValueOperators" do
     end
     
     it "should replace the existing node if you pass a template and values" do
-      pending
+      skip
       @sample.term_value_update(
         :parent_select =>'//oxns:name[@type="personal"]',
         :parent_index => 1,

data/spec/unit/term_xpath_generator_spec.rb

@@ -143,7 +143,7 @@ EOF
   end
 
   it "should support mappers with default_content_path" do
-    pending "need to implement mapper_set first"
+    skip "need to implement mapper_set first"
     #@test_term_with_default_path = OM::XML::Term.new(:volume, :path=>"detail", :attributes=>{:type=>"volume"}, :default_content_path=>"number")
 
     OM::XML::TermXpathGenerator.generate_relative_xpath(@test_term_with_default_path).should == 'oxns:detail[@type="volume"]'

data/spec/unit/terminology_builder_spec.rb

@@ -115,7 +115,7 @@ describe "OM::XML::Terminology::Builder" do
     
     describe '#from_xml' do
       it "should let you load mappings from an xml file" do
-        pending
+        skip
         vocab = OM::XML::Terminology.from_xml( fixture("sample_mappings.xml") )
         vocab.should be_instance_of OM::XML::Terminology
         vocab.mappers.should == {}
@@ -159,7 +159,7 @@ describe "OM::XML::Terminology::Builder" do
     
     describe '.insert_term' do
       it "should create a new OM::XML::Term::Builder and insert it into the class mappings hash" do
-        pending
+        skip
         
         result = @test_builder.insert_mapper(:name_, :namePart).index_as([:facetable, :searchable, :sortable, :displayable]).required(true).type(:text)  
         @test_builder.mapper_builders(:name_, :namePart).should == result

data/spec/unit/terminology_spec.rb

@@ -179,7 +179,7 @@ describe "OM::XML::Terminology" do
 
   describe '#from_xml' do
     it "should let you load mappings from an xml file" do
-      pending
+      skip
       vocab = OM::XML::Terminology.from_xml( fixture("sample_mappings.xml") )
       vocab.should be_instance_of OM::XML::Terminology
       vocab.mappers.should == {}
@@ -188,7 +188,7 @@ describe "OM::XML::Terminology" do
 
   describe '#to_xml' do
     it "should let you serialize mappings to an xml document" do
-      pending
+      skip
       TerminologyTest.to_xml.should == ""
     end
   end
@@ -240,7 +240,7 @@ describe "OM::XML::Terminology" do
 
   describe ".term_xpath" do
     it "should insert calls to xpath array lookup into parent xpaths if parents argument is provided" do
-      pending
+      skip
       # conference_mapper = TerminologyTest.retrieve_mapper(:conference)
       # role_mapper =  TerminologyTest.retrieve_mapper(:conference, :role)
       # text_mapper = TerminologyTest.retrieve_mapper(:conference, :role, :text)
@@ -270,12 +270,12 @@ describe "OM::XML::Terminology" do
     end
 
     it "should support queries with complex constraints" do
-      pending
+      skip
       @test_full_terminology.xpath_for(:person, {:date=>"2010"}).should == '//oxns:name[@type="personal" and contains(oxns:namePart[@type="date"], "2010")]'
     end
 
     it "should support queries with multiple complex constraints" do
-      pending
+      skip
       @test_full_terminology.xpath_for(:person, {:role=>"donor", :last_name=>"Rockefeller"}).should == '//oxns:name[@type="personal" and contains(oxns:role/oxns:roleTerm, "donor") and contains(oxns:namePart[@type="family"], "Rockefeller")]'
     end
 

data/spec/unit/validation_spec.rb

@@ -25,14 +25,14 @@ describe "OM::XML::Validation" do
   
   describe "#schema" do
     it "should return an instance of Nokogiri::XML::Schema loaded from the schema url -- fails if no internet connection" do
-      pending "no internet connection"
+      skip "no internet connection"
       ValidationTest.schema.should be_kind_of Nokogiri::XML::Schema
     end
   end
 
   describe "#validate" do
     it "should validate the provided document against the schema provided in class definition  -- fails if no internet connection" do
-      pending "no internet connection"
+      skip "no internet connection"
       ValidationTest.schema.should_receive(:validate).with(@sample).and_return([])
       ValidationTest.validate(@sample)
     end
@@ -73,7 +73,7 @@ describe "OM::XML::Validation" do
       lambda {ValidationTest.send(:file_from_url, "foo")}.should raise_error(RuntimeError, "Could not retrieve file from foo. Error: No such file or directory - foo")
     end
     it "should raise an error if file retrieval fails" do
-      pending "no internet connection"
+      skip "no internet connection"
       lambda {ValidationTest.send(:file_from_url, "http://fedora-commons.org/nonexistent_file")}.should raise_error(RuntimeError, "Could not retrieve file from http://fedora-commons.org/nonexistent_file. Error: 404 Not Found")  
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: om
 version: !ruby/object:Gem::Version
-  version: 3.0.6
+  version: 3.0.7
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-05 00:00:00.000000000 Z
+date: 2014-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -205,6 +205,7 @@ extra_rdoc_files:
 files:
 - ".document"
 - ".gitignore"
+- ".rspec"
 - ".travis.yml"
 - COMMON_OM_PATTERNS.textile
 - CONTRIBUTING.md