jekyll-pdf 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f528a86edb39066d05296d4e90d9daec587fbe3a
-  data.tar.gz: d7bae1c70e0528ce1b2db37637a0d50c3e8c8d29
+  metadata.gz: c0f8bd549af93a1701ca9536fe0ff023c65226ad
+  data.tar.gz: eb4af933b53461dd4560dd0ca2a7c5022cb0216e
 SHA512:
-  metadata.gz: 8799316ad79950136609dc1ec7a2040a81f50462d9d22692ce504f4fde00b7ae46ce1900b9b8d11980a08381b4d792514e28aaf4385be238bf65dd099a3dddf3
-  data.tar.gz: 52d509a1be9525b904a393838f4b50c44d808a3df5de4f25833283ba4bcb03aabd7c43db1c39ce289f7ef7d8e9d3f5cbdaa42020cf05ff670f2fed589f5a10e6
+  metadata.gz: 8003730882c935204be9e2069a0b9706cd04f91c19daccc5e50c9ce9cd9c5b47436703449c0113a84f9ce5bafe08fe51769a3507e7b26d429523d726fc94110c
+  data.tar.gz: 1afb93d28dc6978a01f2502339ef319d203c59fb7d042b256c197b6d041f021b260aab1f76907f78771e4a5852b3569c0fdea4d2efed77129f0f300d0e8e5ce0

data/README.md

@@ -99,7 +99,7 @@ For asset URLs in CSS files we recommend creating a separate CSS file overriding
 
 ## To Do
 
-- Remove dependencies for ActiveSupport & PDFKit
+- Remove PDFKit Dependency
 - Write tests (rspec)
 - Package default PDF layout file in Gem
 - Support layouts in partials

data/lib/jekyll/pdf/document.rb

@@ -1,99 +1,99 @@
 require 'pdfkit'
-    
+
 module Jekyll
   module PDF
     class Document < Jekyll::Page
       include Helper
-      
+
       def initialize(site, base, page)
         @site = site
         @base = base
         @dir = File.dirname(page.url)
         @name = File.basename(page.url, File.extname(page.url)) + ".pdf"
-        @settings = site.config['pdf'] || {}
+        @settings = site.config['pdf'].clone || {}
         @partials = ['cover','header_html','footer_html']
-      
+
         self.process(@name)
         self.data = page.data.clone
         self.content = page.content.clone
-        
+
         # Set layout to the PDF layout
         self.data['layout'] = layout
-        
+
         # Get PDF settings from the layouts
         Jekyll::Utils.deep_merge_hashes!(@settings, self.getConfig(self.data))
-        
+
         PDFKit.configure do |config|
           config.verbose = site.config['verbose']
         end
-        
+
         # Set pdf_url variable in the source page (for linking to the PDF version)
         page.data['pdf_url'] = self.url
-        
+
         # Set html_url variable in the source page (for linking to the HTML version)
         self.data['html_url'] = page.url
-        
+
         # create the partial objects
         @partials.each do |partial|
           @settings[partial] = Jekyll::PDF::Partial.new(self, @settings[partial]) if @settings[partial] != nil
         end
       end
-      
+
       # Recursively merge settings from the page, layout, site config & jekyll-pdf defaults
       # todo: use jekyll's merge function
       def getConfig(data)
         settings = data['pdf'].is_a?(Hash) ? data['pdf'] : {}
         layout = @site.layouts[data['layout']].data.clone if data['layout'] != nil
-        
+
         # No parent layout found - return settings hash
         return settings if layout == nil
-        
+
         # Merge settings with parent layout settings
         layout['pdf'] ||= {}
         Jekyll::Utils.deep_merge_hashes!(layout['pdf'], settings)
-        
+
         return self.getConfig(layout)
       end
-      
+
       def write(dest_prefix, dest_suffix = nil)
         self.render(@site.layouts, @site.site_payload) if self.output == nil
-        
+
         path = File.join(dest_prefix, CGI.unescape(self.url))
         dest = File.dirname(path)
-        
+
         # Create directory
         FileUtils.mkdir_p(dest) unless File.exist?(dest)
-        
+
         # write partials
         @partials.each do |partial|
           @settings[partial].write if @settings[partial] != nil
         end
-        
+
         # Debugging - create html version of PDF
         File.open("#{path}.html", 'w') {|f| f.write(self.output) } if @settings["debug"]
         @settings.delete("debug")
-        
+
         # Build PDF file
         fix_relative_paths
         kit = PDFKit.new(self.output, @settings)
         file = kit.to_file(path)
-        
+
         #self.output = kit.to_pdf
       end
-      
+
       def layout()
         # Set page layout to the PDF layout
         layout = self.data['pdf_layout'] || @settings['layout']
-        
+
         # Check if a PDF version exists for the current layout (e.g. layout_pdf)
         if layout == nil && self.data['layout'] != nil && File.exist?("_layouts/" + self.data['layout'] + "_pdf.html")
-          layout = self.data['layout'] + "_pdf" 
+          layout = self.data['layout'] + "_pdf"
         end
-        
+
         layout || 'pdf'
       end
-      
+
     end
-  
+
   end
 end

data/lib/jekyll/pdf/generator.rb

@@ -3,7 +3,7 @@ module Jekyll
     class Generator < Jekyll::Generator
       safe true
       priority :lowest
-  
+
       def generate(site)
         # Loop through pages & documents and build PDFs
         [site.pages, site.documents].each do |items|
@@ -12,7 +12,7 @@ module Jekyll
           end
         end
       end
-      
+
     end
   end
 end

data/lib/jekyll/pdf/partial.rb

@@ -5,16 +5,17 @@ module Jekyll
   module PDF
     class Partial
       extend Forwardable
-  
+      include Helper
+
       attr_accessor :doc
       attr_accessor :partial
       attr_accessor :write
       attr_accessor :content, :ext
       attr_writer   :output
-  
+
       def_delegators :@doc, :site, :name, :ext, :relative_path, :extname,
                             :render_with_liquid?, :collection, :related_posts
-  
+
       # Initialize this Partial instance.
       #
       # doc - The Document.
@@ -25,7 +26,7 @@ module Jekyll
         self.partial = partial
         self.content = build_partial(partial)
       end
-  
+
       # Fetch YAML front-matter data from related doc, without layout key
       #
       # Returns Hash of doc data
@@ -34,97 +35,98 @@ module Jekyll
         @data.delete("layout")
         @data
       end
-  
+
       def trigger_hooks(*)
       end
-      
+
       def path
         File.join(doc.path, partial)
       end
-      
+
       def id
         File.basename(path, File.extname(path)) + "-" + Digest::MD5.hexdigest(to_s) + File.extname(path)
       end
-      
+
       # Returns the cache directory
       def dir
         @dir ||= cache_dir
       end
-  
+
       def to_s
         output || content
       end
-  
+
       def to_liquid
         doc.data[partial] = nil
         @to_liquid ||= doc.to_liquid
         doc.data[partial] = self
         @to_liquid
       end
-  
+
       # Returns the shorthand String identifier of this doc.
       def inspect
         "<Partial: #{self.id}>"
       end
-  
+
       def output
         @output ||= Renderer.new(doc.site, self, site.site_payload).run
       end
-      
+
       # generate temp file & set output to it's path
       def write
         tempfile = File.absolute_path(File.join(dir, id))
         unless File.exist?(tempfile)
           FileUtils.mkdir_p(File.dirname(tempfile)) unless File.exist?(File.dirname(tempfile))
+          fix_relative_paths
           File.open(tempfile, 'w') {|f| f.write(to_s) }
         end
         @output = tempfile
-        
+
         # store path for cleanup
         site.data[:jekyll_pdf_partials] ||= []
         site.data[:jekyll_pdf_partials] << "#{self}"
       end
-  
+
       def place_in_layout?
         false
       end
-  
+
       protected
-      
+
       def cache_dir
         return site.config["pdf"]["cache"] if site.config["pdf"] != nil && site.config["pdf"].has_key?('cache')
-        
+
         # Use jekyll-assets cache directory if it exists
         cache_dir = site.config["assets"]["cache"] || '.asset-cache' if site.config["assets"] != nil
-        
+
         File.join(cache_dir || Dir.tmpdir(), 'pdf')
       end
-  
+
       # Internal: Generate partial html
       #
       # Partials are rendered same time as content is rendered.
       #
       # Returns partial html String
       def build_partial(path)
-        
+
         # vars to insert into partial
         vars = ['frompage','topage','page','webpage','section','subsection','subsubsection']
         doc.data["pdf"] = {}
         vars.each { |var| doc.data["pdf"][var] = "<span class='__#{var}'></span>" }
-        
+
         # JavaScript to replace var placeholders with content
         script = "<script>!function(){var t={},n=document.location.search.substring(1).split('&');for(var e in n){var o=n[e].split('=',2);t[o[0]]=decodeURIComponent(o[1])}var n=#{vars};for(var e in n)for(var r=document.getElementsByClassName('__'+n[e]),a=0;a<r.length;++a)r[a].textContent=t[n[e]]}();</script>\n"
-        
+
         # Parse & render
         content = File.read(File.join("_includes", path))
-        
+
         # Add replacer script to body
         if content =~ /<\/body>/i
           content[/(<\/body>)/i] = script + content[/(<\/body>)/i]
         else
           Jekyll.logger.warn  <<-eos
   Couldn't find <body> in #{path}. Make sure your partial is a properly formatted HTML document (including DOCTYPE) e.g.
-  
+
   <!DOCTYPE html>
   <html>
   <head>
@@ -145,9 +147,9 @@ module Jekyll
   </html>
   }
         end
-        
+
         content
-        
+
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-pdf
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Adam Bouqdib
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-31 00:00:00.000000000 Z
+date: 2016-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: wkhtmltopdf-installer
@@ -86,8 +86,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
-description: |2
-      A Jekyll plugin, that allows you to create PDF versions of your pages & documents.
+description: "    A Jekyll plugin, that allows you to create PDF versions of your
+  pages & documents.\n"
 email:
 - adam@abemedia.co.uk
 executables: []
@@ -125,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: PDF generator for Jekyll