issue #116: remove get/set prefixes for method 'position'

https://github.com/rubocop/ruby-style-guide#accessormutator-method-names
rubycdp · Feb 26, 2021 · c102926 · c102926
1 parent 4f26e3c
commit c102926
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 19 deletions.
diff --git a/lib/ferrum/browser.rb b/lib/ferrum/browser.rb
@@ -26,7 +26,7 @@ class Browser
                 frames frame_by main_frame
                 evaluate evaluate_on evaluate_async execute evaluate_func
                 add_script_tag add_style_tag bypass_csp
-                on goto] => :page
+                on goto position position=] => :page
     delegate %i[default_user_agent] => :process
 
     attr_reader :client, :process, :contexts, :logger, :js_errors, :pending_connection_errors,
@@ -113,14 +113,6 @@ def resize(**options)
       page.resize(**options)
     end
 
-    def get_position
-      page.get_position
-    end
-
-    def set_position(left, top)
-      page.set_position(left, top)
-    end
-
     def crash
       command("Browser.crash")
     end

diff --git a/lib/ferrum/page.rb b/lib/ferrum/page.rb
@@ -108,14 +108,12 @@ def resize(width: nil, height: nil, fullscreen: false)
                                                     fitWindow: false)
     end
 
-    def get_position
-      @window_id = @browser.command("Browser.getWindowForTarget", targetId: @target_id)["windowId"]
-      @browser.command("Browser.getWindowBounds", windowId: @window_id).fetch("bounds").values_at("left", "top")
+    def position
+      @browser.command("Browser.getWindowBounds", windowId: window_id).fetch("bounds").values_at("left", "top")
     end
 
-    def set_position(left, top)
-      @window_id = @browser.command("Browser.getWindowForTarget", targetId: @target_id)["windowId"]
-      @browser.command("Browser.setWindowBounds", windowId: @window_id, bounds: { left: left, top: top })
+    def position=(left:, top:)
+      @browser.command("Browser.setWindowBounds", windowId: window_id, bounds: { left: left, top: top })
     end
 
     def refresh

diff --git a/spec/browser_spec.rb b/spec/browser_spec.rb
@@ -124,11 +124,11 @@ module Ferrum
         expect(browser.viewport_size).to eq([200, 400])
       end
     end
-    
+
     it "allows the window to be positioned" do
-      left, top = browser.get_position
-      browser.set_position left + 10, top + 20
-      expect(browser.get_position).to eq([left + 10, top + 20])
+      left, top = browser.position
+      browser.position = { left: left + 10, top: top + 20 }
+      expect(browser.position).to eq([left + 10, top + 20])
     end
 
     it "allows the page to be scrolled" do