gir_ffi 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 107172036ec9fdf82546c5500d102f21b5776298
-  data.tar.gz: 21833bf950d07a14f07b7f95d6a59ec12661ea15
+  metadata.gz: a091e4dbd8360e158b2fb09d53f34fa6913dda07
+  data.tar.gz: 98c7a541d76f2e6217dca26d8cfd2ed5d7b32c71
 SHA512:
-  metadata.gz: 7ce027fd3bd08475eb90d7387cef5f48676db5eef27eba9fcfb86d06e6e3cea50a508f76af91f86418d99803f92e6ebe096986451373582780ab299ec506e5cd
-  data.tar.gz: 7b83c445f3ced66bb2ec47fe026e4fb12f54e76b5896bdc0b7703953e4fc3003ce0ca5986cdb225e9e52992cd6e5bf21b1df89a894fe6f334b23b0ec95708b31
+  metadata.gz: 1aaf7d901357faa26299c194deedb7a6cd42dafd62bb50e5f30c0c364ce4ef25349381deac8a4da8e42aa0d26d6d6bb2f0d1019884bf9c92a55fa03770df6485
+  data.tar.gz: cfd6c0d21b4f674c1fd637f4d8d963158f29264e046204021fb539594a1015f0807c279047c998b71fca4bc8f53ca2d750edd433af3800fab01e6727ec548ccd

data/Changelog.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 0.9.1 / 2016-02-04
+
+* Add field accessors for Object types for fields that don't have corresponding
+  properties or getter methods
+* Improve error handling for signals and properties that are not found
+* Handle signals without GIR data
+* Add interrupt handler to break out of main loops
+
 ## 0.9.0 / 2016-01-21
 
 * Propagate exceptions from callbacks during event loops

data/Gemfile

@@ -3,6 +3,8 @@ source 'https://rubygems.org'
 # The gem's dependencies are specified in gir_ffi.gemspec
 gemspec
 
+gem 'rubocop', '~> 0.36.0', type: :development
+
 if ENV['CI']
   if ENV['TRAVIS_RUBY_VERSION'] == '2.2'
     gem 'coveralls', type: :development

data/README.md

@@ -64,8 +64,8 @@ GirFFI is developed on Debian sid, and tested through Travis CI on Ubuntu
 are therefore not officially supported (although they may work).
 
 On Debian and Ubuntu, installing `libgirepository1.0-dev`,
-`gobject-introspection` and `gir1.2-gtop-2.0` should be enough to get
-`rake test` working.
+`gobject-introspection`, `gir1.2-gtop-2.0` and `gir1.2-gstreamer-1.0` should be
+enough to get `rake test` working.
 
 GirFFI has not been tested on Mac OS X or Microsoft Windows. YMMV.
 

data/Rakefile

@@ -1,6 +1,8 @@
 require 'rake/clean'
 require 'bundler/gem_tasks'
 
+load 'tasks/rubocop.rake'
 load 'tasks/test.rake'
 
-task :default => 'test:all'
+task default: :test
+task default: :rubocop unless RUBY_ENGINE == 'rbx'

data/TODO.md

@@ -1,25 +1,12 @@
 # TODO
 
-## Miscellaneous
-
-* MAKE CONSTRUCTOR_WRAP CHECK TYPES? This would allow GObject::Object.new to
-  work and create the correct subtype for classes that don't define their own
-  default constructor.
-* 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.
-* Do not remove ClassBase.new. We now remove it and then add it back for the
-  default constructor, which is kind of silly.
-
 ## Memory managment
 
-GirFFI does not attempt to free any memory at the moment, or lower the
+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) (done!)
+- [Done!] Lower reference count of GObjects (at garbage-collection time)
 
 **Use memory_profiler to check memory use (https://github.com/SamSaffron/memory_profiler)**
 
@@ -37,10 +24,6 @@ These in the order they occured to me, and may therefore be fixed in any order.
 - Move to a single Pointer class, rather than InPointer, InOutPointer and
   Pointer monkeypatching.
 
-- Move special types like SizedArray to sane namespaces. Types (like
-  GLib::List) that have actual GLib implementations go to the GLib namespace.
-  Other types go to the GirFFI namespace.
-
 ## Derived types
 
 Derived classes can now be registered with GObject, but the way to do this is
@@ -117,6 +100,11 @@ to be put in place for that.
 
 For how to handle objects, see https://bugzilla.gnome.org/show_bug.cgi?id=657202#c1
 
+## Miscellaneous
+
+* Move GObjectIntrospection to GIRepository, and allow generating its own
+  members.
+
 ## External dependencies
 
 Things that I think GirFFI cannot fix:

data/lib/ffi-glib/byte_array.rb

@@ -10,7 +10,7 @@ module GLib
     def append(data)
       bytes = GirFFI::InPointer.from :utf8, data
       len = data.bytesize
-      self.class.wrap(Lib.g_byte_array_append to_ptr, bytes, len)
+      self.class.wrap Lib.g_byte_array_append(to_ptr, bytes, len)
     end
 
     def initialize

data/lib/ffi-glib/list.rb

@@ -8,7 +8,7 @@ module GLib
     include ListMethods
 
     def self.from_enumerable(type, arr)
-      arr.reduce(new type) { |lst, val| lst.append val }
+      arr.reduce(new(type)) { |lst, val| lst.append val }
     end
 
     def append(data)

data/lib/ffi-glib/main_loop.rb

@@ -26,7 +26,7 @@ module GLib
 
       def handler_proc
         proc do
-          Thread.pass
+          ::Thread.pass
           true
         end
       end
@@ -53,16 +53,16 @@ module GLib
     end
 
     def self.handle_exception(ex)
-      current_loop = RUNNING_LOOPS.last
-      if current_loop
-        EXCEPTIONS << ex
-        current_loop.quit
-      else
-        raise ex
-      end
+      raise ex unless (current_loop = RUNNING_LOOPS.last)
+      EXCEPTIONS << ex
+      current_loop.quit
     end
 
     alias_method :run_without_thread_enabler, :run
     alias_method :run, :run_with_thread_enabler
   end
 end
+
+Signal.trap 'INT' do
+  GLib::MainLoop.handle_exception(Interrupt.new)
+end

data/lib/ffi-glib/s_list.rb

@@ -8,7 +8,7 @@ module GLib
     include ListMethods
 
     def self.from_enumerable(type, arr)
-      arr.reverse.reduce(new type) { |lst, val| lst.prepend val }
+      arr.reverse.reduce(new(type)) { |lst, val| lst.prepend val }
     end
 
     def prepend(data)

data/lib/ffi-gobject/object.rb

@@ -1,3 +1,5 @@
+require 'gir_ffi/property_not_found_error'
+
 GObject.load_class :Object
 
 module GObject
@@ -8,9 +10,7 @@ module GObject
     def initialize_with_automatic_gtype(properties = {})
       gparameters = properties.map do |name, value|
         name = name.to_s
-        unless property_param_spec(name)
-          raise ArgumentError, "Property '#{name}' not found in class #{self.class}"
-        end
+        property_param_spec(name)
         GObject::Parameter.new.tap do |gparam|
           gparam.name = name
           gparam.value = value
@@ -106,7 +106,7 @@ module GObject
     private
 
     def get_property_type(property_name)
-      prop = self.class.find_property property_name
+      prop = self.class.find_property(property_name)
       prop.property_type
     end
 
@@ -116,11 +116,13 @@ module GObject
     end
 
     def property_gtype(property_name)
-      property_param_spec(property_name).value_type
+      pspec = property_param_spec(property_name)
+      pspec.value_type
     end
 
     def property_param_spec(property_name)
-      object_class.find_property property_name
+      object_class.find_property property_name or
+        raise GirFFI::PropertyNotFoundError.new(property_name, self.class)
     end
 
     # TODO: Move to ITypeInfo

data/lib/ffi-gobject/value.rb

@@ -45,7 +45,7 @@ module GObject
       TYPE_OBJECT    => [:get_object,        :set_instance_enhanced],
       TYPE_GTYPE     => [:get_gtype,         :set_gtype],
       TYPE_VARIANT   => [:get_variant,       :set_variant]
-    }
+    }.freeze
 
     def set_value(val)
       send set_method, val
@@ -119,7 +119,7 @@ module GObject
       FalseClass => TYPE_BOOLEAN,
       Integer => TYPE_INT,
       String => TYPE_STRING
-    }
+    }.freeze
 
     def init_for_ruby_value(val)
       if val.class.respond_to? :gtype

data/lib/ffi-gobject.rb

@@ -10,7 +10,7 @@ require 'ffi-gobject/closure'
 require 'ffi-gobject/object'
 require 'ffi-gobject/object_class'
 require 'ffi-gobject/ruby_closure'
-require 'gir_ffi/builders/user_defined_builder'
+require 'gir_ffi/signal_not_found_error'
 
 # Module representing GLib's GObject namespace.
 module GObject
@@ -24,6 +24,10 @@ module GObject
     type_from_instance_pointer instance.to_ptr
   end
 
+  def self.type_name_from_instance(instance)
+    type_name type_from_instance instance
+  end
+
   def self.object_class_from_instance(instance)
     object_class_from_instance_pointer instance.to_ptr
   end

data/lib/ffi-gobject_introspection/i_arg_info.rb

@@ -44,7 +44,7 @@ module GObjectIntrospection
     end
 
     def argument_type
-      ITypeInfo.wrap(Lib.g_arg_info_get_type @gobj)
+      ITypeInfo.wrap Lib.g_arg_info_get_type(@gobj)
     end
   end
 end

data/lib/ffi-gobject_introspection/i_base_info.rb

@@ -67,7 +67,7 @@ module GObjectIntrospection
       method = method.to_s
       single = method.sub(/^find_/, '')
       counter ||= "n_#{single}s"
-      fetcher ||= "#{single}"
+      fetcher ||= single
       class_eval <<-CODE
         def #{method}(name)
           name = name.to_s

data/lib/ffi-gobject_introspection/i_callable_info.rb

@@ -7,7 +7,7 @@ module GObjectIntrospection
   # IFunctionInfo, ICallbackInfo or IVFuncInfo.
   class ICallableInfo < IBaseInfo
     def return_type
-      ITypeInfo.wrap(Lib.g_callable_info_get_return_type @gobj)
+      ITypeInfo.wrap Lib.g_callable_info_get_return_type(@gobj)
     end
 
     def caller_owns
@@ -23,7 +23,7 @@ module GObjectIntrospection
     end
 
     def arg(index)
-      IArgInfo.wrap(Lib.g_callable_info_get_arg @gobj, index)
+      IArgInfo.wrap Lib.g_callable_info_get_arg(@gobj, index)
     end
     ##
     build_array_method :args

data/lib/ffi-gobject_introspection/i_constant_info.rb

@@ -13,7 +13,7 @@ module GObjectIntrospection
       guint64:  :v_uint64,
       gdouble:  :v_double,
       utf8:     :v_string
-    }
+    }.freeze
 
     def value
       case type_tag
@@ -27,7 +27,7 @@ module GObjectIntrospection
     end
 
     def constant_type
-      ITypeInfo.wrap(Lib.g_constant_info_get_type @gobj)
+      ITypeInfo.wrap Lib.g_constant_info_get_type(@gobj)
     end
 
     private

data/lib/ffi-gobject_introspection/i_enum_info.rb

@@ -7,7 +7,7 @@ module GObjectIntrospection
     end
 
     def value(index)
-      IValueInfo.wrap(Lib.g_enum_info_get_value @gobj, index)
+      IValueInfo.wrap Lib.g_enum_info_get_value(@gobj, index)
     end
     ##
     build_array_method :values
@@ -17,7 +17,7 @@ module GObjectIntrospection
     end
 
     def get_method(index)
-      IFunctionInfo.wrap(Lib.g_enum_info_get_method @gobj, index)
+      IFunctionInfo.wrap Lib.g_enum_info_get_method(@gobj, index)
     end
 
     ##

data/lib/ffi-gobject_introspection/i_field_info.rb

@@ -15,7 +15,7 @@ module GObjectIntrospection
     end
 
     def field_type
-      ITypeInfo.wrap(Lib.g_field_info_get_type @gobj)
+      ITypeInfo.wrap Lib.g_field_info_get_type(@gobj)
     end
 
     def readable?

data/lib/ffi-gobject_introspection/i_interface_info.rb

@@ -7,7 +7,7 @@ module GObjectIntrospection
     end
 
     def prerequisite(index)
-      IBaseInfo.wrap(Lib.g_interface_info_get_prerequisite @gobj, index)
+      IBaseInfo.wrap Lib.g_interface_info_get_prerequisite(@gobj, index)
     end
 
     ##
@@ -18,7 +18,7 @@ module GObjectIntrospection
     end
 
     def property(index)
-      IPropertyInfo.wrap(Lib.g_interface_info_get_property @gobj, index)
+      IPropertyInfo.wrap Lib.g_interface_info_get_property(@gobj, index)
     end
 
     ##
@@ -30,14 +30,14 @@ module GObjectIntrospection
     end
 
     def get_method(index)
-      IFunctionInfo.wrap(Lib.g_interface_info_get_method @gobj, index)
+      IFunctionInfo.wrap Lib.g_interface_info_get_method(@gobj, index)
     end
 
     ##
     build_array_method :get_methods
 
     def find_method(name)
-      IFunctionInfo.wrap(Lib.g_interface_info_find_method @gobj, name.to_s)
+      IFunctionInfo.wrap Lib.g_interface_info_find_method(@gobj, name.to_s)
     end
 
     def n_signals
@@ -45,7 +45,7 @@ module GObjectIntrospection
     end
 
     def signal(index)
-      ISignalInfo.wrap(Lib.g_interface_info_get_signal @gobj, index)
+      ISignalInfo.wrap Lib.g_interface_info_get_signal(@gobj, index)
     end
 
     ##
@@ -57,14 +57,14 @@ module GObjectIntrospection
     end
 
     def vfunc(index)
-      IVFuncInfo.wrap(Lib.g_interface_info_get_vfunc @gobj, index)
+      IVFuncInfo.wrap Lib.g_interface_info_get_vfunc(@gobj, index)
     end
 
     ##
     build_array_method :vfuncs
 
     def find_vfunc(name)
-      IVFuncInfo.wrap(Lib.g_interface_info_find_vfunc @gobj, name)
+      IVFuncInfo.wrap Lib.g_interface_info_find_vfunc(@gobj, name)
     end
 
     def n_constants
@@ -72,14 +72,14 @@ module GObjectIntrospection
     end
 
     def constant(index)
-      IConstantInfo.wrap(Lib.g_interface_info_get_constant @gobj, index)
+      IConstantInfo.wrap Lib.g_interface_info_get_constant(@gobj, index)
     end
 
     ##
     build_array_method :constants
 
     def iface_struct
-      IStructInfo.wrap(Lib.g_interface_info_get_iface_struct @gobj)
+      IStructInfo.wrap Lib.g_interface_info_get_iface_struct(@gobj)
     end
   end
 end

data/lib/ffi-gobject_introspection/i_object_info.rb

@@ -19,7 +19,7 @@ module GObjectIntrospection
     end
 
     def parent
-      IObjectInfo.wrap(Lib.g_object_info_get_parent @gobj)
+      IObjectInfo.wrap Lib.g_object_info_get_parent(@gobj)
     end
 
     def n_interfaces
@@ -27,7 +27,7 @@ module GObjectIntrospection
     end
 
     def interface(index)
-      IInterfaceInfo.wrap(Lib.g_object_info_get_interface @gobj, index)
+      IInterfaceInfo.wrap Lib.g_object_info_get_interface(@gobj, index)
     end
 
     ##
@@ -38,7 +38,7 @@ module GObjectIntrospection
     end
 
     def field(index)
