om 3.0.0.beta1 → 3.0.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 311c97a223b0160f5766d16da7ec636a85073c39
-  data.tar.gz: 907162fe5292c1316732f68be31d987a3892e402
+  metadata.gz: 2c2d373dd7d3fef0f2cf3d23de1aea05cc4de921
+  data.tar.gz: 66b678101c0255b7b9c94e81987f30329eca32d8
 SHA512:
-  metadata.gz: 249f1349616500b6fbf03cb8d2168fe87e19ea2084f29a77ea5a15996f349ed4b71a84c17a0b9b636f70f522d89f8be4d5f2dda3b3d41d442d5e4eea1830586e
-  data.tar.gz: 10386c58e84a42859682dc6e70b9fe11c548befbaec48185194d7c4897803d6ab8e5876ac4d5c6f57b62b943a34e5419502fc99575b8d4ed1b1fbc8fd82b5ebe
+  metadata.gz: 8b074e1d3cd7ff1a25b7257679519a1d9e0913057ab8b0c4182cd90067513c8d01753b3e27e1324d058b92cff6462f4b072d6c481aca067c344368de5cb41290
+  data.tar.gz: 701ea9a57f9e17410dfe9c50af40ed425df1f35f676d37e292ad625c6b076034f14267859478cfb34569eb162d7ef27b6136b3e6356152a0d187b89ac1e30a65

data/lib/om/version.rb

@@ -1,3 +1,3 @@
 module Om
-  VERSION = "3.0.0.beta1"
+  VERSION = "3.0.0.beta2"
 end

data/lib/om/xml/dynamic_node.rb

@@ -69,7 +69,6 @@ module OM
 
       def val=(args)
         @document.ng_xml_will_change!
-        raise ArgumentError, "The new_values passed to #{to_pointer} must be an array or a string. You provided #{args.first.inspect}" unless [Array, String, NilClass].include?(args.first.class)
         new_values = term.sanitize_new_values(args.first)
         existing_nodes = @document.find_by_xpath(xpath)
         if existing_nodes.length > new_values.length
@@ -78,10 +77,9 @@ module OM
             @document.term_value_delete select: xpath, child_index: index
           end
         end
-        new_values.keys.sort { |a,b| a.to_i <=> b.to_i }.each do |y|
-          z = new_values[y]
+        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? || y.to_i == -1
+          if existing_nodes[y.to_i].nil?
             parent_pointer = parent ? parent.to_pointer : nil
             @document.term_values_append(:parent_select=> parent_pointer,:parent_index=>0,:template=>to_pointer,:values=>z)
           else

data/lib/om/xml/term.rb

@@ -78,15 +78,12 @@ class OM::XML::Term
       # Sanitize new_values to always be a hash with indexes
       case new_values
       when Hash
-        new_values.each {|k, v|  v = serialize(v) }
+        sanitize_new_values(new_values.values)
       when Array
-        nv = new_values.dup
-        new_values = {}
-        nv.each {|v| new_values[nv.index(v).to_s] = serialize(v)}
+        new_values.map {|v| serialize(v)}
       else
-        new_values = {"0"=>serialize(new_values)}
+        [serialize(new_values)]
       end
-      new_values
   end
   
   # @param val [String,Date,Integer]

data/lib/om/xml/term_value_operators.rb

@@ -29,7 +29,7 @@ module OM::XML::TermValueOperators
   # 
   # @param [Hash] params
   # @example
-  #   {[{":person"=>"0"}, "role", "text"]=>["role1", "role2", "role3"], [{:person=>1}, :family_name]=>"Andronicus", [{"person"=>"1"},:given_name]=>["Titus"],[{:person=>1},:role,:text]=>["otherrole1","otherrole2"] }
+  #   {[{":person"=>"0"}, "role", "text"]=>{'1'=>"role1", '2' => "role2", '3'=>"role3"}, [{:person=>1}, :family_name]=>"Andronicus", [{"person"=>"1"},:given_name]=>["Titus"],[{:person=>1},:role,:text]=>["otherrole1","otherrole2"] }
   def update_values(params={})
     # remove any terms from params that this datastream doesn't recognize    
     
@@ -41,39 +41,58 @@ module OM::XML::TermValueOperators
       end
     end
     
-    result = params.dup
-    
-    params.each_pair do |term_pointer,new_values|
-      raise ArgumentError, "The new_values passed to update_values must be an array or string. You provided #{new_values}." unless [Array, String, NilClass, Symbol].include?(new_values.class)
+    params.inject({}) do |result, (term_pointer,new_values)|
       pointer = OM.destringify(term_pointer)
-      template_pointer = OM.pointers_to_flat_array(pointer,false)
       hn = OM::XML::Terminology.term_hierarchical_name(*pointer)
+      result[hn] = assign_nested_attributes_for_collection_association(pointer, new_values)
+      result
+    end
+  end
+
+
+  # @see ActiveRecord::NestedAttributes#assign_nested_attributes_for_collection_association
+  # @example
+  #
+  #   assign_nested_attributes_for_collection_association(:people, {
+  #     '1' => { name: 'Peter' },
+  #     '2' => { name: 'John', role: 'Creator' },
+  #     '3' => { name: 'Bess' }
+  #   })
+  #
+  # Will update the name of the Person with ID 1, build a new associated
+  # person with the name 'John', and mark the associated Person with ID 2
+  # for destruction.
+  #
+  # Also accepts an Array of attribute hashes:
+  #
+  #   assign_nested_attributes_for_collection_association(:people, [
+  #     { name: 'Peter' },
+  #     { name: 'John', role: 'Creator' },
+  #     { name: 'Bess' }
+  #   ])
+  def assign_nested_attributes_for_collection_association(pointer, new_values)
       
       term = self.class.terminology.retrieve_term( *OM.pointers_to_flat_array(pointer,false) )
-
       xpath = self.class.terminology.xpath_with_indexes(*pointer)
       current_values = term_values(*pointer)
 
-      if new_values.is_a?(Array) && current_values.length > new_values.length
+      new_values = term.sanitize_new_values(new_values)
+      
+
+      if current_values.length > new_values.length
         starting_index = new_values.length + 1
         starting_index.upto(current_values.size).each do |index|
           term_value_delete select: xpath, child_index: index
         end
       end
 
-      # Sanitize new_values to always be a hash with indexes
-      new_values = term.sanitize_new_values(new_values)
-
-
       # Populate the response hash appropriately, using hierarchical names for terms as keys rather than the given pointers.
-      result.delete(term_pointer)
-      result[hn] = new_values.dup
+      result = new_values.dup
       
       # Skip any submitted values if the new value matches the current values
-      new_values.keys.sort { |a,b| a.to_i <=> b.to_i }.each do |y|
-        z = new_values[y]
-        if !z.nil? && current_values[y.to_i]==z and y.to_i > -1
-          new_values.delete(y)
+      new_values.each_with_index do |val, index|
+        if !val.nil? && current_values[index] == val
+          new_values.delete_at(index)
         end
       end 
 
@@ -86,22 +105,22 @@ module OM::XML::TermValueOperators
       parent_pointer = pointer.dup
       parent_pointer.pop
       parent_xpath = self.class.terminology.xpath_with_indexes(*parent_pointer)
+
+      template_pointer = OM.pointers_to_flat_array(pointer,false)
       
       # If the value doesn't exist yet, append it.  Otherwise, update the existing value.
-      new_values.keys.sort { |a,b| a.to_i <=> b.to_i }.each do |y|
-        z = new_values[y]
-        if find_by_terms(*pointer)[y.to_i].nil? || y.to_i == -1
-          result[hn].delete(y)
+      new_values.each_with_index do |z, y|
+        if find_by_terms(*pointer)[y.to_i].nil?
+          result.delete(y)
           term_values_append(:parent_select=>parent_pointer,:parent_index=>0,:template=>template_pointer,:values=>z)
