gir_ffi 0.8.4 → 0.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1ad50242508ce93d6d0b6751cd18b550f3f8137
-  data.tar.gz: b4ea1af0594d95c7293edabbf4f108506b2d46c4
+  metadata.gz: 33c7535a4e04bc9db6d60c9b92fd70d7b6d15942
+  data.tar.gz: f2a04471af13eda5efbd038f1f7fa80cb1b0458c
 SHA512:
-  metadata.gz: 71bc54a2a76ddaa7a8d3633c02ce1ccc123ca036031e7c207fb6808aa81c995e30bf2eb4ffa7bc78321401f09887d1118862e7178534d12bc962c32099889355
-  data.tar.gz: 099c5f239a3f1d7222871f1ad3f78730e733dbbc6c8f7fe278740b261390271f7aa072174ccf3a92b3246ead586d52bd29c09c22596474ede0282ef612c86ea7
+  metadata.gz: f4542926a9b0514a68855b00991381fbeb40393001c8da662d2f711107b9276a1803a74910308338b2e7e7a73c32aff8c48d4fef96d10cbb8fe8619e80b09f95
+  data.tar.gz: 9333b2763f9db28c70fee615905ce0e20d9eff912ac222fb136a1ed07cc1f8b4793dd27bbaa8814f44453e781528d7d3be5b25365fbb8dc846a2533dc1114d08

data/Changelog.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 0.8.5 / 2015-12-04
+
+* Improve GObject::Value
+  * Make #wrap_ruby_value work for object classes
+  * Use non-deprecated methods for getting and setting char values
+  * Make set_value and get_value work for interface types
+
 ## 0.8.4 / 2015-12-03
 
 * Handle classes with lower-case names

data/lib/ffi-gobject/value.rb

@@ -22,27 +22,29 @@ module GObject
     end
 
     METHOD_MAP = {
-      TYPE_INVALID => [:get_none,          :set_none],
-      TYPE_BOOLEAN => [:get_boolean,       :set_boolean],
-      TYPE_BOXED   => [:get_boxed,         :set_boxed],
-      TYPE_CHAR    => [:get_char,          :set_char],
-      TYPE_DOUBLE  => [:get_double,        :set_double],
-      TYPE_ENUM    => [:get_enum_enhanced, :set_enum_enhanced],
-      TYPE_FLAGS   => [:get_flags,         :set_flags],
-      TYPE_FLOAT   => [:get_float,         :set_float],
-      TYPE_GTYPE   => [:get_gtype,         :set_gtype],
-      TYPE_INT     => [:get_int,           :set_int],
-      TYPE_INT64   => [:get_int64,         :set_int64],
-      TYPE_LONG    => [:get_long,          :set_long],
-      TYPE_OBJECT  => [:get_object,        :set_instance_enhanced],
-      TYPE_PARAM   => [:get_param,         :set_param],
-      TYPE_POINTER => [:get_pointer,       :set_pointer],
-      TYPE_STRING  => [:get_string,        :set_string],
-      TYPE_UCHAR   => [:get_uchar,         :set_uchar],
-      TYPE_UINT    => [:get_uint,          :set_uint],
-      TYPE_UINT64  => [:get_uint64,        :set_uint64],
-      TYPE_ULONG   => [:get_ulong,         :set_ulong],
-      TYPE_VARIANT => [:get_variant,       :set_variant]
+      TYPE_INVALID   => [:get_none,          :set_none],
+      # TYPE_NONE is skipped
+      TYPE_INTERFACE => [:get_object,        :set_instance_enhanced],
+      TYPE_CHAR      => [:get_schar,         :set_schar],
+      TYPE_UCHAR     => [:get_uchar,         :set_uchar],
+      TYPE_BOOLEAN   => [:get_boolean,       :set_boolean],
+      TYPE_INT       => [:get_int,           :set_int],
+      TYPE_UINT      => [:get_uint,          :set_uint],
+      TYPE_LONG      => [:get_long,          :set_long],
+      TYPE_ULONG     => [:get_ulong,         :set_ulong],
+      TYPE_INT64     => [:get_int64,         :set_int64],
+      TYPE_UINT64    => [:get_uint64,        :set_uint64],
+      TYPE_ENUM      => [:get_enum_enhanced, :set_enum_enhanced],
+      TYPE_FLAGS     => [:get_flags,         :set_flags],
+      TYPE_FLOAT     => [:get_float,         :set_float],
+      TYPE_DOUBLE    => [:get_double,        :set_double],
+      TYPE_STRING    => [:get_string,        :set_string],
+      TYPE_POINTER   => [:get_pointer,       :set_pointer],
+      TYPE_BOXED     => [:get_boxed,         :set_boxed],
+      TYPE_PARAM     => [:get_param,         :set_param],
+      TYPE_OBJECT    => [:get_object,        :set_instance_enhanced],
+      TYPE_GTYPE     => [:get_gtype,         :set_gtype],
+      TYPE_VARIANT   => [:get_variant,       :set_variant]
     }
 
     def set_value(val)
@@ -120,6 +122,9 @@ module GObject
     }
 
     def init_for_ruby_value(val)
+      if val.class.respond_to? :gtype
+        return init val.class.gtype
+      end
       CLASS_TO_GTYPE_MAP.each do |klass, type|
         return init type if val.is_a? klass
       end

data/lib/gir_ffi/version.rb

@@ -1,4 +1,4 @@
 # Current GirFFI version
 module GirFFI
-  VERSION = '0.8.4'
+  VERSION = '0.8.5'
 end

data/test/ffi-gobject/value_test.rb

@@ -1,6 +1,7 @@
 require 'gir_ffi_test_helper'
 
 GirFFI.setup :Regress
+GirFFI.setup :Gio
 
 describe GObject::Value do
   describe '::Struct' do
@@ -63,11 +64,17 @@ describe GObject::Value do
       assert_instance_of GObject::Value, gv
       assert_equal nil, gv.get_value
     end
+
+    it 'wraps object values' do
+      value = GObject::Object.new({})
+      gv = GObject::Value.wrap_ruby_value value
+      gv.get_value.must_equal value
+    end
   end
 
   describe '#set_value' do
     it 'handles char values' do
-      value = 83
+      value = -83
       gv = GObject::Value.for_gtype GObject::TYPE_CHAR
       gv.set_value value
       gv.get_char.must_equal value
@@ -142,6 +149,20 @@ describe GObject::Value do
       gv.set_value value
       gv.get_variant.must_equal value
     end
+
+    it 'handles object values' do
+      value = GObject::Object.new({})
+      gv = GObject::Value.for_gtype GObject::Object.gtype
+      gv.set_value value
+      gv.get_object.must_equal value
+    end
+
+    it 'handles interface values' do
+      value = Gio.file_new_for_path('/')
+      gv = GObject::Value.for_gtype Gio::File.gtype
+      gv.set_value value
+      gv.get_object.must_equal value
+    end
   end
 
   describe '#get_value' do

data/test/integration/generated_gio_test.rb

@@ -1,11 +1,9 @@
 require 'gir_ffi_test_helper'
 
+GirFFI.setup :Gio
+
 # Tests generated methods and functions in the Gio namespace.
 describe 'The generated Gio module' do
-  before do
-    GirFFI.setup :Gio
-  end
-
   describe '#file_new_for_path, a method returning an interface,' do
     it 'returns an object of a more specific class' do
       file = Gio.file_new_for_path('/')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gir_ffi
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.8.5
 platform: ruby
 authors:
 - Matijs van Zuijlen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-03 00:00:00.000000000 Z
+date: 2015-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi