rexle 1.3.15 → 1.3.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14c6f276ae292ed9e707c76af6996b7ff9b66c34
-  data.tar.gz: f8b62b17790fa2e0b5cdc132a7d9a589a23b95bf
+  metadata.gz: 512246ae7c4d8e66534964b7a8b8056aaac24961
+  data.tar.gz: a66848989af6ea65cd7546b0ee6c849fd81fa9b3
 SHA512:
-  metadata.gz: ff4e2456dde4369a2dc688df333085f2c6579c04954ed1c419c427fd17560d1695590e9fadc2b89c5eebfe90bace5c46a14b33128f41f47fb61639c36ec10268
-  data.tar.gz: 6caaa53b123b3cd2089f5c9794927d53f8e0adba57ec3c349e0160028b231daa06f17ef5ec03ad77509a68d2ca7886761b76ed34f55ffa01c9f92f2c2bb3950e
+  metadata.gz: e140c84231b0f35864dd62ee8aed8d652205621e20bb03e9a98ad8a445e0d19349814885ad284ab6f25a9f41962e17ee87af88fe0f2790392784e768a350be95
+  data.tar.gz: 89197b6f77e8c5ffa54b0a5bdbe45b3c1daf72dba7b27cebb675645331c1b6572c8dd140f547ea460cd2d9c202a3a48f722cd4d1e774608c12e77bb313075d68

data/lib/rexle.rb

@@ -12,6 +12,8 @@ require 'backtrack-xpath'
 
 # modifications:
 
+# 28-Mar-2016: minor feature:  the name of an attribute can now be 
+#                              passed into Rexle::Element#text
 # 15-Mar-2016: bug fix: Reapplied a select case statement (which had 
 #                     subsequently been deleted) from method attribute_search()
 # 13-Mar-2016: bug fix: Reapplied a statement that was commented out in 
@@ -250,8 +252,9 @@ class Rexle
       doc_node = ['doc',Attributes.new]
   
       @a = procs[x.class.to_s.to_sym].call(x)
-      @doc = scan_element(*(doc_node << @a))
       
+      @doc = scan_element(*(doc_node << @a))
+
       # fetch the namespaces
       @prefixes = []
 
@@ -299,7 +302,6 @@ class Rexle
       raise "Element name must not be blank" unless name
       @child_elements = []
       self.add_text value if value
-      #@log = Logger.new('rexle.log','daily')
 
     end
     
@@ -313,8 +315,6 @@ class Rexle
 
     def contains(raw_args)
 
-      #log = Logger.new('rexle.log','daily')
-      #log.debug 'inside contains'
       path, raw_val = raw_args.split(',',2)
       val = raw_val.strip[/^["']?.*["']?$/]      
       
@@ -381,12 +381,9 @@ class Rexle
     alias next_sibling next_element
     
     def notx(bool)
-      #log = Logger.new('rexle.log','daily')
-      #log.debug 'self ' + self.xml.inspect
-      #log.debug 'inside not() ' + bool.inspect
+
       r = self.xpath(bool).any?
-      #log.debug 'r: ' + r.inspect
-      #log.debug 'r2: ' + (!r).inspect
+
       !r
     end
     
@@ -896,6 +893,8 @@ class Rexle
       return self.value if s.empty? 
       
       e = self.element(s)
+      return e if e.is_a? String
+      
       e.text if e
     end
     
@@ -1406,22 +1405,23 @@ class Rexle
 
     if children then
 
-      children.each do |x|
-        if x.is_a? Array then
+      children.each do |x4|
+        
 
-          element.add_element scan_element(*x)        
-        elsif x.is_a? String then
+        if x4.is_a? Array then
+          element.add_element scan_element(*x4)        
+        elsif x4.is_a? String then
 
-          e = if x.is_a? String then
+          e = if x4.is_a? String then
 
-            x
-          elsif x.name == '![' then
+            x4
+          elsif x4.name == '![' then
 
-            Rexle::CData.new(x)
+            Rexle::CData.new(x4)
             
-          elsif x.name == '!-' then
+          elsif x4.name == '!-' then
 
-            Rexle::Comment.new(x)
+            Rexle::Comment.new(x4)
             
           end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rexle
 version: !ruby/object:Gem::Version
-  version: 1.3.15
+  version: 1.3.16
 platform: ruby
 authors:
 - James Robertson
@@ -12,26 +12,26 @@ cert_chain:
   -----BEGIN CERTIFICATE-----
   MIIDljCCAn6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBIMRIwEAYDVQQDDAlnZW1t
   YXN0ZXIxHjAcBgoJkiaJk/IsZAEZFg5qYW1lc3JvYmVydHNvbjESMBAGCgmSJomT
-  8ixkARkWAmV1MB4XDTE1MDMxNjE4NDMxMloXDTE2MDMxNTE4NDMxMlowSDESMBAG
+  8ixkARkWAmV1MB4XDTE2MDMyODExNDMyOFoXDTE3MDMyODExNDMyOFowSDESMBAG
   A1UEAwwJZ2VtbWFzdGVyMR4wHAYKCZImiZPyLGQBGRYOamFtZXNyb2JlcnRzb24x
   EjAQBgoJkiaJk/IsZAEZFgJldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-  ggEBALepu9HnkqXFRN+2QkBnTOJGUniXw1YsiV6zurNmtxV7KgBSLqq9BdkpyBhY
-  uLoGL32twfUWweUYAj3nktNYe2c2UVyTEmoVCUkVWb5F++Kk5b3eFOeaKlX3H95t
-  BPcWNa0Bvgq0qkn4zzgm7o8nHdHN/LxiMK5tLCTEFMzjXxCrY1HKNE5jbf3s6UHq
-  lkPtTpSWodej+61NR2AnJW9PFK3TYc2K1B3hmERYUecs+WVQ3+F227Jahdu9Pum1
-  WEwIWIqcD1UoYjGkC27lLHGa0GKQI7IVc0tvctXk0qclJpmXJl2dUtXvSpKjSxEj
-  JPZ2wtuHpb1fvkeot42xOs2QLcMCAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
-  DwQEAwIEsDAdBgNVHQ4EFgQUG33eodoxB171VpyHLtxbiu/WrB0wJgYDVR0RBB8w
+  ggEBALlrL1Lq9Nvp9JMInx50sxyIeCzzlxswfrh78DeJiIOePhwr57W9kND1B9ZM
+  q+wZFu5PohUB4gw3/fwVjLlyyE+7fZVqbbPxnPNcYJRg7j7gf/qN0W5k/G+P1uDV
+  vSS/BTsCmDPjCIeu+hnYDWu/UVm5MDr7ie6cI3ey9VNhYNnItHu73l9Un55QMGLV
+  qNQboa+SGb+3yGIbwD17OK1AmBS4M9sdPshVQAGz0TZQkJNmNnPIUsuTsPEr0VTn
+  eRQdANoF9ctxqeSXRaSQ1Ahw34xyB+OF5HiSTUC9/+roV6UEQpAIiiXDSgb3xzAH
+  DO8Fn2uWSbWFJHXX8y+kRjiq5dMCAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
+  DwQEAwIEsDAdBgNVHQ4EFgQUleDaCwjuew3lbEmUhRoPC3qsJj8wJgYDVR0RBB8w
   HYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1h
-  c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEAHizny21n
-  4ROn7jLSY9RJo68FBYMGmi4GdaGrU3ZxbxC8BbAL7NhYSoMlcYd7EJxjFsTC7bG5
-  /IlDYezNoEj/XH+1ljRWSnN3lgnBX1sq1zpwx40eSSfDDGFJkqHkNN4FxRVKA8Fn
-  quSrqHv4LnX/7FPOc7oaSAoIbbsCDd+7jm/1JvjHmbr8l8zFZPA9DJGtggTxrKN6
-  noRMm+5xBExo7CvHeInBBf/RF/JlEvNuDRic37BCeCOyI0fgrbE7UrGrGbrDgrWQ
-  Tkua07gB3/nVO3aPg7C3vEbDZCxT3WAMli2uZisYT6ozmdAlDsixLjipgFN4If3z
-  Ej0QR3kvGcAvFQ==
+  c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEATh1cpib9
+  9yoX3C1WR3POsYO+HBMGhsQXe3Syy4J6zzsvXyYSGA7nNPbZD+3OMpLCgsbttVS6
+  7El5hdGElIcI4u1Mrn5+slyM0NEDAQApCrhgGVfrAzb31476hi2ff4w6txvb50Zp
+  0Xks7Mr53tuyXF/s84BVDAZZKnSmMw63mHKKoeqYmeI1zWWbPctj5fznB6OK5eYd
+  ILCYqwstirH2V55XwgL724RVaS16z7zihF4dKkZOdy2WyMADHCJhS64b/nUIPsFD
+  pOw2Fx4uv9tO6wagRTcaHduxkh4jYfPDQI9mODFccHeY+wRLDGTENQwIILvMgEa7
+  50vRuyU+obGfjg==
   -----END CERTIFICATE-----
-date: 2016-03-15 00:00:00.000000000 Z
+date: 2016-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rexleparser