grover 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c6a07a0ade8c23210286b3501d87f9634c7f66d
-  data.tar.gz: 149a9096b926444174cd1c4ef1b2425bac25ea9f
+  metadata.gz: 90037348478ac60c7205f57ff6b3fc2013c2cebc
+  data.tar.gz: 9b8762974d7b150b0056495ddd4a116719849ffc
 SHA512:
-  metadata.gz: 6ba6d666daec6b31fabb7484ad74c00787b18184ccb583c6c71fc923c0ac7ee6b9557d45a06a89e0627426af2ad11c2d886970a1eb7776f976d799d8f9280108
-  data.tar.gz: a7d4fd2f0b140f37b3c3cb5f7d33abcfb67cbe414c6eb79caf9c1ac10f954dfc46f7233e5df04ff3b946a6b1bd6433d1d74ca2bc1713246d4b5bf921ce02f338
+  metadata.gz: 4b7cfa2449f703ca0ee14cea8560c051d8f81997f439d90a2d733b622addfc493c9224af8684b6ef0f4bcfa0dd8a7fbad4ced12bd6490d237099b7b26cd5aafc
+  data.tar.gz: d37e206d291939ef8771e5ca2999a462aa952ddc266237c54544b99a65f381eab9b656a41e82c1f2da0ceffe1fb7b0e61aa98eb6533b9342b59b2f37c4667b7f

data/lib/grover.rb

@@ -6,6 +6,7 @@ require 'grover/middleware'
 require 'grover/configuration'
 
 require 'schmooze'
+require 'nokogiri'
 
 #
 # Grover interface for converting HTML to PDF
@@ -112,8 +113,14 @@ class Grover
     Processor.new(root_path)
   end
 
-  def options_with_template_fix
+  def base_options
     options = @options.dup
+    options.merge! meta_options unless url_source?
+    options
+  end
+
+  def options_with_template_fix
+    options = base_options
     display_url = options.delete :display_url
     if display_url
       options[:footer_template] ||= DEFAULT_FOOTER_TEMPLATE
@@ -128,27 +135,46 @@ class Grover
 
   def normalized_options(path)
     options = Utils.normalize_object options_with_template_fix
-    options.merge! meta_options unless url_source?
+    fix_boolean_options! options
+    fix_numeric_options! options
     options['path'] = path if path
     options
   end
 
+  def fix_boolean_options!(options)
+    %w[displayHeaderFooter printBackground landscape preferCSSPageSize].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_numeric_options!(options)
+    return unless options.key? 'scale'
+    options['scale'] = options['scale'].to_f
+  end
+
   #
   # Extract out options from meta tags in the source - based on code from PDFKit project
   #
   def meta_options
     meta_opts = {}
 
-    @url.scan(/<meta [^>]*>/) do |meta|
-      tag_name = meta[/name=["']#{Grover.configuration.meta_tag_prefix}([a-z_-]+)["']/, 1]
-      next if tag_name.nil?
+    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=["']([^"']+)["']/, 1]
+      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(/^http/i)
   end

data/lib/grover/version.rb

@@ -1,3 +1,3 @@
 class Grover
-  VERSION = '0.4.1'.freeze
+  VERSION = '0.4.2'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grover
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Andrew Bromwich
@@ -10,6 +10,20 @@ bindir: bin
 cert_chain: []
 date: 2018-09-08 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.8.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.8.4
 - !ruby/object:Gem::Dependency
   name: schmooze
   requirement: !ruby/object:Gem::Requirement