wisepdf 1.2.1 → 1.2.2

data/VERSION

@@ -1 +1 @@
-1.2.1
+1.2.2

data/lib/wisepdf/render.rb

@@ -41,12 +41,12 @@ module Wisepdf
     end
     
     def default_pdf_render_options
-      Wisepdf::Configuration.options.merge({
+      {
         :wkhtmltopdf => nil,
         :layout => false,
         :template => "#{controller_path}/#{action_name}",
-        :disposition => "inline"              
-      })
+        :disposition => "inline"                      
+      }.merge(Wisepdf::Configuration.options)
     end
     
     def make_pdf(options = {})

data/wisepdf.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "wisepdf"
-  s.version = "1.2.1"
+  s.version = "1.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Igor Alexandrov"]
-  s.date = "2012-05-03"
+  s.date = "2012-05-06"
   s.description = "wisepdf uses the shell utility wkhtmltopdf to serve a PDF file to a user from HTML. In other words, rather than dealing with a PDF generation DSL of some sort, you simply write an HTML view as you would normally, and let pdf take care of the hard stuff."
   s.email = "igor.alexandrov@gmail.com"
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wisepdf
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-03 00:00:00.000000000 Z
+date: 2012-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70221725411520 !ruby/object:Gem::Requirement
+  requirement: &70245578856940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70221725411520
+  version_requirements: *70245578856940
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70221725410940 !ruby/object:Gem::Requirement
+  requirement: &70245578855940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70221725410940
+  version_requirements: *70245578855940
 - !ruby/object:Gem::Dependency
   name: wkhtmltopdf-binary
-  requirement: &70221725410340 !ruby/object:Gem::Requirement
+  requirement: &70245578876880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70221725410340
+  version_requirements: *70245578876880
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70221725409480 !ruby/object:Gem::Requirement
+  requirement: &70245578874920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70221725409480
+  version_requirements: *70245578874920
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70221725407920 !ruby/object:Gem::Requirement
+  requirement: &70245578874220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70221725407920
+  version_requirements: *70245578874220
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70221725407360 !ruby/object:Gem::Requirement
+  requirement: &70245578873500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,7 +76,7 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70221725407360
+  version_requirements: *70245578873500
 description: wisepdf uses the shell utility wkhtmltopdf to serve a PDF file to a user
   from HTML. In other words, rather than dealing with a PDF generation DSL of some
   sort, you simply write an HTML view as you would normally, and let pdf take care
@@ -176,7 +176,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2311109132846177263
+      hash: -3554018367392154232
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: