grover 0.11.2 → 0.11.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49891589eac94bdb0602aefdeaf488bd7df1c40c69c75da1eee473016cb6eefc
-  data.tar.gz: 14b8fd25ee3eafaa76f5b5da6f0591c9cfe8af077ff042f6e2b804e1c12b7e70
+  metadata.gz: 12e04baf78ab0c0339d181c17bdb5c4d9678633c81497e4764cbe9db95b23d1d
+  data.tar.gz: a8333251651e40035fef07784c45e4a9f4e8ae7e2d4c13ac6c7fa98b3bf0667e
 SHA512:
-  metadata.gz: e140285264c56edc46390938f72ff0cd402285a81040c011fac94a2b019753357b238b7a0bc869c0d1e3e741857f21bb5446b51de1fe5f920aba722f23ecb3bc
-  data.tar.gz: 6db55a620a3099e945d31fe0da78ca4d73396c2d2544e0985d836595f4d63620e9856388fa8525b328322125b820738a76931cd348d562974f3e0e1fa82c3b3c
+  metadata.gz: 05e07a53425a21e8e17026e75348cfd8ccbe0a6d8daba269a01d5d825a632fb8b260c6529c74eb023babefd8c8e8cce4105e915ddca1084c2c7a1e03ca492747
+  data.tar.gz: 5d732c36ff47b07abe30f32dd2544f264d0e68c09789b4c00da06af9dbbc0c8576aef25cc245d7fc606b358446169e985bde9f710499b1379019bbefc850a1be

data/lib/grover.rb

@@ -8,6 +8,7 @@ require 'active_support_ext/object/deep_dup' unless defined?(ActiveSupport)
 require 'grover/html_preprocessor'
 require 'grover/middleware'
 require 'grover/configuration'
+require 'grover/options_builder'
 
 require 'nokogiri'
 require 'schmooze'
@@ -151,8 +152,7 @@ class Grover
   #
   def initialize(url, options = {})
     @url = url
-    @options = combine_options options
-
+    @options = OptionsBuilder.new(options, url)
     @root_path = @options.delete 'root_path'
     @front_cover_path = @options.delete 'front_cover_path'
     @back_cover_path = @options.delete 'back_cover_path'
@@ -258,73 +258,6 @@ class Grover
     Processor.new(root_path)
   end
 
