rails-latex 1.0.10 → 1.0.11

data/README.rdoc

@@ -1,8 +1,8 @@
 = Rails-LaTeX
 
 * Git: http://github.com/jacott/rails-latex
-* Author: Geoff Jacobsen   
-* Copyright: 2009-2010    
+* Author: Geoff Jacobsen
+* Copyright: 2009-2010
 * License: MIT-LICENSE
 
 == Description
@@ -22,7 +22,7 @@ app/views/stories/show.html.erb:
 
 
 app/views/stories/show.pdf.erb:
-   ...   
+   ...
    <%= lesc @story.name % >
 
 app/views/layouts/application.pdf.erbtex:
@@ -33,7 +33,7 @@ app/views/layouts/application.pdf.erbtex:
 
 
 config/initializers/mime_types.rb:
-   ...     
+   ...
    Mime::Type.register "application/pdf", :pdf, ['text/pdf'], ['pdf']
 
 
@@ -48,12 +48,16 @@ You can override the defaults like so:
 
    LatexToPdf.config.merge! :command => 'xetex', :arguments => ['-etex'], :parse_twice => true
 
+or to change just the arguments:
+
+   LatexToPdf.config[:arguments].delete('-halt-on-error')
+
 The defaults are:
    command: 'pdflatex'
-   arguments: []
+   arguments: ['-halt-on-error']
    parse_twice: false
 
-The last log file is moved to tmp/rails-latex/input.log . If the PDF is no produced the build directory is not removed;
+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.
 
 See the rails application under examples/rails-latex-demo/ for a working example.
@@ -76,7 +80,7 @@ Then in your mailer:
    def email_sender(user, pdf_attachment)
      @user = user
      attachments["attachment_name.pdf"] = {:mime_type => 'application/pdf', :content => pdf_attachment}
-     mail( .... )  
+     mail( .... )
    end
 
 == Requirements

data/examples/rails-latex-demo/app/controllers/latex_example_controller.rb

@@ -7,10 +7,8 @@ class LatexExampleController < ApplicationController
   end
 
   def barcode_as_string
-
-    old_content_type = self.content_type
     @pdf=render_to_string(action: 'barcode', layout: "barcode", formats: [:pdf])
-    self.content_type = old_content_type # render_to_string changes content_type
+    self.content_type = 'text/html'
 
     File.open(file="#{Rails.root}/tmp/a.pdf",'w:binary') do |io|
       io.write(@pdf)

data/lib/rails-latex/latex_to_pdf.rb

@@ -1,6 +1,6 @@
 class LatexToPdf
   def self.config
-    @config||={:command => 'pdflatex', :arguments => [], :parse_twice => false}
+    @config||={:command => 'pdflatex', :arguments => ['-halt-on-error'], :parse_twice => false}
   end
 
   # Converts a string of LaTeX +code+ into a binary string of PDF.
@@ -24,7 +24,7 @@ class LatexToPdf
           Dir.chdir dir
           STDOUT.reopen("input.log","a")
           STDERR.reopen(STDOUT)
-          args=config[:arguments] + %w[-shell-escape -interaction batchmode -halt-on-error input.tex]
+          args=config[:arguments] + %w[-shell-escape -interaction batchmode input.tex]
           system config[:command],'-draftmode',*args if parse_twice
           exec config[:command],*args
         rescue

data/lib/rails-latex/version.rb

@@ -1,5 +1,5 @@
 module Rails
   module Latex
-    VERSION = "1.0.10"
+    VERSION = "1.0.11"
   end
 end

data/test/test_broken_doc.tex

@@ -0,0 +1,7 @@
+\documentclass{article}
+
+\begin{document}
+
+file with \nosuchcommand\ error
+
+\end{document}

data/test/test_latex_to_pdf.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 require 'helper'
 require 'rails-latex/erb_latex'
 require 'ostruct'
@@ -5,7 +6,13 @@ require 'ostruct'
 Rails=OpenStruct.new(:root => TMP_DIR=File.expand_path("../tmp",__FILE__))
 
 class TestLatexToPdf < Test::Unit::TestCase
+  def setup
+    super
+    FileUtils.rm_rf("#{TMP_DIR}/tmp/rails-latex")
+  end
+
   def teardown
+    super
     LatexToPdf.instance_eval { @config=nil }
   end
 
@@ -26,6 +33,22 @@ class TestLatexToPdf < Test::Unit::TestCase
     assert_equal "dsf \\textless{} \\textgreater{} \\& ! @ \\# \\$ \\% \\^{} \\~{} \\textbackslash{} fds", LatexToPdf.escape_latex('dsf < > & ! @ # $ % ^ ~ \\ fds')
   end
 
+  def test_broken_doc_halt_on_error
+    begin
+      LatexToPdf.generate_pdf(IO.read(File.expand_path('../test_broken_doc.tex',__FILE__)),{})
+      fail "Should throw exception"
+    rescue => e
+      assert(/^pdflatex failed: See / =~ e.message)
+    end
+  end
+
+  def test_broken_doc_overriding_halt_on_error
+    pdf_file=write_pdf do
+      LatexToPdf.generate_pdf(IO.read(File.expand_path('../test_broken_doc.tex',__FILE__)),{arguments: []})
+    end
+    assert_equal "file with error\n\n1\n\n\f", `pdftotext #{pdf_file} -`
+  end
+
   def test_generate_pdf_one_parse
     pdf_file=write_pdf do
       LatexToPdf.generate_pdf(IO.read(File.expand_path('../test_doc.tex',__FILE__)),{})

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails-latex
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-18 00:00:00.000000000 Z
+date: 2012-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -95,6 +95,7 @@ files:
 - lib/rails-latex/version.rb
 - rails-latex.gemspec
 - test/helper.rb
+- test/test_broken_doc.tex
 - test/test_doc.tex
 - test/test_latex_to_pdf.rb
 homepage: http://github.com/jacott/rails-latex
@@ -118,9 +119,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.19
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A LaTeX to pdf rails 3 renderer.
 test_files: []
-has_rdoc: