lib/rabbit/image/dia.rb in rabbit-3.0.0 vs lib/rabbit/image/dia.rb in rabbit-3.0.1

@@ -1,8 +1,23 @@
+# Copyright (C) 2004-2020  Sutou Kouhei <[e-mail]>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
 require "forwardable"
 
-require "rabbit/utils"
 require "rabbit/image/base"
 
 module Rabbit
   module ImageManipulable
     class Dia < Base
@@ -31,29 +46,29 @@
             end
           end
         end
       end
 
-      def_delegators(:@svg_loader, :keep_ratio, :keep_ratio=)
+      def_delegators(:@svg_loader, :keep_ratio, :keep_ratio?, :keep_ratio=)
       def_delegators(:@svg_loader, :pixbuf, :internal_pixbuf)
       def_delegators(:@svg_loader, :width, :height)
       def_delegators(:@svg_loader, :original_width, :original_height)
       def_delegators(:@svg_loader, :resize, :ensure_resize)
       def_delegators(:@svg_loader, :update_size)
 
-      def initialize(filename, keep_ratio)
-        init_svg_loader(filename, keep_ratio)
+      def initialize(filename, props)
+        init_svg_loader(filename, props)
         super
       end
 
       private
-      def init_svg_loader(filename, keep_ratio)
+      def init_svg_loader(filename, props)
         @svg_file = Tempfile.new(["rabbit-loader-dia", ".svg"])
         args = ["--export=#{@svg_file.path}"]
         args << "--filter=svg"
         args << filename
         if DIA_COMMANDS.any? {|dia| run(dia, *args)}
-          @svg_loader = SVG.new(@svg_file.path, keep_ratio)
+          @svg_loader = SVG.new(@svg_file.path, props)
         else
           raise DiaCanNotHandleError.new("dia #{args.join(' ')}",
                                          DIA_COMMANDS)
         end
       end