gir_ffi 0.13.0 → 0.13.1

data/lib/gir_ffi/builders/vfunc_builder.rb

@@ -16,7 +16,7 @@ module GirFFI
     class VFuncBuilder < BaseTypeBuilder
       def setup_class
         setup_constants
-        klass.class_eval mapping_method_definition
+        klass.class_eval mapping_method_definition, __FILE__, __LINE__
       end
 
       def klass

data/lib/gir_ffi/builders/with_layout.rb

@@ -21,7 +21,9 @@ module GirFFI
 
       def setup_layout
         spec = layout_specification
-        struct_class.class_eval { layout(*spec) }
+        struct_class.class_eval do
+          layout(*spec)
+        end
       end
 
       def dummy_layout_specification

data/lib/gir_ffi/callback_base.rb

@@ -17,6 +17,7 @@ module GirFFI
     # TODO: Return instance of this class
     def self.from_native(value, _context)
       return nil if !value || value.null?
+
       FFI::Function.new(gir_ffi_builder.return_ffi_type,
                         gir_ffi_builder.argument_ffi_types, value)
     end
@@ -80,8 +81,8 @@ module GirFFI
       to_native.to_ptr
     end
 
-    def self.copy_value_to_pointer(value, pointer)
-      pointer.put_pointer 0, to_native(value, nil)
+    def self.copy_value_to_pointer(value, pointer, offset = 0)
+      pointer.put_pointer offset, to_native(value, nil)
     end
 
     def self.get_value_from_pointer(pointer, offset)

data/lib/gir_ffi/class_base.rb

@@ -56,6 +56,10 @@ module GirFFI
       self::Struct
     end
 
+    def self.to_callback_ffi_type
+      :pointer
+    end
+
     # Wrap the passed pointer in an instance of the current class, or a
     # descendant type if applicable.
     def self.wrap(ptr)
@@ -66,6 +70,7 @@ module GirFFI
     # do any casting to subtypes or additional processing.
     def self.direct_wrap(ptr)
       return nil if !ptr || ptr.null?
+
       obj = allocate
       obj.__send__ :assign_pointer, ptr
       obj

data/lib/gir_ffi/enum_like_base.rb

@@ -11,19 +11,19 @@ module GirFFI
     include MethodSetup
 
     def wrap(arg)
-      self[arg]
+      from_native arg, nil
     end
 
-    def from(arg)
-      self[arg]
+    def to_int(arg)
+      to_native arg, nil
     end
 
     def size
       native_type.size
     end
 
-    def copy_value_to_pointer(value, pointer)
-      pointer.put_int32 0, to_native(value, nil)
+    def copy_value_to_pointer(value, pointer, offset = 0)
+      pointer.put_int32 offset, to_native(value, nil)
     end
 
     def get_value_from_pointer(pointer, offset)
@@ -41,5 +41,9 @@ module GirFFI
     def to_ffi_type
       self
     end
+
+    def to_callback_ffi_type
+      :int32
+    end
   end
 end

data/lib/gir_ffi/error_argument_info.rb

@@ -3,7 +3,7 @@
 require 'gir_ffi/error_type_info'
 
 module GirFFI
-  # Represents an error argument with the same interface as IArgumentInfo
+  # Represents an error argument with the same interface as IArgInfo
   class ErrorArgumentInfo
     def direction
       :error

data/lib/gir_ffi/ffi_ext/pointer.rb

@@ -8,13 +8,10 @@ module GirFFI
         self
       end
 
-      def zero?
-        null?
-      end
-
       # FIXME: Should probably not be here.
       def to_object
         return nil if null?
+
         gtype = GObject.type_from_instance_pointer self
         Builder.build_by_gtype(gtype).direct_wrap self
       end

data/lib/gir_ffi/field_argument_info.rb

@@ -2,7 +2,7 @@
 
 module GirFFI
   # Class to represent argument info for the argument of a setter method.
-  # Implements the necessary parts of IArgumentInfo's interface.
+  # Implements the necessary parts of IArgInfo's interface.
   # TODO: Rename and add direction argument or subclass
   class FieldArgumentInfo
     attr_reader :name, :argument_type

data/lib/gir_ffi/in_pointer.rb

@@ -7,24 +7,16 @@ module GirFFI
   module InPointer
     def self.from_array(type, ary)
       return unless ary
+
       case type
-      when :utf8, :filename
-        from_utf8_array ary
-      when :gboolean
-        from_boolean_array ary
       when Symbol
-        from_basic_type_array type, ary
-      when Class
-        if type == GObject::Value
-          from_gvalue_array type, ary
-        else
-          from_struct_array type, ary
-        end
+        from_simple_type_array type, ary
       when Module
-        from_enum_array type, ary
+        from_module_type_array type, ary
       when Array
         main_type, sub_type = *type
         raise "Unexpected main type #{main_type}" if main_type != :pointer
+
         from_pointer_array sub_type, ary
       else
         raise NotImplementedError, type
@@ -33,6 +25,7 @@ module GirFFI
 
     def self.from(type, val)
       return unless val
+
       case type
       when :utf8, :filename
         from_utf8 val
@@ -47,9 +40,40 @@ module GirFFI
       end
     end
 
+    def self.from_utf8(str)
+      return unless str
+
+      ptr = FFI::MemoryPointer.from_string(str)
+      ptr.autorelease = false
+      ptr
+    end
+
     class << self
       private
 
+      def from_simple_type_array(type, ary)
+        case type
+        when :utf8, :filename
+          from_utf8_array ary
+        when :gboolean
+          from_boolean_array ary
+        else
+          from_basic_type_array type, ary
+        end
+      end
+
+      def from_module_type_array(type, ary)
+        if type == GObject::Value
+          from_gvalue_array type, ary
+        elsif type < GirFFI::ClassBase
+          from_struct_array type, ary
+        elsif type.singleton_class.include? GirFFI::EnumBase
+          from_enum_array type, ary
+        else
+          raise NotImplementedError, type
+        end
+      end
+
       def from_utf8_array(ary)
         from_basic_type_array :pointer, ary.map { |str| from_utf8 str }
       end
@@ -90,17 +114,6 @@ module GirFFI
         from_basic_type_array :int32, ary.map { |sym| type.to_native sym, nil }
       end
 
-      public
-
-      def from_utf8(str)
-        return unless str
-        ptr = FFI::MemoryPointer.from_string(str)
-        ptr.autorelease = false
-        ptr
-      end
-
-      private
-
       def from_basic_type_array(type, ary)
         ffi_type = TypeMap.type_specification_to_ffi_type type
         type_size = FFI.type_size(ffi_type)

data/lib/gir_ffi/info_ext/i_arg_info.rb

@@ -6,11 +6,13 @@ module GirFFI
     module IArgInfo
       def to_ffi_type
         return :pointer if direction != :in
+
         argument_type.to_ffi_type
       end
 
       def to_callback_ffi_type
         return :pointer if direction != :in
+
         argument_type.to_callback_ffi_type
       end
     end

data/lib/gir_ffi/info_ext/i_callback_info.rb

@@ -8,6 +8,10 @@ module GirFFI
         Builder.build_class(self)
       end
 
+      def to_callback_ffi_type
+        :pointer
+      end
+
       def argument_ffi_types
         args.map(&:to_callback_ffi_type)
       end

data/lib/gir_ffi/info_ext/i_registered_type_info.rb

@@ -10,6 +10,10 @@ module GirFFI
         to_type.to_ffi_type
       end
 
+      def to_callback_ffi_type
+        to_type.to_callback_ffi_type
+      end
+
       def to_type
         Builder.build_class self
       end

data/lib/gir_ffi/info_ext/i_type_info.rb

@@ -6,26 +6,8 @@ module GirFFI
   module InfoExt
     # Extensions for GObjectIntrospection::ITypeInfo needed by GirFFI
     module ITypeInfo
-      def self.flattened_tag_to_gtype_map
-        @flattened_tag_to_gtype_map ||= {
-          [:array, true]     => GObject::TYPE_ARRAY,
-          [:c, true]         => GObject::TYPE_POINTER,
-          [:gboolean, false] => GObject::TYPE_BOOLEAN,
-          [:ghash, true]     => GObject::TYPE_HASH_TABLE,
-          [:glist, true]     => GObject::TYPE_POINTER,
-          [:gint32, false]   => GObject::TYPE_INT,
-          [:gint64, false]   => GObject::TYPE_INT64,
-          [:guint64, false]  => GObject::TYPE_UINT64,
-          [:strv, true]      => GObject::TYPE_STRV,
-          [:utf8, true]      => GObject::TYPE_STRING,
-          [:void, true]      => GObject::TYPE_POINTER,
-          [:void, false]     => GObject::TYPE_NONE
-        }.freeze
-      end
-
       def gtype
-        return interface.gtype if tag == :interface
-        ITypeInfo.flattened_tag_to_gtype_map.fetch [flattened_tag, pointer?]
+        TypeMap.type_info_to_gtype self
       end
 
       def make_g_value
