xmlmapper 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2751c0d13928157eb7e417f96fd379e3bb38a20
-  data.tar.gz: 6fcbf0cf9ffb20975b4d01b8d6e84e73eddf58b1
+  metadata.gz: 8715dbba0c19b07cfea4744aa080a2df0dcc402d
+  data.tar.gz: a0d5a5c30764891dc5a4b6d794be191ded65bded
 SHA512:
-  metadata.gz: f9acda69db552cdd80c9ec8adce3149f255ba9d8fc5a0c858e44423c7e3c36e099f21fab71960427dd52bbda8eafa9494a4d30744d56302b0cb5abeeffedf71b
-  data.tar.gz: 8ce8d94c5d2d26e9b0cc4f77ee74250e8cabfa19225ec724b0cb1853d8927181ffda43766c79549ff8f6f19acbb67e3451ecb312ad8154b99878c5bc116f6978
+  metadata.gz: 9e1b7bde79d987845bfa44a7e474305206bf724b3a265ce3e11cb24145a5ec426d8039fbbab3121a1fa8509574917f3d1535898b6c5db1a157a5184751b8be71
+  data.tar.gz: 98deca942d679ec338f1ee3ac794b8af9c3e6915e82df01c17e1b5847774f5112b333ab39766cb100752e0fa4cdb734782715e5b4b4218ce01886f7ded2707f8

data/lib/xmlmapper/text_node.rb

@@ -2,7 +2,11 @@ module XmlMapper
   class TextNode < Item
 
     def find(node, namespace, xpath_options)
-      yield(node.children.detect{|c| c.text?})
+      if node.children.any? {|c| c.text?}
+        yield(node)
+      else
+        yield(nil)
+      end
     end
   end
 end

data/lib/xmlmapper/version.rb

@@ -1,3 +1,3 @@
 module XmlMapper
-  VERSION = "0.7.2"
+  VERSION = "0.7.3"
 end

data/spec/fixtures/text_node_with_comment.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<textnode>With <!----> Comment</textnode>

data/spec/xmlmapper_spec.rb

@@ -554,7 +554,6 @@ end
 class DefaultNamespaceCombi
   include XmlMapper
 
-
   register_namespace 'bk', "urn:loc.gov:books"
   register_namespace 'isbn', "urn:ISBN:0-395-36341-6"
   register_namespace 'p', "urn:loc.gov:people"
@@ -567,6 +566,14 @@ class DefaultNamespaceCombi
   element :author, String, :namespace => 'p', :tag => "author"
 end
 
+class TextNodeWithComment
+  include XmlMapper
+
+  tag 'textnode'
+
+  content :value, String
+end
+
 describe XmlMapper do
 
   describe "being included into another class" do
@@ -1134,4 +1141,13 @@ describe XmlMapper do
     end
   end
 
+  context 'text_node with comments' do
+    it 'returns the full text in the node' do
+      xml = fixture_file('text_node_with_comment.xml')
+      text_node = TextNodeWithComment.parse(xml, single: true)
+
+      expect(text_node.value).to eq "With  Comment"
+    end
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xmlmapper
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors:
 - Damien Le Berrigaud
@@ -90,6 +90,7 @@ files:
 - spec/fixtures/set_config_options.xml
 - spec/fixtures/statuses.xml
 - spec/fixtures/subclass_namespace.xml
+- spec/fixtures/text_node_with_comment.xml
 - spec/fixtures/unformatted_address.xml
 - spec/fixtures/wrapper.xml
 - spec/has_many_empty_array_spec.rb
@@ -162,6 +163,7 @@ test_files:
 - spec/fixtures/set_config_options.xml
 - spec/fixtures/statuses.xml
 - spec/fixtures/subclass_namespace.xml
+- spec/fixtures/text_node_with_comment.xml
 - spec/fixtures/unformatted_address.xml
 - spec/fixtures/wrapper.xml
 - spec/has_many_empty_array_spec.rb