pdfkit 0.3.2 → 0.3.3

data/Rakefile

@@ -10,7 +10,6 @@ begin
     gem.email = "jared@codewordstudios.com"
     gem.homepage = "http://github.com/jdpace/PDFKit"
     gem.authors = ["jdpace"]
-    gem.add_dependency "activesupport"
     gem.add_development_dependency "rspec", "~> 2.0.0.beta.8"
     gem.add_development_dependency "rspec-core", "~> 2.0.0.beta.8"
     gem.add_development_dependency 'mocha'

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.3.3

data/lib/pdfkit.rb

@@ -1,6 +1,4 @@
 require 'rubygems'
-require 'active_support/core_ext'
-require 'active_support/inflector'
 require 'pdfkit/source'
 require 'pdfkit/pdfkit'
 require 'pdfkit/middleware'

data/lib/pdfkit/pdfkit.rb

@@ -28,9 +28,9 @@ class PDFKit
       :margin_bottom => '0.75in',
       :margin_left => '0.75in'
     }
-    @options = normalize_options(options.reverse_merge(default_options))
+    @options = normalize_options(default_options.merge(options))
     
-    raise NoExecutableError.new if wkhtmltopdf.blank?
+    raise NoExecutableError.new if wkhtmltopdf.nil? || wkhtmltopdf == ''
   end
   
   def command
@@ -89,11 +89,25 @@ class PDFKit
       normalized_options = {}
       options.each do |key, value|
         next if !value
-        normalized_key = "--#{key.to_s.downcase.dasherize}"
-        normalized_value = value.is_a?(TrueClass) ? nil : value
-        normalized_options[normalized_key] = normalized_value
+        normalized_key = "--#{normalize_arg key}"
+        normalized_options[normalized_key] = normalize_value(value)
       end
       normalized_options
     end
+    
+    def normalize_arg(arg)
+      arg.to_s.downcase.gsub(/[^a-z0-9]/,'-')
+    end
+    
+    def normalize_value(value)
+      case value
+      when TrueClass
+        nil
+      when String
+        value.match(/\s/) ? "\"#{value}\"" : value
+      else
+        value
+      end
+    end
   
 end

data/pdfkit.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{pdfkit}
-  s.version = "0.3.2"
+  s.version = "0.3.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["jdpace"]
@@ -55,18 +55,15 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activesupport>, [">= 0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.0.0.beta.8"])
       s.add_development_dependency(%q<rspec-core>, ["~> 2.0.0.beta.8"])
       s.add_development_dependency(%q<mocha>, [">= 0"])
     else
-      s.add_dependency(%q<activesupport>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 2.0.0.beta.8"])
       s.add_dependency(%q<rspec-core>, ["~> 2.0.0.beta.8"])
       s.add_dependency(%q<mocha>, [">= 0"])
     end
   else
-    s.add_dependency(%q<activesupport>, [">= 0"])
     s.add_dependency(%q<rspec>, ["~> 2.0.0.beta.8"])
     s.add_dependency(%q<rspec-core>, ["~> 2.0.0.beta.8"])
     s.add_dependency(%q<mocha>, [">= 0"])

data/spec/PDFKit_spec.rb

@@ -42,9 +42,22 @@ describe PDFKit do
   
   context "command" do
     it "should contstruct the correct command" do
-      pdfkit = PDFKit.new('html', :page_size => 'Letter')
+      pdfkit = PDFKit.new('html', :page_size => 'Letter', :toc_l1_font_size => 12)
       pdfkit.command.should include('wkhtmltopdf')
       pdfkit.command.should include('--page-size Letter')
+      pdfkit.command.should include('--toc-l1-font-size 12')
+    end
+    
+    it "will not include default options it is told to omit" do
+      pdfkit = PDFKit.new('html')
+      pdfkit.command.should include('--disable-smart-shrinking')
+      pdfkit = PDFKit.new('html', :disable_smart_shrinking => false)
+      pdfkit.command.should_not include('--disable-smart-shrinking')
+    end
+    
+    it "should encapsulate string arguments in quotes" do
+      pdfkit = PDFKit.new('html', :header_center => "foo [page]")
+      pdfkit.command.should include('--header-center "foo [page]"')
     end
     
     it "read the source from stdin if it is html" do

data/spec/pdfkit_spec.rb

@@ -42,9 +42,22 @@ describe PDFKit do
   
   context "command" do
     it "should contstruct the correct command" do
-      pdfkit = PDFKit.new('html', :page_size => 'Letter')
+      pdfkit = PDFKit.new('html', :page_size => 'Letter', :toc_l1_font_size => 12)
       pdfkit.command.should include('wkhtmltopdf')
       pdfkit.command.should include('--page-size Letter')
+      pdfkit.command.should include('--toc-l1-font-size 12')
+    end
+    
+    it "will not include default options it is told to omit" do
+      pdfkit = PDFKit.new('html')
+      pdfkit.command.should include('--disable-smart-shrinking')
+      pdfkit = PDFKit.new('html', :disable_smart_shrinking => false)
+      pdfkit.command.should_not include('--disable-smart-shrinking')
+    end
+    
+    it "should encapsulate string arguments in quotes" do
+      pdfkit = PDFKit.new('html', :header_center => "foo [page]")
+      pdfkit.command.should include('--header-center "foo [page]"')
     end
     
     it "read the source from stdin if it is html" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: pdfkit
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 3
-  - 2
-  version: 0.3.2
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - jdpace
@@ -18,24 +18,10 @@ cert_chain: []
 date: 2010-06-18 00:00:00 -04:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: activesupport
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -49,11 +35,11 @@ dependencies:
         - 8
         version: 2.0.0.beta.8
   type: :development
-  version_requirements: *id002
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rspec-core
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -67,11 +53,11 @@ dependencies:
         - 8
         version: 2.0.0.beta.8
   type: :development
-  version_requirements: *id003
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: mocha
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -81,7 +67,7 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id004
+  version_requirements: *id003
 description: Uses wkhtmltopdf to create PDFs using HTML
 email: jared@codewordstudios.com
 executables: