gir_ffi 0.7.5 → 0.7.6

data/lib/gir_ffi/builders/registered_type_builder.rb

@@ -61,17 +61,13 @@ module GirFFI
         }
       end
 
-      def parent
+      def parent_info
         nil
       end
 
       def fields
         info.fields
       end
-
-      def superclass
-        ClassBase
-      end
     end
   end
 end

data/lib/gir_ffi/builders/return_value_builder.rb

@@ -7,17 +7,17 @@ module GirFFI
   module Builders
     # Implements building post-processing statements for return values.
     class ReturnValueBuilder < BaseArgumentBuilder
-      def initialize var_gen, arginfo, is_constructor = false
+      def initialize var_gen, arginfo, constructor_result = false
         super var_gen, arginfo
-        @is_constructor = is_constructor
+        @constructor_result = constructor_result
       end
 
-      def is_relevant?
-        !is_void_return_value? && !arginfo.skip?
+      def relevant?
+        !void_return_value? && !arginfo.skip?
       end
 
       def capture_variable_name
-        @capture_variable_name ||= new_variable
+        @capture_variable_name ||= new_variable if relevant?
       end
 
       def post_converted_name
@@ -29,32 +29,33 @@ module GirFFI
       end
 
       def return_value_name
-        if is_relevant?
-          post_converted_name unless array_arg
-        end
+        post_converted_name if has_return_value_name?
       end
 
       def post_conversion
+        # TODO: Avoid conditional by using NullConvertor
         if has_post_conversion?
-          [ "#{post_converted_name} = #{post_convertor.conversion}" ]
+          ["#{post_converted_name} = #{post_convertor.conversion}"]
         else
           []
         end
       end
 
-      attr_reader :is_constructor
-
       private
 
+      def constructor_result?
+        @constructor_result
+      end
+
       def has_post_conversion?
-        is_closure || is_constructor ||
+        closure? || constructor_result? ||
           type_info.needs_c_to_ruby_conversion_for_functions?
       end
 
       def post_convertor
-        @post_convertor ||= if is_closure
+        @post_convertor ||= if closure?
                               ClosureConvertor.new(capture_variable_name)
-                            elsif is_constructor
+                            elsif constructor_result?
                               ConstructorResultConvertor.new(capture_variable_name)
                             else
                               CToRubyConvertor.new(type_info,
@@ -67,9 +68,13 @@ module GirFFI
         length_arg && length_arg.post_converted_name
       end
 
-      def is_void_return_value?
+      def void_return_value?
         specialized_type_tag == :void && !type_info.pointer?
       end
+
+      def has_return_value_name?
+        relevant? && !array_arg
+      end
     end
   end
 end

data/lib/gir_ffi/builders/signal_closure_builder.rb

@@ -6,12 +6,9 @@ module GirFFI
     # Implements the creation of a closure class for handling a particular
     # signal. The type will be attached to the appropriate class.
     class SignalClosureBuilder < BaseTypeBuilder
-      def instantiate_class
-        unless already_set_up
-          setup_constants
-          klass.class_eval marshaller_definition
-        end
-        klass
+      def setup_class
+        setup_constants
+        klass.class_eval marshaller_definition
       end
 
       def setup_method _method

data/lib/gir_ffi/builders/type_builder.rb

@@ -29,7 +29,7 @@ module GirFFI
       }
 
       def self.build info
-        TYPE_MAP[info.info_type].new(info).build_class
+        builder_for(info).build_class
       end
 
       # TODO: Pull up to include :function and :module

data/lib/gir_ffi/builders/unintrospectable_builder.rb

@@ -6,10 +6,6 @@ module GirFFI
     # which no data is found in the GIR. Typically, these are created to
     # cast objects returned by a function that returns an interface.
     class UnintrospectableBuilder < ObjectBuilder
-      def instantiate_class
-        setup_class unless already_set_up
-      end
-
       def klass
         @klass ||= TypeBuilder::CACHE[target_gtype] ||= Class.new(superclass)
       end
@@ -26,7 +22,7 @@ module GirFFI
 
       private
 
-      def signal_definers
+      def ancestor_infos
         info.interfaces
       end
     end

data/lib/gir_ffi/builders/user_defined_builder.rb

@@ -9,37 +9,33 @@ module GirFFI
         @info = info
       end
 
-      def instantiate_class
-        if already_set_up
-          @gtype = klass.get_gtype
-        else
-          @gtype = GObject.type_register_static(parent_gtype.to_i,
-                                                info.g_name,
-                                                gobject_type_info, 0)
-          included_interfaces.each do |interface|
-            ifinfo = gobject_interface_info interface
-            GObject.type_add_interface_static @gtype, interface.get_gtype, ifinfo
-          end
-          setup_class
-          TypeBuilder::CACHE[@gtype] = klass
-        end
-      end
-
       def setup_class
+        register_type
         setup_layout
         setup_constants
         setup_property_accessors
         setup_constructor
+        TypeBuilder::CACHE[@gtype] = klass
       end
 
       def target_gtype
-        @gtype
+        @gtype ||= klass.get_gtype
       end
 
       private
 
-      def parent
-        @parent ||= gir.find_by_gtype(parent_gtype.to_i)
+      def register_type
+        @gtype = GObject.type_register_static(parent_gtype.to_i,
+                                              info.g_name,
+                                              gobject_type_info, 0)
+        included_interfaces.each do |interface|
+          ifinfo = gobject_interface_info interface
+          GObject.type_add_interface_static @gtype, interface.get_gtype, ifinfo
+        end
+      end
+
+      def parent_info
+        @parent_info ||= gir.find_by_gtype(parent_gtype.to_i)
       end
 
       def parent_gtype
@@ -47,7 +43,7 @@ module GirFFI
       end
 
       def interface_gtypes
-        included_interfaces.map {|interface| GType.new(interface.get_gtype) }
+        included_interfaces.map { |interface| GType.new(interface.get_gtype) }
       end
 
       def included_interfaces
@@ -141,7 +137,7 @@ module GirFFI
 
       def setup_vfunc super_class_struct, impl
         vfunc_name = impl.name
-        vfunc_info = parent.find_vfunc vfunc_name.to_s
+        vfunc_info = parent_info.find_vfunc vfunc_name.to_s
 
         if vfunc_info
           install_vfunc super_class_struct, vfunc_name, vfunc_info, impl.implementation

data/lib/gir_ffi/builders/vfunc_builder.rb

@@ -12,12 +12,9 @@ module GirFFI
     # can serve as such an implementation in C. The class will be namespaced
     # inside class defining the vfunc.
     class VFuncBuilder < BaseTypeBuilder
-      def instantiate_class
-        unless already_set_up
-          setup_constants
-          klass.class_eval mapping_method_definition
-        end
-        klass
+      def setup_class
+        setup_constants
+        klass.class_eval mapping_method_definition
       end
 
       def klass

data/lib/gir_ffi/builders/with_layout.rb

@@ -23,8 +23,8 @@ module GirFFI
       end
 
       def dummy_layout_specification
-        if parent
-          [:parent, superclass.const_get(:Struct), 0]
+        if parent_info
+          [:parent, superclass::Struct, 0]
         else
           [:dummy, :char, 0]
         end
@@ -40,10 +40,6 @@ module GirFFI
         end
       end
 
-      def instantiate_class
-        setup_class unless already_set_up
-      end
-
       def klass
         @klass ||= get_or_define_class namespace_module, @classname, superclass
       end

data/lib/gir_ffi/callback_base.rb

@@ -19,9 +19,14 @@ module GirFFI
     end
 
     def self.to_native value, _context
-      return nil unless value
-      return value if FFI::Function === value
-      value.to_native
+      case value
+      when CallbackBase
+        value.to_native
+      when FFI::Function
+        value
+      else
+        nil
+      end
     end
 
     def self.wrap ptr
@@ -43,8 +48,8 @@ module GirFFI
     end
 
     def self.wrap_in_callback_args_mapper prc
-      return nil unless prc
-      return prc if FFI::Function === prc
+      return unless prc
+
       new do |*args|
         call_with_argument_mapping(prc, *args)
       end

data/lib/gir_ffi/class_base.rb

@@ -1,5 +1,4 @@
 require 'forwardable'
-require 'gir_ffi/builders/null_builder'
 require 'gir_ffi/registered_type_base'
 
 module GirFFI
@@ -12,13 +11,11 @@ module GirFFI
     attr_reader :struct
     def_delegators :@struct, :to_ptr
 
-    GIR_FFI_BUILDER = NullBuilder.new
-
     def setup_and_call method, *arguments, &block
       method_name = self.class.try_in_ancestors(:setup_instance_method, method.to_s)
 
       unless method_name
-        raise RuntimeError, "Unable to set up instance method '#{method}' in #{self}"
+        raise "Unable to set up instance method '#{method}' in #{self}"
       end
 
       send method_name, *arguments, &block
@@ -34,7 +31,7 @@ module GirFFI
       method_name = try_in_ancestors(:setup_method, method.to_s)
 
       unless method_name
-        raise RuntimeError, "Unable to set up method '#{method}' in #{self}"
+        raise "Unable to set up method '#{method}' in #{self}"
       end
 
       send method_name, *arguments, &block
@@ -74,9 +71,9 @@ module GirFFI
       # Wrap the passed pointer in an instance of the current class. Will not
       # do any casting to subtypes.
       def direct_wrap ptr
-        return nil if !ptr or ptr.null?
+        return nil if !ptr || ptr.null?
         obj = _real_new
-        obj.instance_variable_set :@struct, self::Struct.new(ptr.to_ptr)
+        obj.instance_variable_set :@struct, self::Struct.new(ptr)
         obj
       end
 

data/lib/gir_ffi/enum_base.rb

@@ -42,7 +42,7 @@ module GirFFI
       result = setup_method method.to_s
 
       unless result
-        raise RuntimeError, "Unable to set up method #{method} in #{self}"
+        raise "Unable to set up method #{method} in #{self}"
       end
 
       send method, *arguments, &block

data/lib/gir_ffi/g_type.rb

@@ -1,25 +1,27 @@
-# Wrapper class providing extended functionality for a GType, which is normally
-# just a kind of integer
-class GirFFI::GType
-  def initialize gtype
-    @gtype = gtype
-  end
+module GirFFI
+  # Wrapper class providing extended functionality for a GType, which is
+  # normally just a kind of integer
+  class GType
+    def initialize gtype
+      @gtype = gtype
+    end
 
-  def to_i
-    @gtype
-  end
-  
-  def class_size
-    type_query.class_size
-  end
+    def to_i
+      @gtype
+    end
 
-  def instance_size
-    type_query.instance_size
-  end
+    def class_size
+      type_query.class_size
+    end
+
+    def instance_size
+      type_query.instance_size
+    end
 
-  private
+    private
 
-  def type_query
-    @type_query ||= GObject.type_query @gtype
+    def type_query
+      @type_query ||= GObject.type_query @gtype
+    end
   end
 end

data/lib/gir_ffi/in_out_pointer.rb

@@ -13,8 +13,6 @@ module GirFFI
       super ptr
     end
 
-    private :initialize
-
     # TODO: Create type classes that extract values from pointers.
     def to_value
       case value_ffi_type
@@ -58,11 +56,11 @@ module GirFFI
     end
 
     def self.for type
-      new(type).tap {|ptr| ptr.clear}
+      new(type).tap { |ptr| ptr.clear }
     end
 
     def self.from type, value
-      new(type).tap {|ptr| ptr.set_value value}
+      new(type).tap { |ptr| ptr.set_value value }
     end
 
     private

data/lib/gir_ffi/in_pointer.rb

@@ -4,7 +4,7 @@ module GirFFI
   # arrays, strings, or interfaces.
   class InPointer < FFI::Pointer
     def self.from_array type, ary
-      return if !ary
+      return unless ary
       case type
       when :utf8, :filename
         from_utf8_array ary
@@ -30,7 +30,7 @@ module GirFFI
     end
 
     def self.from type, val
-      return if !val
+      return unless val
       case type
       when :utf8, :filename
         from_utf8 val
@@ -47,22 +47,23 @@ module GirFFI
 
     class << self
       def from_closure_data obj
-        FFI::Pointer.new(obj.object_id).tap {|ptr|
-          ArgHelper::OBJECT_STORE.store(ptr, obj) }
+        FFI::Pointer.new(obj.object_id).tap do |ptr|
+          ArgHelper::OBJECT_STORE.store(ptr, obj)
+        end
       end
 
       private
 
       def from_utf8_array ary
-        from_basic_type_array :pointer, ary.map {|str| from_utf8 str}
+        from_basic_type_array :pointer, ary.map { |str| from_utf8 str }
       end
 
       def from_boolean_array ary
-        from_basic_type_array :int, ary.map {|val| val ? 1 : 0}
+        from_basic_type_array :int, ary.map { |val| val ? 1 : 0 }
       end
 
       def from_pointer_array type, ary
-        from_basic_type_array :pointer, ary.map {|elem| from type, elem }
+        from_basic_type_array :pointer, ary.map { |elem| from type, elem }
       end
 
       def from_gvalue_array type, ary
@@ -90,7 +91,7 @@ module GirFFI
       end
 
       def from_enum_array type, ary
-        from_basic_type_array :int32, ary.map {|sym| type.to_native sym, nil }
+        from_basic_type_array :int32, ary.map { |sym| type.to_native sym, nil }
       end
 
       def from_utf8 str

data/lib/gir_ffi/info_ext/i_field_info.rb

@@ -3,9 +3,7 @@ module GirFFI
     # Extensions for GObjectIntrospection::IFieldInfo needed by GirFFI
     module IFieldInfo
       def layout_specification
-        [ name.to_sym,
-          field_type.to_ffitype,
-          offset ]
+        [name.to_sym, field_type.to_ffitype, offset]
       end
     end
   end

data/lib/gir_ffi/info_ext/i_signal_info.rb

@@ -14,13 +14,13 @@ module GirFFI
         bldr.build_class.new(&block)
       end
 
-      # TODO: Use argument info to convert out arguments and array lengths.
       def arguments_to_gvalues instance, arguments
-        arg_values = args.zip(arguments).map do |info, arg|
-          info.argument_type.make_g_value.set_value(arg)
+        arg_g_values = args.map { |info| info.argument_type.make_g_value }
+        arg_g_values.zip(arguments).each do |g_value, arg|
+          g_value.set_value arg
         end
 
-        arg_values.unshift GObject::Value.wrap_instance(instance)
+        arg_g_values.unshift GObject::Value.wrap_instance(instance)
       end
 
       def gvalue_for_return_value

data/lib/gir_ffi/info_ext/i_type_info.rb

@@ -4,7 +4,6 @@ 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:    GObject::TYPE_ARRAY,
@@ -22,10 +21,11 @@ module GirFFI
 
       def g_type
         if tag == :interface
-          interface.g_type
+          return interface.g_type
+        elsif (type = ITypeInfo.flattened_tag_to_gtype_map[flattened_tag])
+          return type
         else
-          ITypeInfo.flattened_tag_to_gtype_map[flattened_tag] or
-            raise "Can't find type for #{flattened_tag} pointer? = #{pointer?}"
+          raise "Can't find GType for #{flattened_tag} pointer? = #{pointer?}"
         end
       end
 
@@ -36,7 +36,7 @@ module GirFFI
       def element_type
         case tag
         when :glist, :gslist, :array, :c
-          enumerable_element_type 
+          enumerable_element_type
         when :ghash
           dictionary_element_type
         else
@@ -197,7 +197,7 @@ module GirFFI
         subtype = param_type(index).to_ffitype
         if subtype == :pointer
           # NOTE: Don't use pointer directly to appease JRuby.
-          :"uint#{FFI.type_size(:pointer)*8}"
+          :"uint#{FFI.type_size(:pointer) * 8}"
         else
           subtype
         end

data/lib/gir_ffi/module_base.rb

@@ -11,14 +11,15 @@ module GirFFI
       load_class(classname) || super
     end
 
+    # @deprecated The load_class method should always be used. Remove in 0.8.0
     def setup_class classname
       gir_ffi_builder.build_namespaced_class classname.to_s
     end
 
-    alias load_class setup_class
+    alias_method :load_class, :setup_class
 
     def gir_ffi_builder
-      const_get :GIR_FFI_BUILDER
+      self::GIR_FFI_BUILDER
     end
 
     def setup_method name

data/lib/gir_ffi/object_base.rb

@@ -33,7 +33,7 @@ module GirFFI
       :pointer
     end
 
-    def self.copy_value_to_pointer value, pointer, offset=0
+    def self.copy_value_to_pointer value, pointer, offset = 0
       pointer.put_pointer offset, value.to_ptr
     end
 

data/lib/gir_ffi/struct_base.rb

@@ -21,7 +21,7 @@ module GirFFI
       pointer.to_ptr
     end
 
-    def self.copy_value_to_pointer value, pointer, offset=0
+    def self.copy_value_to_pointer value, pointer, offset = 0
       size = self::Struct.size
       pointer.put_bytes offset, value.to_ptr.read_bytes(size), 0, size
     end

data/lib/gir_ffi/type_base.rb

@@ -2,11 +2,11 @@ module GirFFI
   # Base module for all generated GLib types.
   module TypeBase
     def gir_ffi_builder
-      const_get :GIR_FFI_BUILDER
+      self::GIR_FFI_BUILDER
     end
 
     def gir_info
-      const_get :GIR_INFO
+      self::GIR_INFO
     end
   end
 end

data/lib/gir_ffi/unintrospectable_type_info.rb

@@ -1,3 +1,5 @@
+require 'gir_ffi/info_ext/full_type_name'
+
 module GirFFI
   # Represents a type not found in the GIR, conforming, as needed, to the
   # interface of GObjectIntrospection::IObjectInfo.

data/lib/gir_ffi/version.rb

@@ -1,4 +1,4 @@
 # Current GirFFI version
 module GirFFI
-  VERSION = "0.7.5"
+  VERSION = "0.7.6"
 end

data/lib/gir_ffi/zero_terminated.rb

@@ -25,7 +25,7 @@ module GirFFI
     def each
       return if @ptr.null?
       offset = 0
-      while val = read_value(offset)
+      while (val = read_value(offset))
         offset += ffi_type_size
         yield wrap_value(val)
       end

data/lib/gir_ffi-base/glib/strv.rb

@@ -17,7 +17,8 @@ module GLib
     end
 
     def each
-      reset_iterator or return
+      return if @ptr.null?
+      reset_iterator
       while (ptr = next_ptr)
         yield ptr.read_string
       end
@@ -30,7 +31,6 @@ module GLib
     private
 
     def reset_iterator
-      return if @ptr.null?
       @offset = 0
     end
 

data/lib/gir_ffi.rb

@@ -20,7 +20,7 @@ require 'gir_ffi/version'
 # Main module containing classes and modules needed for generating GLib and
 # GObject bindings.
 module GirFFI
-  def self.setup module_name, version=nil
+  def self.setup module_name, version = nil
     module_name = module_name.to_s
     GirFFI::Builder.build_module module_name, version
   end

data/test/ffi-glib/array_test.rb

@@ -153,4 +153,32 @@ describe GLib::Array do
       proc { arr.index(-1) }.must_raise IndexError
     end
   end
+
+  describe "#reset_typespec" do
+    describe "when it needs to guess the type" do
+      it "guesses :uint8 for size 1" do
+        arr = GLib::Array.from :int8, [1, 2, 3]
+        arr.reset_typespec
+        arr.element_type.must_equal :uint8
+      end
+
+      it "guesses :uint16 for size 2" do
+        arr = GLib::Array.from :int16, [1, 2, 3]
+        arr.reset_typespec
+        arr.element_type.must_equal :uint16
+      end
+
+      it "guesses :uint32 for size 4" do
+        arr = GLib::Array.from :int32, [1, 2, 3]
+        arr.reset_typespec
+        arr.element_type.must_equal :uint32
+      end
+
+      it "guesses :uint64 for size 8" do
+        arr = GLib::Array.from :int64, [1, 2, 3]
+        arr.reset_typespec
+        arr.element_type.must_equal :uint64
+      end
+    end
+  end
 end