prawn 2.0.2 → 2.1.0

data/spec/text_spec.rb

@@ -63,7 +63,7 @@ describe "#text" do
   end
 
   it "should ignore call when string is nil" do
-    expect(@pdf.text(nil)).to be_false
+    expect(@pdf.text(nil)).to eq false
   end
 
   it "should correctly render empty paragraphs" do
@@ -91,13 +91,13 @@ describe "#text" do
   it "should default to use kerning information" do
     @pdf.text "hello world"
     text = PDF::Inspector::Text.analyze(@pdf.render)
-    expect(text.kerned[0]).to be_true
+    expect(text.kerned[0]).to eq true
   end
 
   it "should be able to disable kerning with an option" do
     @pdf.text "hello world", :kerning => false
     text = PDF::Inspector::Text.analyze(@pdf.render)
-    expect(text.kerned[0]).to be_false
+    expect(text.kerned[0]).to eq false
   end
 
   it "should be able to disable kerning document-wide" do
@@ -105,14 +105,14 @@ describe "#text" do
     @pdf.default_kerning = false
     @pdf.text "hello world"
     text = PDF::Inspector::Text.analyze(@pdf.render)
-    expect(text.kerned[0]).to be_false
+    expect(text.kerned[0]).to eq false
   end
 
   it "option should be able to override document-wide kerning disabling" do
     @pdf.default_kerning = false
     @pdf.text "hello world", :kerning => true
     text = PDF::Inspector::Text.analyze(@pdf.render)
-    expect(text.kerned[0]).to be_true
+    expect(text.kerned[0]).to eq true
   end
 
   it "should raise_error ArgumentError if :at option included" do
@@ -480,25 +480,19 @@ describe "#text" do
   describe "kerning" do
     it "should respect text kerning setting (document default)" do
       create_pdf
-      @pdf.font.expects(:compute_width_of).with do |str, options|
-        str == "VAT" && options[:kerning] == true
-      end.at_least_once.returns(10)
+      expect(@pdf.font).to receive(:compute_width_of).with("VAT", hash_including(kerning: true)).and_return(10)
       @pdf.text "VAT"
     end
 
     it "should respect text kerning setting (kerning=true)" do
       create_pdf
-      @pdf.font.expects(:compute_width_of).with do |str, options|
-        str == "VAT" && options[:kerning] == true
-      end.at_least_once.returns(10)
+      expect(@pdf.font).to receive(:compute_width_of).with("VAT", hash_including(kerning: true)).at_least(:once).and_return(10)
       @pdf.text "VAT", :kerning => true
     end
 
     it "should respect text kerning setting (kerning=false)" do
       create_pdf
-      @pdf.font.expects(:compute_width_of).with do |str, options|
-        str == "VAT" && options[:kerning] == false
-      end.at_least_once.returns(10)
+      expect(@pdf.font).to receive(:compute_width_of).with("VAT", hash_including(kerning: false)).at_least(:once).and_return(10)
       @pdf.text "VAT", :kerning => false
     end
   end

data/spec/transformation_stack_spec.rb

@@ -0,0 +1,63 @@
+# encoding: utf-8
+
+require File.join(File.expand_path(File.dirname(__FILE__)), "spec_helper")
+
+describe Prawn::TransformationStack do
+  before { create_pdf }
+  before { pdf.add_to_transformation_stack(2, 0, 0, 2, 100, 100) }
+
+  let(:pdf)   { @pdf }
+  let(:stack) { @pdf.instance_variable_get(:@transformation_stack) }
+
+  describe "#add_to_transformation_stack" do
+    it "creates and adds to the stack" do
+      pdf.add_to_transformation_stack(1, 0, 0, 1, 20, 20)
+
+      expect(stack).to eq [[[2, 0, 0, 2, 100, 100], [1, 0, 0, 1, 20, 20]]]
+    end
+
+    it "adds to the last stack" do
+      pdf.save_transformation_stack
+      pdf.add_to_transformation_stack(1, 0, 0, 1, 20, 20)
+
+      expect(stack).to eq [
+        [[2, 0, 0, 2, 100, 100]],
+        [[2, 0, 0, 2, 100, 100], [1, 0, 0, 1, 20, 20]]
+      ]
+    end
+  end
+
+  describe "#save_transformation_stack" do
+    it "clones the last stack" do
+      pdf.save_transformation_stack
+
+      expect(stack.length).to eq 2
+      expect(stack.first).to eq stack.last
+      expect(stack.first).to_not be stack.last
+    end
+  end
+
+  describe "#restore_transformation_stack" do
+    it "pops off the last stack" do
+      pdf.save_transformation_stack
+      pdf.add_to_transformation_stack(1, 0, 0, 1, 20, 20)
+      pdf.restore_transformation_stack
+
+      expect(stack).to eq [[[2, 0, 0, 2, 100, 100]]]
+    end
+  end
+
+  describe "current_transformation_matrix_with_translation" do
+    before do
+      pdf.add_to_transformation_stack(1, 0, 0, 1, 20, 20)
+    end
+
+    it "calculates the last transformation" do
+      expect(pdf.current_transformation_matrix_with_translation).to eq [2, 0, 0, 2, 140, 140]
+    end
+
+    it "adds the supplied x and y coordinates to the transformation stack" do
+      expect(pdf.current_transformation_matrix_with_translation(15, 15)).to eq [2, 0, 0, 2, 170, 170]
+    end
+  end
+end

data/spec/view_spec.rb

@@ -10,20 +10,20 @@ describe "Prawn::View" do
   end
 
   it "delegates unhandled methods to object returned by document method" do
-    doc = mock("Document")
-    view_object.stubs(:document => doc)
+    doc = double("Document")
+    allow(view_object).to receive(:document).and_return(doc)
 
-    doc.expects(:some_delegated_method)
+    expect(doc).to receive(: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 = double("Document")
+    allow(view_object).to receive(:document).and_return(doc)
 
-    doc.expects(:foo)
-    doc.expects(:bar)
+    expect(doc).to receive(:foo)
+    expect(doc).to receive(:bar)
 
     view_object.update do
       foo
@@ -32,10 +32,10 @@ describe "Prawn::View" do
   end
 
   it "aliases save_as() to document.render_file()" do
-    doc = mock("Document")
-    doc.expects(:render_file)
+    doc = double("Document")
+    expect(doc).to receive(:render_file)
 
-    view_object.stubs(:document => doc)
+    allow(view_object).to receive(:document).and_return(doc)
 
     view_object.save_as("foo.pdf")
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prawn
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.1.0
 platform: ruby
 authors:
 - Gregory Brown
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-16 00:00:00.000000000 Z
+date: 2016-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ttfunk
@@ -34,28 +34,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.6.1
 - !ruby/object:Gem::Dependency
   name: pdf-inspector
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -74,30 +74,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.14.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.14.1
-- !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -221,6 +207,8 @@ files:
 - data/images/16bit.png
 - data/images/arrow.png
 - data/images/arrow2.png
+- data/images/blend_modes_bottom_layer.jpg
+- data/images/blend_modes_top_layer.jpg
 - data/images/dice.alpha
 - data/images/dice.color
 - data/images/dice.png
@@ -228,12 +216,14 @@ files:
 - data/images/fractal.jpg
 - data/images/indexed_color.dat
 - data/images/indexed_color.png
+- data/images/indexed_transparency.png
+- data/images/indexed_transparency_alpha.dat
+- data/images/indexed_transparency_color.dat
 - data/images/letterhead.jpg
 - data/images/license.md
 - 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
@@ -271,6 +261,7 @@ files:
 - lib/prawn/font/ttf.rb
 - lib/prawn/font_metric_cache.rb
 - lib/prawn/graphics.rb
+- lib/prawn/graphics/blend_mode.rb
 - lib/prawn/graphics/cap_style.rb
 - lib/prawn/graphics/color.rb
 - lib/prawn/graphics/dash.rb
@@ -301,6 +292,7 @@ files:
 - lib/prawn/text/formatted/line_wrap.rb
 - lib/prawn/text/formatted/parser.rb
 - lib/prawn/text/formatted/wrap.rb
+- lib/prawn/transformation_stack.rb
 - lib/prawn/utilities.rb
 - lib/prawn/version.rb
 - lib/prawn/view.rb
@@ -330,6 +322,7 @@ files:
 - manual/document_and_page_options/page_size.rb
 - manual/document_and_page_options/print_scaling.rb
 - manual/example_helper.rb
+- manual/graphics/blend_mode.rb
 - manual/graphics/circle_and_ellipse.rb
 - manual/graphics/color.rb
 - manual/graphics/common_lines.rb
@@ -404,15 +397,15 @@ files:
 - manual/text/utf8.rb
 - manual/text/win_ansi_charset.rb
 - prawn.gemspec
-- spec/acceptance/png.rb
+- spec/acceptance/png_spec.rb
 - spec/annotations_spec.rb
+- spec/blend_mode_spec.rb
 - spec/bounding_box_spec.rb
 - spec/column_box_spec.rb
 - spec/data/curves.pdf
 - spec/destinations_spec.rb
 - spec/document_spec.rb
 - spec/extensions/encoding_helpers.rb
-- spec/extensions/mocha.rb
 - spec/font_metric_cache_spec.rb
 - spec/font_spec.rb
 - spec/formatted_text_arranger_spec.rb
@@ -442,13 +435,14 @@ files:
 - spec/text_spacing_spec.rb
 - spec/text_spec.rb
 - spec/text_with_inline_formatting_spec.rb
+- spec/transformation_stack_spec.rb
 - spec/transparency_spec.rb
 - spec/view_spec.rb
 homepage: http://prawn.majesticseacreature.com
 licenses:
-- RUBY
-- GPL-2
-- GPL-3
+- PRAWN
+- GPL-2.0
+- GPL-3.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -466,12 +460,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: prawn
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: A fast and nimble PDF generator for Ruby
 test_files:
 - spec/annotations_spec.rb
+- spec/blend_mode_spec.rb
 - spec/bounding_box_spec.rb
 - spec/column_box_spec.rb
 - spec/destinations_spec.rb
@@ -504,6 +499,7 @@ test_files:
 - spec/text_spacing_spec.rb
 - spec/text_spec.rb
 - spec/text_with_inline_formatting_spec.rb
+- spec/transformation_stack_spec.rb
 - spec/transparency_spec.rb
 - spec/view_spec.rb
 has_rdoc: 

data/spec/acceptance/png.rb

@@ -1,24 +0,0 @@
-# encoding: utf-8
-
-require_relative "../../lib/prawn"
-
-images = [
-  ["Type 0", "#{Prawn::BASEDIR}/data/images/web-links.png"],
-  ["Type 2", "#{Prawn::BASEDIR}/data/images/ruport.png"],
-  ["Type 3", "#{Prawn::BASEDIR}/data/images/indexed_color.png"],
-  ["Type 4", "#{Prawn::BASEDIR}/data/images/page_white_text.png"],
-  ["Type 6", "#{Prawn::BASEDIR}/data/images/dice.png"]
-]
-
-Prawn::Document.generate("png_types.pdf", :page_size => "A5") do
-  images.each do |header, file|
-    start_new_page unless header.include?("0")
-
-    fill_color "FF0000"
-
-    fill_rectangle bounds.top_left, bounds.width, bounds.height
-    text header
-
-    image file, :at => [50, 450]
-  end
-end

data/spec/extensions/mocha.rb

@@ -1,45 +0,0 @@
-# encoding: utf-8
-
-# Allow speccing things when an expectation matcher runs. Similar to #with, but
-# always succeeds.
-#
-#   @pdf.expects(:stroke_line).checking do |from, to|
-#     @pdf.map_to_absolute(from).should == [0, 0]
-#   end
-#
-# Note that the outer expectation does *not* fail only because the inner one
-# does; in the above example, the outer expectation would only fail if
-# stroke_line were not called.
-
-class ParameterChecker < Mocha::ParametersMatcher
-  def initialize(&matching_block)
-    @expected_parameters = [Mocha::ParameterMatchers::AnyParameters.new]
-    @matching_block = matching_block
-  end
-
-  def match?(actual_parameters = [])
-    @matching_block.call(*actual_parameters)
-
-    true # always succeed
-  end
-end
-
-class Mocha::Expectation
-  def checking(&block)
-    @parameters_matcher = ParameterChecker.new(&block)
-    self
-  end
-end
-
-# Equivalent to expects(method_name).at_least(0). More useful when combined
-# with parameter matchers to ignore certain calls for the sake of parameter
-# matching.
-#
-#   @pdf.ignores(:stroke_color=).with("000000")
-#   @pdf.expects(:stroke_color=).with("ff0000")
-#
-module Mocha::ObjectMethods
-  def ignores(method_name)
-    expects(method_name).at_least(0)
-  end
-end