prawn 1.2.1 → 1.3.0

data/spec/document_spec.rb

@@ -112,8 +112,7 @@ describe "When creating multi-page documents" do
 end
 
 describe "When beginning each new page" do
-
-  describe "Background template feature" do
+  describe "Background image feature" do
     before(:each) do
       @filename = "#{Prawn::DATADIR}/images/pigs.jpg"
       @pdf = Prawn::Document.new(:background => @filename)
@@ -128,11 +127,7 @@ describe "When beginning each new page" do
       @pdf.instance_variable_defined?(:@background).should == true
       @pdf.instance_variable_get(:@background).should == @filename
     end
-
-
   end
-
-
 end
 
 describe "Prawn::Document#float" do
@@ -188,7 +183,7 @@ describe "on_page_create callback" do
   it "should be invoked with document" do
     called_with = nil
 
-    @pdf.on_page_create { |*args| called_with = args }
+    @pdf.renderer.on_page_create { |*args| called_with = args }
 
     @pdf.start_new_page
 
@@ -199,7 +194,7 @@ describe "on_page_create callback" do
     trigger = mock()
     trigger.expects(:fire).times(5)
 
-    @pdf.on_page_create { trigger.fire }
+    @pdf.renderer.on_page_create { trigger.fire }
 
     5.times { @pdf.start_new_page }
   end
@@ -211,11 +206,11 @@ describe "on_page_create callback" do
       trigger2 = mock()
       trigger2.expects(:fire).times(1)
 
-      @pdf.on_page_create { trigger1.fire }
+      @pdf.renderer.on_page_create { trigger1.fire }
 
       @pdf.start_new_page
 
-      @pdf.on_page_create { trigger2.fire }
+      @pdf.renderer.on_page_create { trigger2.fire }
 
       @pdf.start_new_page
   end
@@ -224,11 +219,11 @@ describe "on_page_create callback" do
       trigger = mock()
       trigger.expects(:fire).times(1)
 
-      @pdf.on_page_create { trigger.fire }
+      @pdf.renderer.on_page_create { trigger.fire }
 
       @pdf.start_new_page
 
-      @pdf.on_page_create
+      @pdf.renderer.on_page_create
 
       @pdf.start_new_page
   end
@@ -460,15 +455,15 @@ describe "The render() feature" do
     seq = sequence("callback_order")
 
     # Verify the order: finalize -> fire callbacks -> render body
-    pdf.expects(:finalize_all_page_contents).in_sequence(seq)
+    pdf.renderer.expects(:finalize_all_page_contents).in_sequence(seq)
     trigger = mock()
     trigger.expects(:fire).in_sequence(seq)
 
     # Store away the render_body method to be called below
-    render_body = pdf.method(:render_body)
-    pdf.expects(:render_body).in_sequence(seq)
+    render_body = pdf.renderer.method(:render_body)
+    pdf.renderer.expects(:render_body).in_sequence(seq)
 
-    pdf.before_render{ trigger.fire }
+    pdf.renderer.before_render{ trigger.fire }
 
     # Render the body to set up object offsets
     render_body.call(StringIO.new)
@@ -493,7 +488,7 @@ describe "PDF file versions" do
 
   it "should allow the default to be changed" do
     @pdf = Prawn::Document.new
-    @pdf.__send__(:min_version, 1.4)
+    @pdf.renderer.min_version(1.4)
     str = @pdf.render
     str[0,8].should == "%PDF-1.4"
   end
@@ -530,7 +525,7 @@ describe "Documents that use go_to_page" do
 end
 
 describe "content stream characteristics" do
- it "should have 1 single content stream for a single page PDF with no templates" do
+ it "should have 1 single content stream for a single page PDF" do
     @pdf = Prawn::Document.new
     @pdf.text "James"
     output = StringIO.new(@pdf.render)
@@ -541,7 +536,7 @@ describe "content stream characteristics" do
     streams.size.should == 1
   end
 
- it "should have 1 single content stream for a single page PDF with no templates, even if go_to_page is used" do
+ it "should have 1 single content stream for a single page PDF, even if go_to_page is used" do
     @pdf = Prawn::Document.new
     @pdf.text "James"
     @pdf.go_to_page(1)

data/spec/graphics_spec.rb

@@ -210,22 +210,22 @@ describe "When filling" do
   before(:each) { create_pdf }
 
   it "should default to the f operator (nonzero winding number rule)" do
-    @pdf.expects(:add_content).with("f")
+    @pdf.renderer.expects(:add_content).with("f")
     @pdf.fill
   end
 
   it "should use f* for :fill_rule => :even_odd" do
-    @pdf.expects(:add_content).with("f*")
+    @pdf.renderer.expects(:add_content).with("f*")
     @pdf.fill(:fill_rule => :even_odd)
   end
 
   it "should use b by default for fill_and_stroke (nonzero winding number)" do
-    @pdf.expects(:add_content).with("b")
+    @pdf.renderer.expects(:add_content).with("b")
     @pdf.fill_and_stroke
   end
 
   it "should use b* for fill_and_stroke(:fill_rule => :even_odd)" do
-    @pdf.expects(:add_content).with("b*")
+    @pdf.renderer.expects(:add_content).with("b*")
     @pdf.fill_and_stroke(:fill_rule => :even_odd)
   end
 end
@@ -383,22 +383,22 @@ describe "When using graphics states" do
   before(:each) { create_pdf }
 
   it "should add the right content on save_graphics_state" do
-    @pdf.expects(:add_content).with('q')
+    @pdf.renderer.expects(:add_content).with('q')
 
     @pdf.save_graphics_state
   end
 
   it "should add the right content on restore_graphics_state" do
-    @pdf.expects(:add_content).with('Q')
+    @pdf.renderer.expects(:add_content).with('Q')
 
     @pdf.restore_graphics_state
   end
 
   it "should save and restore when save_graphics_state is used with a block" do
     state = sequence "state"
-    @pdf.expects(:add_content).with('q').in_sequence(state)
+    @pdf.renderer.expects(:add_content).with('q').in_sequence(state)
     @pdf.expects(:foo).in_sequence(state)
-    @pdf.expects(:add_content).with('Q').in_sequence(state)
+    @pdf.renderer.expects(:add_content).with('Q').in_sequence(state)
 
     @pdf.save_graphics_state do
       @pdf.foo
@@ -505,14 +505,14 @@ describe "When using transformation matrix" do
   # part is 5 (PDF Reference, Third Edition, p. 706)
 
   it "should send the right content on transformation_matrix" do
-    @pdf.expects(:add_content).with('1.00000 0.00000 0.12346 -1.00000 5.50000 20.00000 cm')
+    @pdf.renderer.expects(:add_content).with('1.00000 0.00000 0.12346 -1.00000 5.50000 20.00000 cm')
     @pdf.transformation_matrix 1, 0, 0.123456789, -1.0, 5.5, 20
   end
 
   it "should use fixed digits with very small number" do
     values = Array.new(6, 0.000000000001)
     string = Array.new(6, "0.00000").join " "
-    @pdf.expects(:add_content).with("#{string} cm")
+    @pdf.renderer.expects(:add_content).with("#{string} cm")
     @pdf.transformation_matrix *values
   end
 
@@ -528,7 +528,7 @@ describe "When using transformation matrix" do
     process = sequence "process"
 
     @pdf.expects(:save_graphics_state).with().in_sequence(process)
-    @pdf.expects(:add_content).with("#{string} cm").in_sequence(process)
+    @pdf.renderer.expects(:add_content).with("#{string} cm").in_sequence(process)
     @pdf.expects(:do_something).with().in_sequence(process)
     @pdf.expects(:restore_graphics_state).with().in_sequence(process)
     @pdf.transformation_matrix(*values) do

data/spec/line_wrap_spec.rb

@@ -128,25 +128,28 @@ describe "Core::Text::Formatted::LineWrap#wrap_line" do
     string.should == "hello#{Prawn::Text::SHY}"
   end
 
-  it "should not display soft hyphens except at the end of a line" do
-    string = @pdf.font.normalize_encoding("hello#{Prawn::Text::SHY}world")
-    array = [{ :text => string }]
+  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"
+    string.should == "helloworld hiearth"
 
     @pdf.font("#{Prawn::DATADIR}/fonts/DejaVuSans.ttf")
     @line_wrap = Prawn::Text::Formatted::LineWrap.new
 
-    string = "hello#{Prawn::Text::SHY}world"
-    array = [{ :text => string }]
+    string1 = "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"
+    string.should == "helloworld hiearth"
   end
 
   it "should not break before a hard hyphen that follows a word" do

data/spec/view_spec.rb

@@ -0,0 +1,43 @@
+# encoding: utf-8
+
+require_relative "spec_helper"
+
+describe "Prawn::View" do
+  let(:view_object) { Object.new.tap { |o| o.extend(Prawn::View) } }
+
+  it "provides a Prawn::Document object by default" do
+    expect(view_object.document).to be_kind_of(Prawn::Document)
+  end
+
+  it "delegates unhandled methods to object returned by document method" do
+    doc = mock("Document")
+    view_object.stubs(:document => doc)
+
+    doc.expects(:some_delegated_method)
+
+    view_object.some_delegated_method
+  end
+
+  it "allows a block-like DSL via the update method" do
+    doc = mock("Document")
+    view_object.stubs(:document => doc)
+
+    doc.expects(:foo)
+    doc.expects(:bar)
+
+    view_object.update do
+      foo
+      bar
+    end
+  end
+
+  it "aliases save_as() to document.render_file()" do
+    doc = mock("Document")
+    doc.expects(:render_file)
+
+    view_object.stubs(:document => doc)
+
+    view_object.save_as("foo.pdf")
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prawn
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Gregory Brown
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-27 00:00:00.000000000 Z
+date: 2014-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ttfunk
@@ -20,28 +20,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: pdf-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.5
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.5
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: pdf-inspector
   requirement: !ruby/object:Gem::Requirement
@@ -168,6 +168,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.20.1
+- !ruby/object:Gem::Dependency
+  name: code_statistics
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.2.13
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.2.13
 description: |2
     Prawn is a fast, tiny, and nimble PDF generator for Ruby
 email:
@@ -187,7 +201,6 @@ files:
 - Gemfile
 - LICENSE
 - Rakefile
-- VERSION
 - data/encodings/win_ansi.txt
 - data/fonts/Courier-Bold.afm
 - data/fonts/Courier-BoldOblique.afm
@@ -248,7 +261,6 @@ files:
 - lib/prawn/document.rb
 - lib/prawn/document/bounding_box.rb
 - lib/prawn/document/column_box.rb
-- lib/prawn/document/graphics_state.rb
 - lib/prawn/document/internals.rb
 - lib/prawn/document/span.rb
 - lib/prawn/encoding.rb
@@ -290,6 +302,8 @@ files:
 - lib/prawn/text/formatted/parser.rb
 - lib/prawn/text/formatted/wrap.rb
 - lib/prawn/utilities.rb
+- lib/prawn/version.rb
+- lib/prawn/view.rb
 - manual/absolute_position.pdf
 - manual/basic_concepts/adding_pages.rb
 - manual/basic_concepts/basic_concepts.rb
@@ -298,6 +312,7 @@ files:
 - manual/basic_concepts/measurement.rb
 - manual/basic_concepts/origin.rb
 - manual/basic_concepts/other_cursor_helpers.rb
+- manual/basic_concepts/view.rb
 - manual/bounding_box/bounding_box.rb
 - manual/bounding_box/bounds.rb
 - manual/bounding_box/canvas.rb
@@ -427,6 +442,7 @@ files:
 - spec/text_spec.rb
 - spec/text_with_inline_formatting_spec.rb
 - spec/transparency_spec.rb
+- spec/view_spec.rb
 homepage: http://prawn.majesticseacreature.com
 licenses:
 - RUBY
@@ -501,4 +517,5 @@ test_files:
 - spec/text_spec.rb
 - spec/text_with_inline_formatting_spec.rb
 - spec/transparency_spec.rb
+- spec/view_spec.rb
 has_rdoc: 

data/VERSION

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

data/lib/prawn/document/graphics_state.rb

@@ -1,73 +0,0 @@
-# encoding: utf-8
-#
-# graphics_state.rb: Implements graphics state saving and restoring
-#
-# Copyright January 2010, Michael Witrant. All Rights Reserved.
-#
-# This is free software. Please see the LICENSE and COPYING files for details.
-#
-
-module Prawn
-  class Document
-    module GraphicsState # @private
-
-      # Pushes the current graphics state on to the graphics state stack so we
-      # can restore it when finished with a change we want to isolate (such as
-      # modifying the transformation matrix). Used in pairs with
-      # restore_graphics_state or passed a block
-      #
-      # Example without a block:
-      #
-      #   save_graphics_state
-      #   rotate 30
-      #   text "rotated text"
-      #   restore_graphics_state
-      #
-      # Example with a block:
-      #
-      #   save_graphics_state do
-      #     rotate 30
-      #     text "rotated text"
-      #   end
-      #
-
-      def open_graphics_state
-        add_content "q"
-      end
-
-      def close_graphics_state
-        add_content "Q"
-      end
-
-      def save_graphics_state(graphic_state = nil)
-        graphic_stack.save_graphic_state(graphic_state)
-        open_graphics_state
-        if block_given?
-          yield
-          restore_graphics_state
-        end
-      end
-
-      # Pops the last saved graphics state off the graphics state stack and
-      # restores the state to those values
-      def restore_graphics_state
-        if graphic_stack.empty?
-          raise PDF::Core::Errors::EmptyGraphicStateStack,
-            "\n You have reached the end of the graphic state stack"
-        end
-        close_graphics_state
-        graphic_stack.restore_graphic_state
-      end
-
-      def graphic_stack
-        state.page.stack
-      end
-
-      def graphic_state
-        save_graphics_state unless graphic_stack.current_state
-        graphic_stack.current_state
-      end
-
-    end
-  end
-end