puppeteer-ruby 0.0.21 → 0.0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f429910f146a926bd830400269da848120ca070da2a64d5dfec0c9861a6c46f4
-  data.tar.gz: e0ba66f60e283d7d0cc6263f7750dc7ddc6f9cd17ceaaaf4ae247c524f8986f8
+  metadata.gz: 627b2272803511db582250101edac0b5f1f0191abdf86255c6f16d0f088cc82e
+  data.tar.gz: 70458a316f8ecce1b784bd84595c3f0fa248c77e671e4458384c494a1471c196
 SHA512:
-  metadata.gz: 1251d762934da872f78028c12c33e9e025ab331c3e09abe4bb80191e82fa1d09681c204fd1da8c1b86668cf9f317f9f7030d65c6d4aa078355afe8089ffce4eb
-  data.tar.gz: 2a28ea494da354c5658c1618806ddb291d53d4a2f2bde0579c5aefc01da523ddc17511cfa5ff6315761c09b7a83b6d9526ff0020cc2275b871788c88a19e70ed
+  metadata.gz: 2baf0cb4769fc7100495b3dc590293085e3219c661bd164cdb28f0aad1975f18cba17890029156a08873f879ef370c196c3d995bfd040d073d42d0b49acbeef3
+  data.tar.gz: 67a23e46e7d439b76f438c59d062fe5daea0d216469e79ea1b4af2b8d60c4f9070455de22e51b9523fde2a67692919420bce2b05becf948120b71d426c4c560f

data/lib/puppeteer.rb

@@ -61,7 +61,11 @@ class Puppeteer
       is_puppeteer_core: true,
     )
 
-    @puppeteer.send(method, *args, **kwargs, &block)
+    if kwargs.empty? # for Ruby < 2.7
+      @puppeteer.public_send(method, *args, &block)
+    else
+      @puppeteer.public_send(method, *args, **kwargs, &block)
+    end
   end
 
   # @param project_root [String]
@@ -127,7 +131,7 @@ class Puppeteer
       ignore_https_errors: ignore_https_errors,
       default_viewport: default_viewport,
       slow_mo: slow_mo,
-    }.compact
+    }
 
     @product_name ||= product
     browser = launcher.launch(options)

data/lib/puppeteer/browser_runner.rb

@@ -21,9 +21,18 @@ class Puppeteer::BrowserRunner
 
   class BrowserProcess
     def initialize(env, executable_path, args)
+      @spawnargs =
+        if args && !args.empty?
+          [executable_path] + args
+        else
+          [executable_path]
+        end
+
       stdin, @stdout, @stderr, @thread = Open3.popen3(env, executable_path, *args)
       stdin.close
       @pid = @thread.pid
+    rescue Errno::ENOENT => err
+      raise LaunchError.new(err.message)
     end
 
     def kill
@@ -37,7 +46,13 @@ class Puppeteer::BrowserRunner
       @thread.join
     end
 
-    attr_reader :stdout, :stderr
+    attr_reader :stdout, :stderr, :spawnargs
+  end
+
+  class LaunchError < StandardError
+    def initialize(reason)
+      super("Failed to launch browser! #{reason}")
+    end
   end
 
   # @param {!(Launcher.LaunchOptions)=} options
@@ -123,12 +138,12 @@ class Puppeteer::BrowserRunner
 
   # @return {Promise}
   def kill
-    unless @closed
-      @proc.kill
-    end
     if @temp_directory
       FileUtils.rm_rf(@temp_directory)
     end
+    unless @closed
+      @proc.kill
+    end
   end
 
 

data/lib/puppeteer/concurrent_ruby_utils.rb

@@ -4,9 +4,13 @@ module Puppeteer::ConcurrentRubyUtils
   # REMARK: This method doesn't assure the order of calling.
   # for example, await_all(async1, async2) calls calls2 -> calls1 often.
   def await_all(*args)
-    if args.length == 1 && args[0].is_a?(Enumerable)
-      Concurrent::Promises.zip(*(args[0])).value!
+    if args.length == 1 && args.first.is_a?(Enumerable)
+      await_all(*args.first)
     else
+      if args.any? { |arg| !arg.is_a?(Concurrent::Promises::Future) }
+        raise ArgumentError.new("All argument must be a Future: #{args}")
+      end
+
       Concurrent::Promises.zip(*args).value!
     end
   end
@@ -15,9 +19,13 @@ module Puppeteer::ConcurrentRubyUtils
   # REMARK: This method doesn't assure the order of calling.
   # for example, await_all(async1, async2) calls calls2 -> calls1 often.
   def await_any(*args)
-    if args.length == 1 && args[0].is_a?(Enumerable)
-      Concurrent::Promises.any(*(args[0])).value!
+    if args.length == 1 && args.first.is_a?(Enumerable)
+      await_any(*args.first)
     else
+      if args.any? { |arg| !arg.is_a?(Concurrent::Promises::Future) }
+        raise ArgumentError.new("All argument must be a Future: #{args}")
+      end
+
       Concurrent::Promises.any(*args).value!
     end
   end
@@ -32,7 +40,12 @@ module Puppeteer::ConcurrentRubyUtils
   end
 
   def future(&block)
-    Concurrent::Promises.future(&block)
+    Concurrent::Promises.future do
+      block.call
+    rescue => err
+      Logger.new($stderr).warn(err)
+      raise err
+    end
   end
 
   def resolvable_future(&block)

data/lib/puppeteer/launcher.rb

@@ -23,7 +23,6 @@ module Puppeteer::Launcher
         preferred_revision: preferred_revision,
         is_puppeteer_core: is_puppeteer_core,
       )
-      raise NotImplementedError.new('FirefoxLauncher is not implemented yet.')
     end
 
     Chrome.new(

data/lib/puppeteer/launcher/browser_options.rb

@@ -28,7 +28,8 @@ module Puppeteer::Launcher
     # @property {number=} slowMo
     def initialize(options)
       @ignore_https_errors = options[:ignore_https_errors] || false
-      @default_viewport = options[:default_viewport] || Puppeteer::Viewport.new(width: 800, height: 600)
+      # `default_viewport: nil` must be respected here.
+      @default_viewport = options.key?(:default_viewport) ? options[:default_viewport] : Puppeteer::Viewport.new(width: 800, height: 600)
       @slow_mo = options[:slow_mo] || 0
     end
 

data/lib/puppeteer/launcher/chrome.rb

@@ -12,9 +12,9 @@ module Puppeteer::Launcher
 
       chrome_arguments =
         if !@launch_options.ignore_default_args
-          default_args.to_a
+          default_args(options).to_a
         elsif @launch_options.ignore_default_args.is_a?(Enumerable)
-          default_args.reject do |arg|
+          default_args(options).reject do |arg|
             @launch_options.ignore_default_args.include?(arg)
           end.to_a
         else
@@ -141,11 +141,7 @@ module Puppeteer::Launcher
 
     # @return [DefaultArgs]
     def default_args(options = nil)
-      if options.nil?
-        @default_args ||= DefaultArgs.new(@chrome_arg_options)
-      else
-        DefaultArgs.new(ChromeArgOptions.new(options))
-      end
+      DefaultArgs.new(ChromeArgOptions.new(options || {}))
     end
 
     # @return [Puppeteer::Browser]
@@ -206,7 +202,7 @@ module Puppeteer::Launcher
       resolve_executable_path
     end
 
-    private def product
+    def product
       'chrome'
     end
   end

data/lib/puppeteer/launcher/firefox.rb

@@ -12,9 +12,9 @@ module Puppeteer::Launcher
 
       firefox_arguments =
         if !@launch_options.ignore_default_args
-          default_args.to_a
+          default_args(options).to_a
         elsif @launch_options.ignore_default_args.is_a?(Enumerable)
-          default_args.reject do |arg|
+          default_args(options).reject do |arg|
             @launch_options.ignore_default_args.include?(arg)
           end.to_a
         else
@@ -127,7 +127,7 @@ module Puppeteer::Launcher
       resolve_executable_path
     end
 
-    private def product
+    def product
       'firefox'
     end
 
@@ -173,11 +173,7 @@ module Puppeteer::Launcher
 
     # @return [DefaultArgs]
     def default_args(options = nil)
-      if options.nil?
-        @default_args ||= DefaultArgs.new(@chrome_arg_options)
-      else
-        DefaultArgs.new(ChromeArgOptions.new(options))
-      end
+      DefaultArgs.new(ChromeArgOptions.new(options || {}))
     end
 
     private def create_profile(extra_prefs = {})

data/lib/puppeteer/page.rb

@@ -939,16 +939,16 @@ class Puppeteer::Page
       clip = { x: 0, y: 0, width: width, height: height, scale: 1 }
 
       screen_orientation =
-        if @viewport.landscape?
+        if @viewport&.landscape?
           { angle: 90, type: 'landscapePrimary' }
         else
           { angle: 0, type: 'portraitPrimary' }
         end
       @client.send_message('Emulation.setDeviceMetricsOverride',
-        mobile: @viewport.mobile?,
+        mobile: @viewport&.mobile? || false,
         width: width,
         height: height,
-        deviceScaleFactor: @viewport.device_scale_factor,
+        deviceScaleFactor: @viewport&.device_scale_factor || 1,
         screenOrientation: screen_orientation)
     end
 

data/lib/puppeteer/version.rb

@@ -1,3 +1,3 @@
 class Puppeteer
-  VERSION = '0.0.21'
+  VERSION = '0.0.22'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppeteer-ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.21
+  version: 0.0.22
 platform: ruby
 authors:
 - YusukeIwaki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-26 00:00:00.000000000 Z
+date: 2020-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby