docapurl 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c175e73c80948788100dfec7dab654d13cd0ab9c2f1e1f195cb27be55c858b23
-  data.tar.gz: e8c774fd4072aa0cd047afbc7ec7345e9f9a145717ba3c058342502cae6ff6ba
+  metadata.gz: 5aa0b10bd4486ba6c93c290fb5f3e0ee43197ae56c32f6c9b47352393a2f5eac
+  data.tar.gz: 6efd81401f6a3e631425fbced1e11bf1506b6c3e34fbb41614fb985c3a35ad7e
 SHA512:
-  metadata.gz: 1aa1857f6b4309ca714ddf6eb53c36bfdde2191db93efc07d2e23df4209a507ade2d48a8e0959710dd229c560642261d2c204dad99262b57d5878cbaa9321c65
-  data.tar.gz: 8478697b36cc173f4efb4e02f01ea42e34d3c31300df6e1300599c19d2bf1b36dc159ed3389238780ffa46847ef9dc67c3d3b0a28802a2d15378a9f96b916835
+  metadata.gz: 921bdbf8311230dabb6869115dc8a1eb34d1b820bbd348747bd77a5690a8d336270d577f71e5f36bef374bd0f9ff7ce9035711ae9b623c6e935059153cae9d45
+  data.tar.gz: 952f61d8f37051e404716d77fb0f1bebc80232e9bc07f616dae04183eb065a6fb84d9bd47c0bd975f45a420c9d47dc1a3a198e2f14f45e886844bdba009ab738

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    docapurl (0.2.1)
+    docapurl (0.2.2)
       ferrum (~> 0.11)
       thor
 

data/lib/docapurl/browser.rb

@@ -4,7 +4,7 @@ require 'logger'
 module Docapurl
   class Browser
     SYSTEM_MAX_PAGE_DOWN_TO_BOTTOM = 50
-    attr_accessor :browser, :save_path, :logger
+    attr_accessor :browser, :save_path, :logger, :context
 
     def initialize(options)
       @save_path = options[:save_path]
@@ -13,10 +13,12 @@ module Docapurl
       options[:slowmo] = 0.5
       @logger = options[:logger] || Logger.new(STDOUT)
       @browser = Ferrum::Browser.new options
+      @context = browser.contexts.create
+      yield(self) if block_given?
     end
 
     def cap(url, options)
-
+      page = @context.create_page
       options[:quality] ||= 90
       options[:full] = true if options[:full].nil?
       options[:path] ||= @save_path
@@ -25,14 +27,14 @@ module Docapurl
       logger.info "browser begin to visit url #{url}"
 
       set_callback("before_visit_func", options)
-      browser.go_to(url)
+      page.go_to(url)
       set_callback("after_visit_func", options)
 
 
       logger.info 'visited'
       max_pagedown = options[:max_pagedown] || 5
       pagedown_to_bottom = options.delete :pagedown_to_bottom
-      visit_whole_page(browser, max_pagedown: max_pagedown, pagedown_to_bottom: pagedown_to_bottom)
+      visit_whole_page(browser, page: page, max_pagedown: max_pagedown, pagedown_to_bottom: pagedown_to_bottom)
 
       sleep_before_screen = options.delete :sleep_before_screen
       logger.info "sleep #{sleep_before_screen.to_i} second before screenshot"
@@ -40,7 +42,7 @@ module Docapurl
 
 
       set_callback("before_screenshot_func", options)
-      browser.screenshot(**options)
+      page.screenshot(**options)
       set_callback("after_screenshot_func", options)
 
       logger.info "screenshot ended, path = #{options[:path]}"
@@ -48,6 +50,7 @@ module Docapurl
 
     def close
       return if browser.nil?
+      context.dispose unless context.nil?
 
       logger.info 'close browser'
       browser.quit
@@ -69,10 +72,10 @@ module Docapurl
 
       page_down_count.times do
         logger.info "press PageDown .."
-        browser.keyboard.type(:PageDown)
+        page.keyboard.type(:PageDown)
       end
       logger.info "press HOME .."
-      browser.keyboard.type(:Home)
+      page.keyboard.type(:Home)
     end
 
     private

data/lib/docapurl/version.rb

@@ -1,3 +1,3 @@
 module Docapurl
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docapurl
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - atpking
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-05-11 00:00:00.000000000 Z
+date: 2021-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler