From 1bacacc9754752e0310dfe72f43bb0afe68c8c40 Mon Sep 17 00:00:00 2001 From: Richard Metzler Date: Sun, 4 Mar 2012 22:39:33 +0100 Subject: [PATCH 1/5] use prawn settings when creating a new pdf document --- lib/sinatra/prawn.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/sinatra/prawn.rb b/lib/sinatra/prawn.rb index 1561711..4995ca6 100644 --- a/lib/sinatra/prawn.rb +++ b/lib/sinatra/prawn.rb @@ -36,7 +36,7 @@ def prepare end def evaluate(scope, locals, &block) - pdf = ::Prawn::Document.new + pdf = ::Prawn::Document.new settings.prawn if data.respond_to?(:to_str) locals[:pdf] = pdf super(scope, locals, &block) From d0fac54dd842f3441df00ffa265ea4d7a6e5d1da Mon Sep 17 00:00:00 2001 From: Richard Metzler Date: Mon, 5 Mar 2012 00:20:15 +0100 Subject: [PATCH 2/5] fix deprecation warning for rdoc task --- Rakefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Rakefile b/Rakefile index eff7d7e..f0ddeff 100644 --- a/Rakefile +++ b/Rakefile @@ -15,7 +15,7 @@ rescue LoadError puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com" end -require 'rake/rdoctask' +require 'rdoc/task' Rake::RDocTask.new do |rdoc| rdoc.rdoc_dir = 'rdoc' rdoc.title = 'sinatra-prawn' From 79badad5fe9e07ef115a37509cfb809a26b38b95 Mon Sep 17 00:00:00 2001 From: Richard Metzler Date: Mon, 5 Mar 2012 18:59:12 +0100 Subject: [PATCH 3/5] fix tests --- lib/sinatra/prawn.rb | 3 ++- test/sinatra_prawn_test.rb | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/sinatra/prawn.rb b/lib/sinatra/prawn.rb index 4995ca6..f94f7d1 100644 --- a/lib/sinatra/prawn.rb +++ b/lib/sinatra/prawn.rb @@ -36,7 +36,8 @@ def prepare end def evaluate(scope, locals, &block) - pdf = ::Prawn::Document.new settings.prawn + prawn_settings = {} || settings.prawn + pdf = ::Prawn::Document.new prawn_settings if data.respond_to?(:to_str) locals[:pdf] = pdf super(scope, locals, &block) diff --git a/test/sinatra_prawn_test.rb b/test/sinatra_prawn_test.rb index 1b260f8..08a23f1 100644 --- a/test/sinatra_prawn_test.rb +++ b/test/sinatra_prawn_test.rb @@ -3,7 +3,9 @@ class SinatraPrawnTest < Test::Unit::TestCase def prawn_app(&block) mock_app { - helpers Sinatra::Prawn + register Sinatra::Prawn + set :environment, :test + set :raise_errors, true set :views, File.dirname(__FILE__) + '/views' get '/', &block } @@ -41,7 +43,7 @@ def test_renders_prawn_files_in_views_path def test_raises_error_if_template_not_found mock_app { - helpers Sinatra::Prawn + register Sinatra::Prawn set :environment, :test set :raise_errors, true get('/') { prawn :no_such_template } From 9716de939029191643f78f5a846d1b683a0589d2 Mon Sep 17 00:00:00 2001 From: Richard Metzler Date: Sun, 11 Mar 2012 18:58:47 +0100 Subject: [PATCH 4/5] fix stupid error --- lib/sinatra/prawn.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/sinatra/prawn.rb b/lib/sinatra/prawn.rb index f94f7d1..197e198 100644 --- a/lib/sinatra/prawn.rb +++ b/lib/sinatra/prawn.rb @@ -36,7 +36,7 @@ def prepare end def evaluate(scope, locals, &block) - prawn_settings = {} || settings.prawn + prawn_settings ||= {} pdf = ::Prawn::Document.new prawn_settings if data.respond_to?(:to_str) locals[:pdf] = pdf From de85dd4645879de4f07439c510c22cc503b1424b Mon Sep 17 00:00:00 2001 From: Richard Metzler Date: Sun, 11 Mar 2012 19:24:00 +0100 Subject: [PATCH 5/5] fix the fix - I hope this works now --- lib/sinatra/prawn.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/sinatra/prawn.rb b/lib/sinatra/prawn.rb index 197e198..92e6cde 100644 --- a/lib/sinatra/prawn.rb +++ b/lib/sinatra/prawn.rb @@ -36,7 +36,7 @@ def prepare end def evaluate(scope, locals, &block) - prawn_settings ||= {} + prawn_settings = settings.prawn || {} pdf = ::Prawn::Document.new prawn_settings if data.respond_to?(:to_str) locals[:pdf] = pdf