Refactor and fix issues

Author: route

lib/ferrum.rb

@@ -49,15 +49,15 @@ def initialize(message = "Browser is dead or given window is closed")
   end
 
   class NodeIsMovingError < Error
-    def initialize(node, prev_pos, current_pos)
-      @node, @prev_pos, @current_pos = node, prev_pos, current_pos
+    def initialize(node, prev, current)
+      @node, @prev, @current = node, prev, current
       super(message)
     end
 
     def message
-      "Node `#{@node.inspect}` that you're trying to click is moving, hence " \
-      "we cannot. Previosuly it was at #{@prev_pos.inspect} but now at " \
-      "#{@current_pos.inspect}."
+      "#{@node.inspect} that you're trying to click is moving, hence " \
+      "we cannot. Previosuly it was at #{@prev.inspect} but now at " \
+      "#{@current.inspect}."
     end
   end
 

lib/ferrum/node.rb

@@ -124,54 +124,42 @@ def inspect
     end
 
     def find_position(x: nil, y: nil, position: :top)
-      quads = node_quads(x, y)
-      get_position(quads, x, y)
-    end
-
-    private
+      prev = get_content_quads
 
-    def get_content_quads
-      result = page.command("DOM.getContentQuads", nodeId: node_id)
-      raise "Node is either not visible or not an HTMLElement" if result["quads"].size == 0
-      result
-    end
-
-    def node_quads(x, y)
-      prev_result = get_content_quads
-
-      result = Ferrum.with_attempts(errors: NodeIsMovingError, max: MOVING_ATTEMPTS, wait: 0) do
+      # FIXME: Case when a few quads returned
+      points = Ferrum.with_attempts(errors: NodeIsMovingError, max: MOVING_ATTEMPTS, wait: 0) do
         sleep(MOVING_WAIT)
-        current_result = get_content_quads
-
-        if current_result["quads"] != prev_result["quads"]
-          prev_pos = get_position(prev_result, x, y)
-          current_pos = get_position(current_result, x, y)
+        current = get_content_quads
 
-          prev_result = current_result
-          raise NodeIsMovingError.new(self, prev_pos, current_pos)
+        if current != prev
+          error = NodeIsMovingError.new(self, prev, current)
+          prev = current
+          raise(error)
         end
 
-        current_result
-      end
+        current
+      end.map { |q| to_points(q) }.first
 
-      # FIXME: Case when a few quads returned
-      result["quads"].map do |quad|
-        [{x: quad[0], y: quad[1]},
-         {x: quad[2], y: quad[3]},
-         {x: quad[4], y: quad[5]},
-         {x: quad[6], y: quad[7]}]
-      end.first
+      get_position(points, x, y, position)
     end
 
-    def get_position(quads, offset_x, offset_y)
+    private
+
+    def get_content_quads
+      quads = page.command("DOM.getContentQuads", nodeId: node_id)["quads"]
+      raise "Node is either not visible or not an HTMLElement" if quads.size == 0
+      quads
+    end
+
+    def get_position(points, offset_x, offset_y, position)
       x = y = nil
 
       if offset_x && offset_y && position == :top
-        point = quads.first
+        point = points.first
         x = point[:x] + offset_x.to_i
         y = point[:y] + offset_y.to_i
       else
-        x, y = quads.inject([0, 0]) do |memo, point|
+        x, y = points.inject([0, 0]) do |memo, point|
           [memo[0] + point[:x],
            memo[1] + point[:y]]
         end
@@ -187,5 +175,12 @@ def get_position(quads, offset_x, offset_y)
 
       [x, y]
     end
+
+    def to_points(quad)
+      [{x: quad[0], y: quad[1]},
+       {x: quad[2], y: quad[3]},
+       {x: quad[4], y: quad[5]},
+       {x: quad[6], y: quad[7]}]
+    end
   end
 end