latex_to_png 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ec7822ae92fb0f98e532fa72737330791bc9a24
-  data.tar.gz: 9e3f2a3593321336d06d88e70ff675a789a007bc
+  metadata.gz: 2343b421ba8305388e395e8ec3f072ad0d36005d
+  data.tar.gz: 5ed7548a0e922fcca88a2d2f8c86d32b025c460a
 SHA512:
-  metadata.gz: b6e673221153c9fc1142e2dccfa91e44014f7a4515c6f57b978330e6f00ba0c33c45b05a45d1331c0d34eb4853e02540cc17c4677e490ea8d9bfcb817e846cc1
-  data.tar.gz: 925fa8fea6b554c5148fd8099a77e996f19bca10c7f15e8195bc4608998daf21933983f094c545f6ac71a6f04ed0072f95da41b58050d93392f355776a749d60
+  metadata.gz: 5ba388cc7b822b3849cfbbed26e5db5881181d40d2042b4ac2abfd90d349fdb9b9edde12949a10d05444fb03d3d8a8284ed5221253f5f4e21c29a64ba1d2fdcf
+  data.tar.gz: bb8a3588cb7b6cb329b5b5af9eba84fe3ccb88108969787cff9c9d9dfd7c84ab26f0dd6804521160ee1ed6d77c50f80504112405f3356f6d32556d1e3bdd63b8

data/Gemfile

@@ -3,6 +3,6 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in latex_to_png.gemspec
 gemspec
 
-
-gem 'byebug'
-gem 'rspec'
+platforms :ruby do
+  # gem 'byebug'
+end

data/README.md

@@ -19,7 +19,15 @@ Or install it yourself as:
 ## External Dependencies
 
 	sudo apt-get install imagemagick libmagickcore-dev
-	
+
 	sudo apt-get install texlive texlive-latex-extra
-	
-	sudo apt-get install texinfo
+
+	sudo apt-get install texinfo
+
+
+## From source
+
+```
+$ cd latex_to_png
+$ gem build
+```

data/latex_to_png.gemspec

@@ -24,4 +24,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec"
+
 end

data/lib/latex_to_png/version.rb

@@ -1,3 +1,3 @@
 module LatexToPng
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/latex_to_png.rb

@@ -1,8 +1,6 @@
 require "latex_to_png/version"
 require 'tempfile'
 require "erb"
-require 'ostruct'
-
 
 
 #precisa do programa texi2dvi
@@ -23,85 +21,103 @@ begin
     end
 rescue Exception => e
     puts e
-    # raise Gem::Installer::ExtensionBuildError 
+    # raise Gem::Installer::ExtensionBuildError
 end
 
 require "latex_to_png/sizes"
 
 module LatexToPng
-  
-
-
-  ROOT_LIB = File.dirname __FILE__
 
+  Formula = Struct.new(:formula)
 
   class Convert
 
-		attr_accessor :dirname , :filename, :basename, :png_file, :template_path
+		attr_accessor  :filepath
 
-    def size_in_points size_in_pixels
-      size = Sizes.invert[size_in_pixels]
-      if size.nil?
-        size_in_points "#{size_in_pixels.to_i + 1}px"
+    class << self
 
-      else
-        size
+      def template
+        return @doc if @doc
+        @doc = ERB.new(File.read("#{ File.dirname __FILE__}/templates/equation.erb"))
+        @doc
       end
+
     end
 
-		def initialize opts={ filename: nil, formula: nil, template_path: nil, size: nil }
-      
-      @filename = opts[:filename]  if opts[:filename]
-			@basename = File.basename opts[:filename].split(".")[0] if opts[:filename]
-			@dirname =  File.dirname opts[:filename]  if opts[:filename]
+    #or formula or filepath
+		def initialize opts={ filepath: nil, formula: nil, size: nil }
 
+      @filepath = opts[:filepath]  if opts[:filepath]
       @size = (opts[:size] || 10).to_i
-      @template_path = opts[:template_path] if opts[:template_path]
       @formula = opts[:formula] if opts[:formula]
+
 		end
 
-		def to_png
-      if @formula
-        doc = ERB.new(File.read("#{ROOT_LIB}/templates/equation.erb"))
-        infos = OpenStruct.new({formula: @formula })
-        doc = doc.result(infos.instance_eval { binding })
-        
-        tmp_file = Tempfile.new("formula")
-        tmp_file.write doc
-        tmp_file.close
-        # debugger
-        @filename = tmp_file.path
-      else
-        @filename
-  	  end
+    def size_in_points size_in_pixels
+      size = Sizes.invert[size_in_pixels]
+      return (size.nil?)? size_in_points("#{size_in_pixels.to_i + 1}px") : size
+    end
 
-      name = @filename.split("/").last.split(".").first 
-      dirname =  File.dirname @filename
-      basename = @filename.gsub( /.tex$/,'')
-      density = ((300/10)*@size).to_i
+    def from_formula formula, size
 
-      %x(cd #{dirname}; latex -halt-on-error #{@filename} >> convert_#{name}.log)
-      %x(cd #{dirname}; dvips -q* -E #{name}.dvi  >> convert_#{name}.log)
-      %x(cd #{dirname}; convert -density #{density}x#{density} #{name}.ps #{name}.png  >> convert_#{name}.log)
-      %x(cd #{dirname}; rm -f #{name}.dvi #{name}.log #{name}.aux #{name}.ps)
-      png_path = "#{@filename.gsub(/.tex$/,"")}.png"
 
-      if File.exist? png_path
-        %x(cd #{dirname}; rm -f convert_#{name}.log)
-        @png_file = open(png_path)
-      else
-        %x(cp #{tmp_file.path} #{dirname}/origin_#{name}.log)
-        raise StandardError
-      end
+      tmp_file = Tempfile.new("formula")
+      tmp_file.write  mount_tex(formula)
+      tmp_file.close
+      # debugger
+      filepath = tmp_file.path
 
-    end  
+      convert(filepath,size )
 
-  	private
-  	
-  	def move_to_dir
-  		"cd #{@dirname}"
-  	end 
+    end
+
+    def mount_tex formula
+       self.class.template.result(Formula.new( formula ).instance_eval { binding })
+    end
+
+
+    def from_estatic filepath, size
+
+      convert(filepath, size )
+    end
+
+    def convert filepath, size,
+      name = filepath.split("/").last.split(".").first
+      dirname =  File.dirname filepath
+      density = ((300/10)*size).to_i
+# debugger
+        #convert for .dvi
+        # dvi to .ps
+        # .ps to .png "q*" option is to run quietly
+
+         %x(
+           cd #{dirname}; latex -halt-on-error #{filepath} &&
+           dvips -q* -E #{name}.dvi &&
+           convert -density #{density}x#{density} #{name}.ps #{name}.png  1>&2 > /dev/null
+           )
+
+         Thread.new {
+            %x(cd #{dirname}; rm -f #{name}.dvi #{name}.log #{name}.aux  #{name}.ps &)
+         }.run()
+
+         png_path = "#{filepath.gsub(/.tex$/,"")}.png"
+
+         if File.exist?(png_path)
+           return open(png_path)
+         else
+           raise StandardError("Image not generated")
+         end
+    end
+
+
+		def to_png
+      if @formula
+        from_formula @formula, @size
+
+      else
+        from_estatic @filepath, @size
+  	  end
+    end
 
   end
 end
-

data/lib/templates/equation.erb

@@ -1,11 +1,13 @@
-\documentclass{article}
+\documentclass{standalone}
+\usepackage[active,tightpage]{preview}
 \usepackage{amsmath}
 \usepackage{cancel}
 \usepackage{amsfonts}
 \usepackage{amssymb}
 \usepackage{amsthm}
 \usepackage{mathtools}
-\pagestyle{empty}
 \begin{document}
+\begin{preview}
 $$<%= formula %>$$
+\end{preview}
 \end{document}

data/spec/convert_spec.rb

@@ -1,24 +1,24 @@
 require "spec_helper"
 
-describe "" do 
+describe "" do
 
 	after(:each) do
-		# %x(rm #{ROOT_DIR_SPEC}/support/*.png)
+		 %x(rm -Rf #{ROOT_DIR_SPEC}/support/*.png)
 	end
 
 	context "convert.size_in_points" do
-		it "com valor exato" do 
-		
-			image = LatexToPng::Convert.new(filename: "#{ROOT_DIR_SPEC}/support/flux.tex")
-			
+		it "com valor exato" do
+
+			image = LatexToPng::Convert.new(filepath: "#{ROOT_DIR_SPEC}/support/flux.tex")
+
 			expect(image.size_in_points("12px")).to eq "9pt"
 
 		end
 
-		it "com valor inexato pontos arredondadndo" do 
-		
-			image = LatexToPng::Convert.new(filename: "#{ROOT_DIR_SPEC}/support/flux.tex")
-			
+		it "com valor inexato pontos arredondadndo" do
+
+			image = LatexToPng::Convert.new(filepath: "#{ROOT_DIR_SPEC}/support/flux.tex")
+
 			expect(image.size_in_points("18px")).to eq "14pt"
 
 		end
@@ -27,97 +27,80 @@ describe "" do
 	end
 
 
-	it "dirname do arquivo" do 
-	
-		image = LatexToPng::Convert.new(filename: "#{ROOT_DIR_SPEC}/support/flux.tex")
-		
-		expect(image.dirname).to eq "#{ROOT_DIR_SPEC}/support"
-		expect(image.basename).to eq "flux"
+	it "filepath flux.tex" do
 
-
-	end
-
-	it "dirname do arquivo" do 
-	
-		image = LatexToPng::Convert.new(filename: "#{ROOT_DIR_SPEC}/support/flux.tex")
+		image = LatexToPng::Convert.new(filepath: "#{ROOT_DIR_SPEC}/support/flux.tex")
 		image = image.to_png
 		expect(image.class).to eq File
 
-		File.delete image.path
 	end
 
-	it "dirname do arquivo com \\cancel" do 
-	
-		image = LatexToPng::Convert.new(filename: "#{ROOT_DIR_SPEC}/support/cancel_example.tex")
+	it "filepath cancel_example.tex" do
+
+		image = LatexToPng::Convert.new(filepath: "#{ROOT_DIR_SPEC}/support/cancel_example.tex")
 		image = image.to_png
 
 		expect(image.class).to eq File
-		File.delete image.path
 
 	end
-	
-	context "formula com usando template" do
 
-		it "fração simples" do 
-		
+	context "formula usando template" do
+
+		it "fração simples" do
+
 			image = LatexToPng::Convert.new(formula: "\\frac{a}{b}")
 			image = image.to_png
 
 			expect(image.class).to eq File
 			expect(File.exist? image).to eq true
 
-			File.delete image.path
 		end
 
-		it "fração com \\cdot" do 
-		
+		it "fração com \\cdot" do
+
 			image = LatexToPng::Convert.new(formula: "\\frac{a}{b}\\cdot\\frac{b}{a}")
 			image = image.to_png
 
 			expect(image.class).to eq File
 			expect(File.exist? image).to eq true
 
-			File.delete image.path
 		end
 
-		it "fração com \\cdot e espaços" do 
-		
+		it "fração com \\cdot e espaços" do
+
 			image = LatexToPng::Convert.new(formula: "\\frac{a}{b} \\cdot \\frac{b}{a}")
 			image = image.to_png
 
 			expect(image.class).to eq File
 			expect(File.exist? image).to eq true
 
-			File.delete image.path
 		end
 
-		it "fração com \\cdot e espaços e tab" do 
-		
+		it "fração com \\cdot e espaços e tab" do
+
 			image = LatexToPng::Convert.new(formula: "\\frac{a}{b} 		\\cdot 		\\frac{b}{a}")
 			image = image.to_png
 
 			expect(image.class).to eq File
 			expect(File.exist? image).to eq true
 
-			File.delete image.path
 		end
 
-		it "fração com tamanho de fonte" do 
-		
+		it "fração com tamanho de fonte" do
+
 			image = LatexToPng::Convert.new(formula: "\\frac{a}{b}", size_in_pixels: "19px")
 			image = image.to_png
 
 			expect(image.class).to eq File
 			expect(File.exist? image).to eq true
 
-			# File.delete image.path
 		end
 
-		it "insstrução inexistente como \\blabla" do 
-		
+		it "insstrução inexistente como \\blabla" do
+
 			image = LatexToPng::Convert.new(formula: "\\blabla")
-			expect{image.to_png}.to raise_error
+			expect{image.to_png}.to raise_error(StandardError)
 		end
 
 	end
-end
+end

data/spec/spec_helper.rb

@@ -1,5 +1,5 @@
 require "latex_to_png"
-require "byebug"
+# require "byebug"
 require 'bundler/setup'
 
 Bundler.setup
@@ -9,4 +9,4 @@ ROOT_DIR_SPEC = File.dirname __FILE__
 RSpec.configure do |config|
 
 
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: latex_to_png
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - luizamboni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-10 00:00:00.000000000 Z
+date: 2016-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Conversor de documentos Latex em imagens, via shell script
 email:
 - luizamboni2002@hotmail.com
@@ -88,7 +102,7 @@ requirements:
 - dvips
 - imageMagik
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Conversor de documentos Latex em imagens