phantom_svg 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c22d1aafe15617cbdaf2532b524ce1679c29cda4
-  data.tar.gz: 157e67fbd6673dc7cf83fd13642099609913d2c4
+  metadata.gz: c42b5be52455df5b37f7f06f30590034d4b84ac6
+  data.tar.gz: b4dd3009aeff4f919bb0da11c51773b41849d69e
 SHA512:
-  metadata.gz: 4efa9523681e67a4c43dfcc084e900bcde6049efed85734f69db167a428ef7ee5dbab0fae9e4941b8c753f4e9ce1df43bd403ba9931288a337bd5de6b9d15377
-  data.tar.gz: f1023e7640e5f3941c8bb327914b4856f1bda4900a95216328973b34206853ed845e02c35017e6c7376a635205fc1d45e2be452729535584c1588aecbe63f8c5
+  metadata.gz: ab8b940f3537dd56977e5dce4fc7a2dae33173c6824e495941623efcc13319a3b930aa0a02087e026920e2b2a47005ea6d849444161ca547e3af7172bc56df53
+  data.tar.gz: 60d30a0a6c905e1f7d56a1173ccaf1625c10bd166f2c46919125fa0287d62d9eea6ea1286e360757a576eab579a113c81b626bd1cc4b053c8416ce320f1e0efb

data/lib/phantom/parser/svg_reader.rb

@@ -103,13 +103,17 @@ module Phantom
 
         # Read skip_first.
         def read_skip_first
-          @skip_first = @root.elements['svg/defs/symbol/use'].attributes['xlink:href'] != '#frame0'
+          use = @root.elements['svg/defs/symbol/use']
+          @skip_first = use.nil? ? @frames.size > 1 : use.attributes['xlink:href'] != '#frame0'
         end
 
         # Read frame durations.
         def read_durations(options)
+          symbol = @root.elements['svg/defs/symbol']
+          return if symbol.nil?
+
           i = @skip_first ? 1 : 0
-          @root.elements['svg/defs/symbol'].elements.each('use') do |use|
+          symbol.elements.each('use') do |use|
             duration = use.elements['set'].attributes['dur'].to_f
             @frames[i].duration = choice_value(duration, options[:duration])
             i += 1
@@ -118,7 +122,8 @@ module Phantom
 
         # Read animation loop count.
         def read_loops
-          @loops = @root.elements['svg/animate'].attributes['repeatCount'].to_i
+          animate = @root.elements['svg/animate']
+          @loops = animate.nil? ? 0 : animate.attributes['repeatCount'].to_i
         end
 
         # Helper method.

data/lib/phantom/parser/svg_writer.rb

@@ -17,10 +17,7 @@ module Phantom
           reset
 
           # Parse object.
-          if object.is_a?(Base)     then  write_animation_svg(object)
-          elsif object.is_a?(Frame) then  write_svg(object)
-          else                            return 0
-          end
+          return 0 unless write_proc(object)
 
           # Add svg version.
           @root.elements['svg'].add_attribute('version', '1.1')
@@ -39,6 +36,20 @@ module Phantom
           @root << REXML::Comment.new(' Generated by phantom_svg. ')
         end
 
+        # Write procedure.
+        def write_proc(object)
+          if object.is_a?(Base)
+            if object.frames.size == 1    then  write_svg(object.frames[0])
+            elsif object.frames.size > 1  then  write_animation_svg(object)
+            else                                return false
+            end
+          elsif object.is_a?(Frame)       then  write_svg(object)
+          else                                  return false
+          end
+
+          true
+        end
+
         # Write no animation svg.
         def write_svg(frame)
           write_image(frame, @root)
@@ -109,6 +120,8 @@ module Phantom
 
         # Write animation.
         def write_animation(base, parent_node)
+          return if skip_frame_and_no_animation?(base)
+
           REXML::Comment.new(' Animation. ', parent_node)
           symbol = parent_node.add_element('symbol', 'id' => 'animation')
 
@@ -137,8 +150,12 @@ module Phantom
         def write_show_control(base, parent_node)
           REXML::Comment.new(' Main control. ', parent_node)
 
-          write_show_control_header(base, parent_node)
-          write_show_control_main(base, parent_node)
+          if skip_frame_and_no_animation?(base)
+            write_show_control_main_2(parent_node)
+          else
+            write_show_control_header(base, parent_node)
+            write_show_control_main(base, parent_node)
+          end
         end
 
         # Write show control header.
@@ -164,6 +181,15 @@ module Phantom
                                   'begin' => 'controller.end')
         end
 
+        # Write show control main.
+        def write_show_control_main_2(parent_node)
+          use = parent_node.add_element('use', 'xlink:href' => '#frame0')
+
+          use.add_element('set',  'attributeName' => 'xlink:href',
+                                  'to' => '#frame1',
+                                  'begin' => '0s')
+        end
+
         # Convert id.
         def convert_id_to_unique(root_node, prefix)
           id_array = []
@@ -186,7 +212,7 @@ module Phantom
         # Overwrite relative id in surfaces.
         def overwrite_relative_id(parent_node, prefix, id_array)
           parent_node.elements.each do |child|
-            child.attributes.each do |key, val|
+            child.attributes.each do |_, val|
               id_array.each do |id|
                 val.gsub!("##{id}", "##{prefix}#{id}")
               end
@@ -194,6 +220,11 @@ module Phantom
             overwrite_relative_id(child, prefix, id_array)
           end
         end
+
+        # If base has skip frame and no animation, return true.
+        def skip_frame_and_no_animation?(base)
+          base.skip_first == true && base.frames.size == 2
+        end
       end # class SVGWriter
     end # module Parser
   end # module SVG

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.3'
+  s.version       = '1.1.4'
   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

@@ -582,5 +582,22 @@ describe Phantom::SVG::Base do
       @loader.add_frame_from_file(source)
       @loader.save_svg(destination)
     end
+
+    it 'output no animation svg.' do
+      test_name = 'no_animation_test'
+      source = "#{@source_dir}/gradation_test/0.svg"
+      destination = "#{@destination_dir}/#{test_name}.svg"
+      @loader.add_frame_from_file(source)
+      @loader.save_svg(destination)
+    end
+
+    it 'output no animation and has skip frame svg.' do
+      test_name = 'no_animation_and has_skip_frame_test'
+      destination = "#{@destination_dir}/#{test_name}.svg"
+      @loader.add_frame_from_file("#{@source_dir}/test_frames/0.svg")
+      @loader.add_frame_from_file("#{@source_dir}/gradation_test/0.svg")
+      @loader.skip_first = true
+      @loader.save_svg(destination)
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phantom_svg
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Rika Yoshida
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-14 00:00:00.000000000 Z
+date: 2014-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cairo