rghost 0.8.6.5 → 0.8.7

data/lib/rghost/callback.rb

@@ -27,7 +27,7 @@ class RGhost::Callback < RGhost::PsObject
   def initialize(name,options={},&block)
     
     super(""){}
-    set RGhost::PsFacade.new(&block)
+    set RGhost::PsFacade.new(&block) if block
     @name=name
     @options=options
     
@@ -45,11 +45,10 @@ class RGhost::Callback < RGhost::PsObject
   private
   def num_to_array(value)
     case value
-      when Fixnum
+      when Fixnum: 
         a=[]
         a << value
-      when NilClass
-        []
+      when NilClass: []
       else
         value
     end

data/lib/rghost/color.rb

@@ -35,14 +35,14 @@ class RGhost::Color < RGhost::PsObject
   def self.create(color="FFAA99")
     
     return case color
-    when String then RGhost::RGB.new(color)
-    when Symbol
+    when String: RGhost::RGB.new(color)
+    when Symbol:
         c=RGhost::Constants::Colors::RGB[color]
       raise ArgumentError.new("#{color}##{color.class}") unless c 
       self.create c
          
-    when Array, Hash
-      if color.size == 3
+    when Array, Hash:
+        if color.size == 3
         RGhost::RGB.new(color)
       elsif color.size == 4 
         RGhost::CMYK.new(color)
@@ -51,7 +51,7 @@ class RGhost::Color < RGhost::PsObject
       else
         raise ArgumentError.new("#{color}##{color.class}")
       end
-    when Numeric then RGhost::Gray.new(color)
+    when Numeric: RGhost::Gray.new(color)
     else
       raise ArgumentError.new("#{color}##{color.class}")
     end
@@ -93,14 +93,10 @@ class RGhost::RGB < RGhost::Color
 	end
 	def color_params
     case @color
-    when Hash
-      [@color[:red] || @color[:r],@color[:green] || @color[:g],@color[:blue] || @color[:b]]
-    when Array
-      @color
-    when String
-      hex_to_rgb(@color) 
-    when NilClass
-      [0,0,1]
+    when Hash:  [@color[:red] || @color[:r],@color[:green] || @color[:g],@color[:blue] || @color[:b]]
+    when Array:  @color
+    when String: hex_to_rgb(@color) 
+    when NilClass: [0,0,1]
     end
 		
 		
@@ -130,10 +126,8 @@ class RGhost::CMYK < RGhost::Color
   
   def ps
     value=case @color
-      when Hash
-        [@color[:cyan] || @color[:c],@color[:magenta] || @color[:m],@color[:yellow] || @color[:y],@color[:black] || @color[:k]]
-      when Array
-        @color
+      when Hash:  [@color[:cyan] || @color[:c],@color[:magenta] || @color[:m],@color[:yellow] || @color[:y],@color[:black] || @color[:k]]
+      when Array:  @color
     end
     
     array_to_stack(value.map{|n| n > 1 ? n/100.0: n})+"setcmykcolor"
@@ -153,10 +147,8 @@ class RGhost::CMYKSpot < RGhost::Color
   
   def ps
     value=case @color
-      when Hash
-        [@color[:cyan] || @color[:c],@color[:magenta] || @color[:m],@color[:yellow] || @color[:y],@color[:black] || @color[:k]]
-      when Array
-        @color
+      when Hash:  [@color[:cyan] || @color[:c],@color[:magenta] || @color[:m],@color[:yellow] || @color[:y],@color[:black] || @color[:k]]
+      when Array:  @color
     end
     
     array_to_stack(value.map{|n| n > 1 ? n/100.0: n}) + "(#{@name.to_s}) findcmykcustomcolor \n/#{@name.to_s.gsub(' ', '_')} exch def\n\n#{@name.to_s.gsub(' ', '_')} 1 setcustomcolor"

data/lib/rghost/document.rb

@@ -75,11 +75,12 @@ class RGhost::Document < RGhost::PsFacade
   #* <tt>:row_height and row_padding</tt> - Its names say by itself :)
   #* <tt>:font_encoding</tt> - Specifies encoding of data input. You can look for supported encoding using the method RGhost::Config.encode_test
   def initialize(options={},&block)
-    super()
+    
+    
     @head,@callbacks=RGhost::PsObject.new,RGhost::PsObject.new
     @head.set RGhost::Load.library(:type)
     @head.set RGhost::Load.library(:unit)
-    
+    #super()
     @variables=DEFAULT_OPTIONS.dup.merge(options)
     default_encoding
     @paper=RGhost::Paper.new(options[:paper] || :A4, options)
@@ -90,7 +91,9 @@ class RGhost::Document < RGhost::PsFacade
     @additional_params=[]
     
     default_variables
-    yield self if block
+    super()
+    #block.call(self) if block
+    #yield self if block
   end
   
   def gs_paper #:nodoc:
@@ -148,7 +151,7 @@ class RGhost::Document < RGhost::PsFacade
   end   
     
   def ps #:nodoc:
-    done unless @done
+    done 
     
     
     
@@ -251,17 +254,10 @@ class RGhost::Document < RGhost::PsFacade
   # printer.write doc.render_stream(:ps) 
   # printer.close
   def render_stream(device,options={})
-    #    rg=render(device,options)
-    #    out=rg.output.readlines.join
-    #    rg.clear_output
-    #    out
-
     rg=render(device,options)
-    out=rg.output
-    raise "RGhost::#{rg.errors} - #{out}" if rg.error?
-    data=out.readlines.join
+    out=rg.output.readlines.join
     rg.clear_output
-    data
+    out
   end
   #Facade to Function.new
   #Defines low level function to optimize repetitive piece of code.
@@ -325,16 +321,16 @@ class RGhost::Document < RGhost::PsFacade
     set RGhost::VirtualPages.new(&block)
   end
   {
-    :base => -4,
-    :print => -4,
-    :modify => -8,
-    :copy => -16,
-    :annotate => -32,
-    :interactive => -256,
-    :copy_access =>  -512,
-    :assemble => -1024,
-    :high_quality_print => -2048,
-    :all => -3904}
+       :base => -4,
+     :print => -4,
+     :modify => -8,
+     :copy => -16,
+     :annotate => -32,
+     :interactive => -256,
+     :copy_access =>  -512,
+     :assemble => -1024,
+     :high_quality_print => -2048,
+     :all => -3904}
   
   #Security disable the permissions and define passwords to PDF documents. 
   #The password just support set of \w .
@@ -366,9 +362,9 @@ class RGhost::Document < RGhost::PsFacade
   # end
   #
   def security
-    sec=RGhost::PdfSecurity.new
-    yield sec
-    @additional_params << sec.gs_params
+     sec=RGhost::PdfSecurity.new
+     yield sec
+     @additional_params << sec.gs_params
   end
   
   #Starts and Ends internal benckmark will write in bottom of page.
@@ -454,14 +450,18 @@ class RGhost::Document < RGhost::PsFacade
 
   #Informs is ready to converts/prints
   def done
-    @done=true
-    raw "\n\n"
-    call :after_page_create
-    call :callback
-    call :after_document_create
     
-    showpage
-    raw "\n%%EOF"
+    unless @done
+      @done=true
+      raw "\n\n"
+      call :after_page_create
+      call :callback
+      call :after_document_create
+    
+      showpage
+      raw "\n%%EOF"
+    end
+    self
   end
   def enable_virtual_pages
     set RGhost::Variable.new(:has_vp?, true)

data/lib/rghost/font.rb

@@ -34,12 +34,9 @@ class RGhost::Font < RGhost::PsObject #:nodoc:
        
     size= o[:size]
     str_ret+=case size
-    when Hash
-      "/#{@name} findfont [ #{size[:width]} 0 0 #{size[:height]} 0 0] makefont setfont "
-    when Array
-      "/#{@name} findfont [ #{size[0]} 0 0 #{size[1]} 0 0] makefont setfont "
-    when Fixnum
-      "/#{@name} findfont #{size} scalefont setfont "
+    when Hash:   "/#{@name} findfont [ #{size[:width]} 0 0 #{size[:height]} 0 0] makefont setfont "
+    when Array:  "/#{@name} findfont [ #{size[0]} 0 0 #{size[1]} 0 0] makefont setfont "
+    when Fixnum: "/#{@name} findfont #{size} scalefont setfont "
     end
     str_ret
   end

data/lib/rghost/font_map.rb

@@ -3,7 +3,7 @@
 require 'ps_object'
 require 'font'
 require 'function'
-require 'color'
+
 
 class RGhost::FontMap < RGhost::PsObject #:nodoc:
   include RGhost::RubyToPs

data/lib/rghost/graphic.rb

@@ -1,7 +1,5 @@
 require "ps_object"
 require "cursor"
-require "color"
-require "point"
 require "point"
 require "line_width"
 #Creates a new graphic state between gsave and grestore postscript primitives. Example

data/lib/rghost/image.rb

@@ -13,12 +13,9 @@ class RGhost::Image < RGhost::PsObject
   def self.for(path,options={})
     
     clazz=case path
-      when /gif$/i
-        RGhost::Gif
-      when /jpe?g$/i
-        RGhost::Jpeg
-      when /(eps|template)$/i
-        RGhost::Eps
+      when /gif$/i: RGhost::Gif
+      when /jpe?g$/i: RGhost::Jpeg
+      when /(eps|template)$/i : RGhost::Eps
       else raise NameError.new("Unsupported format")
     end
     

data/lib/rghost/newpath.rb

@@ -1,7 +1,5 @@
 require "ps_object"
 require "cursor"
-require "color"
-require "point"
 require "point"
 require "line_width"
 

data/lib/rghost/paper.rb

@@ -87,10 +87,8 @@ class RGhost::Paper < RGhost::PsObject
     
     
     return case RGhost::Config::GS[:unit].new
-    when RGhost::Units::Cm
-      (value.to_f*72/2.545).to_i
-    when RGhost::Units::Inch
-      (value.to_f*72).to_i
+    when RGhost::Units::Cm: (value.to_f*72/2.545).to_i
+    when RGhost::Units::Inch: (value.to_f*72).to_i
     else
       value
     end
@@ -107,10 +105,9 @@ class RGhost::Paper < RGhost::PsObject
     #end
      
     case @options[:margin]
-    when Numeric
-      mt=mr=mb=ml=RGhost::Units::parse(@options[:margin])
-    when Array
-      mt=RGhost::Units::parse(@options[:margin][0] || DEFAULT_OPTIONS[:margin_top] )
+    when Numeric: mt=mr=mb=ml=RGhost::Units::parse(@options[:margin])
+    when Array:
+        mt=RGhost::Units::parse(@options[:margin][0] || DEFAULT_OPTIONS[:margin_top] )
       mr=RGhost::Units::parse(@options[:margin][1] || DEFAULT_OPTIONS[:margin_right])
       mb=RGhost::Units::parse(@options[:margin][2] || DEFAULT_OPTIONS[:margin_bottom])
       ml=RGhost::Units::parse(@options[:margin][3] || DEFAULT_OPTIONS[:margin_left] )
@@ -127,11 +124,12 @@ class RGhost::Paper < RGhost::PsObject
   def format_paper
 
     case @paper
-    when Symbol
-      p=RGhost::Constants::Papers::STANDARD[@paper.to_s.downcase.to_sym]
+    when Symbol: 
+     
+        p=RGhost::Constants::Papers::STANDARD[@paper.to_s.downcase.to_sym]
       p.reverse! if @options[:landscape] 
       {:rg => "/pagesize #{to_array( p  ) } def\n", :gs => p, :done => true}
-    when Array
+    when Array: 
         @paper.reverse! if @options[:landscape] 
       {:rg => "/pagesize #{to_array( @paper.map{|v| to_pt(v) } ) } def\n", :gs => @paper, :done => false}
     end

data/lib/rghost/parse_text.rb

@@ -5,10 +5,10 @@ module RGhost::ParseText #:nodoc:
     
     unless @tag_parse
       case @options[:text_align]
-      when :center, :right
+      when :center, :right:
         @text.split(/\n/).map{|l| "#{to_string(l)} :text_proc_cr :nbw " }.to_s  
         jump_with=':nbw'
-      when :left,nil
+      when :left,nil:
         if self.class == RGhost::Text
           return @text.split(/\n/).map{|l| " :text #{to_string(l)} :text_proc nrdp " }.to_s 
 

data/lib/rghost/polygon.rb

@@ -57,7 +57,7 @@ class RGhost::Polygon < RGhost::PsObject
   
   def ps
     graph=RGhost::Graphic.new 
-    graph.set Cursor.moveto(@options)
+    graph.set RGhost::Cursor.moveto(@options)
     graph.set RGhost::Border.new(@options[:border]) if @options[:border]
     
     @points.each{|p|  graph.set RGhost::Line.rlineto(p) }

data/lib/rghost/ps_facade.rb

@@ -1,50 +1,19 @@
-require "ps_object"
-require "dynamic_document_callback"
-require "static_document_callback"
-require "paper"
-require "load"
-#require "function"
-require "font"
-require "cursor"
-require "show"
-require "color"
-require "graphic"
-#require "arc"
-require "newpath"
-require "line"
-require 'parse_text'
-require "line_width"
-require "textarea"
-require "variable"
-require "eps"
-require "jpeg"
-require "gif"
-require "text_in"
-require "text_link_in"
-require "ruby_ghost_engine"
-require "convert"
-require "text"
-require "dash"
-require "border"
-require "shape_content"
-#require "rectangle"
-require "vertical_line"
-require "horizontal_line"
-require "frame"
-require "polygon"
-require "circle"
-require "how_to"
-require 'rectangle_link'
+[:ps_object, :dynamic_document_callback,:static_document_callback, :paper, :load,
+:cursor,:show, :color, :graphic, :newpath, :line,  :parse_text,:line_width, :textarea, 
+:variable, :eps, :jpeg, :gif, :text_in, :text_link_in, :ruby_ghost_engine, :convert,
+:text, :dash, :border, :shape_content,  :vertical_line, :horizontal_line, 
+:frame, :polygon, :circle, :how_to, :rectangle_link].each{|lib| require "rghost/#{lib}" }
 
 
 #PsFacade is just a big facade involving an instance of most postscript objects.
 class RGhost::PsFacade < RGhost::PsObject
   attr_reader :rows
   
-  def initialize(&block)
+  def initialize #(&block)
     super(""){}
     @rows=0
-    instance_eval(&block) if block
+    yield self if block_given?
+    #instance_eval(&block) if block
   end
   
   #A facade for the method Cursor.next_row
@@ -65,13 +34,23 @@ class RGhost::PsFacade < RGhost::PsObject
   end
 
   #A facade for the class Graphic
-  def graphic(ps_obj=RGhost::PsObject.new,&block)
-    set RGhost::Graphic.new(ps_obj,&block)
+  def graphic(&block)
+    psfc=RGhost::PsFacade.new
+    yield psfc
+    raw :gsave
+    set psfc
+    raw :grestore
+
   end
 
   #A facade for the class NewPath
   def newpath(&block)
-    set RGhost::NewPath.new(&block)
+    psfc=RGhost::PsFacade.new
+    yield psfc
+    raw :newpath
+    set psfc
+    raw :closepath
+    #set RGhost::NewPath.new(&block)
   end
 
   #A facade for the method Cursor.showpage

data/lib/rghost/ruby_ghost_engine.rb

@@ -54,16 +54,16 @@ class RGhost::Engine
      
     
     case @document 
-    when RGhost::Document
+    when RGhost::Document:
         file_in="#{tmp_filename}.rgin"
       params.concat @document.gs_paper
       fi=File.open(file_in,'w')
       fi.puts @document.ps
       fi.close
-    when File
+    when File:
         file_in=@document.path
       #@delete_input=false unless @options[:debug]
-    when String
+    when String:
         file_in=@document
       #@delete_input=false unless @options[:debug]
     end
@@ -87,7 +87,7 @@ class RGhost::Engine
     else
       if multipage
       	file_out.gsub!(/_%04d/,"_*")
-        @output=Dir.glob(file_out).map { |f| File.open(f) }
+        @output=Dir.glob(file_out).map { |f| f }
       else
         @output=File.open(file_out)
       end
@@ -103,10 +103,10 @@ class RGhost::Engine
 
   def clear_output
     case @output
-    when File
+    when File:
         @output.close
       File.delete(@output.path)
-    when Array
+    when Array: 
         @output.each do |f| 
         f.close
         File.delete(f.path)
@@ -135,13 +135,13 @@ class RGhost::Engine
   def format_params(v,pre="-d")
     r=[]
     case v
-    when Symbol
+    when Symbol:
         r << "#{pre}#{v}"
-    when Array
+    when Array:
         v.each do |av|
         r << format_params(av,pre).to_s
       end
-    when Hash
+    when Hash:
         v.each do |k,v|
         r << "#{pre}#{k}=#{v.to_s.gsub(/ /,'')}"  	
       end

data/lib/rghost/ruby_to_ps.rb

@@ -21,7 +21,8 @@ module RGhost::RubyToPs
 	
   
   def ps_escape(value)
-    value.to_s.gsub(/(\(|\)|\\)/,'\\\\\1')
+    value.to_s.gsub(/\(/,"\050").gsub(/\)/,"\051").gsub(/\\/,"\134")
+    #value.to_s.gsub(/(\(|\)|\\)/,'\\\\\1')
   end
   
   def to_bool(value)
@@ -38,14 +39,10 @@ module RGhost::RubyToPs
     ps_arr=[]
     arr.each do |a|
       ps_arr << case a
-      when TrueClass,FalseClass
-        to_bool(a)
-      when Numeric
-        a
-      when Proc
-        a.to_s
-      when Array
-        to_array(a)
+      when TrueClass,FalseClass: to_bool(a)
+      when Numeric: a
+      when Proc: a.to_s
+      when Array: to_array(a)
       else
         to_string(a.to_s)
       end
@@ -70,8 +67,7 @@ module RGhost::RubyToPs
     tudo=""
     s.each do |v|
       case v
-      when /^%/
-        tudo << "#{v.gsub(/%/,'')} to_s show "
+      when /^%/: tudo << "#{v.gsub(/%/,'')} to_s show "
       else
         tudo << "(#{ps_escape(v)}) show "
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rghost
 version: !ruby/object:Gem::Version 
-  version: 0.8.6.5
+  version: 0.8.7
 platform: ruby
 authors: 
 - Shairon Toledo
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-20 00:00:00 -04:00
+date: 2009-05-30 00:00:00 -04:00
 default_executable: 
 dependencies: []