prawn-svg 0.25.1 → 0.25.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 920f166e2e978e119012447d12239650468aa192
-  data.tar.gz: 4a55b681c5c4907dbf9e938da0ccd41217d1623f
+  metadata.gz: bc0f179818ef67c8d26893204ed003aade48b1e2
+  data.tar.gz: 061d2ab83b313f9973d2a480e51f2fd5d288fb0e
 SHA512:
-  metadata.gz: 7934d9a7adaf305002aaea55e2d0acd58ff1d2a3307797f18f2bdb69281cebbcafb4acb16efce262643d28154e28cf160ad0a298e76c83e0913139ef37aebf6e
-  data.tar.gz: a032d3e73d64fb48f3cffefb83a16b059fce5bbd491d73c90512c50056e590758ee0acfde004ae8892f1dc1b7dc50f00bc0ef3aa53393aa2842b3b1480b35e4e
+  metadata.gz: 1df75e7819f4b9c3d016e386ca48bf4041d490da015f808880ff5bc78f40659b37313eb31bbf4106e1d17212e4965bb43bb0b32899ea6fd3003a7e8e3bf3270f
+  data.tar.gz: a693b8ed00d9ee605dc924a0fce2160936662fa11f5555b98b02cf480e8057808f2b6ae2b5ad07d2b42939777ce3f60fb1123d481ea8f2f1e5b97ade42293b82

data/lib/prawn/svg/document.rb

@@ -39,12 +39,16 @@ class Prawn::SVG::Document
     )
 
     @sizing = Prawn::SVG::Calculators::DocumentSizing.new(bounds, @root.attributes)
-    sizing.requested_width = options[:width]
-    sizing.requested_height = options[:height]
-    sizing.calculate
+    calculate_sizing(requested_width: options[:width], requested_height: options[:height])
 
     @css_parser = CssParser::Parser.new
 
     yield self if block_given?
   end
+
+  def calculate_sizing(requested_width: nil, requested_height: nil)
+    sizing.requested_width = requested_width
+    sizing.requested_height = requested_height
+    sizing.calculate
+  end
 end

data/lib/prawn/svg/font.rb

@@ -52,14 +52,12 @@ class Prawn::SVG::Font
   # Construct a subfamily name from the weight and style information.
   # Note that this name might not actually exist in the font.
   def subfamily_name
-    sfn = if weight == :normal && style
+    if weight == :normal && style
       style
     elsif weight || style
-      "#{weight} #{style}"
+      [weight, style].compact.join('_').to_sym
     else
-      "normal"
+      :normal
     end
-
-    sfn.strip.gsub(/\s+/, "_").downcase.to_sym
   end
 end

data/lib/prawn/svg/font_registry.rb

@@ -3,7 +3,8 @@ class Prawn::SVG::FontRegistry
     "/Library/Fonts",
     "/System/Library/Fonts",
     "#{ENV["HOME"]}/Library/Fonts",
-    "/usr/share/fonts/truetype"
+    "/usr/share/fonts/truetype",
+    "/mnt/c/Windows/Fonts", # Bash on Ubuntu on Windows
   ]
 
   @font_path = DEFAULT_FONT_PATHS.select { |path| Dir.exist?(path) }

data/lib/prawn/svg/interface.rb

@@ -39,19 +39,29 @@ module Prawn
 
         @document.warnings.clear
 
-        prawn.bounding_box(position, :width => @document.sizing.output_width, :height => @document.sizing.output_height) do
-          prawn.save_graphics_state do
-            clip_rectangle 0, 0, @document.sizing.output_width, @document.sizing.output_height
+        prawn.save_font do
+          prawn.bounding_box(position, :width => @document.sizing.output_width, :height => @document.sizing.output_height) do
+            prawn.save_graphics_state do
+              clip_rectangle 0, 0, @document.sizing.output_width, @document.sizing.output_height
 
-            calls = []
-            root_element = Prawn::SVG::Elements::Root.new(@document, @document.root, calls)
-            root_element.process
+              calls = []
+              root_element = Prawn::SVG::Elements::Root.new(@document, @document.root, calls)
+              root_element.process
 
-            proc_creator(prawn, calls).call
+              proc_creator(prawn, calls).call
+            end
           end
         end
       end
 
+      def sizing
+        document.sizing
+      end
+
+      def resize(width: nil, height: nil)
+        document.calculate_sizing(requested_width: width, requested_height: height)
+      end
+
       def position
         @options[:at] || [x_based_on_requested_alignment, y_based_on_requested_alignment]
       end

data/lib/prawn/svg/loaders/file.rb

@@ -19,6 +19,13 @@
 # you're passing in a filename that hasn't been taken from an XML document's attribute,
 # you will want to URL encode it before you pass it in.
 #
+# FILES READ AS BINARY
+# ====================
+# At the moment, prawn-svg uses this class only to load graphical files, which are binary.
+# This class therefore uses IO.binread to read file data.  If it is ever used in the future
+# to load text files, it will have to be taught about what kind of file it's expecting to
+# read, and adjust the file read function accordingly.
+#
 module Prawn::SVG::Loaders
   class File
     attr_reader :root_path
@@ -53,7 +60,7 @@ module Prawn::SVG::Loaders
       path = build_absolute_and_expand_path(path)
       assert_valid_path!(path)
       assert_file_exists!(path)
-      IO.read(path)
+      IO.binread(path)
     end
 
     def build_uri(url)

data/lib/prawn/svg/version.rb

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

data/spec/prawn/svg/interface_spec.rb

@@ -91,4 +91,18 @@ describe Prawn::SVG::Interface do
       end
     end
   end
+
+  describe "#sizing and #resize" do
+    let(:interface) { Prawn::SVG::Interface.new(svg, prawn, {}) }
+
+    it "allows the advanced user to resize the SVG after learning about its dimensions" do
+      expect(interface.sizing.output_width).to eq 250
+      expect(interface.sizing.output_height).to eq 100
+
+      interface.resize(width: 500)
+
+      expect(interface.sizing.output_width).to eq 500
+      expect(interface.sizing.output_height).to eq 200
+    end
+  end
 end

data/spec/prawn/svg/loaders/file_spec.rb

@@ -24,7 +24,7 @@ RSpec.describe Prawn::SVG::Loaders::File do
 
       expect(Dir).to receive(:exist?).with(fake_root_path).and_return(true)
       expect(File).to receive(:exist?).with("#{fake_root_path}/relative/path").and_return(true)
-      expect(IO).to receive(:read).with("#{fake_root_path}/relative/path").and_return("data")
+      expect(IO).to receive(:binread).with("#{fake_root_path}/relative/path").and_return("data")
 
       expect(subject).to eq 'data'
     end
@@ -39,7 +39,7 @@ RSpec.describe Prawn::SVG::Loaders::File do
 
       expect(Dir).to receive(:exist?).with(fake_root_path).and_return(true)
       expect(File).to receive(:exist?).with("/some/absolute/path").and_return(true)
-      expect(IO).to receive(:read).with("/some/absolute/path").and_return("data")
+      expect(IO).to receive(:binread).with("/some/absolute/path").and_return("data")
 
       expect(subject).to eq 'data'
     end
@@ -54,7 +54,7 @@ RSpec.describe Prawn::SVG::Loaders::File do
 
       expect(Dir).to receive(:exist?).with(fake_root_path).and_return(true)
       expect(File).to receive(:exist?).with("/some/absolute/path name").and_return(true)
-      expect(IO).to receive(:read).with("/some/absolute/path name").and_return("data")
+      expect(IO).to receive(:binread).with("/some/absolute/path name").and_return("data")
 
       expect(subject).to eq 'data'
     end
@@ -94,7 +94,7 @@ RSpec.describe Prawn::SVG::Loaders::File do
 
       expect(Dir).to receive(:exist?).with(fake_root_path).and_return(true)
       expect(File).to receive(:exist?).with("c:/full/path/to/file.png").and_return(true)
-      expect(IO).to receive(:read).with("c:/full/path/to/file.png").and_return("data")
+      expect(IO).to receive(:binread).with("c:/full/path/to/file.png").and_return("data")
 
       allow(file_loader).to receive(:windows?).and_return true
       expect(subject).to eq 'data'

data/spec/sample_svg/subfamilies.svg

@@ -8,5 +8,6 @@
     <text y="100" fill="black" style="font-weight: 400;">prawn-svg</text>
     <text y="200" fill="black" style="font-weight: 600;">prawn-svg</text>
     <text y="300" fill="black" style="font-weight: 800;">prawn-svg</text>
+    <text y="400" fill="black" style="font-style: italic;">prawn-svg</text>
   </g>
 </svg>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prawn-svg
 version: !ruby/object:Gem::Version
-  version: 0.25.1
+  version: 0.25.2
 platform: ruby
 authors:
 - Roger Nesbitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-21 00:00:00.000000000 Z
+date: 2016-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prawn
@@ -250,93 +250,4 @@ rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: SVG renderer for Prawn PDF library
-test_files:
-- spec/integration_spec.rb
-- spec/prawn/svg/attributes/transform_spec.rb
-- spec/prawn/svg/calculators/aspect_ratio_spec.rb
-- spec/prawn/svg/calculators/document_sizing_spec.rb
-- spec/prawn/svg/calculators/pixels_spec.rb
-- spec/prawn/svg/color_spec.rb
-- spec/prawn/svg/css_spec.rb
-- spec/prawn/svg/document_spec.rb
-- spec/prawn/svg/elements/base_spec.rb
-- spec/prawn/svg/elements/gradient_spec.rb
-- spec/prawn/svg/elements/line_spec.rb
-- spec/prawn/svg/elements/marker_spec.rb
-- spec/prawn/svg/elements/path_spec.rb
-- spec/prawn/svg/elements/polygon_spec.rb
-- spec/prawn/svg/elements/polyline_spec.rb
-- spec/prawn/svg/elements/style_spec.rb
-- spec/prawn/svg/elements/text_spec.rb
-- spec/prawn/svg/font_registry_spec.rb
-- spec/prawn/svg/font_spec.rb
-- spec/prawn/svg/interface_spec.rb
-- spec/prawn/svg/loaders/data_spec.rb
-- spec/prawn/svg/loaders/file_spec.rb
-- spec/prawn/svg/loaders/web_spec.rb
-- spec/prawn/svg/pathable_spec.rb
-- spec/prawn/svg/properties_spec.rb
-- spec/prawn/svg/ttf_spec.rb
-- spec/prawn/svg/url_loader_spec.rb
-- spec/sample_images/mushroom-long.jpg
-- spec/sample_images/mushroom-wide.jpg
-- spec/sample_output/directory
-- spec/sample_svg/arcs01.svg
-- spec/sample_svg/arrows.svg
-- spec/sample_svg/cap_styles.svg
-- spec/sample_svg/circle01.svg
-- spec/sample_svg/clip_path.svg
-- spec/sample_svg/close_path.svg
-- spec/sample_svg/cubic01.svg
-- spec/sample_svg/cubic01a.svg
-- spec/sample_svg/cubic02.svg
-- spec/sample_svg/display_none.svg
-- spec/sample_svg/ellipse01.svg
-- spec/sample_svg/gistfile1.svg
-- spec/sample_svg/google_charts.svg
-- spec/sample_svg/gradients.svg
-- spec/sample_svg/hidden_paths.svg
-- spec/sample_svg/highcharts.svg
-- spec/sample_svg/image01.svg
-- spec/sample_svg/image02_base64.svg
-- spec/sample_svg/image03.svg
-- spec/sample_svg/line01.svg
-- spec/sample_svg/marker.svg
-- spec/sample_svg/markers_degenerate_cp.svg
-- spec/sample_svg/maths.svg
-- spec/sample_svg/matrix_transform.svg
-- spec/sample_svg/matrix_transform_3.svg
-- spec/sample_svg/negminy.svg
-- spec/sample_svg/no_width_or_height.svg
-- spec/sample_svg/offset_viewport.svg
-- spec/sample_svg/omnigraffle.svg
-- spec/sample_svg/opacity01.svg
-- spec/sample_svg/path.svg
-- spec/sample_svg/pie_piece.svg
-- spec/sample_svg/polygon01.svg
-- spec/sample_svg/polyline01.svg
-- spec/sample_svg/preserve-space.svg
-- spec/sample_svg/quad01.svg
-- spec/sample_svg/rect01.svg
-- spec/sample_svg/rect02.svg
-- spec/sample_svg/rotate_scale.svg
-- spec/sample_svg/scale.svg
-- spec/sample_svg/scruffy_graph.svg
-- spec/sample_svg/subfamilies.svg
-- spec/sample_svg/subviewports.svg
-- spec/sample_svg/subviewports2.svg
-- spec/sample_svg/text_entities.svg
-- spec/sample_svg/tref01.svg
-- spec/sample_svg/triangle01.svg
-- spec/sample_svg/tspan01.svg
-- spec/sample_svg/tspan02.svg
-- spec/sample_svg/tspan03-cc.svg
-- spec/sample_svg/tspan03.svg
-- spec/sample_svg/tspan04.svg
-- spec/sample_svg/tspan05.svg
-- spec/sample_svg/tspan91.svg
-- spec/sample_svg/use.svg
-- spec/sample_svg/viewbox.svg
-- spec/sample_svg/viewport.svg
-- spec/sample_ttf/OpenSans-SemiboldItalic.ttf
-- spec/spec_helper.rb
+test_files: []