@@ -57,7 +39,7 @@ module GirFFI
       end
 
       def hidden_struct_type?
-        flattened_tag == :struct && interface.size.zero?
+        flattened_tag == :struct && interface.empty?
       end
 
       def tag_or_class
@@ -123,13 +105,7 @@ module GirFFI
 
         case tag
         when :interface
-          # TODO: Move this logic into interface
-          case interface.info_type
-          when :enum, :flags
-            :int32
-          else
-            :pointer
-          end
+          interface.to_callback_ffi_type
         when :gboolean
           # TODO: Move this logic into TypeMap
           :bool

data/lib/gir_ffi/info_ext/safe_function_name.rb

@@ -7,6 +7,7 @@ module GirFFI
       def safe_name
         name = self.name
         return '_' if name.empty?
+
         name
       end
     end

data/lib/gir_ffi/interface_base.rb

@@ -14,6 +14,7 @@ module GirFFI
     def setup_and_call(method, arguments, &block)
       method_name = setup_method method.to_s
       raise NoMethodError, "undefined method `#{method}' for #{self}" unless method_name
+
       send method_name, *arguments, &block
     end
 
@@ -24,5 +25,9 @@ module GirFFI
     def to_ffi_type
       :pointer
     end
+
+    def to_callback_ffi_type
+      :pointer
+    end
   end
 end

data/lib/gir_ffi/module_base.rb

@@ -10,6 +10,7 @@ module GirFFI
     def method_missing(method, *arguments, &block)
       result = setup_method method.to_s
       return super unless result
+
       send method, *arguments, &block
     end
 

data/lib/gir_ffi/object_base.rb

@@ -72,5 +72,15 @@ module GirFFI
           gir_ffi_builder.object_class_struct.wrap ptr
         end
     end
+
+    def self.included_interfaces
+      included_modules.select { |it| it.singleton_class.include? InterfaceBase }
+    end
+
+    def self.registered_ancestors
+      ancestors.select do |it|
+        it < GirFFI::ObjectBase || it.singleton_class.include?(InterfaceBase)
+      end
+    end
   end
 end

data/lib/gir_ffi/object_store.rb

@@ -10,6 +10,7 @@ module GirFFI
 
     def store(obj)
       return FFI::Pointer::NULL if obj.nil?
+
       # FIXME: Don't use object_id!
       key = obj.object_id
       @store[key] = obj
@@ -18,6 +19,7 @@ module GirFFI
 
     def fetch(ptr)
       return if ptr.null?
+
       key = ptr.address
       if @store.key? key
         @store[key]

data/lib/gir_ffi/receiver_argument_info.rb

@@ -2,7 +2,7 @@
 
 module GirFFI
   # Class to represent the info for the receiver argument of a callback or
-  # signal handler. Implements the necessary parts of IArgumentInfo's
+  # signal handler. Implements the necessary parts of IArgInfo's
   # interface.
   class ReceiverArgumentInfo
     attr_reader :argument_type

data/lib/gir_ffi/return_value_info.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module GirFFI
-  # Represents a return value with the same interface as IArgumentInfo
+  # Represents a return value with the same interface as IArgInfo
   class ReturnValueInfo
     attr_reader :argument_type
     attr_reader :ownership_transfer

data/lib/gir_ffi/sized_array.rb

@@ -39,9 +39,9 @@ module GirFFI
       pointer + offset
     end
 
-    def self.copy_value_to_pointer(value, pointer)
+    def self.copy_value_to_pointer(value, pointer, offset = 0)
       size = value.size_in_bytes
-      pointer.put_bytes(0, value.to_ptr.read_bytes(size))
+      pointer.put_bytes(offset, value.to_ptr.read_bytes(size))
     end
 
     def self.wrap(element_type, size, pointer)
@@ -72,24 +72,17 @@ module GirFFI
         end
       end
 
-      def copy_from(element_type, size, item)
-        return unless item
+      def copy_from(element_type, size, enumerable)
+        return unless enumerable
 
-        enumerable = case item
-                     when FFI::Pointer
-                       wrap(element_type, size, item).to_a
-                     when self
-                       item.to_a
-                     else
-                       item
-                     end
+        arr = enumerable.to_a
         case element_type
         when Array
           _main_type, sub_type = *element_type
-          enumerable = enumerable.map { |it| sub_type.copy_from it }
+          arr = arr.map { |it| sub_type.copy_from it }
         end
 
-        from_enumerable element_type, size, enumerable
+        from_enumerable element_type, size, arr
       end
 
       private