prawn-svg 0.27.0 → 0.27.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05bd5082f2d3bfb40a2776b9b8239ec0d345e826
-  data.tar.gz: 77c9df1c4f8bab6198ea45a0531314deac6e7a59
+  metadata.gz: 78e98b74bfb10e36c2de7a051662546c98ddcfa5
+  data.tar.gz: 9fe692aebb49298a976f9436141c9bf9f4e3b750
 SHA512:
-  metadata.gz: 8d429c038aade4dad263441309d48f43e8ea185f67f85de9e556cbb1b2f50dd19af4bc6345e0a62388eaca504caea8d00506404630be11efea206a28a3b680f3
-  data.tar.gz: 83bc2528c2ba901523e3d54e32098852d354d35c07fc7bacbbc2583526422e8d2f613195e94145efeb56eeeb0d2db427b59bd0f1da19f888cc21f0b2cb7fbb7f
+  metadata.gz: bca8bd9a84bb372434d0a6aac7911c13e097fbdc30e788c9dad883a922237b384cc6f9786a3992193bd46ee47e562274bbe5e7f39a7ad6eba0a9311422e40c24
+  data.tar.gz: 67af84522eb27d03b18afa2d9f6309b4a2588f411ddf123681dd69bf34992a85c2aab62946d87ab025bb12c66df3e2189b3543c5eba4e79c4de691003206696b

data/lib/prawn/svg/calculators/document_sizing.rb

@@ -28,14 +28,25 @@ module Prawn::SVG::Calculators
       container_width = @requested_width || @bounds[0]
       container_height = @requested_height || @bounds[1]
 
-      @output_width = Pixels::Measurement.to_pixels(@document_width || container_width, container_width)
-      @output_height = Pixels::Measurement.to_pixels(@document_height || container_height, container_height)
+      @output_width = Pixels::Measurement.to_pixels(@document_width || @requested_width, container_width)
+      @output_height = Pixels::Measurement.to_pixels(@document_height || @requested_height, container_height)
 
       if @view_box
         values = @view_box.strip.split(Prawn::SVG::Elements::COMMA_WSP_REGEXP)
         @x_offset, @y_offset, @viewport_width, @viewport_height = values.map {|value| value.to_f}
 
         if @viewport_width > 0 && @viewport_height > 0
+          # If neither the width nor height was specified, use the entire space available
+          if @output_width.nil? && @output_height.nil?
+            @output_width = container_width
+            @output_height = container_height
+          end
+
+          # If one of the output dimensions is missing, calculate it from the other one
+          # using the ratio of the viewport width to height.
+          @output_width ||= @output_height * @viewport_width / @viewport_height
+          @output_height ||= @output_width * @viewport_height / @viewport_width
+
           aspect = AspectRatio.new(@preserve_aspect_ratio, [@output_width, @output_height], [@viewport_width, @viewport_height])
           @x_scale = aspect.width / @viewport_width
           @y_scale = aspect.height / @viewport_height
@@ -43,6 +54,9 @@ module Prawn::SVG::Calculators
           @y_offset -= aspect.y / @y_scale
         end
       else
+        @output_width ||= container_width
+        @output_height ||= container_height
+
         @viewport_width = @output_width
         @viewport_height = @output_height
       end

data/lib/prawn/svg/version.rb

@@ -1,5 +1,5 @@
 module Prawn
   module SVG
-    VERSION = '0.27.0'
+    VERSION = '0.27.1'
   end
 end

data/spec/prawn/svg/calculators/document_sizing_spec.rb

@@ -113,6 +113,34 @@ describe Prawn::SVG::Calculators::DocumentSizing do
         end
       end
 
+      context "when a viewBox and a requested width is supplied" do
+        let(:attributes) { {"viewBox" => "0 0 100 200"} }
+
+        it "uses the requested width and calculates the height based on the viewBox" do
+          sizing.requested_width = 550
+          sizing.calculate
+
+          expect(sizing.viewport_width).to eq 100
+          expect(sizing.viewport_height).to eq 200
+          expect(sizing.output_width).to eq 550
+          expect(sizing.output_height).to eq 1100
+        end
+      end
+
+      context "when a viewBox and a requested height is supplied" do
+        let(:attributes) { {"viewBox" => "0 0 100 200"} }
+
+        it "uses the requested height and calculates the width based on the viewBox" do
+          sizing.requested_height = 400
+          sizing.calculate
+
+          expect(sizing.viewport_width).to eq 100
+          expect(sizing.viewport_height).to eq 200
+          expect(sizing.output_width).to eq 200
+          expect(sizing.output_height).to eq 400
+        end
+      end
+
       context "when neither viewBox nor requested width/height specified" do
         let(:attributes) { {} }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prawn-svg
 version: !ruby/object:Gem::Version
-  version: 0.27.0
+  version: 0.27.1
 platform: ruby
 authors:
 - Roger Nesbitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-31 00:00:00.000000000 Z
+date: 2017-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prawn