rails-latex 1.0.12 → 1.0.13

data/.gitignore

@@ -1,3 +1,4 @@
+*.swp
 *.gem
 .bundle
 Gemfile.lock
@@ -9,4 +10,4 @@ rdoc
 examples/rails-latex-demo/log
 examples/rails-latex-demo/tmp
 *#*#
-.#*
+.#*

data/README.rdoc

@@ -1,7 +1,7 @@
 = Rails-LaTeX
 
-* Git: http://github.com/jacott/rails-latex
-* Author: Geoff Jacobsen
+* Git: http://github.com/baierjan/rails-latex
+* Original author: Geoff Jacobsen
 * Copyright: 2009-2010
 * License: MIT-LICENSE
 
@@ -40,13 +40,13 @@ config/initializers/mime_types.rb:
 Only the file containing the \\documentclass should be of type: .pdf.erbtex . Partials and views (when there is a layout)
 should be of type .pdf.erb .
 
-If a LaTeX package requires two parses then add the following to the .pdf.erbtex file:
+If a LaTeX package requires more than one parser run add the following to the .pdf.erbtex file:
 
-   <% @latex_config={:parse_twice => true} %>
+   <% @latex_config={:parse_runs => 3} %>
 
 You can override the defaults like so:
 
-   LatexToPdf.config.merge! :command => 'xetex', :arguments => ['-etex'], :parse_twice => true
+   LatexToPdf.config.merge! :command => 'xetex', :arguments => ['-etex'], :parse_runs => 2
 
 or to change just the arguments:
 
@@ -55,10 +55,12 @@ or to change just the arguments:
 The defaults are:
    command: 'pdflatex'
    arguments: ['-halt-on-error']
-   parse_twice: false
+   parse_runs: 1
 
-The last log file is moved to tmp/rails-latex/input.log . If the PDF is not produced the build directory is not removed;
-an archive script should be written to occasionally clean up the tmp/rails-latex directory.
+The last log file is moved to tmp/rails-latex/input.log , and the corresponding
+source TeX file to tmp/rails-latex/input.tex . If the PDF is not produced the
+build directory is not removed; an archive script should be written to
+occasionally clean up the tmp/rails-latex directory.
 
 See the rails application under examples/rails-latex-demo/ for a working example.
 
@@ -101,5 +103,6 @@ Developing rails-latex requires bundler and RedCloth
 
 == Contributions
 
+* Geoff Jacobsen
 * Tommaso Patrizi
-* Klaus Reske
+* Klaus Reske

data/lib/rails-latex/latex_to_pdf.rb

@@ -1,6 +1,7 @@
+# -*- coding: utf-8 -*-
 class LatexToPdf
   def self.config
-    @config||={:command => 'pdflatex', :arguments => ['-halt-on-error'], :parse_twice => false}
+    @config||={:command => 'pdflatex', :arguments => ['-halt-on-error'], :parse_twice => false, :parse_runs => 1}
   end
 
   # Converts a string of LaTeX +code+ into a binary string of PDF.
@@ -10,17 +11,19 @@ class LatexToPdf
   #
   # The config argument defaults to LatexToPdf.config but can be overridden using @latex_config.
   #
-  # The parse_twice argument is deprecated in favor of using config[:parse_twice] instead.
+  # The parse_twice argument and using config[:parse_twice] is deprecated in favor of using config[:parse_runs] instead.
   def self.generate_pdf(code,config,parse_twice=nil)
     config=self.config.merge(config)
-    parse_twice=config[:parse_twice] if parse_twice.nil?
+    parse_twice=config[:parse_twice] if parse_twice.nil? # deprecated
+    parse_runs=[config[:parse_runs], (parse_twice ? 2 : config[:parse_runs])].max
+    puts "Running Latex #{parse_runs} times..."
     dir=File.join(Rails.root,'tmp','rails-latex',"#{Process.pid}-#{Thread.current.hash}")
     input=File.join(dir,'input.tex')
     FileUtils.mkdir_p(dir)
     # copy any additional supporting files (.cls, .sty, ...)
     supporting = config[:supporting]
-    if supporting.class == String or supporting.class == Array and supporting.length > 0
-      FileUtils.cp(supporting, dir)
+    if supporting.kind_of?(String) or supporting.kind_of?(Pathname) or (supporting.kind_of?(Array) and supporting.length > 0)
+      FileUtils.cp_r(supporting, dir)
     end
     File.open(input,'wb') {|io| io.write(code) }
     Process.waitpid(
@@ -30,7 +33,9 @@ class LatexToPdf
           original_stdout, original_stderr = $stdout, $stderr
           $stderr = $stdout = File.open("input.log","a")
           args=config[:arguments] + %w[-shell-escape -interaction batchmode input.tex]
-          system config[:command],'-draftmode',*args if parse_twice
+          (parse_runs-1).times do
+            system config[:command],'-draftmode',*args
+          end
           exec config[:command],*args
         rescue
           File.open("input.log",'a') {|io|
@@ -42,6 +47,7 @@ class LatexToPdf
         end
       end)
     if File.exist?(pdf_file=input.sub(/\.tex$/,'.pdf'))
+      FileUtils.mv(input,File.join(dir,'..','input.tex'))
       FileUtils.mv(input.sub(/\.tex$/,'.log'),File.join(dir,'..','input.log'))
       result=File.read(pdf_file)
       FileUtils.rm_rf(dir)

data/lib/rails-latex/version.rb

@@ -1,5 +1,5 @@
 module Rails
   module Latex
-    VERSION = "1.0.12"
+    VERSION = "1.0.13"
   end
 end

data/rails-latex.gemspec

@@ -5,11 +5,12 @@ require "rails-latex/version"
 Gem::Specification.new do |s|
   s.name        = "rails-latex"
   s.version     = Rails::Latex::VERSION
-  s.authors     = ["Geoff Jacobsen"]
-  s.email       = ["geoffjacobsen@gmail.com"]
-  s.homepage    = "http://github.com/jacott/rails-latex"
+  s.authors     = ["Jan Baier", "Geoff Jacobsen"]
+  s.email       = ["jan.baier@amagical.net"]
+  s.homepage    = "http://github.com/baierjan/rails-latex"
   s.summary     = %q{A LaTeX to pdf rails 3 renderer.}
   s.description = %q{rails-latex is a renderer for rails 3 which allows tex files with erb to be turned into an inline pdf.}
+  #s.licence     = "MIT"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/test/test_latex_to_pdf.rb

@@ -68,6 +68,16 @@ class TestLatexToPdf < Test::Unit::TestCase
     assert_equal ["#{TMP_DIR}/tmp/rails-latex/input.log"], Dir["#{TMP_DIR}/tmp/rails-latex/*"]
   end
 
+  def test_generate_pdf_parse_runs
+    pdf_file=write_pdf do
+      LatexToPdf.config[:parse_runs]=2
+      LatexToPdf.generate_pdf(IO.read(File.expand_path('../test_doc.tex',__FILE__)),{})
+    end
+    assert_equal "The last page is 1.\n\n1\n\n\f", `pdftotext #{pdf_file} -`
+
+    assert_equal ["#{TMP_DIR}/tmp/rails-latex/input.log"], Dir["#{TMP_DIR}/tmp/rails-latex/*"]
+  end
+
   def test_doc_log_written
     begin
       LatexToPdf.generate_pdf(IO.read(File.expand_path('../test_doc.tex',__FILE__)),{})

metadata

@@ -1,47 +1,53 @@
 --- !ruby/object:Gem::Specification
 name: rails-latex
 version: !ruby/object:Gem::Version
-  version: 1.0.12
+  version: 1.0.13
+  prerelease: 
 platform: ruby
 authors:
+- Jan Baier
 - Geoff Jacobsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-09 00:00:00.000000000 Z
+date: 2015-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: RedCloth
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 4.2.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 4.2.7
 description: rails-latex is a renderer for rails 3 which allows tex files with erb
   to be turned into an inline pdf.
 email:
-- geoffjacobsen@gmail.com
+- jan.baier@amagical.net
 executables: []
 extensions: []
 extra_rdoc_files:
@@ -93,32 +99,29 @@ files:
 - test/test_broken_doc.tex
 - test/test_doc.tex
 - test/test_latex_to_pdf.rb
-homepage: http://github.com/jacott/rails-latex
+homepage: http://github.com/baierjan/rails-latex
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options:
 - --main=README.rdoc
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: A LaTeX to pdf rails 3 renderer.
-test_files:
-- test/helper.rb
-- test/test_broken_doc.tex
-- test/test_doc.tex
-- test/test_latex_to_pdf.rb
+test_files: []

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 184a55dac5d356018d4dc5d476c3a8110ec64f6c
-  data.tar.gz: e5976e30e07475083badf5c781b84cb9b34fa7a4
-SHA512:
-  metadata.gz: 0081962be9aa3cc1f8efb61af0793e49e9b05ae2f67f7661896132afa564447ab9e800323906ce02a0f2e38004cb1b89f488d3dff2e5fbe373f7dde60f92c698
-  data.tar.gz: 4f9887516749dd1c74517c30cade07e517f132c543ca8d515752cb2276831952c0f937228253ebee567d488f76f7a6706cc2fdb70c44d715688e0d3a634017b9