rails-latex 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 981dceed55af9b6b6796e8e01b25877fddcb62c8
-  data.tar.gz: bcff34464bbb2955845001df8500aa4fb9c8c29f
+  metadata.gz: 5309d586b2ef3b9af95eb0c66e120d4c523773b6
+  data.tar.gz: 93a2ad21871df64a11416a0a26bebae2d059fda2
 SHA512:
-  metadata.gz: d13fd73e6c34823a51f71305e5c856c723ddf13b32bacb44e0aee8cec14c578c21cc59b97a1cb8c4b2c39c2af8bbe51fa9c914889023f4e704128c6d14ed1228
-  data.tar.gz: a8c7a813ae373bfe14e105fd595ef186d7c7e1702c9a253602e01ca37acebaad3e75e5dc8453bdfc260985b8ad0b9ce34f43d3e570964b31350d1d15fcc30fff
+  metadata.gz: f942c7f3a80b5e93e4b064bfbbe1adf796a1022df665e2a1b024f482757ea84edad578b01d8402dc3e6f9c9c3745880c647c8d550cb3a3c13f3fd23ee44b3acd
+  data.tar.gz: c8680b6ced9aa002404e4a6969c8c88d23e29e7147041ab1a678da4123d8a35bb0663d99bbbc13141d6e886a6c8adf2afd4cf92f51356eafc8e91aecc2e40711

data/examples/rails-latex-demo/app/views/latex_example/index.html.erb

@@ -1,11 +1,10 @@
 <h1>LatexExample#index</h1>
 <ul>
-  <li> <%= link_to "print", latex_example_path(:format => :pdf) %></li>
+  <li><%= link_to "print", latex_example_path(:format => :pdf) %></li>
 
   <li><%= link_to "print barcode", latex_example_barcode_path(:format => :pdf) %></li>
 
   <li><%= link_to "print barcode - with no '.pdf' in url", latex_example_barcode_path %></li>
 
-
   <li><%= link_to "generate barcode pdf as string", latex_example_barcode_as_string_path %> and write to <tt><%= "#{Rails.root}/tmp/a.pdf" %></tt> </li>
 </ul>

data/examples/rails-latex-demo/app/views/latex_example/index.pdf.erb

@@ -6,4 +6,3 @@ Generated at <%= Time.current %>.
 
 The last page is \pageref{LastPage}.
 
-

data/examples/rails-latex-demo/app/views/layouts/application.pdf.erbtex

@@ -1,14 +1,38 @@
 \documentclass[12pt,a4paper,sloppy]{article}
-<% @latex_config={:command => 'pdflatex',:parse_runs => 2} # you can override the defaults if you wish; see LatexToPdf#config %>
+<% @latex_config = { :recipe => [
+	{:command => 'pdflatex'},
+	{:command => 'bibtex', :arguments =>[]},
+	{:command => 'pdflatex', :runs => 2}
+]} # you can override the defaults if you wish; see LatexToPdf#config
+%>
+\usepackage{filecontents}
 \usepackage{lastpage}
 \usepackage{graphics}
-\begin{document}
 
-This document uses \verb|parse_runs = 2| to calculate the last page.
+\begin{filecontents}{bibliography.bib}
+@article{example,
+  author  = {John Doe},
+  title   = {The title of the work},
+  journal = {The name of the journal},
+  year    = 1993,
+  number  = 2,
+  pages   = {201-213},
+  month   = 7,
+  note    = {An optional note},
+  volume  = 4
+}
+\end{filecontents}
+
+\begin{document}
+This document\cite{example} uses \verb|parse_runs = 2| to calculate the last page.
 
 Other defaults can be overridden using \verb|LatexToPdf#config| and \verb|@latex_config|.
 
 <%= yield %>
 
+\bibliography{bibliography}
+\bibliographystyle{plain}
+
+
 \end{document}
 

data/examples/rails-latex-demo/app/views/layouts/barcode.pdf.erbtex

@@ -4,7 +4,6 @@
 \usepackage{pst-barcode}
 \usepackage{hyperref}
 
-
 \begin{document}
 
 <%= yield %>

data/lib/rails-latex/erb_latex.rb

@@ -13,7 +13,7 @@ module ActionView               # :nodoc: all
       def compile(template)
         erb = "<% __in_erb_template=true %>#{template.source}"
         out=self.class.erb_implementation.new(erb, :trim=>(self.class.erb_trim_mode == "-")).src
-        out + ";LatexToPdf.generate_pdf(@output_buffer.to_s,@latex_config||{},@latex_parse_twice)"
+        out + ";LatexToPdf.generate_pdf(@output_buffer.to_s, @latex_config||{})"
       end
     end
   end

data/lib/rails-latex/latex_to_pdf.rb

@@ -1,53 +1,94 @@
 # -*- coding: utf-8 -*-
 class LatexToPdf
   def self.config
-    @config||={:command => 'pdflatex', :arguments => ['-halt-on-error'], :parse_runs => 1}
+    @config||={
+      :recipe => [
+      #  {
+      #    :command => 'pdflatex',
+      #    :input => 'input.tex',
+      #    :arguments => ['-halt-on-error', '-shell-escape', '-interaction=batchmode'],
+      #    :extra_arguments => [],
+      #    :runs => 1
+      #  }
+      ],
+      :command => 'pdflatex',
+      :arguments => ['-halt-on-error'],
+      :default_arguments => ['-shell-escape', '-interaction=batchmode'],
+      :parse_runs => 1
+    }
   end
 
   # Converts a string of LaTeX +code+ into a binary string of PDF.
   #
-  # pdflatex is used to convert the file and creates the directory +#{Rails.root}/tmp/rails-latex/+ to store intermediate
-  # files.
+  # By default, pdflatex is used to convert the file and creates the directory
+  # +#{Rails.root}/tmp/rails-latex/+ to store intermediate files.
   #
-  # The config argument defaults to LatexToPdf.config but can be overridden using @latex_config.
-  def self.generate_pdf(code,config,parse_twice=nil)
-    config=self.config.merge(config)
-    parse_runs=config[:parse_runs]
-    Rails.logger.info "Running Latex #{parse_runs} times..."
-    dir=File.join(Rails.root,'tmp','rails-latex',"#{Process.pid}-#{Thread.current.hash}")
-    input=File.join(dir,'input.tex')
+  # The config argument defaults to LatexToPdf.config but can be overridden
+  # using @latex_config.
+  def self.generate_pdf(code, config)
+    config = self.config.merge(config)
+    recipe = config[:recipe]
+
+    # Deprecated legacy mode, if no recipe found
+    if recipe.length == 0
+      if config != self.config
+        Rails.logger.warn("Using command, arguments and parse_runs is deprecated in favor of recipe")
+      end
+      # Regression fix -- ability to override some arguments (-halt-on-error) but not other (-interaction),
+      #                   this is expected behaviour as seen in test_broken_doc_overriding_halt_on_error.
+      #                   Will be fixed in rails-latex 3
+      recipe = [{
+        :command => config[:command],
+        :arguments => config[:arguments] + config[:default_arguments],
+        :runs => config[:parse_runs]
+      }]
+    end
+
+    # Create directory, prepare additional supporting files (.cls, .sty, ...)
+    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.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(
-      fork do
-        begin
-          Dir.chdir dir
-          args=config[:arguments] + %w[-shell-escape -interaction batchmode input.tex]
-          kwargs={:out => ["input.log","a"]}
-          (parse_runs-1).times do
-            system config[:command],'-draftmode',*args,**kwargs
+    File.open(input,'wb') {|io| io.write(code)}
+
+    # Process recipe
+    recipe.each do |item|
+      command = item[:command] || config[:command]
+      runs = item[:runs] || config[:parse_runs]
+      args = item[:arguments] || config[:arguments]
+      args += item[:extra_arguments].to_a + ['input']
+      kwargs = {:out => ["input.log", "a"]}
+      Rails.logger.info "Running #{command} #{args.join(' ')} #{runs} times..."
+      Process.waitpid(
+        fork do
+          begin
+            Dir.chdir dir
+            (runs - 1).times do
+              system command, *args, **kwargs
+            end
+            exec command, *args, **kwargs
+          rescue
+            File.open("input.log", 'a'){|io|
+              io.write("#{$!.message}:\n#{$!.backtrace.join("\n")}\n")
+            }
+          ensure
+            Process.exit! 1
           end
-          exec config[:command],*args,**kwargs
-        rescue
-          File.open("input.log",'a') {|io|
-            io.write("#{$!.message}:\n#{$!.backtrace.join("\n")}\n")
-          }
-        ensure
-          Process.exit! 1
         end
-      end)
+      )
+    end
+
+    # Finish
     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.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)
     else
-      raise "pdflatex failed: See #{input.sub(/\.tex$/,'.log')} for details"
+      raise "rails-latex failed: See #{input.sub(/\.tex$/,'.log')} for details"
     end
     result
   end

data/lib/rails-latex/version.rb

@@ -1,3 +1,3 @@
 module RailsLatex
-  VERSION = "2.0.1"
+  VERSION = "2.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails-latex
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Jan Baier
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-04 00:00:00.000000000 Z
+date: 2016-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails