gir_ffi 0.7.8 → 0.7.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 58dffbf9a2115d4ddfe8ca620557382d27510bb5
-  data.tar.gz: 6f0e46d81b16c5d29468acc9fce70e4249b44f37
+  metadata.gz: b9da5e936faa40d8974a094267b9da5c302fd08c
+  data.tar.gz: 441e768cda62450ab418c941703e9cff26e28c0a
 SHA512:
-  metadata.gz: 80c91f162cc4b515d85a77de746ba8305c1a8f241bf28e739bbbb46bd5e34ee4029f553ff57764f7824a33dedcb2486931c979a3d612432601e92aa2867e02d3
-  data.tar.gz: e5e38438a0b57c2ac477a60d464dbf7e0547f74ae7b8326c54f79a486c6bbc205e7e90f484a95a9c628abd927023b771c94b1c0f1272537ac480dcc85a958cdf
+  metadata.gz: 09115a044eee555798d204123d566e10c7fb291f679fb2bfa6d18123716a618de6dcbcd5a23e49fc890b8d2c221046df21f34ac52e92d9939a1cd723fbdac3af
+  data.tar.gz: 6cb2722920829fe0e81ca48ee8fd8e19d5fade1f34d461608c6d8cb43b5421917074b8173a0010e0a07e796ea57d0369799c3db39f81b6b8571a8beea5d5a8a4

data/Changelog.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## 0.7.9 / 2015-05-05
+
+* Unset GValues in finalizer
+* Dereference GObjects in finalizer
+* Increase refcount for ingoing :object arguments of functions with full
+  ownership transfer
+* Increase refcount for receiver arguments with full ownership transfer
+* Increase refcount for ingoing :object arguments of vfuncs with no ownership
+  transfer
+* Increase refcount for :object return values of vfuncs with full transfer
+* Increase refcount for outgoing :object arguments of vfuncs with full ownership
+  transfer
+* Apply more RuboCop rules
+* Support Ruby 2.2
+* Rename several methods. The old names are deprecated and will be removed in 0.8.0.
+
 ## 0.7.8 / 2014-12-09
 
 * Support constants with a falsy value

data/README.md

@@ -9,10 +9,10 @@ Ruby bindings for GNOME using the GObject Introspection Repository.
 ## Status
 
 [![Gem Version](https://badge.fury.io/rb/gir_ffi.png)](http://badge.fury.io/rb/gir_ffi)
-[![Dependency Status](https://gemnasium.com/mvz/ruby-gir-ffi.png)](https://gemnasium.com/mvz/ruby-gir-ffi)
-[![Build Status](https://travis-ci.org/mvz/ruby-gir-ffi.png?branch=master)](https://travis-ci.org/mvz/ruby-gir-ffi)
-[![Code Climate](https://codeclimate.com/github/mvz/ruby-gir-ffi.png)](https://codeclimate.com/github/mvz/ruby-gir-ffi)
-[![Coverage Status](https://coveralls.io/repos/mvz/ruby-gir-ffi/badge.png)](https://coveralls.io/r/mvz/ruby-gir-ffi)
+[![Dependency Status](https://gemnasium.com/mvz/gir_ffi.png)](https://gemnasium.com/mvz/gir_ffi)
+[![Build Status](https://travis-ci.org/mvz/gir_ffi.png?branch=master)](https://travis-ci.org/mvz/gir_ffi)
+[![Code Climate](https://codeclimate.com/github/mvz/gir_ffi.png)](https://codeclimate.com/github/mvz/gir_ffi)
+[![Coverage Status](https://coveralls.io/repos/mvz/gir_ffi/badge.png)](https://coveralls.io/r/mvz/gir_ffi)
 
 ## Features
 
@@ -45,8 +45,8 @@ Ruby bindings for GNOME using the GObject Introspection Repository.
 
 ## Requirements
 
-GirFFI should work on MRI 1.9.3, 2.0, and 2.1, JRuby in 1.9 or 2.0 mode, and on
-Rubinius.
+GirFFI should work on CRuby 1.9.3, 2.0, 2.1 and 2.2, JRuby in 1.9 or 2.0 mode,
+and on Rubinius.
 
 You will also need gobject-introspection installed with some
 introspection data.
@@ -73,17 +73,21 @@ overrides can be defined. The following gems with overrides
 already exist:
 
 * `gir_ffi-gtk`: overrides for Gtk+ 2 and 3.
+* `gir_ffi-gnome_keyring`: overrides for GnomeKeyring
 * `gir_ffi-cairo`: overrides for Cairo
 * `gir_ffi-pango`: overrides for Pango
 * `gir_ffi-tracker`: overrides for Tracker
 
 ## Hacking and contributing
 
-If you want to help out, have a look at TODO.md, and check the notes
-in the code (e.g., using `dnote`). Feel free to file bugs or send pull
-requests.
+Please feel free to file bugs or send pull requests!
 
-If you want to send pull requests or patches, please:
+If you just want to help out but don't know where to start, have a look at
+TODO.md, and check the notes in the code (e.g., using `dnote`).
+
+If you want to send pull requests or patches, please try to follow these
+instructions. If you get stuck, make a pull request anyway and I'll try to help
+out.
 
 * Make sure `rake test` runs without reporting any failures. If your code
   breaks existing stuff, it won't get merged in.
@@ -94,9 +98,18 @@ If you want to send pull requests or patches, please:
 * Try not to include changes that are irrelevant to your feature in the
   same commit.
 
+## Contributors
+
+The following people have contributed to GirFFI over the years:
+
+* John Cupitt
+* Marius Hanne
+* Antonio Terceiro
+* Matijs van Zuijlen
+
 ## License
 
-Copyright © 2009–2014 [Matijs van Zuijlen](http://www.matijs.net)
+Copyright © 2009–2015 [Matijs van Zuijlen](http://www.matijs.net)
 
 GirFFI is free software, distributed under the terms of the GNU Lesser
 General Public License, version 2.1 or later. See the file COPYING.LIB for

data/TODO.md

@@ -1,6 +1,14 @@
 # TODO
 
-MAKE CONSTRUCTOR_WRAP CHECK TYPES?
+## Miscellaneous
+
+* MAKE CONSTRUCTOR_WRAP CHECK TYPES? This would allow GObject::Object.new to
+  work and create the correct subtype.
+* Add tests for the other test files in gobject-introspection. Currently, only
+  regress.c and gimarshallingtests.c are used, but there are 6 other files
+  available.
+* Move GObjectIntrospection to GIRepository, and allow generating its own
+  members.
 
 ## Memory managment
 
@@ -8,7 +16,7 @@ GirFFI does not attempt to free any memory at the moment, or lower the
 reference count of any objects it gets from GObject. This task therefore involves two parts:
 
 - Free non-GObject pointers as needed (at garbage-collection time)
-- Lower reference count of GObjects (at garbage-collection time)
+- Lower reference count of GObjects (at garbage-collection time) (done!)
 
 **Use memory_profiler to check memory use (https://github.com/SamSaffron/memory_profiler)**
 

data/gir_ffi.gemspec

@@ -33,8 +33,8 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency('ffi', ["~> 1.8"])
   s.add_runtime_dependency('indentation', ["~> 0.1.1"])
 
-  s.add_development_dependency('minitest', ["~> 5.2"])
-  s.add_development_dependency('rr', ["~> 1.1.2"])
+  s.add_development_dependency('minitest', ["~> 5.5.1"])
+  s.add_development_dependency('minitest-rspec_mocks', ["~> 0.2.0"])
   s.add_development_dependency('rake', ["~> 10.1"])
 
   s.require_paths = ["lib"]

data/lib/ffi-glib/array.rb

@@ -67,7 +67,7 @@ module GLib
     private
 
     def self.calculated_element_size type
-      ffi_type = GirFFI::TypeMap.type_specification_to_ffitype(type)
+      ffi_type = GirFFI::TypeMap.type_specification_to_ffi_type(type)
       FFI.type_size(ffi_type)
     end
 

data/lib/ffi-glib/hash_table.rb

@@ -57,8 +57,6 @@ module GLib
         FFI::Function.new(:uint,
                           [:pointer],
                           find_support_function('g_str_hash'))
-      else
-        nil
       end
     end
 
@@ -68,8 +66,6 @@ module GLib
         FFI::Function.new(:int,
                           [:pointer, :pointer],
                           find_support_function('g_str_equal'))
-      else
-        nil
       end
     end
 

data/lib/ffi-gobject.rb

@@ -83,7 +83,11 @@ module GObject
 
   # NOTE: This Lib module is set up in `gir_ffi-base/gobject/lib.rb`.
   module Lib
-    attach_function :g_object_ref_sink, [:pointer], :void
+    attach_function :g_object_ref_sink, [:pointer], :pointer
+    attach_function :g_object_ref, [:pointer], :pointer
+    attach_function :g_object_unref, [:pointer], :pointer
+
+    attach_function :g_value_unset, [:pointer], :pointer
 
     attach_function :g_array_get_type, [], :size_t
     attach_function :g_byte_array_get_type, [], :size_t
@@ -91,14 +95,14 @@ module GObject
     attach_function :g_strv_get_type, [], :size_t
 
     attach_function :g_signal_connect_data,
-      [:pointer, :string, Callback, :pointer, ClosureNotify, ConnectFlags],
-      :ulong
+                    [:pointer, :string, Callback, :pointer, ClosureNotify, ConnectFlags],
+                    :ulong
     attach_function :g_closure_set_marshal,
-      [:pointer, ClosureMarshal], :void
+                    [:pointer, ClosureMarshal], :void
 
     attach_function :g_param_spec_int,
-      [:string, :string, :string, :int32, :int32, :int32, ParamFlags],
-      :pointer
+                    [:string, :string, :string, :int32, :int32, :int32, ParamFlags],
+                    :pointer
   end
 
   TYPE_ARRAY = Lib.g_array_get_type

data/lib/ffi-gobject/object.rb

@@ -5,6 +5,23 @@ module GObject
   class Object
     setup_method 'new'
 
+    def self.constructor_wrap ptr
+      super.tap do |obj|
+        ObjectSpace.define_finalizer obj, make_finalizer(ptr, obj.class.name) if obj
+      end
+    end
+
+    def self.make_finalizer ptr, name
+      proc {
+        rc = GObject::Object::Struct.new(ptr)[:ref_count]
+        if rc == 0 || rc > 100
+          warn "not unreffing #{name}:#{ptr} (#{rc})"
+        else
+          GObject::Lib.g_object_unref ptr
+        end
+      }
+    end
+
     # TODO: Generate accessor methods from GIR at class definition time
     def method_missing method, *args
       getter_name = "get_#{method}"

data/lib/ffi-gobject/ruby_closure.rb

@@ -10,7 +10,7 @@ module GObject
     # the object_id of the associated block.
     class Struct < FFI::Struct
       layout :parent, Closure::Struct, 0,
-        :block_id, :int64
+             :block_id, :int64
     end
 
     def block

data/lib/ffi-gobject/value.rb

@@ -3,6 +3,23 @@ GObject.load_class :Value
 module GObject
   # Overrides for GValue, GObject's generic value container structure.
   class Value
+    setup_instance_method 'init'
+
+    def init_with_finalizer type
+      init_without_finalizer(type).tap do
+        ObjectSpace.define_finalizer self, self.class.make_finalizer(to_ptr)
+      end
+    end
+
+    alias_method :init_without_finalizer, :init
+    alias_method :init, :init_with_finalizer
+
+    def self.make_finalizer ptr
+      proc {
+        GObject::Lib.g_value_unset ptr
+      }
+    end
+
     # TODO: Give more generic name
     def set_ruby_value val
       init_for_ruby_value val if current_gtype == 0
@@ -96,17 +113,24 @@ module GObject
       end
     end
 
+    # @deprecated Use GObject::Value.for_gtype instead. Will be removed in 0.8.0.
     def self.for_g_type g_type
-      return nil if g_type == TYPE_NONE
-      new.tap { |it| it.init g_type }
+      for_gtype g_type
+    end
+
+    def self.for_gtype gtype
+      return nil if gtype == TYPE_NONE
+      new.tap do |it|
+        it.init gtype
+      end
     end
 
     # TODO: Combine with wrap_ruby_value
     def self.wrap_instance instance
-      new.tap {|it|
+      new.tap do |it|
         it.init GObject.type_from_instance instance
         it.set_instance instance
-      }
+      end
     end
 
     private

data/lib/ffi-gobject_introspection.rb

@@ -1 +1,5 @@
+require 'gir_ffi-base'
+
+GObject.type_init
+
 require 'ffi-gobject_introspection/i_repository'

data/lib/ffi-gobject_introspection/g_error.rb

@@ -4,8 +4,8 @@ module GObjectIntrospection
     # GLib's GError struct.
     class Struct < FFI::Struct
       layout :domain, :uint32,
-        :code, :int,
-        :message, :string
+             :code, :int,
+             :message, :string
     end
 
     def initialize ptr

data/lib/ffi-gobject_introspection/i_base_info.rb

@@ -5,9 +5,7 @@ module GObjectIntrospection
     def initialize ptr, lib = Lib
       raise ArgumentError, 'ptr must not be null' if ptr.null?
 
-      unless defined?(RUBY_ENGINE) && RUBY_ENGINE == 'rbx'
-        ObjectSpace.define_finalizer self, self.class.make_finalizer(lib, ptr)
-      end
+      ObjectSpace.define_finalizer self, self.class.make_finalizer(lib, ptr)
 
       @gobj = ptr
       @lib = lib

data/lib/ffi-gobject_introspection/i_callable_info.rb

@@ -31,5 +31,13 @@ module GObjectIntrospection
     def skip_return?
       Lib.g_callable_info_skip_return @gobj
     end
+
+    def instance_ownership_transfer
+      if VERSION >= '1.42'
+        Lib.g_callable_info_get_instance_ownership_transfer @gobj
+      else
+        :nothing
+      end
+    end
   end
 end

data/lib/ffi-gobject_introspection/i_registered_type_info.rb

@@ -13,5 +13,7 @@ module GObjectIntrospection
     def g_type
       Lib.g_registered_type_info_get_g_type @gobj
     end
+
+    alias_method :gtype, :g_type
   end
 end

data/lib/ffi-gobject_introspection/i_repository.rb

@@ -1,6 +1,4 @@
 require 'singleton'
-require 'ffi'
-require 'gir_ffi-base'
 
 require 'ffi-gobject_introspection/lib'
 require 'ffi-gobject_introspection/g_error'
@@ -23,8 +21,6 @@ require 'ffi-gobject_introspection/i_enum_info'
 require 'ffi-gobject_introspection/i_flags_info'
 require 'ffi-gobject_introspection/i_unresolved_info'
 
-GObject.type_init
-
 module GObjectIntrospection
   # The Gobject Introspection Repository. This class is the point of
   # access to the introspection typelibs.
@@ -118,6 +114,10 @@ module GObjectIntrospection
       Lib.g_irepository_get_shared_library @gobj, namespace
     end
 
+    def version namespace
+      Lib.g_irepository_get_version @gobj, namespace
+    end
+
     def self.wrap_ibaseinfo_pointer ptr
       return nil if ptr.null?
       type = Lib.g_base_info_get_type ptr

data/lib/ffi-gobject_introspection/lib.rb

@@ -6,25 +6,41 @@ module GObjectIntrospection
     extend FFI::Library
     ffi_lib 'girepository-1.0'
 
+    # Helper class to support guessing the gobject-introspection version.
+    # Provide several guesses to #provide_guess, and the result in #best_guess
+    # will be the best (i.e., lowest) guess.
+    class VersionGuesser
+      def initialize base
+        @guess = base
+      end
+
+      def provide_guess guessed
+        @guess = guessed if guessed < @guess
+      end
+
+      def best_guess
+        @guess
+      end
+    end
+
+    version_guesser = VersionGuesser.new('1.42')
+
     # IRepository
     enum :IRepositoryLoadFlags, [:LAZY, (1 << 0)]
 
     attach_function :g_irepository_get_default, [], :pointer
     attach_function :g_irepository_prepend_search_path, [:string], :void
     attach_function :g_irepository_require,
-      [:pointer, :string, :string, :IRepositoryLoadFlags, :pointer],
-      :pointer
+                    [:pointer, :string, :string, :IRepositoryLoadFlags, :pointer],
+                    :pointer
+    attach_function :g_irepository_get_version, [:pointer, :string], :string
+
     attach_function :g_irepository_get_n_infos, [:pointer, :string], :int
-    attach_function :g_irepository_get_info,
-      [:pointer, :string, :int], :pointer
-    attach_function :g_irepository_find_by_name,
-      [:pointer, :string, :string], :pointer
-    attach_function :g_irepository_find_by_gtype,
-      [:pointer, :size_t], :pointer
-    attach_function :g_irepository_get_dependencies,
-      [:pointer, :string], :pointer
-    attach_function :g_irepository_get_shared_library,
-      [:pointer, :string], :string
+    attach_function :g_irepository_get_info, [:pointer, :string, :int], :pointer
+    attach_function :g_irepository_find_by_name, [:pointer, :string, :string], :pointer
+    attach_function :g_irepository_find_by_gtype, [:pointer, :size_t], :pointer
+    attach_function :g_irepository_get_dependencies, [:pointer, :string], :pointer
+    attach_function :g_irepository_get_shared_library, [:pointer, :string], :string
 
     # IBaseInfo
     enum :IInfoType, [
@@ -78,6 +94,13 @@ module GObjectIntrospection
     attach_function :g_callable_info_get_arg, [:pointer, :int], :pointer
     attach_function :g_callable_info_skip_return, [:pointer], :bool
 
+    begin
+      attach_function :g_callable_info_get_instance_ownership_transfer,
+                      [:pointer], :ITransfer
+    rescue FFI::NotFoundError
+      version_guesser.provide_guess '1.40'
+    end
+
     # IArgInfo
     enum :IDirection, [
       :in,
@@ -236,26 +259,26 @@ module GObjectIntrospection
       signed_size_t = "int#{FFI.type_size(:size_t) * 8}".to_sym
 
       layout :v_boolean, :int,
-        :v_int8, :int8,
-        :v_uint8, :uint8,
-        :v_int16, :int16,
-        :v_uint16, :uint16,
-        :v_int32, :int32,
-        :v_uint32, :uint32,
-        :v_int64, :int64,
-        :v_uint64, :uint64,
-        :v_float, :float,
-        :v_double, :double,
-        :v_short, :short,
-        :v_ushort, :ushort,
-        :v_int, :int,
-        :v_uint, :uint,
-        :v_long, :long,
-        :v_ulong, :ulong,
-        :v_ssize, signed_size_t,
-        :v_size, :size_t,
-        :v_string, :string,
-        :v_pointer, :pointer
+             :v_int8, :int8,
+             :v_uint8, :uint8,
+             :v_int16, :int16,
+             :v_uint16, :uint16,
+             :v_int32, :int32,
+             :v_uint32, :uint32,
+             :v_int64, :int64,
+             :v_uint64, :uint64,
+             :v_float, :float,
+             :v_double, :double,
+             :v_short, :short,
+             :v_ushort, :ushort,
+             :v_int, :int,
+             :v_uint, :uint,
+             :v_long, :long,
+             :v_ulong, :ulong,
+             :v_ssize, signed_size_t,
+             :v_size, :size_t,
+             :v_string, :string,
+             :v_pointer, :pointer
     end
 
     # IConstInfo
@@ -266,5 +289,7 @@ module GObjectIntrospection
     # IPropertyInfo
     #
     attach_function :g_property_info_get_type, [:pointer], :pointer
+
+    ::GObjectIntrospection::VERSION = version_guesser.best_guess
   end
 end