glib2 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a9129c4c11243fef3c35c784c9db0608c2580c5
-  data.tar.gz: 5cefaa68dc53b140cd2a6edac7459024323faf7c
+  metadata.gz: 3eb848d80c98299853e48020a8dd40d75621e5c8
+  data.tar.gz: e3adcc8d05626b832fbdadd7ab792f4d8bdd8cd3
 SHA512:
-  metadata.gz: 213cdab4ecded207438fecfe9e4f007cbabb3058719fba7fbedcb1872ffe65664667a1b5e00cb105ce1516aab9f4ed20ee7f4bcbcef0e598a6421b2fe6838488
-  data.tar.gz: 964f820d9104d08128c80bf6d1f3f9bbace42142e90e9ced6e26d3d57bb84dccf3c6817c0cea1f18659d348a3dc051109f504b060cf49ed4a31252a495c22ab7
+  metadata.gz: acf367073537e5e0d7428196406187e463ef5e8f055d3313c6ecba10ed7e9995151368f5dc285b380c200df0034ea342f2a8220b881d86d194d413a5e8e9e6cc
+  data.tar.gz: 54aebddcd2bdf934eabb00a771fd691a8f0384ff275754b38aa95c69dfeea5074688315f02c7148abc098d2de20f032f69853243d252e2adde57c2bf01b51176

data/Rakefile

@@ -72,7 +72,7 @@ package = GNOME2Package.new do |_package|
       :name => "gnutls",
       :download_base_url => "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2",
       :label => "GnuTLS",
-      :version => "3.2.7",
+      :version => "3.2.12",
       :compression_method => "xz",
       :windows => {
         :configure_args => [

data/ext/glib2/rbglib.c

@@ -816,7 +816,7 @@ rbg_gints2rval_free(gint *gints, long n)
                      rbg_gints2rval_free_ensure, (VALUE)&args);
 }
 
-static const char *
+const gchar *
 rbg_inspect (VALUE object)
 {
     VALUE inspected;

data/ext/glib2/rbglib.h

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011-2013  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2011-2014  Ruby-GNOME2 Project Team
  *  Copyright (C) 2002-2005  Ruby-GNOME2 Project
  *  Copyright (C) 2002,2003  Masahiro Sakai
  *
@@ -20,7 +20,8 @@
  *  MA  02110-1301  USA
  */
 
-#include <glib.h>
+#include <glib-object.h>
+
 #include "ruby.h"
 
 #include "rbglibdeprecated.h"
@@ -34,7 +35,7 @@ extern "C" {
 #endif /* __cplusplus */
 
 #define RBGLIB_MAJOR_VERSION 2
-#define RBGLIB_MINOR_VERSION 1
+#define RBGLIB_MINOR_VERSION 2
 #define RBGLIB_MICRO_VERSION 0
 
 #ifndef RSTRING_PTR
@@ -123,7 +124,7 @@ extern "C" {
 #define G_DEF_ERROR(domain, name, module, parent, gtype)         \
     rbgerr_define_gerror(domain, name, module, parent, gtype)
 #define G_DEF_ERROR2(domain, name, module, parent) \
-    rbgerr_define_gerror(domain, name, module, parent, Qnil)
+    rbgerr_define_gerror(domain, name, module, parent, G_TYPE_INVALID)
 
 #if defined(G_PLATFORM_WIN32) && !defined(RUBY_GLIB2_STATIC_COMPILATION)
 #  ifdef RUBY_GLIB2_COMPILATION
@@ -187,7 +188,7 @@ extern void rbg_scan_options(VALUE options, ...);
 
 /* rbgerror.h */
 extern VALUE rbgerr_gerror2exception(GError *error);
-extern VALUE rbgerr_define_gerror(GQuark domain, const gchar* name, VALUE module, VALUE parent, VALUE gtype);
+extern VALUE rbgerr_define_gerror(GQuark domain, const gchar* name, VALUE module, VALUE parent, GType gtype);
 
 extern VALUE rbglib_int64_to_num(guint64 val);
 extern VALUE rbglib_uint64_to_num(guint64 val);

data/ext/glib2/rbglib_error.c

@@ -24,8 +24,10 @@
 
 static ID id_code;
 static ID id_domain;
+static ID id_code_classes;
 static VALUE gerror_table;
 static VALUE generic_error;
+static VALUE error_info;
 
 VALUE
 rbgerr_gerror2exception(GError *error)
@@ -40,6 +42,16 @@ rbgerr_gerror2exception(GError *error)
     exception_klass = rb_hash_aref(gerror_table, UINT2NUM(error->domain));
     if (NIL_P(exception_klass)) {
         exception_klass = generic_error;
+    } else {
+        VALUE code_class = Qnil;
+        VALUE code_classes;
+        code_classes = rb_ivar_get(exception_klass, id_code_classes);
+        if (!NIL_P(code_classes)) {
+            code_class = rb_hash_aref(code_classes, INT2NUM(error->code));
+        }
+        if (!NIL_P(code_class)) {
+            exception_klass = code_class;
+        }
     }
     exc = rb_exc_new_str(exception_klass, CSTR2RVAL(error->message));
     rb_ivar_set(exc, id_domain, CSTR2RVAL(g_quark_to_string(error->domain)));
@@ -48,38 +60,90 @@ rbgerr_gerror2exception(GError *error)
     return exc;
 }
 
+static gchar *
+nick_to_constant_name(const gchar *nick)
+{
+    GString *constant_name;
+    const gchar *current;
+
+    constant_name = g_string_new(NULL);
+
+    for (current = nick; *current; current++) {
+        if (*current == '-') {
+            g_string_append_c(constant_name, '_');
+        } else {
+            g_string_append_c(constant_name, g_ascii_toupper(*current));
+        }
+    }
+
+    return g_string_free(constant_name, FALSE);
+}
+
+static gchar *
+nick_to_class_name(const gchar *nick)
+{
+    GString *class_name;
+    const gchar *current;
+    gboolean to_upper = TRUE;
+
+    class_name = g_string_new(NULL);
+
+    for (current = nick; *current; current++) {
+        if (to_upper) {
+            g_string_append_c(class_name, g_ascii_toupper(*current));
+            to_upper = FALSE;
+        } else if (*current == '-') {
+            to_upper = TRUE;
+        } else {
+            g_string_append_c(class_name, *current);
+        }
+    }
+
+    return g_string_free(class_name, FALSE);
+}
+
 VALUE
-rbgerr_define_gerror(GQuark domain, const gchar *name, VALUE module, VALUE parent, VALUE gtype)
+rbgerr_define_gerror(GQuark domain, const gchar *name, VALUE module, VALUE parent, GType gtype)
 {
-    VALUE klass = rb_define_class_under(module, name, parent);
-    rb_funcall(klass, rbgutil_id_module_eval, 1, CSTR2RVAL("def code; @code; end\n"));
-    rb_funcall(klass, rbgutil_id_module_eval, 1, CSTR2RVAL("def domain; @domain; end\n"));
+    VALUE error_class;
+    VALUE code_classes;
 
-    rb_hash_aset(gerror_table, UINT2NUM(domain), klass);
+    error_class = rb_define_class_under(module, name, parent);
+    rb_include_module(error_class, error_info);
 
-    if (! NIL_P(gtype)){
+    rb_hash_aset(gerror_table, UINT2NUM(domain), error_class);
+
+    code_classes = rb_hash_new();
+    rb_ivar_set(error_class, id_code_classes, code_classes);
+
+    if (gtype != G_TYPE_INVALID) {
         GEnumClass* gclass = g_type_class_ref(gtype);
         guint i;
 
         for (i = 0; i < gclass->n_values; i++) {
+            VALUE code_class;
             GEnumValue* entry = &(gclass->values[i]);
-            gchar* nick = g_strdup(entry->value_nick);
-            gchar* p;
-            
-            for (p = nick; *p; p++) {
-                if (*p == '-')
-                    *p = '_';
-                else
-                    *p = g_ascii_toupper(*p);
-            }
-            rbgobj_define_const(klass, nick, INT2NUM(i));
-            g_free(nick);
+            gchar *code_constant_name;
+            gchar *code_class_name;
+
+            code_constant_name = nick_to_constant_name(entry->value_nick);
+            rbgobj_define_const(error_class,
+                                code_constant_name,
+                                INT2NUM(entry->value));
+            g_free(code_constant_name);
+
+            code_class_name = nick_to_class_name(entry->value_nick);
+            code_class = rb_define_class_under(error_class,
+                                               code_class_name,
+                                               error_class);
+            g_free(code_class_name);
+            rb_hash_aset(code_classes, INT2NUM(entry->value), code_class);
         }
-        
-        g_type_class_unref(gclass);        
+
+        g_type_class_unref(gclass);
     }
 
-    return klass;
+    return error_class;
 }
 
 void
@@ -87,10 +151,14 @@ Init_glib_error(void)
 {
     id_code = rb_intern("@code");
     id_domain = rb_intern("@domain");
+    id_code_classes = rb_intern("@code_classes");
     gerror_table = rb_hash_new();
     rb_global_variable(&gerror_table);
 
+    error_info = rb_define_module_under(mGLib, "ErrorInfo");
+    rb_define_attr(error_info, "code", TRUE, FALSE);
+    rb_define_attr(error_info, "domain", TRUE, FALSE);
+
     generic_error = rb_define_class_under(mGLib, "Error", rb_eRuntimeError);
-    rb_funcall(generic_error, rbgutil_id_module_eval, 1, CSTR2RVAL("def code; @code; end\n"));
-    rb_funcall(generic_error, rbgutil_id_module_eval, 1, CSTR2RVAL("def domain; @domain; end\n"));
+    rb_include_module(generic_error, error_info);
 }

data/ext/glib2/rbgobj_type.c

@@ -266,22 +266,27 @@ const RGObjClassInfo *
 rbgobj_lookup_class_by_gtype_full(GType gtype, VALUE parent,
                                   gboolean create_class)
 {
+    const RGObjClassInfo *info;
     RGObjClassByGtypeData data;
 
+    info = rbgobj_lookup_class_by_gtype_without_lock(gtype, parent, FALSE);
+    if (info) {
+        return info;
+    }
+
+    if (!create_class) {
+        return NULL;
+    }
+
     data.gtype = gtype;
     data.parent = parent;
     data.create_class = create_class;
 
-    if (create_class) {
-        rb_funcall(lookup_class_mutex, id_lock, 0);
-        return (RGObjClassInfo *)rb_ensure(rbgobj_lookup_class_by_gtype_body,
-                                           (VALUE)&data,
-                                           rbgobj_lookup_class_by_gtype_ensure,
-                                           (VALUE)&data);
-    } else {
-        return rbgobj_lookup_class_by_gtype_without_lock(gtype, parent,
-                                                         create_class);
-    }
+    rb_funcall(lookup_class_mutex, id_lock, 0);
+    return (RGObjClassInfo *)rb_ensure(rbgobj_lookup_class_by_gtype_body,
+                                       (VALUE)&data,
+                                       rbgobj_lookup_class_by_gtype_ensure,
+                                       (VALUE)&data);
 }
 
 VALUE

data/ext/glib2/rbgutil.h

@@ -66,11 +66,17 @@ extern "C" {
 #define RG_REG_SYMBOL_GETTER(name) \
         rbgobj_register_property_getter(CLASS2GTYPE(RG_TARGET_NAMESPACE), name, rbgutil_sym_g2r_func)
 
+#define RG_REPLACE_SET_PROPERTY(name, args)   \
+    G_REPLACE_SET_PROPERTY(RG_TARGET_NAMESPACE, #name, rg_set_ ## name, args)
+#define RG_REPLACE_GET_PROPERTY(name, args)   \
+    G_REPLACE_GET_PROPERTY(RG_TARGET_NAMESPACE, #name, rg_get_ ## name, args)
+#define RG_REPLACE_ACTION(name, args)                               \
+    G_REPLACE_ACTION(RG_TARGET_NAMESPACE, #name, rg_ ## name, args)
+
 #define G_REPLACE_SET_PROPERTY(klass, name, function, args) \
     rb_undef_method(klass, "set_" name); \
-    rb_define_method(klass, "set_" name, function, args); \
     rb_undef_method(klass, name "="); \
-    G_DEF_SETTER(klass, name)
+    rbg_define_method(klass, "set_" name, function, args)
 
 #define G_REPLACE_GET_PROPERTY(klass, name, function, args) \
     rb_undef_method(klass, name); \
@@ -98,6 +104,8 @@ extern void rbgutil_stop_callback_dispatch_thread(void);
 extern VALUE rbgutil_string_set_utf8_encoding(VALUE string);
 extern gboolean rbgutil_key_equal(VALUE rb_string, const char *key);
 
+extern const gchar *rbg_inspect(VALUE object);
+
 /*< protected >*/
 RUBY_GLIB2_VAR ID rbgutil_id_module_eval;
 extern void rbgutil_glibid_r2g_func(VALUE from, GValue* to);

data/test/test_key_file.rb

@@ -9,20 +9,20 @@ class TestGLibKeyFile < Test::Unit::TestCase
     only_glib_version(2, 14, 0)
 
     key_file = GLib::KeyFile.new
-    assert_raise(GLib::KeyFileError) do
+    assert_raise(GLib::KeyFileError::NotFound) do
       key_file.load_from_dirs("non-existent")
     end
 
     temp = Tempfile.new("key-file")
     base_name = File.basename(temp.path)
     search_dirs = [File.dirname(temp.path)]
-    assert_raise(GLib::KeyFileError) do
+    assert_raise(GLib::KeyFileError::NotFound) do
       key_file.load_from_dirs("non-existent", search_dirs)
     end
     if GLib.check_version?(2, 31, 2)
       assert_equal(temp.path, key_file.load_from_dirs(base_name, search_dirs))
     else
-      assert_raise(GLib::KeyFileError) do
+      assert_raise(GLib::KeyFileError::NotFound) do
         key_file.load_from_dirs(base_name, search_dirs)
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glib2
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - The Ruby-GNOME2 Project Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-29 00:00:00.000000000 Z
+date: 2014-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pkg-config