dill 0.4.3 → 0.4.4

data/lib/dill/checkpoint.rb

@@ -16,6 +16,16 @@ module Dill
       Capybara.current_session.driver
     end
 
+    # Executes +block+ repeatedly until it returns a "truthy" value or +timeout+
+    # expires.
+    #
+    # TODO: Expand documentation.
+    def self.wait_for(wait_time = Capybara.default_wait_time,
+                      raise_errors = true,
+                      &block)
+      new(wait_time).wait_for(raise_errors, &block)
+    end
+
     # Initializes a new Checkpoint.
     #
     # @param wait_time how long this checkpoint will wait for its conditions to
@@ -48,7 +58,7 @@ module Dill
     # @return whatever the condition block returns if the condition is
     #   successful. If the condition is not met, returns +false+ if
     #   +rescue_errors+ is false.
-    def wait_until(raise_errors = true, &condition)
+    def wait_for(raise_errors = true, &condition)
       start
 
       begin

data/lib/dill/version.rb

@@ -1,3 +1,3 @@
 module Dill
-  VERSION = "0.4.3"
+  VERSION = "0.4.4"
 end

data/lib/dill/widget.rb

@@ -219,27 +219,23 @@ module Dill
     # Compares the current widget with +value+, waiting for the comparison
     # to return +true+.
     def ==(value)
-      checkpoint.wait_until(false) { cast_to(value) == value }
+      wait_for { cast_to_type_of(value) == value }
     end
 
     # Calls +=~+ on this widget's text content.
     def =~(regexp)
-      checkpoint.wait_until(false) { to_s =~ regexp }
+      wait_for { to_s =~ regexp }
     end
 
     # Calls +!~+ on this widget's text content.
     def !~(regexp)
-      checkpoint.wait_until(false) { to_s !~ regexp }
+      wait_for { to_s !~ regexp }
     end
 
     # Compares the current widget with +value+, waiting for the comparison
     # to return +false+.
     def !=(value)
-      checkpoint.wait_until(false) { cast_to(value) != value }
-    end
-
-    def checkpoint(wait_time)
-      Checkpoint.new(wait_time)
+      wait_for { cast_to_type_of(value) != value }
     end
 
     # Determines if the widget underlying an action exists.
@@ -257,14 +253,16 @@ module Dill
     end
 
     def inspect
-      root = self.root
+      inspection = "<!-- #{self.class.name}: -->\n"
+      root       = self.root
 
-      xml = Nokogiri::HTML(page.body).at(root.path).to_xml
+      begin
+        xml = Nokogiri::HTML(page.body).at(root.path).to_xml
 
-      "<!-- #{self.class.name}: -->\n" <<
-       Nokogiri::XML(xml, &:noblanks).to_xhtml
-    rescue Capybara::NotSupportedByDriverError
-      root.inspect
+        inspection << Nokogiri::XML(xml, &:noblanks).to_xhtml
+      rescue Capybara::NotSupportedByDriverError
+        inspection << "<#{root.tag_name}>\n#{to_s}"
+      end
     end
 
     class Reload < Capybara::ElementNotFound; end
@@ -297,7 +295,7 @@ module Dill
         test     = ->{ old_root != root }
       end
 
-      checkpoint(wait_time).wait_until(false, &test)
+      wait_for(wait_time, false, &test)
 
       begin
         root.inspect
@@ -319,7 +317,7 @@ module Dill
     #
     # @return [MatchData] the match data from running +match+ on the text.
     def match(pattern, position = 0, &block)
-      checkpoint.wait_until(false) { to_s.match(pattern, position, &block) }
+      wait_for { to_s.match(pattern, position, &block) }
     end
 
     def to_i
@@ -334,11 +332,9 @@ module Dill
       node_text(root)
     end
 
-    alias_method :w, :widget
-
     protected
 
-    def cast_to(value)
+    def cast_to_type_of(value)
       case value
       when Float
         to_f
@@ -359,8 +355,8 @@ module Dill
 
     attr_writer :root
 
-    def checkpoint(wait_time = Capybara.default_wait_time)
-      Checkpoint.new(wait_time)
+    def wait_for(wait_time = Capybara.default_wait_time, raise_errors = false, &block)
+      Checkpoint.wait_for(wait_time, raise_errors, &block)
     end
 
     def page

metadata

@@ -2,14 +2,14 @@
 name: dill
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - David Leal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-07 00:00:00.000000000 Z
+date: 2013-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement