rexle 1.3.32 → 1.3.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82fcd328197c1d282c442001e905a24269c41978
-  data.tar.gz: 208fb18b0f81b218f4275b683c756573a757e7fe
+  metadata.gz: 5899147c749d52b55c59a05f23362124f8bf5329
+  data.tar.gz: 3892313cc7233de726f0af7d2913349c23940142
 SHA512:
-  metadata.gz: 33cc6131670d86d2a68cbecf30181b7814c98a15f64de398e91b33cf4338a4c2ca466e06bdafead1483aad2f30af02515f7c3e1597bcb57af316acf68961b425
-  data.tar.gz: d2e97f350be6b99d35d02f61b4d0f3e8486b270e7f8df2e5c7f11f0abd50fc43374a42119c3680877a659f79b2f7568c79a01db396b081ab190e006f26ebed07
+  metadata.gz: bd74fa531c3b64e3a69af97d4537e4165a1611ff54c6891922b9b9b4a6dcd59874a5c9295df8228c97b164878db29363f960237f4f9b27742efce0863537200c
+  data.tar.gz: ca34918f9e079187d46548c96f55bd12acdef54498e44cab10138bcfb13787a840729fe7f57c4c072dffdd90d93c62501458e19177d090a11fa398a130616c9c

checksums.yaml.gz.sig

@@ -1 +1 @@
-���/��r[ֳ�C�y�nx�����\�pm��w�EA��C���h]�rg����S�#����Wl�:md���]<�1��z���@U���?o��w��� "eAZ1�d)HiW�w��)�F��9�X��.�2���''�];+�;m|�\�N{�q���~^��f:�R�2å3 }�q�d���h����d����e�:6_�M��N����=��&����u�:#��\���,K�H�9�;�U�����k}�I�
+,�&�њ�ex�aS�|J0�K]���o)�������+$œ�P'2͹�����C&���S����� |�����2���+�M��=�ʱw��TVӹ�@<�i�[���Ù�o��4���z�h�+�

data/lib/rexle.rb

@@ -12,6 +12,8 @@ require 'backtrack-xpath'
 
 # modifications:
 
+# 21-May-2016: design fix: When an attribute is specified within an XPath, a 
+#                          Rexle::Element::Attribute object is now returned
 # 15-May-2016: bug fix: Rexle::Element::add_attribute can now handle the 
 #                       object Attribute::Value
 # 06-May-2016: feature: Rexle::Element.text now returns a 
@@ -297,7 +299,27 @@ class Rexle
       def >(val2)
         self.to_f > val2.to_f
       end            
-    end    
+    end   
+    
+    class Attribute
+      
+      attr_reader :value
+      
+      def initialize(value)
+        @value = value
+      end
+      
+      def to_f()
+        @value.to_f
+      end      
+      
+      def to_i()
+        @value.to_i
+      end
+      
+      alias to_s value
+        
+    end
     
     attr_accessor :name, :value, :parent
     attr_reader :child_elements, :doc_id, :instructions
@@ -360,7 +382,7 @@ class Rexle
     end    
     
     def max(path) 
-      a = query_xpath(path).flatten.select{|x| x.is_a? String}.map(&:to_i)
+      a = query_xpath(path).flatten.select{|x| x.is_a? String or x.is_a? Rexle::Element::Attribute}.map(&:to_i)
       a.max 
     end
       
@@ -571,7 +593,7 @@ class Rexle
         attribute = xpath_value[/^(attribute::|@)(.*)/,2] 
   
         return @attributes  if attribute == '*'
-        return [@attributes[attribute.to_sym]] if attribute \
+        return [Attribute.new(@attributes[attribute.to_sym])] if attribute \
                   and @attributes and @attributes.has_key?(attribute.to_sym)
         s = a_path.shift
       end      
@@ -1135,7 +1157,7 @@ class Rexle
                   path, value = x.values_at(0,-1)
                   
                   if x[0][/@\w+$/] then
-                    "r = e.xpath('#{path}').first; r and r == #{value}"
+                    "r = e.xpath('#{path}').first; r and r.value == #{value}"
                   else
                     "r = e.xpath('#{path}').first; r and r.value == #{value}"
                   end
@@ -1213,7 +1235,7 @@ class Rexle
     end
 
     def attribute_search(attr_search, e, h, i=nil, &blk)
-      
+
       r2 = if attr_search.is_a? Fixnum then
         block_given? ? blk.call(e) : e if i == attr_search 
       elsif attr_search[/i\s(?:<|>|==|%)\s\d+/] and eval(attr_search) then

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rexle
 version: !ruby/object:Gem::Version
-  version: 1.3.32
+  version: 1.3.33
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   pOw2Fx4uv9tO6wagRTcaHduxkh4jYfPDQI9mODFccHeY+wRLDGTENQwIILvMgEa7
   50vRuyU+obGfjg==
   -----END CERTIFICATE-----
-date: 2016-05-15 00:00:00.000000000 Z
+date: 2016-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rexleparser