pdfkit 0.4.0 → 0.4.1

data/README.md

@@ -42,6 +42,10 @@ If you're on Windows or you installed wkhtmltopdf by hand to a location other th
     # config/initializers/pdfkit.rb
     PDFKit.configure do |config|
       config.wkhtmltopdf = '/path/to/wkhtmltopdf'
+      config.default_options = {
+        :page_size => 'Legal',
+        :print_media_type => true
+      }
     end
 
 ## Middleware

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.4.1

data/lib/pdfkit/configuration.rb

@@ -1,10 +1,18 @@
 class PDFKit
   class Configuration
-    attr_accessor :meta_tag_prefix, :wkhtmltopdf
+    attr_accessor :meta_tag_prefix, :wkhtmltopdf, :default_options
 
     def initialize
       @meta_tag_prefix = 'pdfkit-'
       @wkhtmltopdf = '/usr/local/bin/wkhtmltopdf'
+      @default_options = {
+        :disable_smart_shrinking => true,
+        :page_size => 'Letter',
+        :margin_top => '0.75in',
+        :margin_right => '0.75in',
+        :margin_bottom => '0.75in',
+        :margin_left => '0.75in'
+      }
     end
   end
 

data/lib/pdfkit/middleware.rb

@@ -23,11 +23,10 @@ class PDFKit
         body = pdf.to_pdf
         
         # Do not cache PDFs
-        puts "DELETING CACHING"
         headers.delete('ETag')
         headers.delete('Cache-Control')
         
-        headers["Content-Length"] = body.bytes.to_a.size.to_s
+        headers["Content-Length"] = (body.respond_to?(:bytesize) ? body.bytesize : body.size).to_s
         headers["Content-Type"] = "application/pdf"
         
         response = [body]

data/lib/pdfkit/pdfkit.rb

@@ -21,21 +21,9 @@ class PDFKit
     @source = Source.new(url_file_or_html)
     
     @stylesheets = []
-    
-    default_options = {
-      :disable_smart_shrinking => true,
-      :page_size => 'Letter',
-      :margin_top => '0.75in',
-      :margin_right => '0.75in',
-      :margin_bottom => '0.75in',
-      :margin_left => '0.75in'
-    }
 
-    @options = options.dup
-    unless source.url?
-      @options.merge! find_options_in_meta(url_file_or_html)
-    end
-    @options = normalize_options(default_options.merge(@options))
+    @options = normalize_options(PDFKit.configuration.default_options.merge(options))
+    @options.merge! find_options_in_meta(url_file_or_html) unless source.url?
     
     raise NoExecutableError.new unless File.exists?(PDFKit.configuration.wkhtmltopdf)
   end
@@ -130,7 +118,7 @@ class PDFKit
       when TrueClass
         nil
       else
-        value
+        value.to_s
       end
     end
   

data/pdfkit.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{pdfkit}
-  s.version = "0.4.0"
+  s.version = "0.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["jdpace"]
-  s.date = %q{2010-07-16}
+  s.date = %q{2010-07-19}
   s.default_executable = %q{pdfkit}
   s.description = %q{Uses wkhtmltopdf to create PDFs using HTML}
   s.email = %q{jared@codewordstudios.com}

data/spec/pdfkit_spec.rb

@@ -45,7 +45,7 @@ describe PDFKit do
       pdfkit = PDFKit.new('html', :page_size => 'Letter', :toc_l1_font_size => 12)
       pdfkit.command[0].should include('wkhtmltopdf')
       pdfkit.command[pdfkit.command.index('--page-size') + 1].should == 'Letter'
-      pdfkit.command[pdfkit.command.index('--toc-l1-font-size') + 1].should == 12
+      pdfkit.command[pdfkit.command.index('--toc-l1-font-size') + 1].should == '12'
     end
     
     it "will not include default options it is told to omit" do
@@ -90,6 +90,18 @@ describe PDFKit do
       pdf[0...4].should == "%PDF" # PDF Signature at beginning of file
     end
     
+    it "should generate a PDF with a numerical parameter" do
+      pdfkit = PDFKit.new('html', :header_spacing => 1)
+      pdf = pdfkit.to_pdf
+      pdf[0...4].should == "%PDF" # PDF Signature at beginning of file
+    end
+    
+    it "should generate a PDF with a symbol parameter" do
+      pdfkit = PDFKit.new('html', :page_size => :Letter)
+      pdf = pdfkit.to_pdf
+      pdf[0...4].should == "%PDF" # PDF Signature at beginning of file
+    end
+    
     it "should have the stylesheet added to the head if it has one" do
       pdfkit = PDFKit.new("<html><head></head><body>Hai!</body></html>")
       css = File.join(SPEC_ROOT,'fixtures','example.css')

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: pdfkit
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 0
   - 4
-  - 0
-  version: 0.4.0
+  - 1
+  version: 0.4.1
 platform: ruby
 authors: 
 - jdpace
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-16 00:00:00 -04:00
+date: 2010-07-19 00:00:00 -04:00
 default_executable: pdfkit
 dependencies: 
 - !ruby/object:Gem::Dependency