-          # term_values_append(:parent_select=>parent_xpath,:parent_index=>0,:template=>template_pointer,:values=>z)
           new_array_index = find_by_terms(*pointer).length - 1
-          result[hn][new_array_index.to_s] = z
+          result[new_array_index] = z
         else
           term_value_update(xpath, y.to_i, z)
         end
       end
-    end
-    return result
+
+      return result
   end
   
   def term_values_append(opts={})

data/spec/unit/nokogiri_sanity_spec.rb

@@ -20,7 +20,7 @@ describe "OM::XML::TermValueOperators" do
     it "should respond with a hash of updated values and their indexes" do
       test_args = {[{"person"=>"0"},"description"]=>["mork", "york"]}      
       result = @article.update_values(test_args)
-      result.should == {"person_0_description"=>{"0"=>"mork","1"=>"york"}}
+      result.should == {"person_0_description"=>["mork", "york"]}
     end
     
     it "should update the xml in the specified datastream and know that changes have been made" do
@@ -34,12 +34,12 @@ describe "OM::XML::TermValueOperators" do
     it "should update the xml according to the find_by_terms_and_values in the given hash" do
       terms_attributes = {[{":person"=>"0"}, "affiliation"]=>["affiliation1", "affiliation2", "affiliation3"]}
       result = @article.update_values(terms_attributes)
-      result.should == {"person_0_affiliation"=>{"0"=>"affiliation1", "1"=>"affiliation2", "2"=>"affiliation3"}}
+      result.should == {"person_0_affiliation"=>["affiliation1", "affiliation2", "affiliation3"]}
       
       # Trying again with a more complex update hash
       terms_attributes = {[{":person"=>"0"}, "affiliation"]=>["affiliation1", "affiliation2", "affiliation3"], [{:person=>1}, :last_name]=>"Andronicus", [{"person"=>"1"},:first_name]=>["Titus"],[{:person=>1},:role]=>["otherrole1","otherrole2"] }
       result = @article.update_values(terms_attributes)
-      result.should == {"person_0_affiliation"=>{"0"=>"affiliation1", "1"=>"affiliation2", "2"=>"affiliation3"}, "person_1_last_name"=>{"0"=>"Andronicus"},"person_1_first_name"=>{"0"=>"Titus"}, "person_1_role"=>{"0"=>"otherrole1","1"=>"otherrole2"}}
+      result.should == {"person_0_affiliation"=>["affiliation1", "affiliation2", "affiliation3"], "person_1_last_name"=>["Andronicus"],"person_1_first_name"=>["Titus"], "person_1_role"=>["otherrole1","otherrole2"]}
       @article.should be_changed
     end
     
@@ -47,25 +47,25 @@ describe "OM::XML::TermValueOperators" do
       terms_attributes = {[{":person"=>"0"}, "affiliation"]=>["affiliation1", "affiliation2", "affiliation3"]}
       result = @article.update_values(terms_attributes)
       @article.term_values( {":person"=>"0"}, "affiliation" ).should == ["affiliation1", "affiliation2", "affiliation3"]
-      result.should == {"person_0_affiliation"=>{"0"=>"affiliation1", "1"=>"affiliation2", "2"=>"affiliation3"}}
+      result.should == {"person_0_affiliation"=>["affiliation1", "affiliation2", "affiliation3"]}
       
       terms_attributes = {[{":person"=>"0"}, "affiliation"]=>["affiliation1", "affiliation2", "affiliation3"]}
       @article = OM::Samples::ModsArticle.from_xml( fixture( File.join("mods_articles","hydrangea_article1.xml") ) )
       result = @article.update_values(terms_attributes)
       @article.term_values( {":person"=>"0"}, "affiliation" ).should == ["affiliation1", "affiliation2", "affiliation3"]
-      result.should == {"person_0_affiliation"=>{"0"=>"affiliation1", "1"=>"affiliation2", "2"=>"affiliation3"}}
+      result.should == {"person_0_affiliation"=>["affiliation1", "affiliation2", "affiliation3"]}
       result = @article.update_values(terms_attributes)
       
       terms_attributes = {[{":person"=>"0"}, "affiliation"]=>["affiliation1", "affiliation2", "affiliation3"]}
       @article = OM::Samples::ModsArticle.from_xml( fixture( File.join("mods_articles","hydrangea_article1.xml") ) )
       result = @article.update_values(terms_attributes)
       @article.term_values( {":person"=>"0"}, "affiliation" ).should == ["affiliation1", "affiliation2", "affiliation3"]
-      result.should == {"person_0_affiliation"=>{"0"=>"affiliation1", "1"=>"affiliation2", "2"=>"affiliation3"}}
+      result.should == {"person_0_affiliation"=>["affiliation1", "affiliation2", "affiliation3"]}
       
       # Trying again with a more complex update hash
       terms_attributes = {[{":person"=>"0"}, "affiliation"]=>["affiliation1", "affiliation2", "affiliation3"], [{:person=>1}, :last_name]=>"Andronicus", [{"person"=>"1"},:first_name]=>["Titus"],[{:person=>1},:role]=>["otherrole1","otherrole2"] }
       result = @article.update_values(terms_attributes)
-      result.should == {"person_0_affiliation"=>{"0"=>"affiliation1", "1"=>"affiliation2", "2"=>"affiliation3"}, "person_1_last_name"=>{"0"=>"Andronicus"},"person_1_first_name"=>{"0"=>"Titus"}, "person_1_role"=>{"0"=>"otherrole1","1"=>"otherrole2"}}
+      result.should == {"person_0_affiliation"=>["affiliation1", "affiliation2", "affiliation3"], "person_1_last_name"=>["Andronicus"],"person_1_first_name"=>["Titus"], "person_1_role"=>["otherrole1", "otherrole2"]}
       @article.should be_changed
     end
   end

data/spec/unit/term_value_operators_spec.rb

@@ -31,9 +31,9 @@ describe "OM::XML::TermValueOperators" do
   
   describe ".update_values" do
     it "should update the xml according to the find_by_terms_and_values in the given hash" do
-      terms_attributes = {[{":person"=>"0"}, "affiliation"]=>["affiliation1", "affiliation2".freeze, "affiliation3"], [{:person=>1}, :last_name]=>"Andronicus", [{"person"=>"1"},:first_name]=>["Titus"],[{:person=>1},:role]=>["otherrole1","otherrole2"] }
+      terms_attributes = {[{":person"=>"0"}, "affiliation"]=>{'1' => "affiliation1", '2'=> "affiliation2", '3' => "affiliation3"}, [{:person=>1}, :last_name]=>"Andronicus", [{"person"=>"1"},:first_name]=>["Titus"],[{:person=>1},:role]=>["otherrole1","otherrole2"] }
       result = @article.update_values(terms_attributes)
-      result.should == {"person_0_affiliation"=>{"0"=>"affiliation1", "1"=>"affiliation2", "2"=>"affiliation3"}, "person_1_last_name"=>{"0"=>"Andronicus"},"person_1_first_name"=>{"0"=>"Titus"}, "person_1_role"=>{"0"=>"otherrole1","1"=>"otherrole2"}}
+      result.should == {"person_0_affiliation"=>["affiliation1", "affiliation2", "affiliation3"], "person_1_last_name"=>["Andronicus"], "person_1_first_name"=>["Titus"], "person_1_role"=>["otherrole1","otherrole2"]}
       person_0_affiliation = @article.find_by_terms({:person=>0}, :affiliation)
       person_0_affiliation[0].text.should == "affiliation1"
       person_0_affiliation[1].text.should == "affiliation2"
@@ -87,7 +87,7 @@ describe "OM::XML::TermValueOperators" do
     end
 
     it "should destringify the field key/find_by_terms_and_value pointer" do
