webdrone 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb888344d4b82d0c3747d3812b275d13313accc0
-  data.tar.gz: 1b373f581493ed391fc44e82fa1040909ac037cc
+  metadata.gz: e01d81e7399969fed94be37f103881f1d37cba83
+  data.tar.gz: 10b7013b03c6cf91b851f55f458c46596b95078d
 SHA512:
-  metadata.gz: 545229f0fa9da4eff8a7e477810e37bb10112a1684cccde6c210e861ea9e1d0ec43c31eecbf17d7e886ec7094ed0ea0ba0890b6d60cf6c0d104082623b4e88d1
-  data.tar.gz: 384975fb4517f9a7bf2923798e94db24c0a3686d92d77cfa0110777ddfe89b05f8e481adc2556ba713a6199809791006c316005d30781f43392d5111db3db5f7
+  metadata.gz: 0dabeac3953e01aadb05aecd18016c6b8db6fda87a737c55111e6df1e28be69b6e202a91d0a2378396dbbf36da3988bb308894764ffc4737c887d7552c92c0c7
+  data.tar.gz: 303f2ba7d839eec7c4528fd32b7dd4fd611b80aad5579caec03fb8e9183d03e3e62c3a9ae82fde5502031047a3e5330d610d38901f110eba16af74ebc59d3356

data/.gitignore

@@ -7,3 +7,5 @@
 /pkg/
 /spec/reports/
 /tmp/
+webdrone_output_*
+screenshot-*.png

data/lib/webdrone/browser.rb

@@ -4,7 +4,7 @@ module Webdrone
 
     def initialize(browser: 'chrome', create_outdir: false, outdir: nil)
       if create_outdir or outdir
-        outdir ||= "webdrone_output_#{Time.new.strftime('%Y%m%d_%H%M')}"
+        outdir ||= "webdrone_output/#{Time.new.strftime('%Y%m%d_%H%M')}"
         self.conf.outdir = outdir
       end
       if outdir != nil and browser.to_sym == :chrome

data/lib/webdrone/clic.rb

@@ -16,6 +16,10 @@ module Webdrone
       @a0.find.id(text).click
     end
 
+    def css(text)
+      @a0.find.css(text).click
+    end
+
     def link(text, n: 1, all: false, visible: true)
       @a0.find.link(text, n: n, all: all, visible: visible).click
     end

data/lib/webdrone/ctxt.rb

@@ -10,6 +10,7 @@ module Webdrone
 
     def initialize(a0)
       @a0 = a0
+      @framestack = []
     end
     
     def create_tab
@@ -23,15 +24,15 @@ module Webdrone
     end
 
     def with_frame(name)
-      old_frame = @current_frame
+      @framestack << name      
       @a0.driver.switch_to.frame name
-      @current_frame = name
       if block_given?
         yield
-        @a0.driver.switch_to.frame old_frame
-        @current_frame = old_frame
+        @framestack.pop
+        @a0.driver.switch_to.default_content
+        @framestack.each { |frame| @a0.driver.switch_to.frame frame}
       end
-      @current_frame
+      name
     end
     
     def with_alert

data/lib/webdrone/find.rb

@@ -18,6 +18,13 @@ module Webdrone
       end
     end
 
+    def css(text, n: 1, all: false, visible: true)
+      @a0.wait.for do
+        items = @a0.driver.find_elements :css, text
+        choose(items, n, all, visible)
+      end
+    end
+
     def link(text, n: 1, all: false, visible: true)
       self.xpath XPath::HTML.link(text).to_s, n: n, all: all, visible: visible
     end

data/lib/webdrone/mark.rb

@@ -16,6 +16,10 @@ module Webdrone
       flash @a0.find.id(text), color: color
     end
 
+    def css(text, color: 'red', n: 1, all: false, visible: true)
+      flash @a0.find.css(text, n: n, all: all, visible: visible), color: color
+    end
+
     def link(text, color: 'red', n: 1, all: false, visible: true)
       flash @a0.find.link(text, n: n, all: all, visible: visible), color: color
     end

data/lib/webdrone/text.rb

@@ -16,6 +16,10 @@ module Webdrone
       @a0.find.id(text).text
     end
 
+    def css(text)
+      @a0.find.css(text).text
+    end
+
     def link(text, n: 1, all: false, visible: true)
       @a0.find.link(text, n: n, all: all, visible: visible).text
     end

data/lib/webdrone/version.rb

@@ -1,3 +1,3 @@
 module Webdrone
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

data/lib/webdrone/vrfy.rb

@@ -16,6 +16,10 @@ module Webdrone
       vrfy @a0.find.id(text), attr: attr, eq: eq, contains: contains
     end
 
+    def css(text, attr: nil, eq: nil, contains: nil)
+      vrfy @a0.find.css(text), attr: attr, eq: eq, contains: contains
+    end
+
     def link(text, n: 1, visible: true, attr: nil, eq: nil, contains: nil)
       vrfy @a0.find.link(text, n: n, visible: visible), attr: attr, eq: eq, contains: contains
     end
@@ -35,7 +39,7 @@ module Webdrone
     def xpath(text, n: 1, visible: true, attr: nil, eq: nil, contains: nil)
       vrfy @a0.find.xpath(text, n: n, visible: visible), attr: attr, eq: eq, contains: contains
     end
-    
+
     def vrfy(item, attr: nil, eq: nil, contains: nil)
       if attr != nil
         r = item.attribute(attr) == eq if eq != nil

data/lib/webdrone/xlsx.rb

@@ -6,7 +6,7 @@ module Webdrone
   end
 
   class Xlsx
-    attr_accessor :a0, :filename, :sheet, :dict, :rows
+    attr_accessor :a0, :filename, :sheet, :dict, :rows, :both
 
     def initialize(a0)
       @a0 = a0
@@ -17,6 +17,7 @@ module Webdrone
     def dict(sheet: nil, filename: nil)
       update_sheet_filename(sheet, filename)
       if @dict == nil
+        reset
         @dict = {}
         workbook = RubyXL::Parser.parse(@filename)
         worksheet = workbook[@sheet]
@@ -30,9 +31,10 @@ module Webdrone
       @dict
     end
 
-    def rows(sheet: nil, filename: nil, dict: false)
+    def rows(sheet: nil, filename: nil)
       update_sheet_filename(sheet, filename)
       if @rows == nil
+        reset
         workbook = RubyXL::Parser.parse(@filename)
         worksheet = workbook[@sheet]
         @rows = worksheet.sheet_data.rows.collect do |row|
@@ -41,9 +43,22 @@ module Webdrone
           end
         end
       end
-      if dict
-        head = @rows.shift
-        @rows = @rows.collect do |row|
+      @rows
+    end
+
+    def both(sheet: nil, filename: nil)
+      update_sheet_filename(sheet, filename)
+      if @both == nil
+        reset
+        workbook = RubyXL::Parser.parse(@filename)
+        worksheet = workbook[@sheet]
+        rows = worksheet.sheet_data.rows.collect do |row|
+          row.cells.collect do |cell|
+            cell.value if cell != nil
+          end
+        end
+        head = rows.shift
+        @both = rows.collect do |row|
           dict = {}
           row.each_with_index do |val, i|
             dict[head[i]] = val if head[i] != nil
@@ -51,23 +66,26 @@ module Webdrone
           dict
         end
       end
-      @rows
+      @both
     end
 
+
     def save(sheet: nil, filename: nil, dict: nil, rows: nil)
       @filename = filename if filename
       @sheet = sheet if sheet
       workbook = RubyXL::Parser.parse(@filename)
       worksheet = workbook[@sheet]
-      if dict != nil
+      if @dict != nil
         worksheet.sheet_data.rows.tap do |head, *body|
           body.each do |row|
             k = row[0].value
-            row[1].change_contents(dict[k]) if dict.include?(k)
+            if @dict.include?(k)
+              row[1].change_contents(@dict[k])
+            end
           end
         end
-      elsif rows != nil
-        rows.each_with_index do |row, rowi|
+      elsif @rows != nil
+        @rows.each_with_index do |row, rowi|
           row.each_with_index do |data, coli|
             if worksheet[rowi] == nil || worksheet[rowi][coli] == nil
               worksheet.add_cell(rowi, coli, data)
@@ -76,20 +94,37 @@ module Webdrone
             end
           end
         end
+      elsif @both != nil
+        rows = worksheet.sheet_data.rows.collect do |row|
+          row.cells.collect do |cell|
+            cell.value if cell != nil
+          end
+        end
+        head = rows.shift
+        @both.each_with_index do |entry, i|
+          entry.each do |k, v|
+            index = head.index(k)
+            worksheet[i + 1][index].change_contents(v) if index
+          end
+        end
       end
-      workbook.write(filename)
-      @dict = @rows = nil
+      k = workbook.write(@filename)
+      reset
+    end
+
+    def reset()
+      @dict = @rows = @both = nil
     end
 
     protected
       def update_sheet_filename(sheet, filename)
         if sheet and sheet != @sheet
           @sheet = sheet
-          @dict = @rows = nil
+          reset
         end
         if filename and filename != @filename
           @filename = filename
-          @dict = @rows = nil
+          reset
         end
       end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webdrone
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Aldrin Martoq
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-02 00:00:00.000000000 Z
+date: 2015-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler