rexle 1.3.30 → 1.3.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17b270997c2599c0283eea0a908245ef872bf119
-  data.tar.gz: df441bb368b681bac74196af5c95d98500d1a58c
+  metadata.gz: c70918a9a9fcc6f391f61bcaf5487eb47279b742
+  data.tar.gz: 6a46404468b391f7cc53c666ffa903343b25bb4f
 SHA512:
-  metadata.gz: d5c227c2b77bb9e9cd0484bdd9386823102509b177b967adb3444e62c1b0b9949500c85c951e182dff193896ec9fc0734b0e155f2a2eb844e25d63a52ef458e8
-  data.tar.gz: fa321760606e37223f2facd16b56064ece823d4dabaccd2ea8107643a3ad62d28d4d8200816f186012f66a4d7f7a4d84874b4c5002c7246be8b2b8c8c3ea2191
+  metadata.gz: 2c9b4b0764b8493b06b57448b5321c10fa7b586129f634ca26fb0387800eb23072ada5b103b3af9ae8024b758edcc23a6547810780197d986f93f3a384e5a9d2
+  data.tar.gz: 018db7a1dee71d94cb616d9650c46163140f82ff3d89720a19a35e9be2d55899ec6d84364911e545d8b36f105e9a3f485ede41e27cbc9b3140595b2a11cdacd9

checksums.yaml.gz.sig

@@ -1 +1,3 @@
-���d_��.BP�q1�C���v|*s8kD�p���b���N~�����5�o�˚A�bO&��!�]�������B��Qu�E��N���v)�_6	rH�I���9SxP��K!�T+��Qgap3��
+"�`�~�%�a��^�����o��$	~�Q6�I�[�Ue@�Y��(��@������*X%?fB����!�UY�����m��e`_��N�Z����{�zv-A�	����Y׆o�$y���mDO�Id��3H\�xG =Wt���
+��	oSd�=g;������e�$�h?�e���[v�����q����W��䉑jd
+W�@N�e]Q8�@�5s���u���I�W�}���E��N�-��18L

data/lib/rexle.rb

@@ -12,6 +12,9 @@ require 'backtrack-xpath'
 
 # modifications:
 
+# 06-May-2016: feature: Rexle::Element.text now returns a 
+#                       Rexle::Element::Value object which is a kind of 
+#                       String which be used for comparing numbers
 # 25-Apr-2016: bug fix: Rexle::Element#to_a no longer returns a 
 #                       duplicate text value
 # 24-Apr-2016: bug fix: The element text is now enclosed within quotes when 
@@ -308,6 +311,21 @@ class Rexle
   class Element
     include XMLhelper
     
+    class Value < String
+      
+      def initialize(value)
+        super(value)
+      end
+            
+      def <(val2)
+        self.to_f < val2.to_f
+      end      
+      
+      def >(val2)
+        self.to_f > val2.to_f
+      end            
+    end    
+    
     attr_accessor :name, :value, :parent
     attr_reader :child_elements, :doc_id, :instructions
     
@@ -401,7 +419,7 @@ class Rexle
     
     alias next_sibling next_element
     
-    def notx(bool)
+    def not(bool)
 
       r = self.xpath(bool).any?
 
@@ -443,6 +461,7 @@ class Rexle
 
       # is it a function
       fn_match = path.match(/^(\w+)\(["']?([^\)]*)["']?\)(?:\[(.*)\])?$/)
+      #fn_match = path.match(/^(\w+)\(/)
       #@log.debug 'fn_match : ' + fn_match.inspect
       end_fn_match = path.slice!(/\[\w+\(\)\]$/)
       
@@ -609,6 +628,7 @@ class Rexle
           else
             condition = element_part
             attr_search = format_condition('[' + condition + ']')
+
             #@log.debug 'attr_search : ' + attr_search.inspect
             return [attribute_search(attr_search, \
                                      self, self.attributes) != nil]
@@ -623,6 +643,7 @@ class Rexle
 
       attr_search = format_condition(condition) if condition \
                                                 and condition.length > 0
+
       #@log.debug 'attr_search2 : ' + attr_search.inspect
       attr_search2 = xpath_value[/^\[(.*)\]$/,1]
 
@@ -672,11 +693,12 @@ class Rexle
         elsif ename == '.'
 
           remaining_xpath = raw_path[1..-1]
+
           return remaining_xpath.empty? ? self : self.xpath(remaining_xpath)
         elsif element_name.nil?
           return eval attr_search          
         else
-          
+
           if raw_selector.nil? and ename != element_part  then
 
             right_cond = element_part[/#{ename}(.*)/,1]
@@ -806,7 +828,7 @@ class Rexle
     def add_element(item)
 
       if item.is_a? String then
-        @child_elements << String.new(item)
+        @child_elements << Value.new(item)
 
       elsif item.is_a? Rexle::CData then
         @child_elements << item
@@ -954,6 +976,12 @@ class Rexle
     def last(a) a.last                                          end
     def map(&blk)    self.children.map(&blk)                    end        
     def root() self                                             end 
+      
+    # Reserved for future use in Rexle 2.0
+    #
+    def select(name)
+      elements.select {|x| x.name == name}
+    end
 
     def text(s='')
       
@@ -998,7 +1026,7 @@ class Rexle
         
     def value=(raw_s)
 
-      val = String.new(raw_s.to_s.clone)
+      val = Value.new(raw_s.to_s.clone)
       
       escape_chars = %w(& &amp; < &lt; > &gt;).each_slice(2).to_a
       escape_chars.each{|x| val.gsub!(*x)}
@@ -1065,7 +1093,7 @@ class Rexle
     def format_condition(condition)
 
       raw_items = condition.sub(/\[(.*)\]/,'\1').scan(/\'[^\']*\'|\"[^\"]*\"|\
-         and|or|\d+|[!=<>%]+|position\(\)|contains\([^\)]+\)|notx\([^\)]+\)|[@\w\.\/&;]+/)
+         and|or|\d+|[!=<>%]+|position\(\)|contains\([^\)]+\)|not\([^\)]+\)|[@\w\.\/&;]+/)
 
       if raw_items[0][/^\d+$/] then
 
@@ -1082,7 +1110,8 @@ class Rexle
         return rrr
       elsif raw_items[0][/^contains\(/]
         return raw_items[0]
-      elsif  raw_items[0][/^notx\(/]
+      elsif  raw_items[0][/^not\(/]
+
         return raw_items[0]
       else
 
@@ -1143,7 +1172,7 @@ class Rexle
               x
             end
           end
-          
+
           return items.join(' ')
         end
       end

metadata

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