prawnto_2 0.2.0.beta4 → 0.2.0.beta6

data/Gemfile

@@ -3,6 +3,6 @@ source "http://rubygems.org"
 # Specify your gem's dependencies in my_project.gemspec
 gemspec
 
-gem "spork", "~> 0.9.0.rc9"
+gem "spork", ">= 0.9.0"
 gem "rspec-rails"
 gem "mocha"

data/README.rdoc

@@ -16,7 +16,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.beta3", :require => "prawnto"
+  gem "prawnto_2", "0.2.0.beta6", :require => "prawnto"
 
 Then run:
   

data/lib/prawnto/model_renderer.rb

@@ -19,7 +19,7 @@ module Prawnto
         instance.prawnto :inline => true, :instance_variables_from => calling_object
       end
   
-      return instance.render_to_string(:action => template, :template => false, :format => :pdf).html_safe
+      return instance.render_to_string(:action => template, :template => false, :formats => [:pdf]).html_safe
     end
 
   end

data/lib/prawnto/template_handlers/renderer.rb

@@ -33,17 +33,29 @@ module Prawnto
         vars = object.instance_variables.map(&:to_s) - exclude.map(&:to_s)
         vars.each { |name| instance_variable_set(name, object.instance_variable_get(name)) }
       end
+      
+      def push_instance_variables_to(object, exclude = [])
+        vars = instance_variables.map(&:to_s) - exclude.map(&:to_s)
+        vars.each { |name| object.instance_variable_set(name, instance_variable_get(name)) }
+      end
    
-      def method_missing(m, *args)
+      # This method is a little hacky with pushing the instance variables back. I would prefer to use bindings, but wasn't having much luck.
+      def method_missing(m, *args, &block)
         begin
           super
         rescue
           if pdf.respond_to?(m.to_s)
-            pdf.send(m, *args)
+            pdf.send(m, *args, &block)
           elsif @calling_object.respond_to?(m.to_s)
-            @calling_object.send(m, *args)
+            push_instance_variables_to @calling_object
+            res = @calling_object.send(m, *args, &block)
+            copy_instance_variables_from @calling_object
+            res
           elsif @calling_object != @view_context and @view_context.respond_to?(m.to_s)
-            @view_context.send(m, *args)
+            push_instance_variables_to @view_context
+            res = @view_context.send(m, *args, &block)
+            copy_instance_variables_from @view_context
+            res
           else
             raise
           end

data/prawnto.gemspec

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

data/spec/assets/yield_block_in_helper_test.pdf

@@ -0,0 +1,76 @@
+%PDF-1.3
+%����
+1 0 obj
+<< /Creator <feff0050007200610077006e>
+/Producer <feff0050007200610077006e>
+>>
+endobj
+2 0 obj
+<< /Type /Catalog
+/Pages 3 0 R
+>>
+endobj
+3 0 obj
+<< /Type /Pages
+/Count 1
+/Kids [5 0 R]
+>>
+endobj
+4 0 obj
+<< /Length 112
+>>
+stream
+q
+
+BT
+36 747.384 Td
+/F1.0 12 Tf
+[<746573742031>] TJ
+ET
+
+
+BT
+36 733.512 Td
+/F1.0 12 Tf
+[<746573742032>] TJ
+ET
+
+Q
+
+endstream
+endobj
+5 0 obj
+<< /Type /Page
+/Parent 3 0 R
+/MediaBox [0 0 612.0 792.0]
+/Contents 4 0 R
+/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
+/Font << /F1.0 6 0 R
+>>
+>>
+>>
+endobj
+6 0 obj
+<< /Type /Font
+/Subtype /Type1
+/BaseFont /Helvetica
+/Encoding /WinAnsiEncoding
+>>
+endobj
+xref
+0 7
+0000000000 65535 f 
+0000000015 00000 n 
+0000000109 00000 n 
+0000000158 00000 n 
+0000000215 00000 n 
+0000000378 00000 n 
+0000000556 00000 n 
+trailer
+<< /Size 7
+/Root 2 0 R
+/Info 1 0 R
+>>
+startxref
+653
+%%EOF

data/spec/dummy/app/controllers/test_controller.rb

@@ -9,5 +9,14 @@ class TestController < ApplicationController
     @x = 1
     render :action => "dsl_render"
   end
+  
+  def instance_var_test
+    @x = 1
+    render :action => "instance_var_test"
+  end
+  
+  def yield_block_in_helper_test
+    render :action => "yield_block_in_helper_test"
+  end
     
 end

data/spec/dummy/app/helpers/application_helper.rb

@@ -2,4 +2,17 @@ module ApplicationHelper
   def some_helper
     "this is from a helper"
   end
+  
+  def x_output_helper
+    @x.to_s
+  end
+  
+  def set_x_to_3_in_helper
+    @x = 3
+  end
+  
+  def yield_this_block
+    yield
+  end
+  
 end

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

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

data/spec/dummy/app/views/test/instance_var_test.pdf.prawn

@@ -0,0 +1,15 @@
+text "Complex Example"
+text "@x = #{@x}"
+@x = 2
+text x_output_helper
+
+if @x.to_s != x_output_helper
+  raise "Variable did not carry over"
+end
+
+set_x_to_3_in_helper
+
+if @x != 3
+  raise "Variable did not carry over"
+end
+

data/spec/dummy/app/views/test/yield_block_in_helper_test.pdf.prawn

@@ -0,0 +1,4 @@
+text "test 1"
+yield_this_block {
+  text "test 2"
+}

data/spec/dummy/config/routes.rb

@@ -1,6 +1,8 @@
 Rails.application.routes.draw do
   get "/default_render" => "test#default_render"
   get "/dsl_render" => "test#dsl_render"
+  get "/instance_var_test" => "test#instance_var_test"
+  get "/yield_block_in_helper_test" => "test#yield_block_in_helper_test"
   
   root :to => "test#default_render"
 end

data/spec/integrations/test_controller_spec.rb

@@ -2,7 +2,7 @@ require File.expand_path("../spec_helper.rb", File.dirname(__FILE__))
 
 describe TestController do
   
-  describe "GET default_render" do
+  describe "simple" do
     it "returns correct PDF" do
       get "/default_render.pdf"
       response.should be_success
@@ -11,10 +11,22 @@ describe TestController do
       body_binary = response.body.bytes.to_a
       body_binary.should == asset_binary
     end
+    
+    
+    it "shares values/changes of instance vars between view and helpers" do
+      expect { get "/instance_var_test.pdf" }.should_not raise_error
+    end
+    
+    it "should render items in a block passed to a helper" do
+      get "/yield_block_in_helper_test.pdf"
+      asset_binary = File.open(TEST_ASSETS + "/yield_block_in_helper_test.pdf").read.bytes.to_a
+      body_binary = response.body.bytes.to_a
+      body_binary.should == asset_binary
+    end
   end
   
   
-  describe "GET dsl_render" do
+  describe "dsl" do
     it "returns correct PDF" do
       get "/dsl_render.pdf"
       response.should be_success
@@ -24,5 +36,5 @@ describe TestController do
       body_binary.should == asset_binary
     end
   end
-  
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prawnto_2
 version: !ruby/object:Gem::Version
-  version: 0.2.0.beta4
+  version: 0.2.0.beta6
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-22 00:00:00.000000000Z
+date: 2012-01-23 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70215973019900 !ruby/object:Gem::Requirement
+  requirement: &70328106613180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70215973019900
+  version_requirements: *70328106613180
 - !ruby/object:Gem::Dependency
   name: prawn
-  requirement: &70215973019200 !ruby/object:Gem::Requirement
+  requirement: &70328106612700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: 0.12.0
   type: :runtime
   prerelease: false
-  version_requirements: *70215973019200
+  version_requirements: *70328106612700
 description: Simple PDF generation using the prawn library.
 email:
 - development@forrestzeisler.com
@@ -60,6 +60,7 @@ files:
 - script/rails
 - spec/assets/default_render.pdf
 - spec/assets/dsl_render.pdf
+- spec/assets/yield_block_in_helper_test.pdf
 - spec/dummy/.rspec
 - spec/dummy/.sass-cache/387f7b3fde13680ae5a79212c089f81d2d418f1e/application.css.scssc
 - spec/dummy/.sass-cache/6a18c557e07dbc07a14d0809be02d4f21f1dbe91/_shared.css.scssc
@@ -82,6 +83,8 @@ files:
 - spec/dummy/app/views/pdf_emailer/email_with_attachment.text.erb
 - spec/dummy/app/views/test/default_render.pdf.prawn
 - spec/dummy/app/views/test/dsl_render.pdf.prawn
+- spec/dummy/app/views/test/instance_var_test.pdf.prawn
+- spec/dummy/app/views/test/yield_block_in_helper_test.pdf.prawn
 - spec/dummy/config.ru
 - spec/dummy/config/application.rb
 - spec/dummy/config/boot.rb
@@ -139,6 +142,7 @@ summary: This gem allows you to use the PDF mime-type and the simple prawn synta
 test_files:
 - spec/assets/default_render.pdf
 - spec/assets/dsl_render.pdf
+- spec/assets/yield_block_in_helper_test.pdf
 - spec/dummy/.rspec
 - spec/dummy/.sass-cache/387f7b3fde13680ae5a79212c089f81d2d418f1e/application.css.scssc
 - spec/dummy/.sass-cache/6a18c557e07dbc07a14d0809be02d4f21f1dbe91/_shared.css.scssc
@@ -161,6 +165,8 @@ test_files:
 - spec/dummy/app/views/pdf_emailer/email_with_attachment.text.erb
 - spec/dummy/app/views/test/default_render.pdf.prawn
 - spec/dummy/app/views/test/dsl_render.pdf.prawn
+- spec/dummy/app/views/test/instance_var_test.pdf.prawn
+- spec/dummy/app/views/test/yield_block_in_helper_test.pdf.prawn
 - spec/dummy/config.ru
 - spec/dummy/config/application.rb
 - spec/dummy/config/boot.rb