prawnto_2 0.2.0.beta2 → 0.2.0.beta3

data/README.rdoc

@@ -14,7 +14,7 @@ This is my attempt to merge the various forks of the prawnto gem, and <b>update
 
 In your <code>Gemfile</code>:
 
-  gem "prawnto_2", "0.2.0.beta2", :require => "prawnto"
+  gem "prawnto_2", "0.2.0.beta3", :require => "prawnto"
 
 Then run:
   
@@ -62,7 +62,7 @@ Sometimes you need to be able to render a PDF from anywhere (Background process
     ...
     def to_pdf
       @x = 1
-      Prawnto::Render.to_string "template_path", self
+      Prawnto::ModelRenderer.to_string "test/default_render", self
     end
   end
 

data/lib/prawnto.rb

@@ -5,11 +5,9 @@ require 'prawnto/railtie' if defined?(Rails)
 
 module Prawnto
   autoload :ActionControllerMixin, 'prawnto/action_controller_mixin'
-  
-  module ActionViewMixins
-    autoload :ActionViewMixin, 'prawnto/action_view_mixins/action_view_mixin'
-    autoload :CompileSupport, 'prawnto/action_view_mixins/compile_support'
-  end
+  autoload :ActionViewMixin, 'prawnto/action_view_mixin'
+  autoload :CompileSupport, 'prawnto/compile_support'
+
 
   module TemplateHandlers
     autoload :Renderer, 'prawnto/template_handlers/renderer'
@@ -18,7 +16,6 @@ module Prawnto
     autoload :Dsl, 'prawnto/template_handlers/dsl'
   end
   
-  autoload :Render, 'prawnto/pretend_render'
-  
+  autoload :ModelRenderer, 'prawnto/model_renderer'
   
 end

data/lib/prawnto/action_view_mixin.rb

@@ -0,0 +1,13 @@
+module Prawnto
+  module ActionViewMixin
+
+  private
+
+    def _prawnto_compile_setup
+      compile_support = CompileSupport.new(controller)
+      @prawnto_options = compile_support.options
+    end
+
+  end
+end
+

data/lib/prawnto/compile_support.rb

@@ -0,0 +1,72 @@
+module Prawnto
+  class CompileSupport
+    attr_reader :options
+
+    def initialize(controller)
+      @controller = controller
+      @options = pull_options
+      set_headers
+    end
+
+    def pull_options
+      @controller.send :compute_prawnto_options || {}
+    end
+
+    def set_headers
+      unless defined?(ActionMailer) && defined?(ActionMailer::Base) && @controller.is_a?(ActionMailer::Base)
+        set_pragma
+        set_cache_control
+        set_content_type
+        set_disposition
+        set_other_headers_for_ie_ssl
+      end
+    end
+
+    def ie_request?
+      @controller.request.env['HTTP_USER_AGENT'] =~ /msie/i
+    end
+
+    def ssl_request?
+      @controller.request.ssl?
+    end
+    
+    def set_other_headers_for_ie_ssl
+      return unless ssl_request? && ie_request?
+      headers['Content-Description'] = 'File Transfer'
+      headers['Content-Transfer-Encoding'] = 'binary'
+      headers['Expires'] = '0'        
+    end
+
+    # TODO: kept around from railspdf-- maybe not needed anymore? should check.
+    def set_pragma
+      if ssl_request? && ie_request?
+        @controller.headers['Pragma'] = 'public' # added to make ie ssl pdfs work (per naisayer)
+      else
+        @controller.headers['Pragma'] ||= ie_request? ? 'no-cache' : ''
+      end
+    end
+
+    # TODO: kept around from railspdf-- maybe not needed anymore? should check.
+    def set_cache_control
+      if ssl_request? && ie_request?
+        @controller.headers['Cache-Control'] = 'maxage=1' # added to make ie ssl pdfs work (per naisayer)
+      else
+        @controller.headers['Cache-Control'] ||= ie_request? ? 'no-cache, must-revalidate' : ''
+      end
+    end
+
+    def set_content_type
+      @controller.response.content_type ||= Mime::PDF
+    end
+
+    def set_disposition
+      inline = options[:inline] ? 'inline' : 'attachment'
+      filename = options[:filename] ? "filename=\"#{options[:filename]}\"" : nil
+      @controller.headers["Content-Disposition"] = [inline,filename].compact.join(';')
+    end
+
+  end
+end
+
+
+

data/lib/prawnto/{pretend_render.rb → model_renderer.rb}

@@ -1,16 +1,15 @@
 module Prawnto
-  module Render
+  module ModelRenderer
     # template : invoices/show.pdf
     # instance_variables : {"@account" => account} - variables set in before filters
     def self.to_string(template, calling_object = nil)
       instance = ApplicationController.new
-  
       instance.request = ActionDispatch::Request.new({})
       instance.response = ActionDispatch::Response.new()
   
-      instance_variables.each{|key, value|
-        instance.instance_variable_set(key, value)
-      }
+      if calling_object
+        instance.prawnto :inline => true, :instance_variables_from => calling_object
+      end
   
       return instance.render_to_string(template, :template => false).html_safe
     end

data/lib/prawnto/railtie.rb

@@ -14,7 +14,7 @@ module Prawnto
     config.to_prepare do
       ActionController::Base.send :include, Prawnto::ActionControllerMixin
       ActionMailer::Base.send :include, Prawnto::ActionControllerMixin
-      ActionView::Base.send :include, Prawnto::ActionViewMixins::ActionViewMixin
+      ActionView::Base.send :include, Prawnto::ActionViewMixin
     end
     
   end

data/lib/prawnto/template_handlers/renderer.rb

@@ -1,11 +1,11 @@
 module Prawnto
   module TemplateHandlers
     class Renderer
-      def initialize(calling_object = nil)
+      def initialize(view_context, calling_object = nil)
+        @view_context = view_context
         @calling_object = calling_object
-        copy_instance_variables_from(@calling_object) if @calling_object
+        set_instance_variables
         @pdf = Prawn::Document.new(@prawnto_options[:prawn]);
-        self
       end
       
       def to_pdf(&block)
@@ -15,6 +15,15 @@ module Prawnto
     
     private
     
+      def set_instance_variables
+        @calling_object ||= @view_context
+        copy_instance_variables_from @calling_object
+        
+        if @prawnto_options[:instance_variables_from]
+          copy_instance_variables_from @prawnto_options[:instance_variables_from]
+        end
+      end
+    
       def pdf
         @pdf
       end
@@ -33,6 +42,8 @@ module Prawnto
             pdf.send(m, *args)
           elsif @calling_object.respond_to?(m.to_s)
             @calling_object.send(m, *args)
+          elsif @calling_object != @view_context and @view_context.respond_to?(m.to_s)
+            @view_context.send(m, *args)
           else
             raise
           end

data/prawnto.gemspec

@@ -1,7 +1,7 @@
 
 Gem::Specification.new do |s|
   s.name = "prawnto_2"
-  s.version = '0.2.0.beta2'
+  s.version = '0.2.0.beta3'
   s.author = ["Forrest"]
   s.email = ["development@forrestzeisler.com"]
   s.date = Time.now.utc.strftime("%Y-%m-%d")

data/spec/dummy/app/models/super_model.rb

@@ -2,7 +2,7 @@ class SuperModel
   
   def to_pdf
     @x = 1
-    Prawnto::Render.to_string "test/default_render", self
+    Prawnto::ModelRenderer.to_string "test/default_render", self
   end
   
 end

data/spec/units/compile_support_spec.rb

@@ -1,6 +1,6 @@
 require File.expand_path("../spec_helper.rb", File.dirname(__FILE__))
 
-describe Prawnto::ActionViewMixins::CompileSupport do
+describe Prawnto::CompileSupport do
   
   before do
     @request = mock()
@@ -14,26 +14,26 @@ describe Prawnto::ActionViewMixins::CompileSupport do
 
   describe "#set_disposition" do
     before do
-      Prawnto::ActionViewMixins::CompileSupport.any_instance.stubs(:set_pragma).returns(true)
-      Prawnto::ActionViewMixins::CompileSupport.any_instance.stubs(:set_cache_control).returns(true)
-      Prawnto::ActionViewMixins::CompileSupport.any_instance.stubs(:set_content_type).returns(Mime::PDF)
+      Prawnto::CompileSupport.any_instance.stubs(:set_pragma).returns(true)
+      Prawnto::CompileSupport.any_instance.stubs(:set_cache_control).returns(true)
+      Prawnto::CompileSupport.any_instance.stubs(:set_content_type).returns(Mime::PDF)
     end
     
     it "default" do
       @headers.expects("[]=").with("Content-Disposition", "inline").once
-      Prawnto::ActionViewMixins::CompileSupport.new(@controller)
+      Prawnto::CompileSupport.new(@controller)
     end
 
     it "inline with filename" do
       @controller.stubs(:compute_prawnto_options).returns({:filename => "xxx.pdf", :inline => true})
       @headers.expects("[]=").with("Content-Disposition", "inline;filename=\"xxx.pdf\"").once
-      Prawnto::ActionViewMixins::CompileSupport.new(@controller)
+      Prawnto::CompileSupport.new(@controller)
     end
     
     it "attachment with filename" do
       @controller.stubs(:compute_prawnto_options).returns({:filename => "xxx.pdf", :inline => false})
       @headers.expects("[]=").with("Content-Disposition", "attachment;filename=\"xxx.pdf\"").once
-      Prawnto::ActionViewMixins::CompileSupport.new(@controller)
+      Prawnto::CompileSupport.new(@controller)
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prawnto_2
 version: !ruby/object:Gem::Version
-  version: 0.2.0.beta2
+  version: 0.2.0.beta3
   prerelease: 6
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-01-22 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70318788769400 !ruby/object:Gem::Requirement
+  requirement: &70321925128560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70318788769400
+  version_requirements: *70321925128560
 - !ruby/object:Gem::Dependency
   name: prawn
-  requirement: &70318788768940 !ruby/object:Gem::Requirement
+  requirement: &70321925128100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: 0.12.0
   type: :runtime
   prerelease: false
-  version_requirements: *70318788768940
+  version_requirements: *70321925128100
 description: Simple PDF generation using the prawn library.
 email:
 - development@forrestzeisler.com
@@ -48,9 +48,9 @@ files:
 - Rakefile
 - lib/prawnto.rb
 - lib/prawnto/action_controller_mixin.rb
-- lib/prawnto/action_view_mixins/action_view_mixin.rb
-- lib/prawnto/action_view_mixins/compile_support.rb
-- lib/prawnto/pretend_render.rb
+- lib/prawnto/action_view_mixin.rb
+- lib/prawnto/compile_support.rb
+- lib/prawnto/model_renderer.rb
 - lib/prawnto/railtie.rb
 - lib/prawnto/template_handlers/base.rb
 - lib/prawnto/template_handlers/renderer.rb

data/lib/prawnto/action_view_mixins/action_view_mixin.rb

@@ -1,15 +0,0 @@
-module Prawnto
-  module ActionViewMixins
-    module ActionViewMixin
-
-    private
-
-      def _prawnto_compile_setup
-        compile_support = CompileSupport.new(controller)
-        @prawnto_options = compile_support.options
-      end
-
-    end
-  end
-end
-

data/lib/prawnto/action_view_mixins/compile_support.rb

@@ -1,74 +0,0 @@
-module Prawnto
-  module ActionViewMixins
-    class CompileSupport
-      attr_reader :options
-
-      def initialize(controller)
-        @controller = controller
-        @options = pull_options
-        set_headers
-      end
-
-      def pull_options
-        @controller.send :compute_prawnto_options || {}
-      end
-
-      def set_headers
-        unless defined?(ActionMailer) && defined?(ActionMailer::Base) && @controller.is_a?(ActionMailer::Base)
-          set_pragma
-          set_cache_control
-          set_content_type
-          set_disposition
-          set_other_headers_for_ie_ssl
-        end
-      end
-
-      def ie_request?
-        @controller.request.env['HTTP_USER_AGENT'] =~ /msie/i
-      end
-
-      def ssl_request?
-        @controller.request.ssl?
-      end
-      
-      def set_other_headers_for_ie_ssl
-        return unless ssl_request? && ie_request?
-        headers['Content-Description'] = 'File Transfer'
-        headers['Content-Transfer-Encoding'] = 'binary'
-        headers['Expires'] = '0'        
-      end
-
-      # TODO: kept around from railspdf-- maybe not needed anymore? should check.
-      def set_pragma
-        if ssl_request? && ie_request?
-          @controller.headers['Pragma'] = 'public' # added to make ie ssl pdfs work (per naisayer)
-        else
-          @controller.headers['Pragma'] ||= ie_request? ? 'no-cache' : ''
-        end
-      end
-
-      # TODO: kept around from railspdf-- maybe not needed anymore? should check.
-      def set_cache_control
-        if ssl_request? && ie_request?
-          @controller.headers['Cache-Control'] = 'maxage=1' # added to make ie ssl pdfs work (per naisayer)
-        else
-          @controller.headers['Cache-Control'] ||= ie_request? ? 'no-cache, must-revalidate' : ''
-        end
-      end
-
-      def set_content_type
-        @controller.response.content_type ||= Mime::PDF
-      end
-
-      def set_disposition
-        inline = options[:inline] ? 'inline' : 'attachment'
-        filename = options[:filename] ? "filename=\"#{options[:filename]}\"" : nil
-        @controller.headers["Content-Disposition"] = [inline,filename].compact.join(';')
-      end
-
-    end
-  end
-end
-
-
-