gdk3 2.2.3 → 2.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3624c05778aca4682f86b8b9f5eafd4a9a851e9f
-  data.tar.gz: ff818f4fc593da1c621656ad52032aa06a158628
+  metadata.gz: 8fb6a6ffa274f7d19f464561c1c9c9d31488797e
+  data.tar.gz: d70a7a19bd10a9f153756071e893c89aa8f98626
 SHA512:
-  metadata.gz: ce2cccad5bc1c4e33bb7efe128a81beca80b19b84ba46ed736d0841c261c16cb7687eaf67895cdcdf3b89284405631a7a94daa7d1b4bb2a56738d60d384f67a1
-  data.tar.gz: 9a495352a75bd4f523602546f506292d842366f3c83ca900afe6717e1bb8997d8347674ca019f2a22dd429721fd6be79d1acd1984856e12466d72f5f3b9b5a04
+  metadata.gz: da1e352a3f37a5965fff3418f9129b8401d00fb9e59d3448b1bf0d2783bc12d5777c06032724b39759610367df076301fcd4bbb1b690beb5ed14e537af90e90b
+  data.tar.gz: a40ea46084e97b457562940a49411f304360ecdc338091f3e4a71c0835302143fbbab2327972c5ca41340519713645cda12661399529c267c43655086da88840

data/Rakefile

@@ -47,7 +47,7 @@ package_task = GNOME2::Rake::PackageTask.new do |package|
       :name => "gtk+",
       :download_site => :gnome,
       :label => "GTK+",
-      :version => "3.14.1",
+      :version => "3.14.6",
       :compression_method => "xz",
       :windows => {
         :configure_args => [
@@ -60,14 +60,14 @@ package_task = GNOME2::Rake::PackageTask.new do |package|
       },
     },
     {
-      :name => "hicolor-icon-theme",
-      :download_base_url => "http://icon-theme.freedesktop.org/releases",
-      :label => "gtk-hi-color-icon-theme",
-      :version => "0.13",
+      :name => "adwaita-icon-theme",
+      :download_site => :gnome,
+      :label => "adwaita-icon-theme",
+      :version => "3.14.1",
       :windows => {
         :configure_args => [],
         :build_concurrently => false,
-        :built_file => "share/icons/hicolor/index.theme",
+        :built_file => "share/icons/Adwaita/index.theme",
       }
     },
   ]

data/lib/gdk3/cairo.rb

@@ -36,11 +36,15 @@ module Cairo
 
     if method_defined?(:set_source_rgba)
       alias_method :set_source_not_gdk_rgba, :set_source_rgba
-      def set_source_rgba(rgba)
-        if rgba.is_a?(Gdk::RGBA)
+      def set_source_rgba(rgba, g=nil, b=nil, a=nil)
+        case rgba
+        when Gdk::RGBA
           set_source_gdk_rgba(rgba)
-        else
+        when Array
           set_source_not_gdk_rgba(rgba)
+        else
+          r = rgba
+          set_source_not_gdk_rgba([r, g, b, a])
         end
       end
     else

data/lib/gdk3/color.rb

@@ -16,6 +16,28 @@
 
 module Gdk
   class Color
+    class << self
+      alias_method :parse_raw, :parse
+      def parse(spec)
+        succeeded, color = parse_raw(spec)
+        unless succeeded
+          message = "Invalid color spec: <#{spec.inspect}>: "
+          message << "Color spec must be one of them: "
+          message << "\"\#rgb\", "
+          message << "\"\#rrggbb\", "
+          message << "\"\#rrggbb\", "
+          message << "\"\#rrrgggbbb\", "
+          message << "\"\#rrrrggggbbbb\", "
+          message << "\"\#fff\", "
+          message << "\"\#ffffff\", "
+          message << "\"\#fffffffff\", "
+          message << "\"\#fffffffffffff\""
+          raise ArgumentError, message
+        end
+        color
+      end
+    end
+
     alias_method :initialize_raw, :initialize
     def initialize(red, green, blue)
       initialize_raw

data/lib/gdk3/deprecated.rb

@@ -53,11 +53,8 @@ module Gdk
 
   class Event
     extend GLib::Deprecatable
-    define_deprecated_flags :Mask
-    define_deprecated_enums :Type
-    Gdk::EventMask.constants.each do |event_mask|
-      define_deprecated_const event_mask, ['Gdk::EventMask', event_mask].join('::')
-    end
+    define_deprecated_const :Mask, "Gdk::EventMask"
+    define_deprecated_const :Type, "Gdk::EventType"
   end
 
   class EventCrossing
@@ -134,17 +131,20 @@ module Gdk
 
   class Window
     extend GLib::Deprecatable
-    define_deprecated_flags :AttributesType, 'WA'
-    define_deprecated_enums :Edge, 'EDGE'
-    define_deprecated_enums :FilterReturn, 'FILTER'
-    define_deprecated_enums :Gravity, 'GRAVITY'
-    define_deprecated_flags :Hints, 'HINT'
-    define_deprecated_flags :ModifierType
-    define_deprecated_enums :Type
-    define_deprecated_enums :TypeHint, 'TYPE_HINT'
-    define_deprecated_const :WindowClass, 'Gdk::Window::Class'
-    define_deprecated_flags :WMDecoration, 'DECOR'
-    define_deprecated_flags :WMFunction, 'FUNC'
+
+    define_deprecated_const :Gravity, "Gdk::Gravity"
+    define_deprecated_const :AttributesType, "Gdk::WindowAttributesType"
+    define_deprecated_const :Edge, "Gdk::WindowEdge"
+    define_deprecated_const :FilterReturn, "Gdk::FilterReturn"
+    define_deprecated_const :Hints, "Gdk::WindowHints"
+    define_deprecated_const :ModifierType, "Gdk::ModifierType"
+    define_deprecated_const :Type, "Gdk::WindowType"
+    define_deprecated_const :TypeHint, "Gdk::WindowTypeHint"
+    define_deprecated_const :WindowClass, "Gdk::WindowWindowClass"
+    define_deprecated_const :Class, "Gdk::WindowWindowClass"
+    define_deprecated_const :WMDecoration, "Gdk::WMDecoration"
+    define_deprecated_const :WMFunction, "Gdk::WMFunction"
+    define_deprecated_const :PARENT_RELATIVE, "Gdk::PARENT_RELATIVE"
     define_deprecated_method :clear, :warn => "Don't use this method."
     define_deprecated_method :clear_area, :warn => "Don't use this method."
     define_deprecated_method :internal_paint_info, :raise => "Don't use this method."

data/lib/gdk3/loader.rb

@@ -218,6 +218,9 @@ module Gdk
         else
           define_method(info, Cairo::Context, name)
         end
+      when /\Akeyval_/
+        name = rubyish_method_name(info, :prefix => "keyval_")
+        define_module_function(@keyval_module, name, info)
       else
         super
       end
@@ -237,10 +240,6 @@ module Gdk
 
     def define_enum(info)
       case info.name
-      when /\AWindowWindow/
-        self.class.define_class(info.gtype, $POSTMATCH, window_class)
-      when /\AWindow/
-        self.class.define_class(info.gtype, $POSTMATCH, window_class)
       when "EventType"
         self.class.register_constant_rename_map("2BUTTON_PRESS",
                                                 "BUTTON2_PRESS")

data/test/test-gdk-cairo.rb

@@ -32,10 +32,40 @@ class TestGdkCairo < Test::Unit::TestCase
                  @context.source.color)
   end
 
-  def test_set_source_rgba
-    rgba = Gdk::RGBA.new(0.1, 0.2, 0.3, 0.4)
-    @context.source_rgba = rgba
-    assert_equal(Cairo::Color::RGB.new(0.1, 0.2, 0.3, 0.4),
-                 @context.source.color)
+  sub_test_case "#set_source_rgba" do
+    sub_test_case "RGBA" do
+      def test_rgba
+        rgba = Gdk::RGBA.new(0.1, 0.2, 0.3, 0.4)
+        @context.source_rgba = rgba
+        assert_equal(Cairo::Color::RGB.new(0.1, 0.2, 0.3, 0.4),
+                     @context.source.color)
+      end
+
+      def test_values
+        @context.set_source_rgba(0.1, 0.2, 0.3, 0.4)
+        assert_equal([0.1, 0.2, 0.3, 0.4],
+                     @context.source.rgba)
+      end
+
+      def test_array
+        @context.set_source_rgba([0.1, 0.2, 0.3, 0.4])
+        assert_equal([0.1, 0.2, 0.3, 0.4],
+                     @context.source.rgba)
+      end
+    end
+
+    sub_test_case "RGB" do
+      def test_values
+        @context.set_source_rgb(0.1, 0.2, 0.3)
+        assert_equal([0.1, 0.2, 0.3, 1.0],
+                    @context.source.rgba)
+      end
+
+      def test_array
+        @context.set_source_rgb([0.1, 0.2, 0.3])
+        assert_equal([0.1, 0.2, 0.3, 1.0],
+                    @context.source.rgba)
+      end
+    end
   end
 end

data/test/test-gdk-color.rb

@@ -17,6 +17,31 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 class TestGdkColor < Test::Unit::TestCase
+  sub_test_case ".parse" do
+    def test_invalid_spec
+      spec = "fff"
+      message = "Invalid color spec: <#{spec.inspect}>: "
+      message << "Color spec must be one of them: "
+      message << "\"\#rgb\", "
+      message << "\"\#rrggbb\", "
+      message << "\"\#rrggbb\", "
+      message << "\"\#rrrgggbbb\", "
+      message << "\"\#rrrrggggbbbb\", "
+      message << "\"\#fff\", "
+      message << "\"\#ffffff\", "
+      message << "\"\#fffffffff\", "
+      message << "\"\#fffffffffffff\""
+      assert_raise(ArgumentError.new(message)) do
+        Gdk::Color.parse(spec)
+      end
+    end
+
+    def test_valid
+      color = Gdk::Color.parse("#abc")
+      assert_equal("#aaaabbbbcccc", color.to_s)
+    end
+  end
+
   def test_to_s
     color = Gdk::Color.new(0xffff, 0x1234, 0xabcd)
     assert_equal("#ffff1234abcd", color.to_s)

data/test/test-gdk-keyval.rb

@@ -18,4 +18,59 @@ class TestGdkKeyval < Test::Unit::TestCase
   def test_consntant_name
     assert_equal("a".unpack("c")[0], Gdk::Keyval::KEY_a)
   end
+
+  sub_test_case "#lower?" do
+    def test_lower
+      assert_true(Gdk::Keyval.lower?(Gdk::Keyval::KEY_a))
+    end
+
+    def test_upper
+      assert_false(Gdk::Keyval.lower?(Gdk::Keyval::KEY_A))
+    end
+  end
+
+  sub_test_case "#upper?" do
+    def test_lower
+      assert_false(Gdk::Keyval.upper?(Gdk::Keyval::KEY_a))
+    end
+
+    def test_upper
+      assert_true(Gdk::Keyval.upper?(Gdk::Keyval::KEY_A))
+    end
+  end
+
+  def test_name
+    assert_equal("A", Gdk::Keyval.name(Gdk::Keyval::KEY_A))
+  end
+
+  sub_test_case "#to_lower" do
+    def test_lower
+      assert_equal(Gdk::Keyval::KEY_a,
+                   Gdk::Keyval.to_lower(Gdk::Keyval::KEY_a))
+    end
+
+    def test_upper
+      assert_equal(Gdk::Keyval::KEY_a,
+                   Gdk::Keyval.to_lower(Gdk::Keyval::KEY_A))
+    end
+  end
+
+  sub_test_case "#to_upper" do
+    def test_lower
+      assert_equal(Gdk::Keyval::KEY_A,
+                   Gdk::Keyval.to_upper(Gdk::Keyval::KEY_a))
+    end
+
+    def test_upper
+      assert_equal(Gdk::Keyval::KEY_A,
+                   Gdk::Keyval.to_upper(Gdk::Keyval::KEY_A))
+    end
+  end
+
+  sub_test_case "#to_unicode" do
+    def test_to_unicode
+      assert_equal("\u02D8", # BREVE
+                   [Gdk::Keyval.to_unicode(Gdk::Keyval::KEY_breve)].pack("U"))
+    end
+  end
 end

data/test/test-gdk-window-attr.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2013  Ruby-GNOME2 Project Team
+# Copyright (C) 2013-2014  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
@@ -24,8 +24,8 @@ class TestGdkWindowAttr < Test::Unit::TestCase
     assert_equal([
                    100,
                    100,
-                   Gdk::Window::Class::INPUT_ONLY,
-                   Gdk::Window::Type::TEMP,
+                   Gdk::WindowWindowClass::INPUT_ONLY,
+                   Gdk::WindowType::TEMP,
                  ],
                  [attrs.width, attrs.height, attrs.wclass, attrs.window_type])
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gdk3
 version: !ruby/object:Gem::Version
-  version: 2.2.3
+  version: 2.2.4
 platform: ruby
 authors:
 - The Ruby-GNOME2 Project Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-26 00:00:00.000000000 Z
+date: 2014-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pango
@@ -16,56 +16,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.3
+        version: 2.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.3
+        version: 2.2.4
 - !ruby/object:Gem::Dependency
   name: gdk_pixbuf2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.3
+        version: 2.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.3
+        version: 2.2.4
 - !ruby/object:Gem::Dependency
   name: cairo-gobject
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.3
+        version: 2.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.3
+        version: 2.2.4
 - !ruby/object:Gem::Dependency
   name: gobject-introspection
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.3
+        version: 2.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.3
+        version: 2.2.4
 description: Ruby/GDK3 is a Ruby binding of GDK-3.x.
 email: ruby-gnome2-devel-en@lists.sourceforge.net
 executables: []