om 1.5.0 → 1.5.1

data/History.textile

@@ -1,3 +1,8 @@
+h3. 1.5.1
+
+  HYDRA-737 OM tests fail under ree 1.8.7-2011.12
+  (Fix also applies to ruby 1.8.7-p357)
+  
 h3. 1.5.0
 
   HYDRA-358 Added support for namespaceless terminologies

data/lib/om/version.rb

@@ -1,3 +1,3 @@
 module Om
-  VERSION = "1.5.0"
+  VERSION = "1.5.1"
 end

data/lib/om/xml/dynamic_node.rb

@@ -67,7 +67,8 @@ module OM
 
       def val=(args)
         new_values = sanitize_new_values(args.first)
-        new_values.each do |y,z|   
+        new_values.keys.sort { |a,b| a.to_i <=> b.to_i }.each do |y|
+          z = new_values[y]
 ## If we pass something that already has an index on it, we should be able to add it.
           if @document.find_by_xpath(xpath)[y.to_i].nil? || y.to_i == -1
             @document.term_values_append(:parent_select=> parent.to_pointer,:parent_index=>0,:template=>to_pointer,:values=>z)

data/lib/om/xml/term_value_operators.rb

@@ -57,11 +57,10 @@ module OM::XML::TermValueOperators
       
       # Skip any submitted values if the new value matches the current values
       current_values = term_values(*pointer)
-      new_values.delete_if do |y,z| 
+      new_values.keys.sort { |a,b| a.to_i <=> b.to_i }.each do |y|
+        z = new_values[y]
         if current_values[y.to_i]==z and y.to_i > -1
-          true
-        else
-          false
+          new_values.delete(y)
         end
       end 
       
@@ -78,7 +77,8 @@ module OM::XML::TermValueOperators
       parent_xpath = self.class.terminology.xpath_with_indexes(*parent_pointer)
       
       # If the value doesn't exist yet, append it.  Otherwise, update the existing value.
-      new_values.each do |y,z|   
+      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)
           term_values_append(:parent_select=>parent_pointer,:parent_index=>0,:template=>template_pointer,:values=>z)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: om
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 1
   - 5
-  - 0
-  version: 1.5.0
+  - 1
+  version: 1.5.1
 platform: ruby
 authors: 
 - Matt Zumwalt
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-25 00:00:00 Z
+date: 2012-01-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: nokogiri