prawn-svg 0.25.0 → 0.25.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bcd6cefab7e10066561afcaee2e9aeed78c9b30f
-  data.tar.gz: dbe371b99f2cf4953de90e892a3f95718abdd02e
+  metadata.gz: 920f166e2e978e119012447d12239650468aa192
+  data.tar.gz: 4a55b681c5c4907dbf9e938da0ccd41217d1623f
 SHA512:
-  metadata.gz: 7c567a3f24cebf73c40ec247799f78e730b5f3479be3b486791b7bba9cf7140611db88b00e49422b6bb151613a09296e167e08b30b9f2bd73acf34a9ff49f193
-  data.tar.gz: b2e8135844d8e09dbabdf153794775531c6f3b15a6ca796b7a3a765a135b16837fa9127d5d88c616d07709868d296210eba044605540afe010d68e42a63e36c7
+  metadata.gz: 7934d9a7adaf305002aaea55e2d0acd58ff1d2a3307797f18f2bdb69281cebbcafb4acb16efce262643d28154e28cf160ad0a298e76c83e0913139ef37aebf6e
+  data.tar.gz: a032d3e73d64fb48f3cffefb83a16b059fce5bbd491d73c90512c50056e590758ee0acfde004ae8892f1dc1b7dc50f00bc0ef3aa53393aa2842b3b1480b35e4e

data/lib/prawn/svg/elements.rb

@@ -2,6 +2,8 @@ module Prawn::SVG::Elements
   COMMA_WSP_REGEXP = /(?:\s+,?\s*|,\s*)/
 end
 
+require 'prawn/svg/elements/call_duplicator'
+
 %w(base depth_first_base root container viewport style text text_component line polyline polygon circle ellipse rect path use image gradient marker ignored).each do |filename|
   require "prawn/svg/elements/#{filename}"
 end

data/lib/prawn/svg/elements/base.rb

@@ -1,6 +1,8 @@
 class Prawn::SVG::Elements::Base
   extend Forwardable
 
+  include Prawn::SVG::Elements::CallDuplicator
+
   include Prawn::SVG::Calculators::Pixels
 
   include Prawn::SVG::Attributes::Transform
@@ -106,7 +108,7 @@ class Prawn::SVG::Elements::Base
   end
 
   def add_calls_from_element(other)
-    @calls.concat other.base_calls
+    @calls.concat duplicate_calls(other.base_calls)
   end
 
   def new_call_context_from_base

data/lib/prawn/svg/elements/call_duplicator.rb

@@ -0,0 +1,37 @@
+#
+# Unfortunately, prawn mutates arguments passed in to it.
+# When we make a copy of one of the call stacks, we need to make a deep
+# duplicate of it so that the first time prawn mutates the arguments, it
+# won't affect the subsequent calls.
+#
+module Prawn::SVG::Elements::CallDuplicator
+  private
+
+  def duplicate_calls(calls)
+    calls.map { |call| duplicate_call(call) }
+  end
+
+  def duplicate_call(call)
+    [call[0], duplicate_array(call[1]), duplicate_calls(call[2])]
+  end
+
+  def duplicate_array(array)
+    array.map do |value|
+      case value
+      when Array then duplicate_array(value)
+      when Hash  then duplicate_hash(value)
+      else            value
+      end
+    end
+  end
+
+  def duplicate_hash(hash)
+    hash.each.with_object({}) do |(key, value), result|
+      result[key] = case value
+                    when Array then duplicate_array(value)
+                    when Hash  then duplicate_hash(value)
+                    else            value
+                    end
+    end
+  end
+end

data/lib/prawn/svg/interface.rb

@@ -184,12 +184,12 @@ module Prawn
       end
 
       def clip_rectangle(x, y, width, height)
-          prawn.move_to x, y
-          prawn.line_to x + width, y
-          prawn.line_to x + width, y + height
-          prawn.line_to x, y + height
-          prawn.close_path
-          prawn.add_content "W n" # clip to path
+        prawn.move_to x, y
+        prawn.line_to x + width, y
+        prawn.line_to x + width, y + height
+        prawn.line_to x, y + height
+        prawn.close_path
+        prawn.add_content "W n" # clip to path
       end
     end
   end

data/lib/prawn/svg/version.rb

@@ -1,5 +1,5 @@
 module Prawn
   module SVG
-    VERSION = '0.25.0'
+    VERSION = '0.25.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prawn-svg
 version: !ruby/object:Gem::Version
-  version: 0.25.0
+  version: 0.25.1
 platform: ruby
 authors:
 - Roger Nesbitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-29 00:00:00.000000000 Z
+date: 2016-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prawn
@@ -103,6 +103,7 @@ files:
 - lib/prawn/svg/document.rb
 - lib/prawn/svg/elements.rb
 - lib/prawn/svg/elements/base.rb
+- lib/prawn/svg/elements/call_duplicator.rb
 - lib/prawn/svg/elements/circle.rb
 - lib/prawn/svg/elements/container.rb
 - lib/prawn/svg/elements/depth_first_base.rb