docapurl 0.1.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a37e93ff0416e27430f0f1ac9bbd38e80a7daa206d72812066ccf6be85fa9f06
-  data.tar.gz: 1480714897707b03fb8f15cbc4f163d2610427ec6d1e03db9f153f31074dd96d
+  metadata.gz: 5aa0b10bd4486ba6c93c290fb5f3e0ee43197ae56c32f6c9b47352393a2f5eac
+  data.tar.gz: 6efd81401f6a3e631425fbced1e11bf1506b6c3e34fbb41614fb985c3a35ad7e
 SHA512:
-  metadata.gz: 190bbab4d71c972c0c64ce41f58b77a4beda7ee6edef06b7c66fee2313b194915dd3a026f9707113b5028f4cb16515dd1790eb150501596fade9226bcbec932e
-  data.tar.gz: 7fccf20f97768c25ed441f48f8312422aa8dd8639300443b86ec3b46c570e261cae051281f2e5a5f1748f82881314c96d17beb72776c296f8002cdbd24548f5c
+  metadata.gz: 921bdbf8311230dabb6869115dc8a1eb34d1b820bbd348747bd77a5690a8d336270d577f71e5f36bef374bd0f9ff7ce9035711ae9b623c6e935059153cae9d45
+  data.tar.gz: 952f61d8f37051e404716d77fb0f1bebc80232e9bc07f616dae04183eb065a6fb84d9bd47c0bd975f45a420c9d47dc1a3a198e2f14f45e886844bdba009ab738

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,9 +1,9 @@
 PATH
   remote: .
   specs:
-    docapurl (0.1.1)
+    docapurl (0.2.2)
       ferrum (~> 0.11)
-      thor (~> 0.20)
+      thor
 
 GEM
   remote: https://rubygems.org/
@@ -33,7 +33,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.2)
-    thor (0.20.3)
+    thor (1.1.0)
     websocket-driver (0.7.3)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)

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:
@@ -37,6 +44,12 @@ use `docapurl help cap` to know more details
  docapurl cap https:/www.bilibili.com 1.jpg --pagedown-to-bottom
 ```
 
+or if u wanna know more details on screenshot
+
+```
+ docapurl cap https:/www.bilibili.com 1.jpg --pagedown-to-bottom --no-headless
+```
+
 ## FAQ
 
 -  Why docapurl needs chrome and where to download Chrome?

data/docapurl.gemspec

@@ -32,6 +32,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", ">= 12.3.3"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_dependency 'ferrum', '~>0.11'
-  spec.add_dependency "thor", "~> 0.20"
+  spec.add_dependency "thor"
 
 end

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
@@ -24,22 +26,31 @@ 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(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 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
@@ -61,12 +72,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.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docapurl
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.2
 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
@@ -70,16 +70,16 @@ dependencies:
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: '0'
 description:
 email:
 - atpking@gmail.com