Dhalang 0.6.5 → 0.7.0

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dhalang",
-  "version": "0.6.4",
+  "version": "0.7.0",
   "description": "",
   "main": "index.js",
   "directories": {
@@ -20,6 +20,6 @@
   },
   "homepage": "https://github.com/NielsSteensma/Dhalang#readme",
   "dependencies": {
-    "puppeteer": "^13.3.2"
+    "puppeteer": "^22.5.0"
   }
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: Dhalang
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.7.0
 platform: ruby
 authors:
 - Niels Steensma
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-06-10 00:00:00.000000000 Z
+date: 2024-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,15 +80,16 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-description: 
+description:
 email:
 - nielssteensma@yahoo.nl
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/build.yml"
+- ".github/workflows/publish.yml"
 - ".gitignore"
-- ".travis.yml"
 - Dhalang.gemspec
 - Gemfile
 - Gemfile.lock
@@ -96,14 +97,17 @@ files:
 - README.md
 - Rakefile
 - lib/Dhalang.rb
+- lib/Dhalang/configuration.rb
 - lib/Dhalang/error.rb
 - lib/Dhalang/file_utils.rb
-- lib/Dhalang/puppeteer.rb
+- lib/Dhalang/node_script_invoker.rb
 - lib/Dhalang/url_utils.rb
 - lib/Dhalang/version.rb
 - lib/PDF.rb
+- lib/Scraper.rb
 - lib/Screenshot.rb
 - lib/js/dhalang.js
+- lib/js/html-scraper.js
 - lib/js/pdf-generator.js
 - lib/js/screenshot-generator.js
 - package-lock.json
@@ -112,7 +116,7 @@ homepage: https://github.com/NielsSteensma/Dhalang
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -127,8 +131,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: Ruby wrapper for Puppeteer. Generate screenshots and PDF's from HTML!
 test_files: []

data/.travis.yml

@@ -1,21 +0,0 @@
-language: ruby
-node_js:
-- node
-rvm:
-- 2.6
-addons:
-  chrome: stable
-before_install:
-- nvm install v15.0.1
-install:
-- bundle install
-- npm install
-script: bundle exec rake spec
-deploy:
-  provider: rubygems    
-  gemspec: Dhalang.gemspec
-  api_key:
-    secure: PMiaYF8Xtyyl9Kuhf9WwDRaUzUcqbe430DF8Rwk2qYM1oI8eiYbESswHVavAnrT+ZLKZVzp0+avXJ1TFjoz2tHBa7YVmmz76+RvECozwBXFVofK0GX8c6PVZTuuHgoanr1RVv0KTJOZXs5Aa+372Er31ESuwaaRPU2y/d8aotxtoe7MUoVle67S7Z28H53jwDCut54WFq6hKi+gNO/B+7y/e2efPgrqSktHxaPDGcaUaX9v8fAYBJgAulJLYMeRj+m7IQccajIjppr7vWDE1m9XEDAK71i3EZis96/z+KexB2bo3+Qc+TvpTWP5NeKw61uhtPn9HU4+XCaOV8Vz0e6PH2JfS82h333BcSifXjcFb9iQU8aEMpSpcjraUvvvu8JZepUUO//vtGEJLyOJ0L4f9XiUPhQ15OYjBsJ2ADFdNcqyFeASDuLoeKbAQrWunyTStb+wFrr5TzAoQp9ItZbEt6eHaI6WSd4qhJfzqU7NOzE06Ns03J1jMdmzMxREl8ENJFle65fQouQfRnfcZTS6qW7UX/7YZUiMw60Cpa15qHW+92glCkOuiZUhr4D999ejqMFY5Jd3tHGVBX0/1MWc2jl0fPk2/fueA/YW8xLd3xKP9p0KhbqWZhiMxIct5w718nfOLuSoL1VLJRImj4HAKmoCFKP4RE+1Vl95UwEY=
-  on:
-    branch: master
-    tags: true

data/lib/Dhalang/puppeteer.rb

@@ -1,97 +0,0 @@
-module Dhalang
-    # Contains common logic for interacting with Puppeteer.
-    class Puppeteer
-        NODE_MODULES_PATH = Dir.pwd + '/node_modules/'.freeze
-        private_constant :NODE_MODULES_PATH
-
-        USER_OPTIONS = {
-            navigationTimeout: 10000,
-            printToPDFTimeout: 0, # unlimited
-            navigationWaitUntil: 'load',
-            navigationWaitForSelector: '',
-            navigationWaitForXPath: '',
-            userAgent: '',
-            isHeadless: true,
-            viewPort: '',
-            httpAuthenticationCredentials: '',
-            isAutoHeight: false,
-            chromeOptions: []
-        }
-        private_constant :USER_OPTIONS
-
-        DEFAULT_PDF_OPTIONS = {
-            scale: 1,
-            displayHeaderFooter: false,
-            headerTemplate: '',
-            footerTemplate: '',
-            headerTemplateFile: '',
-            footerTemplateFile: '',
-            printBackground: true,
-            landscape: false,
-            pageRanges: '',
-            format: 'A4',
-            width: '',
-            height: '',
-            margin: { top: 36, right: 36, bottom: 20, left: 36 },
-            preferCSSPageSize: true,
-            omitBackground: false
-        }
-        private_constant :DEFAULT_PDF_OPTIONS
-
-        DEFAULT_SCREENSHOT_OPTIONS = {
-            fullPage: true,
-            clip: nil,
-            omitBackground: false
-        }
-        private_constant :DEFAULT_SCREENSHOT_OPTIONS
-
-        DEFAULT_JPEG_OPTIONS = {
-            quality: 100
-        }
-        private_constant :DEFAULT_JPEG_OPTIONS
-
-
-        # Launches a new Node process, executing the (Puppeteer) script under the given script_path.
-        #
-        # @param [String] page_url              The url to pass to the goTo method of Puppeteer.
-        # @param [String] script_path           The absolute path of the JS script to execute.
-        # @param [String] temp_file_path        The absolute path of the temp file to use to write any actions from Puppeteer.
-        # @param [String] temp_file_extension   The extension of the temp file.
-        # @param [Object] options               Set of options to use, configurable by the user.
-        def self.visit(page_url, script_path, temp_file_path, temp_file_extension, options)
-            configuration = create_configuration(page_url, script_path, temp_file_path, temp_file_extension, options)
-
-            command = "node #{script_path} #{Shellwords.escape(configuration)}"
-
-            Open3.popen2e(command) do |_stdin, stdouterr, wait|
-                return nil if wait.value.success?
-
-                output = stdouterr.read.strip
-                output = nil if output == ''
-                message = output || "Exited with status #{wait.value.exitstatus}"
-                raise DhalangError, message
-            end
-        end
-
-
-        # Returns a JSON string with the configuration to use within the Puppeteer script.
-        #
-        # @param [String] page_url              The url to pass to the goTo method of Puppeteer.
-        # @param [String] script_path           The absolute path of the JS script to execute.
-        # @param [String] temp_file_path        The absolute path of the temp file to use to write any actions from Puppeteer.
-        # @param [String] temp_file_extension   The extension of the temp file.
-        # @param [Hash]   options               Set of options to use, configurable by the user.
-        private_class_method def self.create_configuration(page_url, script_path, temp_file_path, temp_file_extension, options)
-            {
-                webPageUrl: page_url,
-                tempFilePath: temp_file_path,
-                puppeteerPath: NODE_MODULES_PATH,
-                imageType: temp_file_extension,
-                userOptions: USER_OPTIONS.map { |option, value| [option, options.has_key?(option) ? options[option] : value]}.to_h,
-                pdfOptions: DEFAULT_PDF_OPTIONS.map { |option, value| [option, options.has_key?(option) ? options[option] : value] }.to_h,
-                screenshotOptions: DEFAULT_SCREENSHOT_OPTIONS.map { |option, value| [option, options.has_key?(option) ? options[option] : value] }.to_h,
-                jpegOptions: DEFAULT_JPEG_OPTIONS.map { |option, value| [option, options.has_key?(option) ? options[option] : value] }.to_h
-            }.to_json
-        end
-    end
-end