xpath-simplify 0.0.3 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19b0cfd7d8fe8f1d3e32d2bd10c483a40d5278d3
-  data.tar.gz: 6097aa6968794349dd5ba69c049f896b5d5dfb5c
+  metadata.gz: 7da400bd35e49ea0b725e1d43684618f737059be
+  data.tar.gz: d18f8ed5fadef1431020a706f2627142a017a6e6
 SHA512:
-  metadata.gz: 41a3d57eb7310a032dd978f65fa5edc62f061f7ca212595258d11b988f67410256f3808403cfb58b9e839dd503cc98fffc69172d2cf39bcef4fb122f7a152e8f
-  data.tar.gz: 04ed884b65415517bc1a9a86b89bab11ed0eb38fc3c045c70d1abf1db643db147f8499570d076482407ef398e0a5c1346a59adb7f1f1e941a461692204c39111
+  metadata.gz: 7c99e0112bb8fef4a014b6bfb7e6b8ad9df214c463f83d770fd7d15c408b01402413917ba0dfa48db053a13c5c93a46367d113fcc602e8e9bd7e41ab4d14d17d
+  data.tar.gz: c82aa66e53ddf95a3ab12e6ade8f5cf6b7fa4775d410b23b7934a6411a97a6c9f149763339d3f453b8641203199d9051e837a8a4c0e23faf4f1e5ed243c24084

data/lib/xpath-simplify.rb

@@ -1,73 +1,159 @@
 class XPathSimplify
   def self.simplify (str)
     arr = str.split(/ /)
-    @f_and = false
-    @f_or = false
-    xp = convert(arr, false, false)
+    xp = assemble(arr)
     return xp
   end
 
-  def self.convert (arr, f_attach, f_text)
-    xp = Array.new
-    i = 0
-    f_attach = "//*" unless f_attach
-    begin
-    while i < arr.length do
-      case arr[i]
-      when '(('    then i += 1; xp[i] = convert(arr[i..arr.length], false, f_text); xp[i] = append_previous(xp, i); i = bracket_increment(arr,i)
-      when '))'    then return xp.join('')
-      when '->'    then i += 1; xp[i] = "[#{arr[i]}]"
-      when '>>'    then i += 1; f_attach = xp[i-1]
-      when '&&'    then if f_text then @f_and = true; return xp.join(''); else i += 1; xp[i] = " and #{convert(arr[i..arr.length], false, false)}"; i = bracket_increment(arr, i+1); end
-      when '||'    then if f_text then @f_or = true; return xp.join(''); else i += 1; xp[i] = " or #{convert(arr[i..arr.length], false, false)}"; i = bracket_increment(arr, i+1); end
-      when '::'    then if f_text then return xp.join(''); else i+=2; xp[i] = "#{f_attach}[contains(text(),'#{arr[i-1]}#{convert(arr[i..arr.length], f_attach, true)}')]"; i = text_increment(arr,i); end
-      else              if f_text then xp[i] = " #{arr[i]}"
-        else
-          case arr[i]
-          when /^#.+/                                                           then xp[i] = "#{f_attach}[@id='#{arr[i][1..-1]}']";
-          when /^\..+/                                                          then xp[i] = "#{f_attach}[contains(@class,'#{arr[i][1..-1]}')]";
-          when 'li', 'ul', 'a', 'span', 'button', 'input', 'label', 'textarea'  then xp[i] = "//#{arr[i]}"
-          when /^\/.+/, /^http.*/, /^mailto.*/                                  then xp[i] = "#{f_attach}[contains(@href,'#{arr[i]}')]";
-          else i+=1;                                                                 xp[i] = "#{f_attach}[contains(text(),'#{arr[i-1]}#{convert(arr[i..arr.length], f_attach, true)}')]"; i = text_increment(arr,i); end
-        end
+  def self.assemble(arr)
+    return "//*[contains(text(),'#{arr.join(' ')}')]" if check_only_text(arr)
+    arr.each_with_index do |a,i|
+      case a
+      when '((', '))', '->', '>>', '&&', '||', '::'                         then next
+      when /^#.+/                                                           then arr[i] = "//*[@id='#{arr[i][1..-1]}']";
+      when /^\..+/                                                          then arr[i] = "//*[contains(@class,'#{arr[i][1..-1]}')]";
+      when /\/[^\/].+/, /^http.*/, /^mailto.*/                              then arr[i] = "//*[contains(@href,'#{arr[i]}')]";
+      else                                                                       next
       end
-      if    @f_and then @f_and = false
-      elsif @f_or  then @f_or = false
-      else  i += 1 end
     end
-    rescue then return xp.join('')
+    arr = combine_words(arr)
+    arr.each_with_index do |a,i|
+      case a
+      when 'li', 'ul', 'a', 'span', 'button', 'input', 'label', 'textarea'  then arr[i] = "//#{arr[i]}";
+      else                                                                       next
+      end
     end
-    return xp.join('')
+    arr = evaluate_array(arr, true)
+    return arr.join('')
   end
 
-  def self.text_increment(arr, i)
-    while i < arr.length do
-      if arr[i] === '::' || arr[i] === '&&' || arr[i] === '||' || arr[i] === '((' || arr[i] === '))' || arr[i] === '->' || arr[i] === '>>'  then return i
-      else i+=1 end
+  def self.check_only_text(arr)
+    arr.each do |a|
+      case a
+      when '((', '))', '->', '>>', '&&', '||', '::'                       then return false
+      else                                                                     next
+      end
+    end
+    case arr[0]
+    when '((', '))', '->', '>>', '&&', '||', '::', /^#.+/, /^\..+/        then return false
+    when 'li', 'ul', 'a', 'span', 'button', 'input', 'label', 'textarea'  then return false
+    when /\/[^\/].+/, /^http.*/, /^mailto.*/                              then return false
+    else                                                                       return true
     end
-    return arr.length
   end
 
-  def self.bracket_increment(arr, i)
-    counter = 0
-    while i < arr.length do
-      if arr[i] === '((' then counter += 1
-      elsif arr[i] === '))' then if counter == 0 then return i; else counter -=1; end
-      else i+=1; end
+  def self.combine_words(arr)
+    f_text = -1
+    arr.each_with_index do |a,i|
+      case a
+      when '((', '))', '->', '>>', '&&', '||'                               then next
+      when /^\/\/\*.+/                                                      then next
+      when '::'
+        if f_text != -1
+          arr[f_text] = arr[f_text][0..-2].to_s + "')]"
+          f_text = -1
+          arr[i] = nil
+        else
+          f_text = i
+          arr[i] = "//*[contains(text(),'"
+        end
+      else
+        if f_text != -1
+          arr[f_text] = arr[f_text].to_s + arr[i].to_s + ' '
+          arr[i] = nil
+        else
+          next
+        end
+      end
     end
-    return arr.length
+    if f_text != -1 then arr[f_text] = arr[f_text][0..-2].to_s + "')]"; end;
+    return arr.compact
   end
 
-  def self.append_previous(xp, i)
-    if i>1
-      begin
-      xp[i] = xp[i].gsub(' and //'," and #{xp[i-2]}//")
-      xp[i] = xp[i].gsub(' or //'," or #{xp[i-2]}//")
-      rescue
-        # Do Nothing
-     end
+  def self.evaluate_array(arr,toplevel = false)
+    arr = arr.compact
+    arr.each_with_index do |a,i|
+      case a
+      when nil     then next
+      when '(('
+        targ = 0
+        arr[(i+1)..arr.length].each_with_index do |b,j|
+          if b == '))'
+            targ = i+j+1
+            break
+          end
+        end
+        arr[i]=nil
+        arr[targ]=nil
+        temp = evaluate_array(arr[i+1..targ])
+        for j in (0...temp.length) do
+          arr[i+j] = temp[j];
+        end
+        for j in (i+temp.length)..(targ) do
+          arr[j] = nil
+        end
+      when '))'    then return arr
+      else              next
+      end
+    end
+
+    arr = arr.compact
+    arr.each_with_index do |a,i|
+      case a
+      when '->'    then arr = evaluate_index(arr,i)
+      else         next
+      end
     end
-    return xp[i]
+
+    arr = arr.compact
+    arr.each_with_index do |a,i|
+      case a
+      when '>>'    then arr = evaluate_attach(arr,i)
+      else         next
+      end
+    end
+
+    arr = arr.compact
+    arr.each_with_index do |a,i|
+      case a
+      when '&&'    then arr = evaluate_and(arr,i,toplevel)
+      when '||'    then arr = evaluate_or(arr,i,toplevel)
+      else         next
+      end
+    end
+
+    return arr
+  end
+
+  def self.evaluate_index(arr,i)
+    arr[i] = "#{arr[i-1]}[#{arr[i+1]}]"
+    arr[i-1] = nil
+    arr[i+1] = nil
+    return arr
+  end
+
+  def self.evaluate_attach(arr,i)
+    arr[i] = "#{arr[i-1]}#{arr[i+1][3..-1]}"
+    arr[i-1] = nil
+    arr[i+1] = nil
+    return arr
+  end
+
+  def self.evaluate_and(arr,i,flag = false)
+    if flag then arr[i] = "#{arr[i-1]} and //*#{arr[i+1][3..-1]}"
+    else         arr[i] = "#{arr[i-1][0..-2]} and #{arr[i+1][4..-1]}"
+    end
+    arr[i-1] = nil
+    arr[i+1] = nil
+    return arr
   end
-end
 
+  def self.evaluate_or(arr,i,flag = false)
+    if flag then arr[i] = "#{arr[i-1]} or //*#{arr[i+1][3..-1]}"
+    else         arr[i] = "#{arr[i-1][0..-2]} or #{arr[i+1][4..-1]}"
+    end
+    arr[i-1] = nil
+    arr[i+1] = nil
+    return arr
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xpath-simplify
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.5
 platform: ruby
 authors:
 - Scott Mackie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-29 00:00:00.000000000 Z
+date: 2016-06-30 00:00:00.000000000 Z
 dependencies: []
 description: This gem helps streamline the creation of X-Paths!
 email: scottmackie@live.ca