-      IFieldInfo.wrap(Lib.g_object_info_get_field @gobj, index)
+      IFieldInfo.wrap Lib.g_object_info_get_field(@gobj, index)
     end
 
     ##
@@ -49,26 +49,31 @@ module GObjectIntrospection
     end
 
     def property(index)
-      IPropertyInfo.wrap(Lib.g_object_info_get_property @gobj, index)
+      IPropertyInfo.wrap Lib.g_object_info_get_property(@gobj, index)
     end
 
-    ##
-    build_array_method :properties, :property
-    build_finder_method :find_property, :n_properties
+    def properties
+      @properties ||= Array.new(n_properties) { |idx| property(idx) }
+    end
+
+    def find_property(name)
+      name = name.to_s.tr('_', '-')
+      properties.find { |prop| prop.name == name }
+    end
 
     def get_n_methods
       Lib.g_object_info_get_n_methods @gobj
     end
 
     def get_method(index)
-      IFunctionInfo.wrap(Lib.g_object_info_get_method @gobj, index)
+      IFunctionInfo.wrap Lib.g_object_info_get_method(@gobj, index)
     end
 
     ##
     build_array_method :get_methods
 
     def find_method(name)
-      IFunctionInfo.wrap(Lib.g_object_info_find_method @gobj, name.to_s)
+      IFunctionInfo.wrap Lib.g_object_info_find_method(@gobj, name.to_s)
     end
 
     def n_signals
@@ -76,7 +81,7 @@ module GObjectIntrospection
     end
 
     def signal(index)
-      ISignalInfo.wrap(Lib.g_object_info_get_signal @gobj, index)
+      ISignalInfo.wrap Lib.g_object_info_get_signal(@gobj, index)
     end
 
     ##
@@ -88,11 +93,11 @@ module GObjectIntrospection
     end
 
     def vfunc(index)
-      IVFuncInfo.wrap(Lib.g_object_info_get_vfunc @gobj, index)
+      IVFuncInfo.wrap Lib.g_object_info_get_vfunc(@gobj, index)
     end
 
     def find_vfunc(name)
-      IVFuncInfo.wrap(Lib.g_object_info_find_vfunc @gobj, name.to_s)
+      IVFuncInfo.wrap Lib.g_object_info_find_vfunc(@gobj, name.to_s)
     end
     ##
     build_array_method :vfuncs
@@ -102,13 +107,13 @@ module GObjectIntrospection
     end
 
     def constant(index)
-      IConstantInfo.wrap(Lib.g_object_info_get_constant @gobj, index)
+      IConstantInfo.wrap Lib.g_object_info_get_constant(@gobj, index)
     end
     ##
     build_array_method :constants
 
     def class_struct
-      IStructInfo.wrap(Lib.g_object_info_get_class_struct @gobj)
+      IStructInfo.wrap Lib.g_object_info_get_class_struct(@gobj)
     end
   end
 end

data/lib/ffi-gobject_introspection/i_property_info.rb

@@ -3,7 +3,7 @@ module GObjectIntrospection
   # Represents a property of an IObjectInfo or an IInterfaceInfo.
   class IPropertyInfo < IBaseInfo
     def property_type
-      ITypeInfo.wrap(Lib.g_property_info_get_type @gobj)
+      ITypeInfo.wrap Lib.g_property_info_get_type(@gobj)
     end
 
     def flags

data/lib/ffi-gobject_introspection/i_repository.rb

@@ -51,7 +51,7 @@ module GObjectIntrospection
       arg:                      IArgInfo,
       type:                     ITypeInfo,
       unresolved:               IUnresolvedInfo
-    }
+    }.freeze
 
     def initialize
       @gobj = Lib.g_irepository_get_default

data/lib/ffi-gobject_introspection/i_struct_info.rb

@@ -7,7 +7,7 @@ module GObjectIntrospection
     end
 
     def field(index)
-      IFieldInfo.wrap(Lib.g_struct_info_get_field @gobj, index)
+      IFieldInfo.wrap Lib.g_struct_info_get_field(@gobj, index)
     end
 
     ##
@@ -19,7 +19,7 @@ module GObjectIntrospection
     end
 
     def get_method(index)
-      IFunctionInfo.wrap(Lib.g_struct_info_get_method @gobj, index)
+      IFunctionInfo.wrap Lib.g_struct_info_get_method(@gobj, index)
     end
 
     ##

data/lib/ffi-gobject_introspection/i_type_info.rb

@@ -11,7 +11,7 @@ module GObjectIntrospection
     end
 
     def param_type(index)
-      ITypeInfo.wrap(Lib.g_type_info_get_param_type @gobj, index)
+      ITypeInfo.wrap Lib.g_type_info_get_param_type(@gobj, index)
     end
 
     def interface

data/lib/ffi-gobject_introspection/i_union_info.rb

@@ -7,7 +7,7 @@ module GObjectIntrospection
     end
 
     def field(index)
-      IFieldInfo.wrap(Lib.g_union_info_get_field @gobj, index)
+      IFieldInfo.wrap Lib.g_union_info_get_field(@gobj, index)
     end
 
     ##
@@ -18,14 +18,14 @@ module GObjectIntrospection
     end
 
     def get_method(index)
-      IFunctionInfo.wrap(Lib.g_union_info_get_method @gobj, index)
+      IFunctionInfo.wrap Lib.g_union_info_get_method(@gobj, index)
     end
 
     ##
     build_array_method :get_methods
 
     def find_method(name)
-      IFunctionInfo.wrap(Lib.g_union_info_find_method @gobj, name.to_s)
+      IFunctionInfo.wrap Lib.g_union_info_find_method(@gobj, name.to_s)
     end
 
     def size

data/lib/ffi-gobject_introspection/i_vfunc_info.rb

@@ -15,11 +15,11 @@ module GObjectIntrospection
     end
 
     def signal
-      ISignalInfo.wrap(Lib.g_vfunc_info_get_signal @gobj)
+      ISignalInfo.wrap Lib.g_vfunc_info_get_signal(@gobj)
     end
 
     def invoker
-      IFunctionInfo.wrap(Lib.g_vfunc_info_get_invoker @gobj)
+      IFunctionInfo.wrap Lib.g_vfunc_info_get_invoker(@gobj)
     end
   end
 end

data/lib/gir_ffi/builders/argument_builder.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'gir_ffi/builders/base_argument_builder'
 require 'gir_ffi/builders/closure_to_pointer_convertor'
 require 'gir_ffi/builders/full_c_to_ruby_convertor'
@@ -147,7 +148,7 @@ module GirFFI
           @arginfo.caller_allocates?
       end
 
-      DESTROY_NOTIFIER = 'GLib::DestroyNotify.default'
+      DESTROY_NOTIFIER = 'GLib::DestroyNotify.default'.freeze
 
       def ingoing_convertor
         if skipped?

data/lib/gir_ffi/builders/base_argument_builder.rb

@@ -10,7 +10,7 @@ module GirFFI
         module next nil not or redo rescue retry
         return self super then true undef unless
         until when while yield
-      )
+      ).freeze
 
       attr_reader :arginfo
       attr_accessor :length_arg, :array_arg

data/lib/gir_ffi/builders/boxed_builder.rb

@@ -15,6 +15,12 @@ module GirFFI
         stub_methods
         setup_field_accessors
       end
+
+      def setup_field_accessors
+        fields.each do |finfo|
+          FieldBuilder.new(finfo).build
+        end
+      end
     end
   end
 end

data/lib/gir_ffi/builders/closure_to_pointer_convertor.rb

@@ -9,7 +9,13 @@ module GirFFI
       end
 
       def conversion
-        "GirFFI::InPointer.from_closure_data(#{@callback_argument.call_argument_name}.object_id)"
+        "GirFFI::InPointer.from_closure_data(#{callback_argument_name}.object_id)"
+      end
+
+      private
+
+      def callback_argument_name
+        @callback_argument.call_argument_name
       end
     end
   end