rtex 2.0.5 → 2.1.0

data/CHANGELOG

@@ -1,11 +1,20 @@
+v2.1.0
+
+  Merge in rails-2.2.2 branch, modify to make sure Prawn isn't trampled and
+  2.3.0 is supported.
+  Simplify tagging of templates for later processing (+ ensure it works
+  with compiled templates).
+  Update README_RAILS 
+
 v2.0.5
 
-  Fix issue with Echoe being ultra-sensitive on RubyGems versions (v2.0.4 was RubyGems 1.2 only,
-  and 1.3 just came out)
+  Fix issue with Echoe being ultra-sensitive on RubyGems versions (v2.0.4
+  was RubyGems 1.2 only, and 1.3 just came out)
   
 v2.0.4
 
-  Support for TeX escaping (via l()) calling to_s on the argument.  This should handle nils.
+  Support for TeX escaping (via l()) calling to_s on the argument.
+  This should handle nils.
 
 v2.0.3
 

data/README_RAILS.rdoc

@@ -26,15 +26,22 @@ Create files +pdf.rtex+ extensions (eg, +index.pdf.rtex+) using standard LaTeX m
 
 With the following:
 
+  # In config/initializers/mime_types.rb (or environment.rb in older Rails)
+  Mime::Type.register "application/pdf", :pdf
+
   # app/controllers/items_controller.rb
   def index
     @items = Item.find(:all)
+    respond_to do |format|
+      format.html # We support the normal HTML view as well
+      format.pdf
+    end
   end
   
   # app/views/items/index.pdf.rtex
   \section*{Items}
   \begin{itemize}
-  <%= render :partial => @items %>
+    <%= render :partial => @items %>
   \end{itemize}
   
   # app/views/items/_item.pdf.rtex
@@ -43,7 +50,7 @@ With the following:
   # app/layouts/application.pdf.rtex
   \documentclass[12pt]{article}
   \begin{document}
-  <%= yield %>
+    <%= yield %>
   \end{document}
 
 If you hit +http://the.server.url/items.pdf+, you end up with a nice PDF listing of items.

data/lib/rtex/framework/rails.rb

@@ -7,30 +7,21 @@ module RTeX
       def self.setup
         RTeX::Document.options[:tempdir] = File.expand_path(File.join(RAILS_ROOT, 'tmp'))
         if ActionView::Base.respond_to?(:register_template_handler)
-          ActionView::Base.register_template_handler(:rtex, Template)
+          ActionView::Base.register_template_handler(:rtex, TemplateHandler)
         else
-          # Rails 2.1
-          ActionView::Template.register_template_handler(:rtex, Template)
+          ActionView::Template.register_template_handler(:rtex, TemplateHandler)
         end
         ActionController::Base.send(:include, ControllerMethods)
         ActionView::Base.send(:include, HelperMethods)
       end
       
-      class Template < ::ActionView::TemplateHandlers::ERB
-        def initialize(*args)
-          super
-          # Support Rails render API before:
-          #   commit d2ccb852d4e1f6f1b01e43f32213053ae3bef408
-          #   Date:   Fri Jul 18 16:00:20 2008 -0500
-          if defined?(@view)
-            @view.template_format = :pdf
-          end
-          # Tag for RTeX
-          # TODO: Move options into TemplateHandler from Controller
-          #       (need to handle send_file)
-          def @view.rendered_with_rtex
-            true
-          end
+      class TemplateHandler < ::ActionView::TemplateHandlers::ERB
+        # Due to significant changes in ActionView over the lifespan of Rails,
+        # tagging compiled templates to set a thread local variable flag seems
+        # to be the least brittle approach.
+        def compile(template)
+          # Insert assignment, but not before the #coding: line, if present
+          super.sub(/^(?!#)/m, "Thread.current[:_rendering_rtex] = true;\n")
         end
       end
       
@@ -41,7 +32,7 @@ module RTeX
         
         def render_with_rtex(options=nil, *args, &block)
           result = render_without_rtex(options, *args, &block)
-          if result.is_a?(String) && @template.respond_to?(:rendered_with_rtex)
+          if result.is_a?(String) && Thread.current[:_rendering_rtex]
             options ||= {}
             ::RTeX::Document.new(result, options.merge(:processed => true)).to_pdf do |filename|
               serve_file = Tempfile.new('rtex-pdf')
@@ -54,13 +45,13 @@ module RTeX
                 :length => File.size(serve_file.path)
               serve_file.close
             end
-          else
-            result
           end
+          
         end
       end
       
       module HelperMethods
+        # Similar to h()
         def latex_escape(s)
           RTeX::Document.escape(s)
         end
@@ -69,4 +60,4 @@ module RTeX
       
     end
   end
-end
+end

data/lib/rtex/version.rb

@@ -64,8 +64,8 @@ module RTeX
     end
 
     MAJOR = 2
-    MINOR = 0
-    TINY  = 5
+    MINOR = 1
+    TINY  = 0
     
     # The current version as a Version instance
     CURRENT = new(MAJOR, MINOR, TINY)

data/rtex.gemspec

@@ -1,117 +1,40 @@
+# -*- encoding: utf-8 -*-
 
-# Gem::Specification for Rtex-2.0.5
-# Originally generated by Echoe
+Gem::Specification.new do |s|
+  s.name = %q{rtex}
+  s.version = "2.1.0"
 
---- !ruby/object:Gem::Specification 
-name: rtex
-version: !ruby/object:Gem::Version 
-  version: 2.0.5
-platform: ruby
-authors: 
-- Bruce Williams, Wiebe Cazemier
-autorequire: 
-bindir: bin
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Bruce Williams, Wiebe Cazemier"]
+  s.date = %q{2009-02-26}
+  s.default_executable = %q{rtex}
+  s.description = %q{LaTeX preprocessor for PDF generation; Rails plugin}
+  s.email = %q{bruce@codefluency.com}
+  s.executables = ["rtex"]
+  s.extra_rdoc_files = ["bin/rtex", "CHANGELOG", "lib/rtex/document.rb", "lib/rtex/escaping.rb", "lib/rtex/framework/merb.rb", "lib/rtex/framework/rails.rb", "lib/rtex/tempdir.rb", "lib/rtex/version.rb", "lib/rtex.rb", "README.rdoc", "README_RAILS.rdoc"]
+  s.files = ["bin/rtex", "CHANGELOG", "init.rb", "lib/rtex/document.rb", "lib/rtex/escaping.rb", "lib/rtex/framework/merb.rb", "lib/rtex/framework/rails.rb", "lib/rtex/tempdir.rb", "lib/rtex/version.rb", "lib/rtex.rb", "Manifest", "rails/init.rb", "Rakefile", "README.rdoc", "README_RAILS.rdoc", "test/document_test.rb", "test/filter_test.rb", "test/fixtures/first.tex", "test/fixtures/first.tex.erb", "test/fixtures/fragment.tex.erb", "test/fixtures/text.textile", "test/tempdir_test.rb", "test/test_helper.rb", "vendor/instiki/LICENSE", "vendor/instiki/redcloth_for_tex.rb", "rtex.gemspec"]
+  s.has_rdoc = true
+  s.homepage = %q{http://rtex.rubyforge.org}
+  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Rtex", "--main", "README.rdoc"]
+  s.require_paths = ["lib"]
+  s.rubyforge_project = %q{rtex}
+  s.rubygems_version = %q{1.3.1}
+  s.summary = %q{LaTeX preprocessor for PDF generation; Rails plugin}
+  s.test_files = ["test/document_test.rb", "test/filter_test.rb", "test/tempdir_test.rb", "test/test_helper.rb"]
 
-date: 2008-10-08 00:00:00 -05:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: Shoulda
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: echoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-description: LaTeX preprocessor for PDF generation; Rails plugin
-email: bruce@codefluency.com
-executables: 
-- rtex
-extensions: []
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 2
 
-extra_rdoc_files: 
-- bin/rtex
-- CHANGELOG
-- lib/rtex/document.rb
-- lib/rtex/escaping.rb
-- lib/rtex/framework/merb.rb
-- lib/rtex/framework/rails.rb
-- lib/rtex/tempdir.rb
-- lib/rtex/version.rb
-- lib/rtex.rb
-- README.rdoc
-- README_RAILS.rdoc
-files: 
-- bin/rtex
-- CHANGELOG
-- init.rb
-- lib/rtex/document.rb
-- lib/rtex/escaping.rb
-- lib/rtex/framework/merb.rb
-- lib/rtex/framework/rails.rb
-- lib/rtex/tempdir.rb
-- lib/rtex/version.rb
-- lib/rtex.rb
-- Manifest
-- rails/init.rb
-- Rakefile
-- README.rdoc
-- README_RAILS.rdoc
-- test/document_test.rb
-- test/filter_test.rb
-- test/fixtures/first.tex
-- test/fixtures/first.tex.erb
-- test/fixtures/fragment.tex.erb
-- test/fixtures/text.textile
-- test/tempdir_test.rb
-- test/test_helper.rb
-- vendor/instiki/LICENSE
-- vendor/instiki/redcloth_for_tex.rb
-- rtex.gemspec
-has_rdoc: true
-homepage: http://rtex.rubyforge.org
-post_install_message: 
-rdoc_options: 
-- --line-numbers
-- --inline-source
-- --title
-- Rtex
-- --main
-- README.rdoc
-require_paths: 
-- lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
-requirements: []
-
-rubyforge_project: rtex
-rubygems_version: 1.3.0
-specification_version: 2
-summary: LaTeX preprocessor for PDF generation; Rails plugin
-test_files: 
-- test/document_test.rb
-- test/filter_test.rb
-- test/tempdir_test.rb
-- test/test_helper.rb
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<Shoulda>, [">= 0"])
+      s.add_development_dependency(%q<echoe>, [">= 0"])
+    else
+      s.add_dependency(%q<Shoulda>, [">= 0"])
+      s.add_dependency(%q<echoe>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<Shoulda>, [">= 0"])
+    s.add_dependency(%q<echoe>, [">= 0"])
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rtex
 version: !ruby/object:Gem::Version 
-  version: 2.0.5
+  version: 2.1.0
 platform: ruby
 authors: 
 - Bruce Williams, Wiebe Cazemier
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-08 00:00:00 -05:00
+date: 2009-02-26 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -104,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rtex
-rubygems_version: 1.3.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: LaTeX preprocessor for PDF generation; Rails plugin