-  def combine_options(options)
-    combined = Utils.deep_stringify_keys Grover.configuration.options
-    Utils.deep_merge! combined, Utils.deep_stringify_keys(options)
-    Utils.deep_merge! combined, meta_options unless url_source?
-
-    fix_boolean_options! combined
-    fix_integer_options! combined
-    fix_float_options! combined
-    fix_array_options! combined
-
-    combined
-  end
-
-  #
-  # Extract out options from meta tags in the source - based on code from PDFKit project
-  #
-  def meta_options
-    meta_opts = {}
-
-    meta_tags.each do |meta|
-      tag_name = meta['name'] && meta['name'][/#{Grover.configuration.meta_tag_prefix}([a-z_-]+)/, 1]
-      next unless tag_name
-
-      Utils.deep_assign meta_opts, tag_name.split('-'), meta['content']
-    end
-
-    meta_opts
-  end
-
-  def meta_tags
-    Nokogiri::HTML(@url).xpath('//meta')
-  end
-
-  def url_source?
-    @url.match(/\Ahttp/i)
-  end
-
-  def fix_boolean_options!(options)
-    %w[display_header_footer print_background landscape prefer_css_page_size].each do |opt|
-      next unless options.key? opt
-
-      options[opt] = !FALSE_VALUES.include?(options[opt])
-    end
-  end
-
-  FALSE_VALUES = [nil, false, 0, '0', 'f', 'F', 'false', 'FALSE', 'off', 'OFF'].freeze
-
-  def fix_integer_options!(options)
-    ['viewport.width', 'viewport.height'].each do |opt|
-      keys = opt.split('.')
-      Utils.deep_assign(options, keys, options.dig(*keys).to_i) if options.dig(*keys)
-    end
-  end
-
-  def fix_float_options!(options)
-    ['viewport.device_scale_factor', 'scale'].each do |opt|
-      keys = opt.split('.')
-      Utils.deep_assign(options, keys, options.dig(*keys).to_f) if options.dig(*keys)
-    end
-  end
-
-  def fix_array_options!(options)
-    return unless options['launch_args'].is_a? String
-
-    options['launch_args'] = YAML.safe_load options['launch_args']
-  end
-
   def normalized_options(path:)
     normalized_options = Utils.normalize_object @options
     normalized_options['path'] = path if path.is_a? ::String

data/lib/grover/options_builder.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+require 'grover/utils'
+require 'grover/options_fixer'
+
+class Grover
+  #
+  # Build options from Grover.configuration, meta_options, and passed-in options
+  #
+  class OptionsBuilder < Hash
+    def initialize(options, url)
+      @url = url
+      combined = grover_configuration
+      Utils.deep_merge! combined, Utils.deep_stringify_keys(options)
+      Utils.deep_merge! combined, meta_options unless url_source?
+
+      update OptionsFixer.new(combined).run
+    end
+
+    private
+
+    def grover_configuration
+      Utils.deep_stringify_keys Grover.configuration.options
+    end
+
+    #
+    # Extract out options from meta tags in the source - based on code from PDFKit project
+    #
+    def meta_options
+      meta_opts = {}
+
+      meta_tags.each do |meta|
+        tag_name = meta['name'] && meta['name'][/#{Grover.configuration.meta_tag_prefix}([a-z_-]+)/, 1]
+        next unless tag_name
+
+        Utils.deep_assign meta_opts, tag_name.split('-'), meta['content']
+      end
+
+      meta_opts
+    end
+
+    def meta_tags
+      Nokogiri::HTML(@url).xpath('//meta')
+    end
+
+    def url_source?
+      @url.match(/\Ahttp/i)
+    end
+  end
+end

data/lib/grover/options_fixer.rb

@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+require 'grover/utils'
+
+class Grover
+  #
+  # Convert string option values to boolean, numeric, and array literals
+  #
+  class OptionsFixer
+    FALSE_VALUES = [nil, false, 0, '0', 'f', 'F', 'false', 'FALSE', 'off', 'OFF'].freeze
+
+    def initialize(options)
+      @options = options
+    end
+
+    def run
+      fix_boolean_options!
+      fix_integer_options!
+      fix_float_options!
+      fix_array_options!
+      @options
+    end
+
+    private
+
+    def fix_options!(*option_paths)
+      option_paths.each do |option_path|
+        keys = option_path.split '.'
+        value = @options.dig(*keys)
+        Utils.deep_assign(@options, keys, yield(value)) if value
+      end
+    end
+
+    def fix_boolean_options!
+      fix_options!(
+        'display_header_footer', 'full_page', 'landscape', 'omit_background', 'prefer_css_page_size',
+        'print_background', 'viewport.has_touch', 'viewport.is_landscape', 'viewport.is_mobile'
+      ) { |value| !FALSE_VALUES.include?(value) }
+    end
+
+    def fix_integer_options!
+      fix_options!(
+        'viewport.height', 'viewport.width',
+        &:to_i
+      )
+    end
+
+    def fix_float_options!
+      fix_options!(
+        'clip.height', 'clip.width', 'clip.x', 'clip.y', 'quality', 'scale', 'viewport.device_scale_factor',
+        &:to_f
+      )
+    end
+
+    def fix_array_options!
+      fix_options!('launch_args') do |value|
+        value.is_a?(String) ? YAML.safe_load(value) : value
+      end
+    end
+  end
+end

data/lib/grover/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class Grover
-  VERSION = '0.11.2'
+  VERSION = '0.11.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grover
 version: !ruby/object:Gem::Version
-  version: 0.11.2
+  version: 0.11.3
 platform: ruby
 authors:
 - Andrew Bromwich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-16 00:00:00.000000000 Z
+date: 2020-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: combine_pdf
@@ -157,6 +157,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.17'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.18'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -164,6 +167,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.17'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.18'
 description: Transform HTML into PDF/PNG/JPEG using Google Puppeteer/Chromium
 email:
 - abromwich@studiosity.com
@@ -177,6 +183,8 @@ files:
 - lib/grover/configuration.rb
 - lib/grover/html_preprocessor.rb
 - lib/grover/middleware.rb
+- lib/grover/options_builder.rb
+- lib/grover/options_fixer.rb
 - lib/grover/utils.rb
 - lib/grover/version.rb
 homepage: https://github.com/Studiosity/grover
@@ -198,8 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: A Ruby gem to transform HTML into PDF, PNG or JPEG by wrapping the NodeJS