prawn-format 0.2.1 → 0.2.2

data/examples/basic-formatting.rb

@@ -1,8 +1,6 @@
 #coding: utf-8
 
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'prawn'
-require 'prawn/format'
+require "#{File.dirname(__FILE__)}/example_helper.rb"
 
 JAPANESE = "#{Prawn::BASEDIR}/data/fonts/gkai00mp.ttf"
 

data/examples/document.rb

@@ -1,8 +1,6 @@
 #coding: utf-8
 
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require "prawn"
-require "prawn/format"
+require "#{File.dirname(__FILE__)}/example_helper.rb"
 
 Prawn::Document.generate("document.pdf") do
   tags :h1 => { :font_size => "2em", :font_weight => :bold },

data/examples/flowing.rb

@@ -1,8 +1,6 @@
 #coding: utf-8
 
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'prawn'
-require 'prawn/format'
+require "#{File.dirname(__FILE__)}/example_helper"
 
 dice = "#{Prawn::BASEDIR}/data/images/dice.png"
 Prawn::Document.generate "flowing.pdf" do

data/examples/style-classes.rb

@@ -1,8 +1,6 @@
 #coding: utf-8
 
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'prawn'
-require 'prawn/format'
+require "#{File.dirname(__FILE__)}/example_helper"
 
 Prawn::Document.generate "style-classes.pdf" do
   styles :quote => { :font_style => :italic },

data/examples/syntax-highlighting.rb

@@ -1,8 +1,6 @@
 #coding: utf-8
 
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'prawn'
-require 'prawn/format'
+require "#{File.dirname(__FILE__)}/example_helper"
 
 begin
   require 'coderay'

data/examples/tags.rb

@@ -1,8 +1,7 @@
 #coding: utf-8
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'prawn'
-require 'prawn/format'
+require "#{File.dirname(__FILE__)}/example_helper"
 
 CHINESE_FONT = "#{Prawn::BASEDIR}/data/fonts/gkai00mp.ttf"
 

data/lib/prawn/format.rb

@@ -5,42 +5,29 @@ require 'prawn/format/text_object'
 
 module Prawn
   module Format
-    def self.included(mod)
-      mod.send :alias_method, :text_without_formatting, :text
-      mod.send :alias_method, :text, :text_with_formatting
 
-      mod.send :alias_method, :width_of_without_formatting, :width_of
-      mod.send :alias_method, :width_of, :width_of_with_formatting
-
-      mod.send :alias_method, :height_of_without_formatting, :height_of
-      mod.send :alias_method, :height_of, :height_of_with_formatting
-    end
-
-    # Overloaded version of #text. Call via #text, rather than #text_with_formatting
-    # (see above, where it aliased to #text).
-    def text_with_formatting(text, options={}) #:nodoc:
+    # Overloaded version of #text.
+    def text(text, options={}) #:nodoc:
       if unformatted?(text, options)
-        text_without_formatting(text, options)
+        super
       else
         format(text, options)
       end
     end
 
-    # Overloaded version of #height_of. Call via #height_of, rather than
-    # #height_of_with_formatting (see above, where it aliased to #height_of).
-    def height_of_with_formatting(string, line_width, size=font_size, options={}) #:nodoc:
+    # Overloaded version of #height_of.
+    def height(string, line_width, size=font_size, options={}) #:nodoc:
       if unformatted?(string, options)
-        height_of_without_formatting(string, line_width, size)
+        super(string, line_width, size)
       else
         formatted_height(string, line_width, size, options)
       end
     end
 
-    # Overloaded version of #width_of. Call via #width_of, rather than
-    # #width_of_with_formatting (see above, where it aliased to #width_of).
-    def width_of_with_formatting(string, options={}) #:nodoc:
+    # Overloaded version of #width_of.
+    def width(string, options={}) #:nodoc:
       if unformatted?(string, options)
-        width_of_without_formatting(string, options)
+        super
       else
         formatted_width(string, options)
       end
@@ -225,5 +212,4 @@ module Prawn
   end
 end
 
-require 'prawn/document'
-Prawn::Document.send(:include, Prawn::Format)
+Prawn::Document.extensions << Prawn::Format

data/lib/prawn/format/instructions/text.rb

@@ -14,7 +14,7 @@ module Prawn
           @text = text
           @break = options.key?(:break) ? options[:break] : text.index(/[-\xE2\x80\x94\s]/)
           @discardable = options.key?(:discardable) ? options[:discardable] : text.index(/\s/)
-          state.font.normalize_encoding(@text) if options.fetch(:normalize, true)
+          @text = state.font.normalize_encoding(@text) if options.fetch(:normalize, true)
         end
 
         def dup

data/lib/prawn/format/version.rb

@@ -1,5 +1,5 @@
 module Prawn
   module Format
-    VERSION = "0.2.1"
+    VERSION = "0.2.2"
   end
 end

data/prawn-format.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{prawn-format}
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jamis Buck"]
-  s.date = %q{2009-09-22}
+  s.date = %q{2009-11-10}
   s.description = %q{an extension of Prawn that allows inline formatting}
   s.email = %q{jamis@jamisbuck.org}
   s.extra_rdoc_files = ["lib/prawn/format/effects/link.rb", "lib/prawn/format/effects/underline.rb", "lib/prawn/format/instructions/base.rb", "lib/prawn/format/instructions/tag_close.rb", "lib/prawn/format/instructions/tag_open.rb", "lib/prawn/format/instructions/text.rb", "lib/prawn/format/layout_builder.rb", "lib/prawn/format/lexer.rb", "lib/prawn/format/line.rb", "lib/prawn/format/parser.rb", "lib/prawn/format/state.rb", "lib/prawn/format/text_object.rb", "lib/prawn/format/version.rb", "lib/prawn/format.rb"]
@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Prawn-format"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{prawn}
-  s.rubygems_version = %q{1.3.4}
+  s.rubygems_version = %q{1.3.5}
   s.summary = %q{an extension of Prawn that allows inline formatting}
   s.test_files = ["spec/layout_builder_spec.rb", "spec/lexer_spec.rb", "spec/parser_spec.rb"]
 

data/spec/spec_helper.rb

@@ -5,10 +5,12 @@ puts "Prawn-Format specs: Running on Ruby Version: #{RUBY_VERSION}"
 require "rubygems"
 require "test/spec"                                                
 require "mocha"
-$LOAD_PATH << File.join(File.dirname(__FILE__), '..', 'vendor', 'prawn-core', 'lib')
-$LOAD_PATH << File.join(File.dirname(__FILE__), '..', 'lib') 
 
+$LOAD_PATH.unshift( ENV["PRAWN_CORE_LIB"] ||
+                File.join(File.dirname(__FILE__), *%w[.. vendor prawn-core lib]) )
 require "prawn/core"
+
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib') 
 require "prawn/format"
 
 Prawn.debug = true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: prawn-format
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Jamis Buck
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-22 00:00:00 -04:00
+date: 2009-11-10 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -119,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: prawn
-rubygems_version: 1.3.4
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: an extension of Prawn that allows inline formatting