phantom_svg 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bef19b043049de58cbe8f6f6b1760f25415760d7
-  data.tar.gz: 42612111601ec34a3383ff81909a95c2e403397b
+  metadata.gz: e4b4dfe8fa254071a19ef5dedefca7f3e2d92f71
+  data.tar.gz: 9f420b9d38ac37a1c5bba9dbf973a723e9027211
 SHA512:
-  metadata.gz: 42c97170d698d23a0adba93a12f9fe6e8f0021b5a0d10b4f10e5bbda198354a072747f2f5fb7ed8e17cec461564eeb006bdf91ccb2dd83b1229f9c382e506229
-  data.tar.gz: 61dc006678e0d5524381c1d198fcd1b1638032cac52342671bf31ddf0a31b698b88d4aa67041a948f061ca53b4e4ea93d0a8b504e5e6bbd73eb8dfc8c762acd4
+  metadata.gz: 32ab275348cecb39938958c02fdebe8cd6b2165bca705813f0d41d2511b52be5defbcd17584c7335868b66fd6fbff84aebde6dccf0bb55f2054a6a6bd42684b5
+  data.tar.gz: 15a9aac286b4fa0f53024dd290994612f7cab34da7a07cec6fda16cac53be42382a48331095b23fbe7d8d19d39b6ad8dca148e1af100c0aba232d6ed0c533dc3

data/lib/phantom/parser/abstract_image_reader.rb

@@ -13,7 +13,7 @@ module Phantom
         end
 
         # Read image file from path.
-        def read(path, options = {})
+        def read(_path, _options = {})
           fail 'Called abstract method.'
         end
 

data/lib/phantom/parser/abstract_image_writer.rb

@@ -11,7 +11,7 @@ module Phantom
 
         # Write image file from object to path.
         # Return write size.
-        def write(path, object)
+        def write(_path, _object)
           fail 'Called abstract method.'
         end
       end # class AbstractImageWriter

data/lib/phantom/parser/gif_reader.rb

@@ -13,7 +13,7 @@ module Phantom
       class GIFReader < AbstractImageReader
         include Magick
         # Read gif file from path.
-        def read(path, options = {})
+        def read(path, _options = {})
           reset
 
           return if path.nil? || path.empty?
@@ -27,24 +27,27 @@ module Phantom
         private
 
         # Create frames for each frame in the gif.
-        def create_frames(path, duration = nil)
+        def create_frames(path, _duration = nil)
           frames = []
           lst = ImageList.new path
 
           lst.each do |img|
-            frame = Phantom::SVG::Frame.new
-            frame.width = "#{img.columns}px"
-            frame.height = "#{img.rows}px"
-            frame.viewbox.set_from_text("0 0 #{img.columns} #{img.rows}")
-            frame.surfaces = create_surfaces(img)
-            frame.duration = img.delay * 0.1 unless img.delay.nil?
-            frame.namespaces = {
-              'xmlns' => 'http://www.w3.org/2000/svg',
-              'xlink' => 'http://www.w3.org/1999/xlink'
-            }
+            frame = set_param(img)
             frames << frame
           end
-         frames
+          frames
+        end
+
+        def set_param(img)
+          frame = Phantom::SVG::Frame.new
+          frame.width = "#{img.columns}px"
+          frame.height = "#{img.rows}px"
+          frame.viewbox.set_from_text("0 0 #{img.columns} #{img.rows}")
+          frame.surfaces = create_surfaces(img)
+          frame.duration = img.delay * 0.1 unless img.delay.nil?
+          frame.namespaces = { 'xmlns' => 'http://www.w3.org/2000/svg',
+                               'xlink' => 'http://www.w3.org/1999/xlink' }
+          frame
         end
 
         # Create surfaces.

data/lib/phantom/parser/jpeg_reader.rb

@@ -10,7 +10,7 @@ module Phantom
       # JPEG reader.
       class JPEGReader < AbstractImageReader
         # Read jpeg file from path.
-        def read(path, options = {})
+        def read(path, _options = {})
           reset
 
           return if path.nil? || path.empty?
@@ -33,11 +33,8 @@ module Phantom
           frame.viewbox.set_from_text("0 0 #{pixbuf.width} #{pixbuf.height}")
           frame.surfaces = create_surfaces(path, pixbuf.width, pixbuf.height)
           frame.duration = duration unless duration.nil?
-          frame.namespaces = {
-            'xmlns' => 'http://www.w3.org/2000/svg',
-            'xlink' => 'http://www.w3.org/1999/xlink'
-          }
-
+          frame.namespaces = { 'xmlns' => 'http://www.w3.org/2000/svg',
+                               'xlink' => 'http://www.w3.org/1999/xlink' }
           frame
         end
 

data/lib/phantom/parser/phantom_xmldecl.rb

@@ -0,0 +1,18 @@
+require 'rexml/xmldecl'
+
+module Phantom
+  module SVG
+    module Parser
+      # convert single quotes into double quotes.
+      class PhantomXMLDecl < REXML::XMLDecl
+        private
+        def content(enc)
+          rv = "version=\"#@version\""
+          rv << " encoding=\"#{enc}\"" if @writeencoding || enc !~ /\Autf-8\z/i
+          rv << " standalone=\"#@standalone\"" if @standalone
+          rv
+        end
+      end
+    end
+  end
+end

data/lib/phantom/parser/png_reader.rb

@@ -13,7 +13,7 @@ module Phantom
       # PNG reader.
       class PNGReader < AbstractImageReader
         # Read png file from path.
-        def read(path, options = {})
+        def read(path, _options = {})
           reset
 
           return if path.nil? || path.empty?
@@ -40,16 +40,7 @@ module Phantom
         def read_apng(apngasm)
           @width = @height = 0
           Dir.mktmpdir(nil, File.dirname(__FILE__)) do |dir|
-            # Create temporary file.
-            apngasm.save_pngs(dir)
-
-            # Create frames.
-            apngasm.get_frames.each_with_index do |png_frame, index|
-              @width = png_frame.width if @width < png_frame.width
-              @height = png_frame.height if @height < png_frame.height
-              duration = png_frame.delay_numerator.to_f / png_frame.delay_denominator.to_f
-              @frames << create_frame("#{dir}/#{index}.png", duration)
-            end
+            set_frame(apngasm, dir)
           end
 
           @width = "#{@width}px"
@@ -59,21 +50,36 @@ module Phantom
           @has_animation = true
         end
 
+        def set_frame(apngasm, dir)
+          # Create temporary file.
+          apngasm.save_pngs(dir)
+
+          # Create frames.
+          apngasm.get_frames.each_with_index do |png_frame, index|
+            @width = png_frame.width if @width < png_frame.width
+            @height = png_frame.height if @height < png_frame.height
+            duration = png_frame.delay_numerator.to_f / png_frame.delay_denominator.to_f
+            @frames << create_frame("#{dir}/#{index}.png", duration)
+          end
+        end
+
         # Create frame.
         def create_frame(path, duration = nil)
           pixbuf = Gdk::Pixbuf.new(path)
+          frame = set_param(path, pixbuf, duration)
 
+          frame
+        end
+
+        def set_param(path, pixbuf, duration)
           frame = Phantom::SVG::Frame.new
           frame.width = "#{pixbuf.width}px"
           frame.height = "#{pixbuf.height}px"
           frame.viewbox.set_from_text("0 0 #{pixbuf.width} #{pixbuf.height}")
           frame.surfaces = create_surfaces(path, pixbuf.width, pixbuf.height)
           frame.duration = duration unless duration.nil?
-          frame.namespaces = {
-            'xmlns' => 'http://www.w3.org/2000/svg',
-            'xlink' => 'http://www.w3.org/1999/xlink'
-          }
-
+          frame.namespaces = { 'xmlns' => 'http://www.w3.org/2000/svg',
+                               'xlink' => 'http://www.w3.org/1999/xlink' }
           frame
         end
 
@@ -91,7 +97,6 @@ module Phantom
 
           [image]
         end
-
       end # class PNGReader
     end # Parser
   end # SVG

data/lib/phantom/parser/png_writer.rb

@@ -46,7 +46,8 @@ module Phantom
           handle = RSVG::Handle.new_from_file("#{path}.svg")
           surface = Cairo::ImageSurface.new(Cairo::FORMAT_ARGB32, width, height)
           context = Cairo::Context.new(surface)
-          context.scale(width.to_f / handle.dimensions.width, height.to_f / handle.dimensions.height)
+          context.scale(width.to_f / handle.dimensions.width,
+                        height.to_f / handle.dimensions.height)
           context.render_rsvg_handle(handle)
           surface.write_to_png("#{path}.png")
           surface.finish

data/lib/phantom/parser/svg_reader.rb

@@ -47,18 +47,34 @@ module Phantom
 
         # Read size from node to dest.
         def read_size(node, dest, options = {})
-          dest.viewbox.set_from_text(choice_value(node.attributes['viewBox'], options[:viewbox]).to_s) unless node.attributes['viewBox'].nil?
+          set_view_box(node, dest, options)
+          set_width(node, dest, options)
+          set_height(node, dest, options)
+        end
+
+        def set_view_box(node, dest, options = {})
+          return if node.attributes['viewBox'].nil?
+          dest.viewbox.set_from_text(choice_value(node.attributes['viewBox'],
+                                                  options[:viewbox]).to_s)
+        end
 
+        def set_width(node, dest, options = {})
           if node.attributes['width'].nil?
-            dest.instance_variable_set(:@width, choice_value("#{dest.viewbox.width}px", options[:width]))
+            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]))
+            dest.instance_variable_set(:@width,
+                                       choice_value(node.attributes['width'], options[:width]))
           end
+        end
 
+        def set_height(node, dest, options = {})
           if node.attributes['height'].nil?
-            dest.instance_variable_set(:@height, choice_value("#{dest.viewbox.height}px", options[:height]))
+            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]))
+            dest.instance_variable_set(:@height,
+                                       choice_value(node.attributes['height'], options[:height]))
           end
         end
 

data/lib/phantom/parser/svg_writer.rb

@@ -2,6 +2,7 @@
 require 'rexml/document'
 
 require_relative 'abstract_image_writer.rb'
+require_relative 'phantom_xmldecl.rb'
 
 module Phantom
   module SVG
@@ -33,7 +34,8 @@ module Phantom
         # Reset SVGWriter object.
         def reset
           @root = REXML::Document.new
-          @root << REXML::XMLDecl.new('1.0', 'UTF-8')
+          @root.context[:attribute_quote] = :quote
+          @root << Phantom::SVG::Parser::PhantomXMLDecl.new('1.0', 'UTF-8')
           @root << REXML::Comment.new(' Generated by phantom_svg. ')
         end
 

data/lib/phantom/svg.rb

@@ -30,15 +30,19 @@ module Phantom
 
       def add_frame_from_file(path, options = {})
         create_file_list(path).each do |file|
-          case File.extname(file)
-          when '.svg'   then  load_from_svg(file, options)
-          when '.png'   then  load_from_png(file, options)
-          when '.jpg'   then  load_from_jpeg(file, options)
-          when '.jpeg'  then  load_from_jpeg(file, options)
-          when '.gif'   then  load_from_gif(file, options)
-          when '.json'  then  load_from_json(file, options)
-          when '.xml'   then  load_from_xml(file, options)
-          end
+          load_file(file, options)
+        end
+      end
+
+      def load_file(file, options)
+        case File.extname(file)
+        when '.svg'   then  load_from_svg(file, options)
+        when '.png'   then  load_from_png(file, options)
+        when '.jpg'   then  load_from_jpeg(file, options)
+        when '.jpeg'  then  load_from_jpeg(file, options)
+        when '.gif'   then  load_from_gif(file, options)
+        when '.json'  then  load_from_json(file, options)
+        when '.xml'   then  load_from_xml(file, options)
         end
       end
 
@@ -53,9 +57,13 @@ module Phantom
       end
 
       def set_size(width = nil, height = nil)
-        # width
-        if width.nil? then
-          if @width.nil? || @width == 0 then
+        set_width(width)
+        set_height(height)
+      end
+
+      def set_width(width)
+        if width.nil?
+          if @width.nil? || @width == 0
             frames.each do |frame|
               @width = frame.width.to_i if frame.width.to_i > @width
             end
@@ -63,10 +71,11 @@ module Phantom
         else
           @width = width
         end
+      end
 
-        # height
-        if height.nil? then
-          if @height.nil? || @height == 0 then
+      def set_height(height)
+        if height.nil?
+          if @height.nil? || @height == 0
             frames.each do |frame|
               @height = frame.height.to_i if frame.height.to_i > @height
             end
@@ -120,6 +129,14 @@ module Phantom
         result
       end
 
+      def run_gc
+        @frames = nil
+
+        disabled = GC.enable
+        GC.start
+        GC.disable if disabled
+      end
+
       private
 
       def load_from_svg(path, options)
@@ -178,7 +195,7 @@ module Phantom
         load_from_reader(Parser::XMLAnimationReader.new(path), options)
       end
 
-      def load_from_reader(reader, options)
+      def load_from_reader(reader, _options)
         if @frames.empty?
           @loops = reader.loops
           @skip_first = reader.skip_first

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.1.0'
+  s.version       = '1.1.1'
   s.license       = 'LGPL-3'
   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

@@ -463,7 +463,6 @@ describe Phantom::SVG::Base do
       expect(@loader.width).to eq('64px')
       expect(@loader.height).to eq('64px')
       expect(@loader.loops).to eq(0)
-      expect(@loader.skip_first).to eq(true)
     end
 
     it 'loads an animation spec from a JSON.' do
@@ -514,7 +513,7 @@ describe Phantom::SVG::Base do
       @loader = Phantom::SVG::Base.new
     end
 
-    it "loads frames." do
+    it 'loads frames.' do
       test_name = 'jpeg_test'
       @loader.add_frame_from_file("#{@source_dir}/*.jpg")
       expect(@loader.frames.size).to eq(34)
@@ -545,7 +544,7 @@ describe Phantom::SVG::Base do
       @loader = Phantom::SVG::Base.new
     end
 
-    it "loads frames / saves to SVG and PNG" do
+    it 'loads frames / saves to SVG and PNG' do
       test_name = 'gif_test'
       @loader.add_frame_from_file(@source)
       expect(@loader.frames.size).to eq(34)
@@ -562,6 +561,8 @@ describe Phantom::SVG::Base do
       expect(write_size).not_to eq(0)
       write_size = @loader.save_apng("#{@destination_dir}/#{test_name}.png")
       expect(write_size).not_to eq(0)
+
+      @loader.run_gc
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phantom_svg
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Rika Yoshida
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-09 00:00:00.000000000 Z
+date: 2014-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cairo
@@ -90,6 +90,7 @@ files:
 - lib/phantom/parser/gif_reader.rb
 - lib/phantom/parser/jpeg_reader.rb
 - lib/phantom/parser/json_animation_reader.rb
+- lib/phantom/parser/phantom_xmldecl.rb
 - lib/phantom/parser/png_reader.rb
 - lib/phantom/parser/png_writer.rb
 - lib/phantom/parser/svg_reader.rb