selenium-dsl 0.1.1 → 0.1.2

data/lib/selenium_dsl/commands.rb

@@ -75,23 +75,29 @@ class SeleniumDsl
 
     def parse_cmd(line)
       arr = match_line(@r_cmd,line.strip,'cmd')
-
       query,cmd,prm = arr
       if query!=[] && !(cmd==[] && prm=='') && !@mock
         puts "#{@path}>cmd: #{arr.inspect}" if opt_v
         @nodes = @driver 
 
         query.each do |el|
+          idx = el[/\[([\w\d=]+)\]/,1].to_i
+          el.sub!(/\[(\d+)\]/,'') if idx>0
           if el[0]==":"
-            find_element(:name, el[1,99])
+            if idx>0
+              find_elements(:name, el[1,99],idx)
+            else
+              find_element(:name, el[1,99])
+            end
           elsif el[0]=="/"
-            find_element(:xpath,"/#{el}")
+            if idx>0
+              find_elements(:xpath, "/#{el}",idx)
+            else
+              find_element(:xpath, "/#{el}")
+            end
           else
-            idx = el[/\[(\d+)\]/,1].to_i
-            el.sub!(/\[(\d+)\]/,'')
             if el[0]==">"
               if idx>0
-                # binding.pry
                 find_elements(:css, el[1,99],idx)
               else
                 find_element(:css,  el[1,99])
@@ -150,6 +156,7 @@ class SeleniumDsl
         end
       end
     rescue Exception => e
+      puts "~>err: #{e.to_s}"
       failed
     end
 

data/lib/selenium_dsl/modules.rb

@@ -26,6 +26,7 @@ class SeleniumDsl
     # the first array, so it need to split for prm
     def parse_fnc(line)
       arr = match_line(@r_fnc,line.strip,'mod')
+      return false if arr[0]==[] #[/^ *\w+.*/] - :code=123 - [[], ":code=123"]
       cmd,prm = arr[0][0].split(/ +/,2)
       npath = "#{@path}/#{cmd}"
       if @code.keys.index("~/#{cmd}")

data/lib/selenium_dsl.rb

@@ -15,7 +15,7 @@ class SeleniumDsl
     include Modules
 
     def init
-      nodes    = /^(\>*([\-\w]*(\.[.\[\]\-\d\w]+|[#:][\-\d\w]+)|[\d\w]+)|\/\w+)(\[\d+\])*/
+      nodes    = /^(\>*([\-\w]*(\.[.\[\]\-\d\w]+|[#:][\-\d\w]+)|\w+(\[\w+\=[\d\w"]+\])*)|\/[\w@"=\[\]]+)(\[\d+\])*/
       action   = /^[~]\w+(\:\w+)*/
       @driver  = nil
       @nodes   = nil
@@ -120,6 +120,7 @@ class SeleniumDsl
         puts "#{no+1}. #{tx}"
       end
       puts "#{l+1}. #{r[l]}" if r[l]
+      puts caller
       Kernel.exit(1)
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: selenium-dsl
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-10 00:00:00.000000000 Z
+date: 2012-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver