grover 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0b1ac4d5fc56686d55aa46a802c393e8458fd93
-  data.tar.gz: f5f24d27564b772b333e9a4103d0f212ad15c0e0
+  metadata.gz: 21fdefff2c21b5341c4d824e0fd2b1a497f23636
+  data.tar.gz: 423949075eecb0abd2ba0ac9fa77493fa7131861
 SHA512:
-  metadata.gz: 021426b86e6e7c2bf1b44f93f5d5b98953266c8e66be9731ddae6d08191240c16f26fce04eccbb705ede46bbe0f53592b53c17a083d6bc3c4bde0d5d07ee2090
-  data.tar.gz: 9db725e6bdb5d2616a9700b131de4c9e81b9e808ec0a48494650d50e3a7358af49c7bad1af8f5c58c58f3e555ece656926f79803e13785cc8ad1ebd2e7858f15
+  metadata.gz: a5a62083e5deabebf8728033b0519d1ffadc7cd08683a5d1ad85e25fe490d83113d41db34db24bde1f4b89c0c709e0b46e424ee02ca23d96ff82f8fe79911e6d
+  data.tar.gz: 6fad9c43307155729a8425d1553953ae1ce22e75a2a12f7f6d6aa7c755e18339130205b36e9dbe3f379ac0a0e0b3bb1ff1c2e8b63ead6867669b9c64332cd789

data/lib/grover.rb

@@ -114,47 +114,12 @@ class Grover
   end
 
   def base_options
-    options = @options.dup
+    options = {}
+    @options.each { |k, v| options[k.to_s] = v }
     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
-
-      %i[header_template footer_template].each do |key|
-        next unless options[key].is_a? String
-        options[key] = options[key].gsub(DISPLAY_URL_PLACEHOLDER, display_url)
-      end
-    end
-    options
-  end
-
-  def normalized_options(path)
-    options = Utils.normalize_object options_with_template_fix
-    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
   #
@@ -178,4 +143,44 @@ class Grover
   def url_source?
     @url.match(/^http/i)
   end
+
+  def normalized_options(path)
+    options = base_options
+
+    fix_templates! options
+    fix_boolean_options! options
+    fix_numeric_options! options
+    options['path'] = path if path
+
+    Utils.normalize_object options
+  end
+
+  def fix_templates!(options)
+    display_url = options.delete 'display_url'
+    return unless display_url
+
+    options['footer_template'] ||= DEFAULT_FOOTER_TEMPLATE
+
+    %w[header_template footer_template].each do |key|
+      next unless options[key].is_a? String
+
+      options[key] = options[key].gsub(DISPLAY_URL_PLACEHOLDER, display_url)
+    end
+  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_numeric_options!(options)
+    return unless options.key? 'scale'
+
+    options['scale'] = options['scale'].to_f
+  end
 end

data/lib/grover/middleware.rb

@@ -83,6 +83,7 @@ class Grover
 
     def path_without_extension
       return @path_without_extension if defined? @path_without_extension
+
       path = @request.path.sub(PDF_REGEX, '')
       @path_without_extension = path.sub(@request.script_name, '')
     end

data/lib/grover/version.rb

@@ -1,3 +1,3 @@
 class Grover
-  VERSION = '0.4.3'.freeze
+  VERSION = '0.4.4'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grover
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Andrew Bromwich
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.4
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.4
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: schmooze
   requirement: !ruby/object:Gem::Requirement
@@ -150,7 +150,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.15'
-description: A Ruby gem to transform HTML into PDFs using Google Puppeteer/Chromium
+description: Transform HTML into PDFs using Google Puppeteer/Chromium
 email:
 - abromwich@studiosity.com
 executables: []