-      expected_result = {"person_0_role"=>{"0"=>"the role"}}
+      expected_result = {"person_0_role"=>["the role"]}
       @article.update_values( { [{":person"=>"0"}, "role"]=>"the role" }).should == expected_result
       @article.update_values( { [{"person"=>"0"}, "role"]=>"the role" }).should == expected_result
       @article.update_values( { [{:person=>0}, :role]=>"the role" }).should == expected_result
@@ -149,7 +149,7 @@ describe "OM::XML::TermValueOperators" do
     
     it "should apply submitted hash to corresponding datastream field values" do
       result = @article.update_values( {[{":person"=>"0"}, "first_name"]=>["Billy", "Bob", "Joe"] })
-      result.should == {"person_0_first_name"=>{"0"=>"Billy", "1"=>"Bob", "2"=>"Joe"}}
+      result.should == {"person_0_first_name"=>["Billy", "Bob", "Joe"]}
       # xpath = ds.class.xpath_with_indexes(*field_key)
       # result = ds.term_values(xpath)
       @article.term_values({:person=>0}, :first_name).should == ["Billy","Bob","Joe"]
@@ -158,7 +158,7 @@ describe "OM::XML::TermValueOperators" do
     it "should support single-value arguments (as opposed to a hash of values with array indexes as keys)" do
       # In other words, { [:journal, :title_info]=>"dork" } should have the same effect as { [:journal, :title_info]=>{"0"=>"dork"} }
       result = @article.update_values( { [{":person"=>"0"}, "role"]=>"the role" } )
-      result.should == {"person_0_role"=>{"0"=>"the role"}}
+      result.should == {"person_0_role"=>["the role"]}
       @article.term_values({:person=>0}, :role).first.should == "the role"     
       @article.term_values('//oxns:name[@type="personal"][1]/oxns:role').first.should == "the role"
     end
@@ -176,11 +176,11 @@ describe "OM::XML::TermValueOperators" do
     it "should work for text fields" do 
       att= {[{"person"=>"0"},"description"]=>["mork", "york"]}
       result = @article.update_values(att)
-      result.should == {"person_0_description"=>{"0"=>"mork","1"=>"york"}}
+      result.should == {"person_0_description"=>["mork", "york"]}
       @article.term_values({:person=>0},:description).should == ['mork', 'york']
       att= {[{"person"=>"0"},{"description" => 2}]=>"dork"}
       result2 = @article.update_values(att)
-      result2.should == {"person_0_description_2"=>{"0"=>"dork"}}
+      result2.should == {"person_0_description_2"=>["dork"]}
       @article.term_values({:person=>0},:description).should == ['mork', 'york', 'dork']
     end
     
@@ -188,7 +188,7 @@ describe "OM::XML::TermValueOperators" do
       @article.update_values([:journal, :title_info]=>["all", "for", "the"])
       att = {[:journal, {:title_info => 3}]=>'glory'}
       result = @article.update_values(att)
-      result.should == {"journal_title_info_3"=>{"0"=>"glory"}}
+      result.should == {"journal_title_info_3"=>["glory"]}
       @article.term_values(:journal, :title_info).should == ["all", "for", "the", "glory"]
     end
 
@@ -202,7 +202,7 @@ describe "OM::XML::TermValueOperators" do
       att = {[:journal, :issue, :pages, {:end => 3}]=>'108'}
       @article.term_values(:journal, :issue, :pages, :end).should == []
       result = @article.update_values(att)
-      result.should == {"journal_issue_pages_end_3"=>{"-1"=>"108"}}
+      result.should == {"journal_issue_pages_end_3"=>["108"]}
       @article.term_values(:journal, :issue, :pages, :end).should == ["108"]
     end
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: om
 version: !ruby/object:Gem::Version
-  version: 3.0.0.beta1
+  version: 3.0.0.beta2
 platform: ruby
 authors:
 - Matt Zumwalt