erb_latex 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c84304bc85e90020a761203b4bdddc2586c039cc
-  data.tar.gz: a9e53b0cf408eb643a2fcf9442e86817582cb4a8
+  metadata.gz: ff1d232589ee66eab16df483e4a00650123023e2
+  data.tar.gz: 812988816e5f7b00cc11e535feb0e898d49f8dd4
 SHA512:
-  metadata.gz: 21ea773fdbff0b511714dc2582697dc80a027696ae31fb6379ce61c92819a7218b9dc9d455f83d6ae0c07395fe4b97efbfbe91ff0faaccf85a78fb03333f1ac2
-  data.tar.gz: a9d6ac79090d939e2f1b8515a06d50cfbd88fcb5de36ecc1edb7c6412316a4326f63627c8f63c1c0c2c197909b10f49cfc9f16aa849faa96e54ab95239bfd66a
+  metadata.gz: 6914c9b7f198d049f633176ad2902f4e2a537c879303ad989842badbd7a488fa12b2b95db64e12a11b39fe2e0327766ed37153d760b5d52a444973386554518f
+  data.tar.gz: f7657b33f14bbc3ed55e20ec1d7f0ded2f5a83cc155ffc2123de7d58bc86685a57e491e233c4eb224543ebb62199dd117c4b920835a4e3894f1274f07259f45c

data/erb_latex.gemspec

@@ -18,6 +18,7 @@ Gem::Specification.new do |spec|
     spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
     spec.require_paths = ["lib"]
 
+    spec.add_development_dependency "rake",    "~> 10.5"
     spec.add_development_dependency "bundler", "~> 1.10"
     spec.add_development_dependency "yard",    "~> 0.8"
     spec.add_development_dependency "guard",   "~> 2.13"

data/lib/erb_latex.rb

@@ -1,17 +1,12 @@
 require "erb_latex/version"
+require "erb_latex/configuration"
 require "erb_latex/errors"
 require "erb_latex/context"
 require "erb_latex/stringio"
 require "erb_latex/template"
-module ErbLatex
-
+require "erb_latex/file_access"
 
+module ErbLatex
 
-    def self.xelatex_binary
-        defined?(@@xelatex_binary) ? @@xelatex_binary  : "xelatex"
-    end
 
-    def self.xelatex_binary=(bin)
-        @@xelatex_binary = bin
-    end
 end

data/lib/erb_latex/configuration.rb

@@ -0,0 +1,25 @@
+module ErbLatex
+    class << self
+        attr_reader :config
+    end
+
+
+    def self.configure
+        yield(@config)
+    end
+
+    class Configuration
+        attr_accessor :file_extension
+        attr_accessor :xelatex_path
+        attr_accessor :verbose_logs
+
+        def initialize
+            @verbose_logs   = false
+            @file_extension = '.tex.erb'
+            @xelatex_path   = 'xelatex'
+        end
+    end
+
+    # Initialize configuration with defaults
+    @config = Configuration.new
+end

data/lib/erb_latex/context.rb

@@ -30,13 +30,8 @@ module ErbLatex
 
         # include another latex file into the current template
         def partial( template, data={} )
-            view_file = @directory.join( template )
-            if view_file.exist?
-                context = Context.new( @directory, data )
-                ERB.new( view_file.read, 0, '-' ).result(  context.getBinding )
-            else
-                "missing partial: #{template}"
-            end
+            context = Context.new( @directory, data )
+            ErbLatex::File.evaluate(Pathname.new(template), context.getBinding, @directory)
         end
 
         # convert newline characters into latex '\\newline'

data/lib/erb_latex/errors.rb

@@ -7,7 +7,7 @@ module ErbLatex
         #   @return the log from the xelatex run
         attr_reader :log
 
-        def initialize( msg, log )
+        def initialize( msg, log = '')
             super(msg)
             @log = log
         end

data/lib/erb_latex/file_access.rb

@@ -0,0 +1,28 @@
+module ErbLatex
+
+    module File
+
+        # simualar to File.read, except:
+        #   * Will search in_directory for file if given, otherwise expects file to be an absolute path
+        #   * appends ErbLatex.config.file_extension to the file if it's not found as-is.
+        def self.read(file, in_directory = nil)
+            if in_directory
+                file = Pathname.new(in_directory.to_s).join(file)
+            end
+            unless file.exist?
+                file = Pathname.new(file.to_s + ErbLatex.config.file_extension) unless file.exist?
+            end
+            unless file.exist?
+                msg = "Unable to read from #{@view.to_s}.  Also tried extension #{ErbLatex.config.file_extension}"
+                raise LatexError.new(msg)
+            end
+            file.read
+        end
+
+        def self.evaluate(file, context_binding, directory = nil)
+            ::ERB.new( self.read(file, directory), 0, '-' ).result( context_binding )
+        end
+
+    end
+
+end

data/lib/erb_latex/template.rb

@@ -97,7 +97,7 @@ module ErbLatex
                     yield pdf_file
                 else
                     errors = @log.scan(/\*\!\s(.*?)\n\s*\n/m).map{|e| e.first.gsub(/\n/,'') }.join("; ")
-                    STDERR.puts @log
+                    STDERR.puts @log, errors if ErbLatex.config.verbose_logs
                     raise LatexError.new( errors.empty? ? "xelatex compile error" : errors, @log )
                 end
             end
@@ -114,11 +114,9 @@ module ErbLatex
         def compile_latex
             begin
                 context = ErbLatex::Context.new( @partials_path || @view.dirname, @data )
-                content = ERB.new( @view.read, 0, '-' ).result( context.getBinding )
+                content = ErbLatex::File.evaluate(@view, context.getBinding)
                 if layout
-                    ERB.new( layout_file.read, nil, '-' ).result( context.getBinding{
-                        content
-                    })
+                    ErbLatex::File.evaluate(layout_file, context.getBinding{ content })
                 else
                     content
                 end
@@ -144,7 +142,7 @@ module ErbLatex
             if @packages_path
                 ENV['TEXINPUTS'] = "#{@packages_path}:"
             end
-            Open3.popen2e( ErbLatex.xelatex_binary,
+            Open3.popen2e( ErbLatex.config.xelatex_path,
               "--no-shell-escape", "-shell-restricted",
               "-jobname=output",   "-output-directory=#{dir}",
             ) do |stdin, output, wait_thr|

data/lib/erb_latex/version.rb

@@ -1,5 +1,5 @@
 module ErbLatex
 
-    VERSION = "0.2.0"
+    VERSION = "0.3.0"
 
 end

data/test/erb_latex_test.rb

@@ -42,4 +42,11 @@ class ErbLatexTest < MiniTest::Test
         assert_match "a test ’ of a partial", text_output
     end
 
+    def test_path_with_extension
+        tmpl = ErbLatex::Template.new( document('with_partial.tex.erb') )
+        tmpl.to_file tmp_output_file
+        assert_match "a test ’ of a partial", text_output
+    end
+
+
 end

data/test/helper.rb

@@ -1,14 +1,9 @@
 require 'rubygems'
 require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
+require 'minitest'
+
 
-#require 'test/unit'
+require 'minitest/autorun'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
@@ -17,7 +12,7 @@ require 'erb_latex'
 class MiniTest::Test
 
     def document( name )
-        File.expand_path(File.join(File.dirname(__FILE__), "fixtures/#{name}.tex.erb"))
+        File.expand_path(File.join(File.dirname(__FILE__), "fixtures/#{name}"))
     end
 
     def tmp_output_file

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: erb_latex
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Nathan Stitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-25 00:00:00.000000000 Z
+date: 2016-02-11 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.5'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -83,8 +97,10 @@ files:
 - Rakefile
 - erb_latex.gemspec
 - lib/erb_latex.rb
+- lib/erb_latex/configuration.rb
 - lib/erb_latex/context.rb
 - lib/erb_latex/errors.rb
+- lib/erb_latex/file_access.rb
 - lib/erb_latex/guard.rb
 - lib/erb_latex/guard_runner.rb
 - lib/erb_latex/stringio.rb