@@ -1,3 +1,6 @@ +require 'action_controller' +require 'action_view' + require 'prawn' require 'prawnto/action_controller' @@ -7,7 +10,11 @@ require 'prawnto/template_handler/raw' # for now applying to all Controllers # however, could reduce footprint by letting user mixin (i.e. include) only into controllers that need it # but does it really matter performance wise to include in a controller that doesn't need it? doubtful-- depends how much of a hit the before_filter is i guess.. +# + class ActionController::Base include Prawnto::ActionController end + + lib/prawnto.rb @@ -1,9 +1,10 @@ module Prawnto module ActionController + + DEFAULT_PRAWNTO_OPTIONS = {:inline=>true} def self.included(base) base.extend ClassMethods - base.before_filter :reset_prawnto_options end module ClassMethods @@ -23,18 +24,15 @@ module Prawnto end def prawnto(options) + @prawnto_options ||= DEFAULT_PRAWNTO_OPTIONS.dup @prawnto_options.merge! options end private - def reset_prawnto_options - @prawnto_options = {:inline=> true} - end - def compute_prawnto_options - @prawnto_options ||= reset_prawnto_options + @prawnto_options ||= DEFAULT_PRAWNTO_OPTIONS.dup @prawnto_options[:prawn] ||= {} @prawnto_options[:prawn].merge!(self.class.read_inheritable_attribute(:prawn) || {}) {|k,o,n| o} @prawnto_options.merge!(self.class.read_inheritable_attribute(:prawnto) || {}) {|k,o,n| o} lib/prawnto/action_controller.rb @@ -33,13 +33,6 @@ module TemplateHandlerTestMocks end class ActionController - def self.before_filter(method) - @@init_method = method - end - - def initialize - eval @@init_method.to_s - end include Prawnto::ActionController test/template_handler_test_mocks.rb fdbdcdd4fb3e769b6a651b96945aabefa6d4972e thorny_sun thorny_sun@cracklabs.com http://github.com/thorny-sun/prawnto/commit/9425cc0fa357bf73701d5f4bc8a1af4c52e0ac8b 9425cc0fa357bf73701d5f4bc8a1af4c52e0ac8b 2008-12-02T21:48:55-08:00 2008-12-02T21:48:55-08:00 fixed before filter bug before filter wasn't getting picked up for some reason-- assuming order of loading things wasn't correct somehow-- anyways, figured out a way to do it cleaner without before_filters and that works also fixed tests to test new way of doing it e292a193d32d4f3f735f76f5d90c95f3ad1d7821 thorny_sun thorny_sun@cracklabs.com