clutter 2.0.0 → 2.0.1

data/Rakefile

@@ -92,7 +92,7 @@ package_task = GNOME2::Rake::PackageTask.new do |package|
       :name => "json-glib",
       :download_site => :gnome,
       :label => "JSON-GLib",
-      :version => "0.14.2",
+      :version => "0.16.0",
       :compression_method => "xz",
       :windows => {
         :configure_args => [
@@ -104,7 +104,7 @@ package_task = GNOME2::Rake::PackageTask.new do |package|
       :name => "clutter",
       :download_site => :gnome,
       :label => "Clutter",
-      :version => "1.14.0",
+      :version => "1.14.4",
       :compression_method => "xz",
       :windows => {
         :configure_args => [
@@ -114,6 +114,13 @@ package_task = GNOME2::Rake::PackageTask.new do |package|
       },
     }
   ]
+  package.cross_compiling do |spec|
+    if /mingw|mswin/ =~ spec.platform.to_s
+      spec.add_runtime_dependency("atk", "= #{package.version}")
+      spec.add_runtime_dependency("pango", "= #{package.version}")
+      spec.add_runtime_dependency("gdk_pixbuf2", "= #{package.version}")
+    end
+  end
 end
 package_task.define
 

data/lib/clutter.rb

@@ -34,11 +34,17 @@ module Clutter
   LOG_DOMAIN = "Clutter"
   GLib::Log.set_log_domain(LOG_DOMAIN)
 
-  @initialized = false
   class << self
-    def init(argv=ARGV)
-      return if @initialized
-      @initialized = true
+    def const_missing(name)
+      init()
+      if const_defined?(name)
+        const_get(name)
+      else
+        super
+      end
+    end
+
+    def init(argv=[])
       loader = Loader.new(self, argv)
       loader.load("Clutter")
       require "clutter/actor"
@@ -50,6 +56,10 @@ module Clutter
       require "clutter/point"
       require "clutter/text"
       require "clutter/threads"
+      class << self
+        remove_method(:init)
+        remove_method(:const_missing)
+      end
     end
   end
 
@@ -68,8 +78,11 @@ module Clutter
     private
     def pre_load(repository, namespace)
       init = repository.find(namespace, "init")
-      error, argc, argv = init.invoke(1 + @init_arguments.size,
-                                      [$0] + @init_arguments)
+      arguments = [
+        1 + @init_arguments.size,
+        [$0] + @init_arguments,
+      ]
+      error, argc, argv = init.invoke(arguments)
       @init_arguments.replace(argv)
       if error.to_i <= 0
         raise InitError, "failed to initialize Clutter: #{error.name}"

data/lib/clutter/color.rb

@@ -16,13 +16,20 @@
 
 module Clutter
   class Color
+    private_class_method(:from_hls)    if respond_to?(:from_hls)
+    private_class_method(:from_pixel)  if respond_to?(:from_pixel)
+    private_class_method(:from_string) if respond_to?(:from_string)
+
     class << self
       def new(*args)
         if [Symbol] == args.collect(&:class)
           name = args[0]
           get_static(name)
         else
-          super
+          if args.empty?
+            args = [0, 0, 0, 1] unless private_method_defined?(:initialize_alloc)
+          end
+          super(*args)
         end
       end
 
@@ -39,15 +46,36 @@ module Clutter
       end
 
       def hlsa(hue, luminance, saturation, alpha)
-        color = new
-        color.from_hls(hue, luminance, saturation)
+        if respond_to?(:from_hls, true)
+          color = from_hls(hue, luminance, saturation)
+        else
+          color = new
+          color.from_hls(hue, luminance, saturation)
+        end
         color.alpha = alpha
         color
       end
 
       def pixel(pixel)
-        color = new
-        color.from_pixel(pixel)
+        if respond_to?(:from_pixel, true)
+          color = from_pixel(pixel)
+        else
+          color = new
+          color.from_pixel(pixel)
+        end
+        color
+      end
+
+      def parse(string)
+        if respond_to?(:from_string, true)
+          succeeded, color = from_string(string)
+        else
+          color = new
+          succeeded = color.from_string(string)
+        end
+        unless succeeded
+          raise ArgumentError, "invalid color string: <#{string}>"
+        end
         color
       end
     end

data/sample/basic-actor.rb

@@ -22,8 +22,6 @@
 
 require "clutter"
 
-Clutter.init
-
 stage = Clutter::Stage.new
 stage.signal_connect("destroy") do |*args|
   Clutter.main_quit

data/sample/bin-layout.rb

@@ -25,8 +25,6 @@
 require "clutter"
 require "gdk_pixbuf2"
 
-Clutter.init
-
 stage = Clutter::Stage.new
 stage.title = "BinLayout"
 stage.background_color = Clutter::Color.get_static(:aluminium_2)

data/sample/box-layout.rb

@@ -35,8 +35,6 @@
 
 require "clutter"
 
-Clutter.init
-
 stage = Clutter::Stage.new
 stage.title = "Box Layout"
 stage.user_resizable = true

data/sample/canvas.rb

@@ -22,8 +22,6 @@
 
 require "clutter"
 
-Clutter.init
-
 stage = Clutter::Stage.new
 stage.title = "2D Clock"
 stage.user_resizable = true
@@ -43,8 +41,8 @@ actor.add_constraint(Clutter::BindConstraint.new(stage, :size, 0))
 idle_resize_id = nil
 actor.signal_connect("allocation-changed") do |_actor, allocation, flags|
   idle_resize_id ||= Clutter::Threads.add_timeout(1000) do
-    size = _actor.size
-    _actor.content.set_size(size.width.ceil, size.height.ceil)
+    width, height = _actor.size
+    _actor.content.set_size(width.ceil, height.ceil)
     idle_resize_id = nil
     GLib::Source::REMOVE
   end

data/sample/constraints.rb

@@ -22,8 +22,6 @@
 
 require "clutter"
 
-Clutter.init
-
 stage = Clutter::Stage.new
 stage.name = "stage"
 stage.title = "Snap Constraint"

data/sample/drag-action.rb

@@ -24,8 +24,6 @@ require "optparse"
 
 require "clutter"
 
-Clutter.init
-
 drag_axis = :none
 x_drag_threshold = 0
 y_drag_threshold = 0

data/sample/drop-action.rb

@@ -22,8 +22,6 @@
 
 require "clutter"
 
-Clutter.init
-
 TARGET_SIZE = 200
 HANDLE_SIZE = 128
 
@@ -73,11 +71,11 @@ add_drag_object = lambda do |target|
 
     action = Clutter::DragAction.new
     action.signal_connect("drag-begin") do |_action, _actor, event_x, event_y, modifiers|
-      position = _actor.position
+      x, y = _actor.position
       handle = Clutter::Actor.new
       handle.background_color = Clutter::Color.new(:sky_blue_dark)
       handle.set_size(128, 128)
-      handle.set_position(event_x - position.x, event_y - position.y)
+      handle.set_position(event_x - x, event_y - y)
       stage.add_child(handle)
 
       _action.drag_handle = handle
@@ -138,14 +136,14 @@ add_drag_object = lambda do |target|
     parent.remove_child(drag)
 
     parent.save_easing_state do
-      parent.easing_mode :linear
+      parent.easing_mode = :linear
       parent.opacity = 64
     end
   end
   target.add_child(drag)
 
   target.save_easing_state do
-    target.easing_mode :linear
+    target.easing_mode = :linear
     target.opacity = 255
   end
 end

data/sample/easing-modes.rb

@@ -24,8 +24,6 @@ require "optparse"
 
 require "clutter"
 
-Clutter.init
-
 duration = 1
 
 parser = OptionParser.new

data/sample/flow-layout.rb

@@ -24,8 +24,6 @@ require "optparse"
 
 require "clutter"
 
-Clutter.init
-
 random_size_p = false
 n_rects       = 20
 vertical_p    = false

data/sample/grid-layout.rb

@@ -38,8 +38,6 @@ require "optparse"
 
 require "clutter"
 
-Clutter.init
-
 random_size_p    = false
 random_align_p   = false
 default_expand_p = true

data/sample/image-content.rb

@@ -25,8 +25,6 @@
 require "clutter"
 require "gdk_pixbuf2"
 
-Clutter.init
-
 gravities = Clutter::ContentGravity.values
 current_gravity_index = gravities.size - 1
 

data/sample/pan-action.rb

@@ -25,8 +25,6 @@
 require "clutter"
 require "gdk_pixbuf2"
 
-Clutter.init
-
 stage = Clutter::Stage.new
 stage.name = "Pan Action"
 stage.user_resizable = true

data/sample/rounded-rectangle.rb

@@ -22,8 +22,6 @@
 
 require "clutter"
 
-Clutter.init
-
 stage = Clutter::Stage.new
 stage.title = "Rectangle with rounded corners"
 stage.background_color = Clutter::Color.new(:black)

data/sample/scroll-actor.rb

@@ -22,8 +22,6 @@
 
 require "clutter"
 
-Clutter.init
-
 stage = Clutter::Stage.new
 stage.title = "Scroll Actor"
 stage.user_resizable = true

data/test/run-test.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #
-# Copyright (C) 2012  Ruby-GNOME2 Project Team
+# Copyright (C) 2012-2013  Ruby-GNOME2 Project Team
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -29,7 +29,7 @@ modules = [
   [clutter_base, "clutter"],
 ]
 modules.each do |target, module_name|
-  if system("which make > /dev/null")
+  if File.exist?("Makefile") and system("which make > /dev/null")
     `make -C #{target.dump} > /dev/null` or exit(false)
   end
   $LOAD_PATH.unshift(File.join(target, "ext", module_name))
@@ -39,6 +39,8 @@ end
 $LOAD_PATH.unshift(File.join(glib_base, "test"))
 require "glib-test-init"
 
+$VERBOSE = false # TODO: remove me
+
 $LOAD_PATH.unshift(File.join(gobject_introspection_base, "test"))
 require "gobject-introspection-test-utils"
 
@@ -47,4 +49,6 @@ require "clutter-test-utils"
 
 require "clutter"
 
-exit Test::Unit::AutoRunner.run(true)
+Clutter.init([])
+
+exit Test::Unit::AutoRunner.run(true, clutter_base)

data/test/test-clutter-color.rb

@@ -0,0 +1,42 @@
+# Copyright (C) 2013  Ruby-GNOME2 Project Team
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library 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
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+class ClutterColorTest < Test::Unit::TestCase
+  def test_rgb
+    assert_equal("#ff0000ff", Clutter::Color.rgb(255, 0, 0).to_s)
+  end
+
+  def test_rgba
+    assert_equal("#ff00007f", Clutter::Color.rgb(255, 0, 0, 127).to_s)
+  end
+
+  def test_hls
+    assert_equal("#20dfdfff", Clutter::Color.hls(180, 0.5, 0.75).to_s)
+  end
+
+  def test_hlsa
+    assert_equal("#20dfdf7f", Clutter::Color.hls(180, 0.5, 0.75, 127).to_s)
+  end
+
+  def test_pixel
+    assert_equal("#20dfdf7f", Clutter::Color.pixel(0x20dfdf7f).to_s)
+  end
+
+  def test_parse
+    assert_equal("#20dfdf7f",
+                 Clutter::Color.parse("rgba(32, 223, 223, 0.5)").to_s)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: clutter
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,40 +9,40 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-29 00:00:00.000000000 Z
+date: 2013-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cairo-gobject
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: gobject-introspection
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: test-unit-notify
   requirement: !ruby/object:Gem::Requirement
@@ -93,6 +93,7 @@ files:
 - sample/scroll-actor.rb
 - test/clutter-test-utils.rb
 - test/run-test.rb
+- test/test-clutter-color.rb
 homepage: http://ruby-gnome2.sourceforge.jp/
 licenses: []
 post_install_message: