docapurl 0.1.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c10bf394b6481f9fc5c761b00e66c07962528af9f7f06126af16a50c775341a
-  data.tar.gz: f17dd6558580511af00c722be7fe435d605aa2a967bf3e0bba54b4fc72f7f47d
+  metadata.gz: 86b590bab2ec4319cb20309eb6a8aada80cb75f06518d3a1dc187f975a586c22
+  data.tar.gz: 991021e9e09e7fee0bfd2bb2c4c2de68740a6b5f21b271022b223b57876efa49
 SHA512:
-  metadata.gz: d96e596ec9a1efcb84d2ebb6f76d3cb0058983ce5aa4c7056e645f436b36dad0eaca13784a245f13f548b62fdcf6473eb6a9dacad234970dfc10168798596664
-  data.tar.gz: 0247bfe4cd74ddcbd56d8f3b20c74096cc994c2b67de559dae8126bb2ba7451acbb8fc6337a6b7e769dbce5f55a5465196b94a174af90a75975e35edb40adcb1
+  metadata.gz: ad15cf9f5f9456b163d1ca8fd6a2cab22eef9d710ad6c5acbd93609c6cd7d2f7a63e256c3875dad1312a352d0d60be5d240612e9c52e7213145ab13bae708b6d
+  data.tar.gz: 15c44caa1302a481166441ac3bfb43894248681c8b357752398bedaac55ab293b761d9c1ed75fe8f0c377e782b0db59e4c7f5f2373deff65e96f91e2b6957b0e

data/CH_README.md

@@ -1,10 +1,15 @@
 # Docapurl
 一个ruby的命令行截图网页的工具
 
+## 抓取网页线上服务
+
+[https://www.urlprint.com](https://www.urlprint.com) 提供在线抓取网页生成图片的服务, 支持 REST API 调用, 欢迎各位大佬试用
+
 ## 安装
 
 gem install docapurl
 
+
 ## 前置条件
 
 - ruby 环境

data/Gemfile.lock

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

data/README.md

@@ -3,6 +3,13 @@
 A tool to screenshot the webpage on terminal.
 
 [chinese_readme 中文说明](https://github.com/jicheng1014/docapurl/blob/master/CH_README.md)
+
+## Capture url as a Service
+
+[https://www.urlprint.com](https://www.urlprint.com) provides the capture url service, REST API supported.
+
+
+
 ## Installation
 
 Add this line to your application's Gemfile:

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, :page
 
     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
+      @page = @context.create_page
+      yield(self) if block_given?
     end
 
     def cap(url, options)
-
       options[:quality] ||= 90
       options[:full] = true if options[:full].nil?
       options[:path] ||= @save_path
@@ -24,29 +26,37 @@ module Docapurl
       options[:path] ||= "screenshot-#{host.to_s == '' ? '' : "#{host}-"}#{Time.now.strftime('%F-%T')}.jpg"
       logger.info "browser begin to visit url #{url}"
 
-      browser.go_to(url)
+      set_callback("before_visit_func", options)
+      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(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 screen"
+      logger.info "sleep #{sleep_before_screen.to_i} second before screenshot"
       sleep(sleep_before_screen.to_i)
 
-      browser.screenshot(**options)
+
+      set_callback("before_screenshot_func", options)
+      page.screenshot(**options)
+      set_callback("after_screenshot_func", options)
+
       logger.info "screenshot ended, path = #{options[:path]}"
     end
 
     def close
       return if browser.nil?
+      context.dispose unless context.nil?
 
       logger.info 'close browser'
       browser.quit
     end
 
-    def visit_whole_page(browser, page: nil, max_pagedown: nil, pagedown_to_bottom: false)
-      page ||= browser.page
+    def visit_whole_page( page: nil, max_pagedown: nil, pagedown_to_bottom: false)
       viewport_height = page.viewport_size.last.to_i
       document_height = page.document_size.last.to_i
       return if document_height<= viewport_height
@@ -61,12 +71,24 @@ 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
+
+    def set_callback(name, options)
+      the_function = options.delete name
+      if the_function.nil?
+        the_function = options.delete name.to_sym
+      end
+
+      the_function.call(self) unless the_function.nil?
     end
 
+
     class << self
       def cap(url, path = nil, browser_options = {}, cap_options = {})
         browser = new(browser_options)

data/lib/docapurl/version.rb

@@ -1,3 +1,3 @@
 module Docapurl
-  VERSION = "0.1.2"
+  VERSION = "0.2.3"
 end

metadata

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