phantom_svg 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83b2989f948845f7d83da71c019ec9797badc74f
-  data.tar.gz: d808e2f5115912c81d87e171fdb20fb5d386df7f
+  metadata.gz: 18f99a7628287a82ef66f940b39600f89297d9e2
+  data.tar.gz: c2bd3e70192b8e27330905329355a86794e64e9a
 SHA512:
-  metadata.gz: eab25f3be99ae749af2c4dd001e95d3ea2ac8d44564edfea46ad36806ac3442cc2c5b56aa142d0eab91355ad79bb108d0c60e648129627cf9eb1d1c4fb9e24c3
-  data.tar.gz: aa79742a536b34f8fa45180636867c33a305af669591814cf6736543d442666a01174ae94fcb22004523775fccbe4f7180e162b2a1016378fa3ad6a05724063d
+  metadata.gz: 350c5c93b3691d385b5b4c8152cbb488b36869c66b2e89c5c479084cb6f76d5985c17b8575b5ced6b72a437dc801d0b2fddb33658353a759a9e2884f0440028f
+  data.tar.gz: ef0dcd3d8ffb2ea1a77db9ca7bff109c1ca7f65d31be7a4352599a97d8c8cf2ee753e3ad4a85817a7632100ce4ed6104442a064f60b5da3fee7da4ed154d6253

data/lib/phantom/frame.rb

@@ -56,10 +56,10 @@ module Phantom
 
       def set_viewbox(val)
         @viewbox =
-          if val.nil?               then  ViewBox.new
+          if val.nil?               then  ViewBox.new(0, 0, @width, @height)
           elsif val.is_a?(ViewBox)  then  val
           elsif val.is_a?(String)   then  ViewBox.new.set_from_text(val)
-          else                            ViewBox.new
+          else                            ViewBox.new(0, 0, @width, @height)
           end
       end
 

data/lib/phantom/parser/raster.rb

@@ -25,7 +25,7 @@ module Phantom
         def create_frame_from_png(path, id, duration = nil)
           pixbuf = Gdk::Pixbuf.new(path)
 
-          frame = Phantom::SVG::Frame.new
+          frame = Phantom::SVG::Frame.new( { width: pixbuf.width, height: pixbuf.height } )
           frame.width = "#{pixbuf.width}px"
           frame.height = "#{pixbuf.height}px"
           frame.surfaces = create_surfaces(path, pixbuf.width, pixbuf.height)

data/lib/phantom/parser/svg_reader.rb

@@ -64,15 +64,18 @@ module Phantom
 
         # Read size from node to dest.
         def read_size(node, dest, options = {})
-          node.attributes.each do |key, val|
-            case key
-            when 'width'
-              dest.instance_variable_set(:@width, choice_value(val, options[:width]))
-            when 'height'
-              dest.instance_variable_set(:@height, choice_value(val, options[:height]))
-            when 'viewBox'
-              dest.viewbox.set_from_text(choice_value(val, options[:viewbox]).to_s)
-            end
+          dest.viewbox.set_from_text(choice_value(node.attributes['viewBox'], options[:viewbox]).to_s) unless node.attributes['viewBox'].nil?
+
+          if node.attributes['width'].nil? then
+            dest.instance_variable_set(:@width, choice_value("#{dest.viewbox.width}px", options[:width]))
+          else
+            dest.instance_variable_set(:@width, choice_value(node.attributes['width'], options[:width]))
+          end
+
+          if node.attributes['height'].nil? then
+            dest.instance_variable_set(:@height, choice_value("#{dest.viewbox.height}px", options[:height]))
+          else
+            dest.instance_variable_set(:@height, choice_value(node.attributes['height'], options[:height]))
           end
         end
 

data/lib/phantom/parser/svg_writer.rb

@@ -69,6 +69,10 @@ module Phantom
         def write_size(s, d)
           d.add_attribute('width', s.width.is_a?(String) ? s.width : "#{s.width.to_i}px")
           d.add_attribute('height', s.height.is_a?(String) ? s.height : "#{s.height.to_i}px")
+        end
+
+        # Write viewbox.
+        def write_viewbox(s, d)
           d.add_attribute('viewBox', s.viewbox.to_s) if s.instance_variable_defined?(:@viewbox)
         end
 
@@ -90,7 +94,9 @@ module Phantom
         def write_image(frame, parent_node, id = nil)
           svg = parent_node.add_element('svg')
           svg.add_attribute('id', id) unless id.nil?
-          write_size(frame, svg)
+          write_size(frame, svg) if parent_node == @root
+          write_viewbox(frame, svg)
+          svg.add_attribute('preserveAspectRatio', 'none')
           write_namespaces(frame, svg)
           write_surfaces(frame.surfaces, svg)
         end

data/lib/phantom/svg.rb

@@ -51,8 +51,8 @@ module Phantom
         @width = 0
         @height = 0
         frames.each do |frame|
-          @width = frame.width.to_f if frame.width.to_f > @width
-          @height = frame.height.to_f if frame.height.to_f > @height
+          @width = frame.width.to_i if frame.width.to_i > @width
+          @height = frame.height.to_i if frame.height.to_i > @height
         end
       end
 

data/phantom_svg.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.platform      = Gem::Platform::RUBY
   s.name          = 'phantom_svg'
-  s.version       = '1.0.3'
+  s.version       = '1.0.4'
   s.license       = 'LGPL-3.0'
   s.summary       = 'Hight end SVG manipulation tools for Ruby'
   s.description   = 'Hight end SVG manipulation tools for Ruby.\n' \

data/spec/phantom/svg_spec.rb

@@ -195,8 +195,19 @@ describe Phantom::SVG::Base do
 
     it 'successfully converts.' do
       expect(@loader.frames.size).to eq(12)
-      is_succeeded = @loader.save_apng(@destination)
-      expect(is_succeeded).to eq(true)
+      expect(@loader.save_apng(@destination)).to eq(true)
+    end
+
+    it 'stretches horizontally' do
+      expect(@loader.frames.size).to eq(12)
+      @loader.width = 128
+      expect(@loader.save_apng("#{SPEC_TEMP_DIR}/svg2apng_h.png")).to eq(true)
+    end
+
+    it 'stretches vertically' do
+      expect(@loader.frames.size).to eq(12)
+      @loader.height = 128
+      expect(@loader.save_apng("#{SPEC_TEMP_DIR}/svg2apng_v.png")).to eq(true)
     end
   end
 
@@ -213,6 +224,79 @@ describe Phantom::SVG::Base do
       @loader = Phantom::SVG::Base.new
     end
 
+    it 'loads and saves PNG.' do
+      @loader.add_frame_from_file("#{SPEC_SOURCE_DIR}/test_raster.png")
+      expect(@loader.frames.size).to eq(1)
+      expect(@loader.frames.first.width).to eq("256px")
+      expect(@loader.frames.first.height).to eq("128px")
+      expect(@loader.frames.first.viewbox.width).to eq(256)
+      expect(@loader.frames.first.viewbox.height).to eq(128)
+
+      write_size = @loader.save_svg("#{SPEC_TEMP_DIR}/static_same.svg")
+      expect(write_size).not_to eq(0)
+      @loader.width = 64
+      @loader.height = 32
+      write_size = @loader.save_svg("#{SPEC_TEMP_DIR}/static_scaled.svg")
+      expect(write_size).not_to eq(0)
+    end
+
+    it 'loads and saves an irrigularly proportioned PNG' do
+      @loader.add_frame_from_file("#{SPEC_SOURCE_DIR}/small_v_raster.png")
+      expect(@loader.frames.size).to eq(1)
+      expect(@loader.frames.first.width).to eq("33px")
+      expect(@loader.frames.first.height).to eq("54px")
+      expect(@loader.frames.first.viewbox.width).to eq(33)
+      expect(@loader.frames.first.viewbox.height).to eq(54)
+
+      write_size = @loader.save_svg("#{SPEC_TEMP_DIR}/small_v_same.svg")
+      expect(write_size).not_to eq(0)
+
+      @loader.width = 64
+      @loader.height = 32
+      write_size = @loader.save_svg("#{SPEC_TEMP_DIR}/small_v_scaled.svg")
+      expect(write_size).not_to eq(0)
+    end
+
+    it 'loads an APNG and saves a smaller APNG.' do
+      @loader.add_frame_from_file(@source)
+      expect(@loader.frames.size).to eq(34)
+
+      @loader.width = 12
+      @loader.height = 12
+      write_size = @loader.save_apng("#{SPEC_TEMP_DIR}/apng_scaled.png")
+      expect(write_size).not_to eq(0)
+    end
+
+    it 'loads an APNG and saves a bigger APNG.' do
+      @loader.add_frame_from_file(@source)
+      expect(@loader.frames.size).to eq(34)
+
+      @loader.width = 128
+      @loader.height = 128
+      write_size = @loader.save_apng("#{SPEC_TEMP_DIR}/apng_scaled_up.png")
+      expect(write_size).not_to eq(0)
+    end
+
+    it 'loads an APNG and saves a horizontally stretched APNG.' do
+      @loader.add_frame_from_file(@source)
+      expect(@loader.frames.size).to eq(34)
+
+      @loader.width = 80
+      @loader.height = 20
+      write_size = @loader.save_apng("#{SPEC_TEMP_DIR}/apng_h_stretched.png")
+      expect(write_size).not_to eq(0)
+    end
+
+    it 'loads an APNG and saves a vertically stretched APNG.' do
+      @loader.add_frame_from_file(@source)
+      expect(@loader.frames.size).to eq(34)
+
+      @loader.width = 20
+      @loader.height = 80
+      write_size = @loader.save_apng("#{SPEC_TEMP_DIR}/apng_v_stretched.png")
+      expect(write_size).not_to eq(0)
+    end
+
     it 'loads an APNG and saves a keyframe animated SVG.' do
       @loader.add_frame_from_file(@source)
       expect(@loader.frames.size).to eq(34)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phantom_svg
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Rika Yoshida
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-12 00:00:00.000000000 Z
+date: 2014-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cairo
@@ -82,6 +82,7 @@ files:
 - spec/images/apngasm.png
 - spec/images/compiled.svg
 - spec/images/plain.svg
+- spec/images/small_v_raster.png
 - spec/images/test_frames/0.svg
 - spec/images/test_frames/1.svg
 - spec/images/test_frames/10.svg
@@ -102,6 +103,7 @@ files:
 - spec/images/test_frames/test1.xml
 - spec/images/test_frames/test2.json
 - spec/images/test_frames/test2.xml
+- spec/images/test_raster.png
 - spec/phantom/svg_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/Genshin/phantom_svg
@@ -133,6 +135,7 @@ test_files:
 - spec/images/apngasm.png
 - spec/images/compiled.svg
 - spec/images/plain.svg
+- spec/images/small_v_raster.png
 - spec/images/test_frames/0.svg
 - spec/images/test_frames/1.svg
 - spec/images/test_frames/10.svg
@@ -153,6 +156,7 @@ test_files:
 - spec/images/test_frames/test1.xml
 - spec/images/test_frames/test2.json
 - spec/images/test_frames/test2.xml
+- spec/images/test_raster.png
 - spec/phantom/svg_spec.rb
 - spec/spec_helper.rb
 has_rdoc: