rexle 1.1.5 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ea9d6789b97138c44f661c3985a60a30cdb07e6
-  data.tar.gz: 4d1b4280565b4fc109926f6e4c73cb975f3d89c3
+  metadata.gz: c95e078cd7d4eaf7e385cf3caf2c2f78cea1e687
+  data.tar.gz: 50292d127b13753cfc56c371a0047f33c164b42e
 SHA512:
-  metadata.gz: ecb15547ab78d7f513bbc8245cde9c76c3f8b972a0294fa93de0143093ceb972daa91a6f46c4c74058de3d60a4f8091bfeb553fbe57b53a7ac647c903d5f78cb
-  data.tar.gz: befec903a77e51f9814b1d6a97c1877209fe1de805fd37c8ed04a022be83251d5ebed727a77be6f07e33f588207918de42c71175ef01a2ea71bd31a4eff721a2
+  metadata.gz: 0e0a00096b1a801e27a5d761cec543eaa50e80e8594301a4145dd0a3bfdbc8cf788fbcf6d3028a395daa3ea824af877c2c42b4bab19704a52b86654d11de2a30
+  data.tar.gz: 56b68877fd6c6bc106b9659d3ef6c599d7a0141fc2c24d32c1d54885da1afbe10d84f30f669bf3befdfeabde67d8926bd192c62c54ddedffcb1855bd1f3e439d

data/lib/rexle.rb

@@ -11,6 +11,8 @@ require 'cgi'
 
 # modifications:
 
+# 30-Jan-2015: Rexle::Element#texts now returns the values of 
+#                CData elements as well as strings
 # 29-Jan-2015: Removed code references to REXML, as it was no longer needed.
 #              feature: Implemented Rexle::Element#cdatas. A CData element is 
 #                       now created from the parsing stage.
@@ -773,7 +775,7 @@ class Rexle
 
     def elements(s=nil)
       procs = {
-        NilClass: proc {Elements.new(@child_elements.select{|x| x.is_a? Rexle::Element })},
+        NilClass: proc {Elements.new(@child_elements.select{|x| x.kind_of? Rexle::Element })},
         String: proc {|x| @child_elements[x]}
       }
 
@@ -810,7 +812,9 @@ class Rexle
     end
     
     def texts()
-      [@value] + @child_elements.select {|x| x.is_a? String}
+      [@value] + @child_elements.inject([]) do |r, x| 
+        r << x.to_s if (x.is_a?(String) or x.is_a?(CData))
+      end
     end
 
     def value()
@@ -1049,6 +1053,10 @@ class Rexle
       CData.new(@name, @value)
     end
     
+    def to_s()
+      self.value
+    end
+    
   end
   
   class Elements
@@ -1173,10 +1181,12 @@ class Rexle
           'polyrex' => proc {|x| RexleParser.new(x).to_a}
         }
         procs[recordx_type].call(x)
+        
       else
 
         rp = RexleParser.new(x)
         a = rp.to_a
+
         @instructions = rp.instructions
         return a
       end
@@ -1192,7 +1202,7 @@ class Rexle
   end
     
   def scan_element(name, value=nil, attributes=nil, *children)
-
+    
     return CData.new(value) if name == '!['
       
     element = Element.new(name, (value ? value.to_s : value), attributes, self)  

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rexle
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   UOGKUMV5RApHDnC0ywMYNe0HK7qMSTP5YLKs8JUjNxpc5jl8+o3D3sHkNN4DzbQm
   jVfzDZ+niKvAUA==
   -----END CERTIFICATE-----
-date: 2015-01-29 00:00:00.000000000 Z
+date: 2015-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rexleparser