prawn 1.1.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8492b319da06bf93faa4e58cfa4932b46fd8a474
-  data.tar.gz: ba94547a9eda37f13c91b7293203a12df99b9815
+  metadata.gz: 4853225e17270cdd3f00813349b44209903ab6b2
+  data.tar.gz: 9ef5c9cf24f812537776b41b3503a87aa9fe52b6
 SHA512:
-  metadata.gz: d898304c9f63ac7826f49b3802106ec84e36fb8a0efcb07d85b2b88d0e7a2f3016f722655fea9e4992e028a8a740ef5d29a5ee9e7287164f6768d9435179891c
-  data.tar.gz: 0127f4e217c2588fe196665712cb1fe7e3914a49d3ba4e0b248e1a7bd3615f52e6c97e2288c4c7fb9295383e48c03ad48557c137e8d1f822841c65d1a8f77d62
+  metadata.gz: cef52ab9b8e81515a1314f63bbb6ee27d8ed2fd8d0832def46e4a49b40296eedc633c5f05b3689ea5fae33905e42747ac2ac5a6e00d434528caa9e7f171a113f
+  data.tar.gz: 6dca2892f00d9c7b11d2124e09b17d11d82f5f50e0f0fbe76befba7cc263a02fc33946736f70c90c3ba456bba1151aa48c2df5fc42c1f066550323dda600fb14

data/VERSION

@@ -0,0 +1 @@
+1.2.1

data/lib/prawn.rb

@@ -9,8 +9,6 @@ require 'ttfunk'
 require "pdf/core"
 
 module Prawn
-  VERSION = "1.1.0"
-
   extend self
 
   file = __FILE__
@@ -23,6 +21,8 @@ module Prawn
   BASEDIR = File.expand_path(File.join(dir, '..'))
   DATADIR = File.expand_path(File.join(dir, '..', 'data'))
 
+  VERSION = File.read("#{BASEDIR}/VERSION").strip
+
   FLOAT_PRECISION = 1.0e-9
 
   # Whe set to true, Prawn will verify hash options to ensure only valid keys

data/lib/prawn/text/box.rb

@@ -40,6 +40,8 @@ module Prawn
     # <tt>:character_spacing</tt>:: <tt>number</tt>. The amount of space to add
     #                               to or remove from the default character
     #                               spacing. [0]
+    # <tt>:disable_wrap_by_char</tt>:: <tt>boolean</tt> Whether
+    # or not to prevent mid-word breaks when text does not fit in box. [false]
     # <tt>:mode</tt>:: <tt>symbol</tt>. The text rendering mode. See
     #                  documentation for Prawn::Document#text_rendering_mode
     #                  for a list of valid options. [:fill]

data/lib/prawn/text/formatted/box.rb

@@ -144,6 +144,7 @@ module Prawn
           self.class.extensions.reverse_each { |e| extend e }
 
           @overflow          = options[:overflow] || :truncate
+          @disable_wrap_by_char = options[:disable_wrap_by_char]
 
           self.original_text = formatted_text
           @text              = nil
@@ -211,11 +212,7 @@ module Prawn
               @document.text_rendering_mode(@mode) do
                 process_options
 
-                if @skip_encoding
-                  text = original_text
-                else
-                  text = normalize_encoding
-                end
+                text = normalized_text(flags)
 
                 @document.font_size(@font_size) do
                   shrink_to_fit(text) if @overflow == :shrink_to_fit
@@ -335,6 +332,7 @@ module Prawn
                                               :align, :valign,
                                               :rotate, :rotate_around,
                                               :overflow, :min_font_size,
+                                              :disable_wrap_by_char,
                                               :leading, :character_spacing,
                                               :mode, :single_line,
                                               :skip_encoding,
@@ -346,6 +344,18 @@ module Prawn
 
         private
 
+        def normalized_text(flags)
+          if @skip_encoding
+            text = original_text
+          else
+            text = normalize_encoding
+          end
+
+          text.each { |t| t.delete(:color) } if flags[:dry_run]
+
+          text
+        end
+
         def original_text
           @original_array.collect { |hash| hash.dup }
         end
@@ -390,33 +400,37 @@ module Prawn
 
           original_font = @document.font.family
           fragment_font = hash[:font] || original_font
-          @document.font(fragment_font)
 
           fallback_fonts = @fallback_fonts.dup
           # always default back to the current font if the glyph is missing from
           # all fonts
           fallback_fonts << fragment_font
 
-          hash[:text].each_char do |char|
-            @document.font(fragment_font)
-            font_glyph_pairs << [find_font_for_this_glyph(char,
-                                                          @document.font.family,
-                                                          fallback_fonts.dup),
-                                 char]
+          @document.save_font do
+            hash[:text].each_char do |char|
+              font_glyph_pairs << [find_font_for_this_glyph(char,
+                                                            fragment_font,
+                                                            fallback_fonts.dup),
+                                   char]
+            end
           end
 
-          @document.font(original_font)
+          # Don't add a :font to fragments if it wasn't there originally
+          if hash[:font].nil?
+            font_glyph_pairs.each do |pair|
+              pair[0] = nil if pair[0] == original_font
+            end
+          end
 
           form_fragments_from_like_font_glyph_pairs(font_glyph_pairs, hash)
         end
 
         def find_font_for_this_glyph(char, current_font, fallback_fonts)
+          @document.font(current_font)
           if fallback_fonts.length == 0 || @document.font.glyph_present?(char)
             current_font
           else
-            current_font = fallback_fonts.shift
-            @document.font(current_font)
-            find_font_for_this_glyph(char, @document.font.family, fallback_fonts)
+            find_font_for_this_glyph(char, fallback_fonts.shift, fallback_fonts)
           end
         end
 
@@ -426,11 +440,11 @@ module Prawn
           current_font = nil
 
           font_glyph_pairs.each do |font, char|
-            if font != current_font
+            if font != current_font || fragments.count == 0
               current_font = font
               fragment = hash.dup
               fragment[:text] = char
-              fragment[:font] = font
+              fragment[:font] = font unless font.nil?
               fragments << fragment
             else
               fragment[:text] += char
@@ -484,11 +498,22 @@ module Prawn
         # Decrease the font size until the text fits or the min font
         # size is reached
         def shrink_to_fit(text)
-          wrap(text)
-          until @everything_printed || @font_size <= @min_font_size
+          loop do
+            if @disable_wrap_by_char && @font_size > @min_font_size
+              begin
+                wrap(text)
+              rescue Errors::CannotFit
+                # Ignore errors while we can still attempt smaller
+                # font sizes.
+              end
+            else
+              wrap(text)
+            end
+
+            break if @everything_printed || @font_size <= @min_font_size
+
             @font_size = [@font_size - 0.5, @min_font_size].max
             @document.font_size = @font_size
-            wrap(text)
           end
         end
 

data/lib/prawn/text/formatted/line_wrap.rb

@@ -29,6 +29,10 @@ module Prawn
           @newline_encountered || is_next_string_newline? || @arranger.finished?
         end
 
+        def tokenize(fragment)
+          fragment.scan(scan_pattern)
+        end
+
         # Work in conjunction with the PDF::Formatted::Arranger
         # defined in the :arranger option to determine what formatted text
         # will fit within the width defined by the :width option
@@ -89,7 +93,7 @@ module Prawn
             @newline_encountered = true
             false
           else
-            fragment.scan(scan_pattern).each do |segment|
+            tokenize(fragment).each do |segment|
               if segment == zero_width_space
                 segment_width = 0
               else
@@ -160,6 +164,8 @@ module Prawn
           @kerning = options[:kerning]
           @width = options[:width]
 
+          @disable_wrap_by_char = options[:disable_wrap_by_char]
+
           @accumulated_width = 0
           @line_empty = true
           @line_contains_more_than_one_word = false
@@ -237,7 +243,7 @@ module Prawn
 
         def end_of_the_line_reached(segment)
           update_line_status_based_on_last_output
-          wrap_by_char(segment) unless @line_contains_more_than_one_word
+          wrap_by_char(segment) unless @disable_wrap_by_char || @line_contains_more_than_one_word
           @line_full = true
         end
 

data/lib/prawn/text/formatted/wrap.rb

@@ -20,6 +20,7 @@ module Prawn
           @line_wrap = Prawn::Text::Formatted::LineWrap.new
           @arranger = Prawn::Text::Formatted::Arranger.new(@document,
             :kerning => options[:kerning])
+          @disable_wrap_by_char = options[:disable_wrap_by_char]
         end
 
 
@@ -54,7 +55,8 @@ module Prawn
             @line_wrap.wrap_line(:document => @document,
                                  :kerning => @kerning,
                                  :width => available_width,
-                                 :arranger => @arranger)
+                                 :arranger => @arranger,
+                                 :disable_wrap_by_char => @disable_wrap_by_char)
 
             if enough_height_for_this_line?
               move_baseline_down

data/manual/contents.rb

@@ -20,8 +20,8 @@ Prawn::ManualBuilder::Example.generate("manual.pdf",
 
   # Remaining chapters
   load_package "layout"
+  load_page "", "table"
   load_package "images"
-  load_package "table"
   load_package "document_and_page_options"
   load_package "outline"
   load_package "repeatable_content"

data/manual/example_helper.rb

@@ -1,7 +1,6 @@
 # encoding: UTF-8
 
 require_relative "../lib/prawn"
-require_relative "../lib/prawn/table"
 require "prawn/manual_builder"
 
 Prawn::ManualBuilder.manual_dir = File.dirname(__FILE__)

data/manual/table.rb

@@ -0,0 +1,16 @@
+# encoding: UTF-8
+
+require_relative "example_helper"
+
+filename = File.basename(__FILE__).gsub('.rb', '.pdf')
+
+Prawn::ManualBuilder::Example.generate(filename) do
+  header("Prawn::Table")
+
+  prose <<-END_TEXT
+    As of Prawn 1.2.0, Prawn::Table has been extracted into its own
+    semi-officially supported gem.
+
+    Please see https://github.com/prawnpdf/prawn-table for more details.
+  END_TEXT
+end

data/manual/text/text_box_overflow.rb

@@ -12,6 +12,10 @@
 # <code>:min_font_size</code> option set. The font size will not be reduced to
 # less than the value provided even if it means truncating some text.
 #
+# If the <code>:disable_wrap_by_char</code> is set to <code>true</code>
+# then any text wrapping done while using the <code>:shrink_to_fit</code>
+# mode will not break up the middle of words.
+#
 require File.expand_path(File.join(File.dirname(__FILE__),
                                    %w[.. example_helper]))
 

data/prawn.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
                 ["data/shift_jis_text.txt"] +
                 ["Rakefile", "prawn.gemspec", "Gemfile",
                  "COPYING", "LICENSE", "GPLv2", "GPLv3",
-                 ".yardopts"]
+                 "VERSION", ".yardopts"]
   spec.require_path = "lib"
   spec.required_ruby_version = '>= 1.9.3'
   spec.required_rubygems_version = ">= 1.3.6"
@@ -24,13 +24,12 @@ Gem::Specification.new do |spec|
   spec.add_dependency('pdf-core', "~> 0.2.5")
 
   spec.add_development_dependency('pdf-inspector', '~> 1.1.0')
-  spec.add_development_dependency('coderay', '~> 1.0.7')
   spec.add_development_dependency('yard')
   spec.add_development_dependency('rspec', '2.14.1')
   spec.add_development_dependency('mocha')
   spec.add_development_dependency('rake')
   spec.add_development_dependency('simplecov')
-  spec.add_development_dependency('prawn-manual_builder', ">= 0.1.1")
+  spec.add_development_dependency('prawn-manual_builder', ">= 0.2.0")
   spec.add_development_dependency('pdf-reader', '~>1.2')
   spec.add_development_dependency('rubocop', '0.20.1')
 

data/spec/formatted_text_box_spec.rb

@@ -555,6 +555,28 @@ describe "Text::Formatted::Box#render" do
   end
 end
 
+describe "Text::Formatted::Box#render(:dry_run => true)" do
+  it "should not change the graphics state of the document" do
+    create_pdf
+
+    state_before = PDF::Inspector::Graphics::Color.analyze(@pdf.render)
+    fill_color_count = state_before.fill_color_count
+    stroke_color_count = state_before.stroke_color_count
+    stroke_color_space_count = state_before.stroke_color_space_count
+
+    array = [{ :text => 'Foo',
+               :color => [0, 0, 0, 100] }]
+    options = { :document => @pdf }
+    text_box = Prawn::Text::Formatted::Box.new(array, options)
+    text_box.render(:dry_run => true)
+
+    state_after = PDF::Inspector::Graphics::Color.analyze(@pdf.render)
+    state_after.fill_color_count.should == fill_color_count
+    state_after.stroke_color_count.should == stroke_color_count
+    state_after.stroke_color_space_count.should == stroke_color_space_count
+  end
+end
+
 describe "Text::Formatted::Box#render with fragment level :character_spacing option" do
   it "should draw the character spacing to the document" do
     create_pdf

data/spec/line_wrap_spec.rb

@@ -291,6 +291,10 @@ describe "Core::Text::Formatted::LineWrap" do
                                :document => @pdf)
     line.should be_empty
   end
+  it "should tokenize a string using the scan_pattern" do
+    tokens = @line_wrap.tokenize("one two three")
+    tokens.length.should == 6
+  end
 end
 
 describe "Core::Text::Formatted::LineWrap#paragraph_finished?" do

data/spec/text_box_spec.rb

@@ -1011,6 +1011,34 @@ describe "Text::Box wrapping" do
 
     first_line(results_with_accent).length.should == first_line(results_without_accent).length
   end
+
+  it "should allow you to disable wrapping by char" do
+    text = "You_cannot_wrap_this_text_at_all_because_we_are_disabling_wrapping_by_char_and_there_are_no_word_breaks"
+
+    @pdf.font "Courier"
+    text_box = Prawn::Text::Box.new(text,
+                                    :width => 180,
+                                    :overflow => :shrink_to_fit,
+                                    :disable_wrap_by_char => true,
+                                    :document => @pdf)
+    expect { text_box.render }.to raise_error(Prawn::Errors::CannotFit)
+  end
+
+  it "should retain full words with :shrink_to_fit if char wrapping is disabled" do
+    text = "Wrapped_words"
+    expect = "Wrapped_words"
+
+    @pdf.font "Courier"
+    text_box = Prawn::Text::Box.new(text,
+                                    :width => 50,
+                                    :height => 50,
+                                    :size => 50,
+                                    :overflow => :shrink_to_fit,
+                                    :disable_wrap_by_char => true,
+                                    :document => @pdf)
+    text_box.render
+    text_box.text.should == expect
+  end
 end
 
 describe "Text::Box#render with :mode option" do

data/spec/text_spec.rb

@@ -434,4 +434,23 @@ describe "#text" do
     })
     pdf.fallback_fonts = ["dejavu"]
   end
