prawn 1.3.0 → 2.0.1

data/spec/graphics_spec.rb

@@ -143,10 +143,12 @@ describe "When drawing a rounded rectangle" do
   end
 
   it "should draw a rectangle by connecting lines with rounded bezier curves" do
-    @all_coords.should == [[60.0, 550.0],[90.0, 550.0], [95.523, 550.0], [100.0, 545.523], [100.0, 540.0],
-                           [100.0, 460.0], [100.0, 454.477], [95.523, 450.0], [90.0, 450.0],
-                           [60.0, 450.0], [54.477, 450.0], [50.0, 454.477], [50.0, 460.0],
-                           [50.0, 540.0], [50.0, 545.523], [54.477, 550.0], [60.0, 550.0]]
+    @all_coords.should == [[60.0, 550.0],[90.0, 550.0], [95.5228, 550.0],
+                           [100.0, 545.5228], [100.0, 540.0], [100.0, 460.0],
+                           [100.0, 454.4772], [95.5228, 450.0], [90.0, 450.0],
+                           [60.0, 450.0], [54.4772, 450.0], [50.0, 454.4772],
+                           [50.0, 460.0], [50.0, 540.0], [50.0, 545.5228],
+                           [54.4772, 550.0], [60.0, 550.0]]
   end
 
   it "should start and end with the same point" do
@@ -167,20 +169,20 @@ describe "When drawing an ellipse" do
     @curve.coords.should ==
       [125.0, 100.0,
 
-       125.0, 127.614,
-       113.807, 150,
+       125.0, 127.6142,
+       113.8071, 150,
        100.0, 150.0,
 
-       86.193, 150.0,
-       75.0, 127.614,
+       86.1929, 150.0,
+       75.0, 127.6142,
        75.0, 100.0,
 
-       75.0, 72.386,
-       86.193, 50.0,
+       75.0, 72.3858,
+       86.1929, 50.0,
        100.0, 50.0,
 
-       113.807, 50.0,
-       125.0, 72.386,
+       113.8071, 50.0,
+       125.0, 72.3858,
        125.0, 100.0,
 
        100.0, 100.0]
@@ -427,6 +429,18 @@ describe "When using graphics states" do
     @pdf.graphic_state.dash[:dash].should == 5
   end
 
+  it "should round dash values to four decimal places" do
+    @pdf.dash 5.12345
+    @pdf.graphic_state.dash_setting.should == "[5.1235 5.1235] 0.0 d"
+  end
+
+  it "should raise an error when dash is called w. a zero length or space" do
+    expect { @pdf.dash(0) }.to raise_error(ArgumentError)
+    expect { @pdf.dash([0]) }.to raise_error(ArgumentError)
+    expect { @pdf.dash([0,0]) }.to raise_error(ArgumentError)
+    expect { @pdf.dash([0,0,0,1]) }.to raise_error(ArgumentError)
+  end
+
   it "the current graphic state should keep track of previous unchanged settings" do
     @pdf.stroke_color '000000'
     @pdf.save_graphics_state

data/spec/line_wrap_spec.rb

@@ -128,21 +128,36 @@ describe "Core::Text::Formatted::LineWrap#wrap_line" do
     string.should == "hello#{Prawn::Text::SHY}"
   end
 
+  it "should ignore width of a soft-hyphen during adding fragments to line", :issue =>775 do
+    hyphen_string = "Hy#{Prawn::Text::SHY}phe#{Prawn::Text::SHY}nat#{Prawn::Text::SHY}ions "
+    string1 = @pdf.font.normalize_encoding(hyphen_string * 5)
+    string2 = @pdf.font.normalize_encoding("Hyphenations " * 3 + hyphen_string)
+
+    array1 = [{text: string1}]
+    array2 = [{text: string2}]
+
+    @arranger.format_array = array1
+
+    res1 = @line_wrap.wrap_line(:arranger => @arranger,
+                                :width => 300,
+                                :document => @pdf)
+
+    @line_wrap = Prawn::Text::Formatted::LineWrap.new
+
+    @arranger.format_array = array2
+
+    res2 = @line_wrap.wrap_line(:arranger => @arranger,
+                                :width => 300,
+                                :document => @pdf)
+    res1.should == res2
+  end
+
   it "should not display soft hyphens except at the end of a line " +
      "for more than one element in format_array", :issue => 347 do
-    string1 = @pdf.font.normalize_encoding("hello#{Prawn::Text::SHY}world ")
-    string2 = @pdf.font.normalize_encoding("hi#{Prawn::Text::SHY}earth")
-    array = [{ :text => string1 }, { :text => string2 }]
-    @arranger.format_array = array
-    string = @line_wrap.wrap_line(:arranger => @arranger,
-                                  :width => 300,
-                                  :document => @pdf)
-    string.should == "helloworld hiearth"
-
     @pdf.font("#{Prawn::DATADIR}/fonts/DejaVuSans.ttf")
     @line_wrap = Prawn::Text::Formatted::LineWrap.new
 
-    string1 = "hello#{Prawn::Text::SHY}world "
+    string1 = @pdf.font.normalize_encoding("hello#{Prawn::Text::SHY}world ")
     string2 = @pdf.font.normalize_encoding("hi#{Prawn::Text::SHY}earth")
     array = [{ :text => string1 }, { :text => string2 }]
     @arranger.format_array = array
@@ -349,3 +364,4 @@ describe "Core::Text::Formatted::LineWrap#paragraph_finished?" do
     @line_wrap.paragraph_finished?.should == true
   end
 end
+

data/spec/png_spec.rb

@@ -98,7 +98,15 @@ describe "When reading an RGB PNG file with transparency (color type 2)" do
   end
 end
 
-# TODO: describe "When reading an indexed color PNG file wiih transparency (color type 3)"
+describe "When reading an indexed color PNG file "+
+         "wiih transparency (color type 3)" do
+
+  it "raises a not supported error" do
+    bin = File.binread("#{Prawn::DATADIR}/images/pal_bk.png")
+    expect { Prawn::Images::PNG.new(bin)}.to(
+      raise_error(Prawn::Errors::UnsupportedImageType))
+  end
+end
 
 describe "When reading an indexed color PNG file (color type 3)" do
 

data/spec/soft_mask_spec.rb

@@ -57,7 +57,7 @@ describe "Document with soft masks" do
     end
 
     extgstate = PDF::Inspector::ExtGState.analyze(@pdf.render).extgstates.first
-    extgstate[:soft_mask][:G].data.should == "q\n/DeviceRGB cs\n0.000 0.000 0.000 scn\n/DeviceRGB CS\n0.000 0.000 0.000 SCN\n1 w\n0 J\n0 j\n[ ] 0 d\n/DeviceRGB cs\n0.502 0.502 0.502 scn\n100.000 -100.000 200.000 200.000 re\nf\nQ\n"
+    extgstate[:soft_mask][:G].data.should == "q\n/DeviceRGB cs\n0.000 0.000 0.000 scn\n/DeviceRGB CS\n0.000 0.000 0.000 SCN\n1 w\n0 J\n0 j\n[] 0 d\n/DeviceRGB cs\n0.502 0.502 0.502 scn\n100.0 -100.0 200.0 200.0 re\nf\nQ\n"
   end
 
   it "should not create duplicate extended graphics states" do

data/spec/spec_helper.rb

@@ -12,10 +12,10 @@ if ENV["COVERAGE"]
   end
 end
 
-$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
-require "prawn"
+require_relative "../lib/prawn"
 
 Prawn.debug = true
+Prawn::Font::AFM.hide_m17n_warning = true
 
 #require "test/spec"
 require "rspec"

data/spec/text_at_spec.rb

@@ -36,10 +36,39 @@ describe "#draw_text" do
   it "should allow setting a default font size" do
     @pdf.font_size = 16
     @pdf.draw_text("Blah", :at => [0, 0])
+
     text = PDF::Inspector::Text.analyze(@pdf.render)
     text.font_settings[0][:size].should == 16
   end
 
+  rotated_text_inspector = Class.new(PDF::Inspector) do
+    attr_reader :tm_operator_used
+
+    def initialize
+      @tm_operator_used = false
+    end
+
+    def set_text_matrix_and_text_line_matrix(*a)
+      @tm_operator_used = true
+    end
+  end
+
+  it "should allow rotation" do
+    @pdf.draw_text("Test", :at => [100, 100], :rotate => 90)
+
+    text = rotated_text_inspector.analyze(@pdf.render)
+
+    text.tm_operator_used.should(be_true)
+  end
+
+  it "should not use rotation matrix by default" do
+    @pdf.draw_text("Test", :at => [100, 100])
+
+    text = rotated_text_inspector.analyze(@pdf.render)
+
+    text.tm_operator_used.should(be_false)
+  end
+
   it "should allow overriding default font for a single instance" do
     @pdf.font_size = 16
 
@@ -100,7 +129,6 @@ describe "#draw_text" do
 
   it "should raise_error an exception when a utf-8 incompatible string is rendered" do
     str = "Blah \xDD"
-    str.force_encoding(Encoding::ASCII_8BIT)
     lambda { @pdf.draw_text(str, :at => [0, 0]) }.should raise_error(
       Prawn::Errors::IncompatibleStringEncoding)
   end

data/spec/text_box_spec.rb

@@ -664,31 +664,12 @@ describe "Text::Box printing UTF-8 string with higher bit characters" do
       remaining_text = @text_box.render
       remaining_text.should == @text
     end
-
-    it "subsequent calls to Text::Box need not include the" +
-       " :skip_encoding => true option" do
-      @pdf.font("Panic Sans")
-      remaining_text = @text_box.render
-
-      # expect that calling text_box will not raise an encoding error
-      @pdf.text_box(remaining_text, :document => @pdf)
-    end
   end
 
   describe "when using an AFM font" do
-    it "unprinted text should be in WinAnsi encoding" do
-      remaining_text = @text_box.render
-      remaining_text.should == @pdf.font.normalize_encoding(@text)
-    end
-    it "subsequent calls to Text::Box must include the" +
-       " :skip_encoding => true option" do
+    it "unprinted text should be in UTF-8 encoding" do
       remaining_text = @text_box.render
-      lambda {
-        @pdf.text_box(remaining_text, :document => @pdf)
-      }.should raise_error(Prawn::Errors::IncompatibleStringEncoding)
-
-      @pdf.text_box(remaining_text, :skip_encoding => true,
-                                    :document => @pdf)
+      remaining_text.should == @text
     end
   end
 end

data/spec/text_spacing_spec.rb

@@ -9,7 +9,7 @@ describe "#character_spacing" do
       @pdf.text("hello world")
     end
     contents = PDF::Inspector::Text.analyze(@pdf.render)
-    contents.character_spacing.first.should == 10.556
+    contents.character_spacing.first.should == 10.5556
   end
   it "should not draw the character spacing to the document" +
     " when the new character spacing matches the old" do
@@ -63,7 +63,7 @@ describe "#word_spacing" do
       @pdf.text("hello world")
     end
     contents = PDF::Inspector::Text.analyze(@pdf.render)
-    contents.word_spacing.first.should == 10.556
+    contents.word_spacing.first.should == 10.5556
   end
   it "should draw the word spacing to the document" +
     " when the new word spacing matches the old" do

data/spec/text_spec.rb

@@ -315,7 +315,6 @@ describe "#text" do
 
   it "should raise_error an exception when a utf-8 incompatible string is rendered" do
     str = "Blah \xDD"
-    str.force_encoding(Encoding::ASCII_8BIT)
     lambda { @pdf.text str }.should raise_error(
       Prawn::Errors::IncompatibleStringEncoding)
   end
@@ -351,6 +350,108 @@ describe "#text" do
       text.strings[3].should == ("hello " * 19).strip
       text.strings[4].should == ("hello " * 21).strip
     end
+
+
+    it "should indent from right side when using :rtl direction" do
+      para1 = "The rain in spain falls mainly on the plains " * 3
+      para2 = "The rain in spain falls mainly on the plains " * 3
+
+      @pdf.text(para1 + "\n" + para2, :indent_paragraphs => 60, :direction => :rtl)
+
+      text = PDF::Inspector::Text.analyze(@pdf.render)
+
+      lines = text.strings
+      x_positions = text.positions.map { |e| e[0] }
+
+      # NOTE: The code below reflects Prawn's current kerning behavior for RTL
+      # text, which isn't necessarily correct. If we change that behavior,
+      # this test will need to be updated.
+
+      x_positions[0].should(
+        be_within(0.001).of(@pdf.bounds.absolute_right - 60 -
+                            @pdf.width_of(lines[0].reverse, :kerning => true)))
+
+      x_positions[1].should(
+        be_within(0.001).of(@pdf.bounds.absolute_right -
+                            @pdf.width_of(lines[1].reverse, :kerning => true)))
+
+      x_positions[2].should(
+        be_within(0.001).of(@pdf.bounds.absolute_right - 60 -
+                            @pdf.width_of(lines[2].reverse, :kerning => true)))
+
+      x_positions[3].should(
+        be_within(0.001).of(@pdf.bounds.absolute_right -
+                            @pdf.width_of(lines[3].reverse, :kerning => true)))
+    end
+
+    it "should indent from right side when document has :rtl direction" do
+      para1 = "The rain in spain falls mainly on the plains " * 3
+      para2 = "The rain in spain falls mainly on the plains " * 3
+
+      @pdf.text_direction = :rtl
+      @pdf.text(para1 + "\n" + para2, :indent_paragraphs => 60)
+
+      text = PDF::Inspector::Text.analyze(@pdf.render)
+
+      lines = text.strings
+      x_positions = text.positions.map { |e| e[0] }
+
+      # NOTE: The code below reflects Prawn's current kerning behavior for RTL
+      # text, which isn't necessarily correct. If we change that behavior,
+      # this test will need to be updated.
+
+      x_positions[0].should(
+        be_within(0.001).of(@pdf.bounds.absolute_right - 60 -
+                            @pdf.width_of(lines[0].reverse, :kerning => true)))
+
+      x_positions[1].should(
+        be_within(0.001).of(@pdf.bounds.absolute_right -
+                            @pdf.width_of(lines[1].reverse, :kerning => true)))
+
+      x_positions[2].should(
+        be_within(0.001).of(@pdf.bounds.absolute_right - 60 -
+                            @pdf.width_of(lines[2].reverse, :kerning => true)))
+
+      x_positions[3].should(
+        be_within(0.001).of(@pdf.bounds.absolute_right -
+                            @pdf.width_of(lines[3].reverse, :kerning => true)))
+    end
+
+    it "should indent from left side when using :ltr direction" do
+      para1 = "The rain in spain falls mainly on the plains " * 3
+      para2 = "The rain in spain falls mainly on the plains " * 3
+
+      @pdf.text(para1 + "\n" + para2, :indent_paragraphs => 60, :direction => :ltr)
+
+      text = PDF::Inspector::Text.analyze(@pdf.render)
+
+      x_positions = text.positions.map { |e| e[0] }
+
+      x_positions[0].should == 60
+      x_positions[1].should == 0
+
+      x_positions[2].should == 60
+      x_positions[3].should == 0
+    end
+
+    it "should indent from left side when document has :ltr direction" do
+      para1 = "The rain in spain falls mainly on the plains " * 3
+      para2 = "The rain in spain falls mainly on the plains " * 3
+
+      @pdf.text_direction = :ltr
+      @pdf.text(para1 + "\n" + para2, :indent_paragraphs => 60)
+
+      text = PDF::Inspector::Text.analyze(@pdf.render)
+
+      x_positions = text.positions.map { |e| e[0] }
+
+      x_positions[0].should == 60
+      x_positions[1].should == 0
+
+      x_positions[2].should == 60
+      x_positions[3].should == 0
+    end
+
     describe "when wrap to new page, and first line of new page" +
              " is not the start of a new paragraph, that line should" +
              " not be indented" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prawn
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Gregory Brown
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-28 00:00:00.000000000 Z
+date: 2015-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ttfunk
@@ -34,28 +34,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.5.1
 - !ruby/object:Gem::Dependency
   name: pdf-inspector
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -160,14 +160,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.1
+        version: 0.28.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.1
+        version: 0.28.0
 - !ruby/object:Gem::Dependency
   name: code_statistics
   requirement: !ruby/object:Gem::Requirement
@@ -201,7 +201,6 @@ files:
 - Gemfile
 - LICENSE
 - Rakefile
-- data/encodings/win_ansi.txt
 - data/fonts/Courier-Bold.afm
 - data/fonts/Courier-BoldOblique.afm
 - data/fonts/Courier-Oblique.afm
@@ -234,6 +233,7 @@ files:
 - data/images/page_white_text.alpha
 - data/images/page_white_text.color
 - data/images/page_white_text.png
+- data/images/pal_bk.png
 - data/images/pigs.jpg
 - data/images/prawn.png
 - data/images/ruport.png
@@ -367,6 +367,7 @@ files:
 - manual/outline/insert_section_after.rb
 - manual/outline/outline.rb
 - manual/outline/sections_and_pages.rb
+- manual/repeatable_content/alternate_page_numbering.rb
 - manual/repeatable_content/page_numbering.rb
 - manual/repeatable_content/repeatable_content.rb
 - manual/repeatable_content/repeater.rb
@@ -449,20 +450,7 @@ licenses:
 - GPL-2
 - GPL-3
 metadata: {}
-post_install_message: |2+
-
-    ********************************************
-
-
-    A lot has changed recently in Prawn.
-
-    Please read the changelog for details:
-
-    https://github.com/prawnpdf/prawn/wiki/CHANGELOG
-
-
-    ********************************************
-
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -470,7 +458,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="