poltergeist 1.1.2 → 1.2.0

data/lib/capybara/poltergeist/errors.rb

@@ -54,6 +54,16 @@ module Capybara
       end
     end
 
+    class FrameNotFound < ClientError
+      def name
+        response['args'].first
+      end
+
+      def message
+        "The frame '#{name}' was not found."
+      end
+    end
+
     class NodeError < ClientError
       attr_reader :node
 
@@ -73,19 +83,24 @@ module Capybara
       end
     end
 
-    class ClickFailed < NodeError
-      def selector
+    class MouseEventFailed < NodeError
+      def name
         response['args'][0]
       end
 
+      def selector
+        response['args'][1]
+      end
+
       def position
-        [response['args'][1]['x'], response['args'][1]['y']]
+        [response['args'][2]['x'], response['args'][2]['y']]
       end
 
       def message
-        "Click at co-ordinates [#{position.join(', ')}] failed. Poltergeist detected " \
+        "Firing a #{name} at co-ordinates [#{position.join(', ')}] failed. Poltergeist detected " \
           "another element with CSS selector '#{selector}' at this position. " \
-          "It may be overlapping the element you are trying to click."
+          "It may be overlapping the element you are trying to interact with. " \
+          "If you don't care about overlapping elements, try using node.trigger('#{name}')."
       end
     end
 

data/lib/capybara/poltergeist/node.rb

@@ -22,19 +22,31 @@ module Capybara::Poltergeist
       case error.name
       when 'Poltergeist.ObsoleteNode'
         raise ObsoleteNode.new(self, error.response)
-      when 'Poltergeist.ClickFailed'
-        raise ClickFailed.new(self, error.response)
+      when 'Poltergeist.MouseEventFailed'
+        raise MouseEventFailed.new(self, error.response)
       else
         raise
       end
     end
 
-    def find(selector)
-      command(:find_within, selector).map { |id| self.class.new(driver, page_id, id) }
+    def find(method, selector)
+      command(:find_within, method, selector).map { |id| self.class.new(driver, page_id, id) }
     end
 
-    def text
-      command(:text).gsub(NBSP, ' ').gsub(/\s+/u, ' ').strip
+    def find_xpath(selector)
+      find :xpath, selector
+    end
+
+    def find_css(selector)
+      find :css, selector
+    end
+
+    def all_text
+      filter_text command(:all_text)
+    end
+
+    def visible_text
+      filter_text command(:visible_text)
     end
 
     def [](name)
@@ -88,6 +100,10 @@ module Capybara::Poltergeist
       self[:selected]
     end
 
+    def disabled?
+      command :disabled?
+    end
+
     def click
       command :click
     end
@@ -96,6 +112,10 @@ module Capybara::Poltergeist
       command :double_click
     end
 
+    def hover
+      command :hover
+    end
+
     def drag_to(other)
       command :drag, other.id
     end
@@ -107,5 +127,11 @@ module Capybara::Poltergeist
     def ==(other)
       command :equals, other.id
     end
+
+    private
+
+    def filter_text(text)
+      text.gsub(NBSP, ' ').gsub(/\s+/u, ' ').strip
+    end
   end
 end

data/lib/capybara/poltergeist/utility.rb

@@ -0,0 +1,9 @@
+module Capybara
+  module Poltergeist
+    class << self
+      def windows?
+        RbConfig::CONFIG["host_os"] =~ /mingw|mswin|cygwin/
+      end
+    end
+  end
+end

data/lib/capybara/poltergeist/version.rb

@@ -1,5 +1,5 @@
 module Capybara
   module Poltergeist
-    VERSION = "1.1.2"
+    VERSION = "1.2.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: poltergeist
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-11 00:00:00.000000000 Z
+date: 2013-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: http_parser.rb
   requirement: !ruby/object:Gem::Requirement
@@ -49,6 +49,9 @@ dependencies:
     none: false
     requirements:
     - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.4'
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.4.4
   type: :runtime
@@ -57,6 +60,9 @@ dependencies:
     none: false
     requirements:
     - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.4'
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.4.4
 - !ruby/object:Gem::Dependency
@@ -98,7 +104,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +112,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: '10.0'
 - !ruby/object:Gem::Dependency
   name: image_size
   requirement: !ruby/object:Gem::Requirement
@@ -189,6 +195,7 @@ files:
 - lib/capybara/poltergeist/network_traffic/response.rb
 - lib/capybara/poltergeist/version.rb
 - lib/capybara/poltergeist/driver.rb
+- lib/capybara/poltergeist/utility.rb
 - lib/capybara/poltergeist/client/connection.coffee
 - lib/capybara/poltergeist/client/node.coffee
 - lib/capybara/poltergeist/client/compiled/agent.js
@@ -226,7 +233,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2858802430034504505
+      hash: 1657182441903472235
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24