+
+  describe "fallback_fonts" do
+    it "should preserve font style" do
+      create_pdf
+
+      @pdf.fallback_fonts ["Helvetica"]
+      @pdf.font "Times-Roman", :style => :italic do
+        @pdf.text "hello"
+      end
+
+      text = PDF::Inspector::Text.analyze(@pdf.render)
+      fonts_used = text.font_settings.map { |e| e[:name] }
+
+      fonts_used.length.should == 1
+      fonts_used[0].should == :"Times-Italic"
+      text.strings[0].should == "hello"
+    end
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prawn
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Gregory Brown
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-27 00:00:00.000000000 Z
+date: 2014-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ttfunk
@@ -56,20 +56,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.0
-- !ruby/object:Gem::Dependency
-  name: coderay
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.7
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.7
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -146,14 +132,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: pdf-reader
   requirement: !ruby/object:Gem::Requirement
@@ -201,6 +187,7 @@ files:
 - Gemfile
 - LICENSE
 - Rakefile
+- VERSION
 - data/encodings/win_ansi.txt
 - data/fonts/Courier-Bold.afm
 - data/fonts/Courier-BoldOblique.afm
@@ -293,15 +280,6 @@ files:
 - lib/prawn/security/arcfour.rb
 - lib/prawn/soft_mask.rb
 - lib/prawn/stamp.rb
-- lib/prawn/table.rb
-- lib/prawn/table/cell.rb
-- lib/prawn/table/cell/image.rb
-- lib/prawn/table/cell/in_table.rb
-- lib/prawn/table/cell/span_dummy.rb
-- lib/prawn/table/cell/subtable.rb
-- lib/prawn/table/cell/text.rb
-- lib/prawn/table/cells.rb
-- lib/prawn/table/column_width_calculator.rb
 - lib/prawn/text.rb
 - lib/prawn/text/box.rb
 - lib/prawn/text/formatted.rb
@@ -381,24 +359,7 @@ files:
 - manual/security/encryption.rb
 - manual/security/permissions.rb
 - manual/security/security.rb
-- manual/table/basic_block.rb
-- manual/table/before_rendering_page.rb
-- manual/table/cell_border_lines.rb
-- manual/table/cell_borders_and_bg.rb
-- manual/table/cell_dimensions.rb
-- manual/table/cell_text.rb
-- manual/table/column_widths.rb
-- manual/table/content_and_subtables.rb
-- manual/table/creation.rb
-- manual/table/filtering.rb
-- manual/table/flow_and_header.rb
-- manual/table/image_cells.rb
-- manual/table/position.rb
-- manual/table/row_colors.rb
-- manual/table/span.rb
-- manual/table/style.rb
-- manual/table/table.rb
-- manual/table/width.rb
+- manual/table.rb
 - manual/text/alignment.rb
 - manual/text/color.rb
 - manual/text/column_box.rb
@@ -430,7 +391,6 @@ files:
 - spec/acceptance/png.rb
 - spec/annotations_spec.rb
 - spec/bounding_box_spec.rb
-- spec/cell_spec.rb
 - spec/column_box_spec.rb
 - spec/data/curves.pdf
 - spec/destinations_spec.rb
@@ -460,8 +420,6 @@ files:
 - spec/spec_helper.rb
 - spec/stamp_spec.rb
 - spec/stroke_styles_spec.rb
-- spec/table/span_dummy_spec.rb
-- spec/table_spec.rb
 - spec/text_at_spec.rb
 - spec/text_box_spec.rb
 - spec/text_rendering_mode_spec.rb
@@ -511,7 +469,6 @@ summary: A fast and nimble PDF generator for Ruby
 test_files:
 - spec/annotations_spec.rb
 - spec/bounding_box_spec.rb
-- spec/cell_spec.rb
 - spec/column_box_spec.rb
 - spec/destinations_spec.rb
 - spec/document_spec.rb
@@ -537,7 +494,6 @@ test_files:
 - spec/span_spec.rb
 - spec/stamp_spec.rb
 - spec/stroke_styles_spec.rb
-- spec/table_spec.rb
 - spec/text_at_spec.rb
 - spec/text_box_spec.rb
 - spec/text_rendering_mode_spec.rb