om 1.7.0.rc1 → 1.7.0.rc2

data/.gitignore

@@ -11,7 +11,7 @@ tmtags
 .\#*
 
 ## VIM
-*.swp
+*.sw[po]
 
 ## PROJECT::GENERAL
 coverage
@@ -22,4 +22,4 @@ doc
 .yardoc
 
 ## PROJECT::SPECIFIC
-
+Gemfile.lock

data/lib/om/version.rb

@@ -1,3 +1,3 @@
 module Om
-  VERSION = "1.7.0.rc1"
+  VERSION = "1.7.0.rc2"
 end

data/lib/om/xml/dynamic_node.rb

@@ -69,7 +69,7 @@ module OM
 
       def val=(args)
         @document.ng_xml_will_change!
-        new_values = sanitize_new_values(args.first)
+        new_values = term.sanitize_new_values(args.first)
         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.
@@ -82,20 +82,6 @@ module OM
         end
       end
 
-      def sanitize_new_values(new_values)
-          # Sanitize new_values to always be a hash with indexes
-          case new_values
-          when Hash
-            new_values.each {|k, v|  v = serialize(v) }
-          when Array
-            nv = new_values.dup
-            new_values = {}
-            nv.each {|v| new_values[nv.index(v).to_s] = serialize(v)}
-          else
-            new_values = {"0"=>serialize(new_values)}
-          end
-          new_values
-      end
 
       def term_child_by_name(term, name)
         if (term.kind_of? NamedTermProxy)
@@ -109,35 +95,9 @@ module OM
         query = xpath
         trim_text = !query.index("text()").nil?
         val = @document.find_by_xpath(query).collect {|node| (trim_text ? node.text.strip : node.text) }
-        deserialize(val)
-      end
-
-      # @param string
-      # @return [String,Date,Integer]
-      def deserialize(val)
-        case term.type
-        when :date
-          val.map { |v| Date.parse(v)}
-        when :integer
-          val.map { |v| v.to_i}
-        else 
-          val
-        end
+        term.deserialize(val)
       end
 
-      # @param val [String,Date,Integer]
-      def serialize (val)
-        case term.type
-        when :date
-          val.to_s
-        when :integer
-          val.to_s
-        else 
-          val
-        end
-
-      end
-      
       def nodeset
         query = xpath
         trim_text = !query.index("text()").nil?

data/lib/om/xml/term.rb

@@ -203,6 +203,50 @@ class OM::XML::Term
   end
 
 
+  def sanitize_new_values(new_values)
+      # Sanitize new_values to always be a hash with indexes
+      case new_values
+      when Hash
+        new_values.each {|k, v|  v = serialize(v) }
+      when Array
+        nv = new_values.dup
+        new_values = {}
+        nv.each {|v| new_values[nv.index(v).to_s] = serialize(v)}
+      else
+        new_values = {"0"=>serialize(new_values)}
+      end
+      new_values
+  end
+  
+  # @param val [String,Date,Integer]
+  def serialize (val)
+    case type
+    when :date, :integer
+      val.to_s
+    when :boolean
+      val.to_s
+    else 
+      val
+    end
+  end
+
+  # @param string
+  # @return [String,Date,Integer]
+  def deserialize(val)
+    case type
+    when :date
+      #TODO use present?
+      val.map { |v| !v.empty? ? Date.parse(v) : nil}
+    when :integer
+      #TODO use blank?
+      val.map { |v| v.empty? ? nil : v.to_i}
+    when :boolean
+      val.map { |v| v == 'true' }
+    else 
+      val
+    end
+  end
+
   def self.from_node(mapper_xml)
     name = mapper_xml.attribute("name").text.to_sym
     attributes = {}

data/lib/om/xml/term_value_operators.rb

@@ -11,8 +11,14 @@ module OM::XML::TermValueOperators
     #if value is on line by itself sometimes does not trim leading and trailing whitespace for a text node so will detect and fix it
     trim_text = !xpath.nil? && !xpath.index("text()").nil?
     find_by_terms(*term_pointer).each {|node| result << (trim_text ? node.text.strip : node.text) }
-    # find_by_terms(*OM.destringify(term_pointer)).each {|node| result << node.text }
-    return result
+
+    if term_pointer.length == 1 && term_pointer.first.kind_of?(String)
+      logger.warn "Passing a xpath to term_values means that OM can not properly find the associated term. Pass a term pointer instead."
+      result
+    else
+      term = self.class.terminology.retrieve_term(*OM.pointers_to_flat_array(OM.destringify(term_pointer), false))
+      term.deserialize(result)
+    end
   end
   
   # alias for term_values
@@ -40,16 +46,10 @@ module OM::XML::TermValueOperators
       template_pointer = OM.pointers_to_flat_array(pointer,false)
       hn = OM::XML::Terminology.term_hierarchical_name(*pointer)
       
+      term = self.class.terminology.retrieve_term( *OM.pointers_to_flat_array(pointer,false) )
+
       # Sanitize new_values to always be a hash with indexes
-      case new_values
-      when Hash
-      when Array
-        nv = new_values.dup
-        new_values = {}
-        nv.each {|v| new_values[nv.index(v).to_s] = v}
-      else
-        new_values = {"0"=>new_values}
-      end
+      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)
@@ -65,7 +65,6 @@ module OM::XML::TermValueOperators
       end 
       
       # Fill out the pointer completely if the final term is a NamedTermProxy
-      term = self.class.terminology.retrieve_term( *OM.pointers_to_flat_array(pointer,false) )
       if term.kind_of? OM::XML::NamedTermProxy
         pointer.pop
         pointer = pointer.concat(term.proxy_pointer)

data/spec/integration/serialization_spec.rb

@@ -9,45 +9,126 @@ describe "element values" do
         t.root(:path => "outer", :xmlns => nil)
         t.my_date(:type=>:date)
         t.my_int(:type=>:integer)
+        t.active(:type=>:boolean)
+        t.wrapper do
+          t.inner_date(:type=>:date)
+        end
       end
     end
   end
 
-  subject do
-    ElementValueTerminology.from_xml <<-EOF
+
+  describe "when the xml template has existing values" do
+    subject do
+      ElementValueTerminology.from_xml <<-EOF
 <outer outerId="hypatia:outer" type="outer type">
   <my_date>2012-10-30</my_date>
   <my_int>7</my_int>
+  <active>true</active>
 </outer>
 EOF
-end
-
-  describe "Reading from xml" do
-    it "should handle date" do
-      subject.my_date.should == [Date.parse('2012-10-30')]
     end
-    it "should handle ints" do
-      subject.my_int.should == [7]
+    describe "reading  values" do
+      it "should deserialize date" do
+        subject.my_date.should == [Date.parse('2012-10-30')]
+      end
+      it "should deserialize ints" do
+        subject.my_int.should == [7]
+      end
+      it "should deserialize boolean" do
+        subject.active.should == [true]
+      end
+    end
+    describe "Writing to xml" do
+      it "should serialize date" do
+        subject.my_date = [Date.parse('2012-09-22')]
+        subject.to_xml.should be_equivalent_to '<?xml version="1.0"?>
+         <outer outerId="hypatia:outer" type="outer type">
+           <my_date>2012-09-22</my_date>
+           <my_int>7</my_int>
+           <active>true</active>
+         </outer>'
+      end
+      it "should serialize ints" do
+        subject.my_int = [9]
+        subject.to_xml.should be_equivalent_to '<?xml version="1.0"?>
+         <outer outerId="hypatia:outer" type="outer type">
+           <my_date>2012-10-30</my_date>
+           <my_int>9</my_int>
+           <active>true</active>
+         </outer>'
+      end
+      it "should serialize boolean" do
+        subject.active = [false]
+        subject.to_xml.should be_equivalent_to '<?xml version="1.0"?>
+         <outer outerId="hypatia:outer" type="outer type">
+           <my_date>2012-10-30</my_date>
+           <my_int>7</my_int>
+           <active>false</active>
+         </outer>'
+      end
     end
   end
-  describe "Writing to xml" do
-    it "should handle date" do
-      subject.my_date = [Date.parse('2012-09-22')]
-      subject.to_xml.should be_equivalent_to '<?xml version="1.0"?>
-       <outer outerId="hypatia:outer" type="outer type">
-         <my_date>2012-09-22</my_date>
-         <my_int>7</my_int>
-       </outer>'
+
+  describe "when the xml template is empty" do
+    subject do
+      ElementValueTerminology.from_xml <<-EOF
+<outer outerId="hypatia:outer" type="outer type">
+  <my_date></my_date>
+  <my_int></my_int>
+  <active></active>
+</outer>
+EOF
     end
-    it "should handle ints" do
-      subject.my_int = [9]
-      subject.to_xml.should be_equivalent_to '<?xml version="1.0"?>
-       <outer outerId="hypatia:outer" type="outer type">
-         <my_date>2012-10-30</my_date>
-         <my_int>9</my_int>
-       </outer>'
+    describe "reading  values" do
+      it "should deserialize date" do
+        subject.my_date.should == [nil]
+      end
+      it "should deserialize ints" do
+        subject.my_int.should == [nil]
+      end
+      it "should deserialize bools" do
+        subject.active.should == [false]
+      end
+    end
+    describe "Writing to xml" do
+      it "should serialize date" do
+        subject.my_date = [Date.parse('2012-09-22')]
+        subject.to_xml.should be_equivalent_to '<?xml version="1.0"?>
+         <outer outerId="hypatia:outer" type="outer type">
+           <my_date>2012-09-22</my_date>
+           <my_int></my_int>
+           <active/>
+         </outer>'
+      end
+      it "should serialize ints" do
+        subject.my_int = [9]
+        subject.to_xml.should be_equivalent_to '<?xml version="1.0"?>
+         <outer outerId="hypatia:outer" type="outer type">
+           <my_date></my_date>
+           <my_int>9</my_int>
+           <active/>
+         </outer>'
+      end
+      it "should serialize booleans" do
+        subject.active = [true]
+        subject.to_xml.should be_equivalent_to '<?xml version="1.0"?>
+         <outer outerId="hypatia:outer" type="outer type">
+           <my_date></my_date>
+           <my_int></my_int>
+           <active>true</active>
+         </outer>'
+      end
+      it "should serialize nil values" do
+        # I'm not sure that this is the correct behavior for this. Should it remove nodes or just blank them.
+        subject.my_int = [nil]
+        subject.my_date = [nil]
+        subject.active = [nil]
+        subject.to_xml.should be_equivalent_to '<?xml version="1.0"?>
+         <outer outerId="hypatia:outer" type="outer type">
+         </outer>'
+      end
     end
   end
-
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: om
 version: !ruby/object:Gem::Version
-  version: 1.7.0.rc1
+  version: 1.7.0.rc2
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-13 00:00:00.000000000 Z
+date: 2012-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -174,7 +174,6 @@ files:
 - GETTING_FANCY.textile
 - GETTING_STARTED.textile
 - Gemfile
-- Gemfile.lock
 - History.textile
 - LICENSE
 - QUERYING_DOCUMENTS.textile

data/Gemfile.lock

@@ -1,82 +0,0 @@
-PATH
-  remote: .
-  specs:
-    om (1.6.2)
-      activemodel
-      activesupport
-      mediashelf-loggable
-      nokogiri (>= 1.4.2)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    RedCloth (4.2.9)
-    activemodel (3.2.8)
-      activesupport (= 3.2.8)
-      builder (~> 3.0.0)
-    activesupport (3.2.8)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    awesome_print (1.0.2)
-    builder (3.0.0)
-    columnize (0.3.6)
-    debugger (1.2.0)
-      columnize (>= 0.3.1)
-      debugger-linecache (~> 1.1.1)
-      debugger-ruby_core_source (~> 1.1.3)
-    debugger-linecache (1.1.2)
-      debugger-ruby_core_source (>= 1.1.1)
-    debugger-ruby_core_source (1.1.3)
-    diff-lcs (1.1.3)
-    equivalent-xml (0.2.9)
-      nokogiri (>= 1.4.3)
-    i18n (0.6.0)
-    linecache (0.46)
-      rbx-require-relative (> 0.0.4)
-    mediashelf-loggable (0.4.9)
-    metaclass (0.0.1)
-    mocha (0.12.3)
-      metaclass (~> 0.0.1)
-    multi_json (1.3.6)
-    nokogiri (1.5.5)
-    rake (0.9.2.2)
-    rbx-require-relative (0.0.9)
-    rcov (1.0.0)
-    rspec (2.11.0)
-      rspec-core (~> 2.11.0)
-      rspec-expectations (~> 2.11.0)
-      rspec-mocks (~> 2.11.0)
-    rspec-core (2.11.1)
-    rspec-expectations (2.11.2)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.2)
-    ruby-debug (0.10.4)
-      columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.4.0)
-    ruby-debug-base (0.10.4)
-      linecache (>= 0.3)
-    simplecov (0.6.4)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.5.3)
-    simplecov-html (0.5.3)
-    simplecov-rcov (0.2.3)
-      simplecov (>= 0.4.1)
-    yard (0.8.2.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  RedCloth (~> 4.2.9)
-  awesome_print
-  debugger
-  equivalent-xml (>= 0.2.4)
-  mocha (>= 0.9.8)
-  om!
-  rake
-  rcov
-  rspec (~> 2.0)
-  ruby-debug
-  simplecov
-  simplecov-rcov
-  yard