gir_ffi 0.6.3 → 0.6.4

data/lib/gir_ffi/in_out_pointer.rb

@@ -40,9 +40,6 @@ module GirFFI
       case @value_type
       when :gboolean
         (value ? 1 : 0)
-      # TODO: Remove all references to :utf8 from this class
-      when :utf8
-        InPointer.from :utf8, value
       else
         value || nil_value
       end
@@ -60,7 +57,5 @@ module GirFFI
         value
       end
     end
-
   end
 end
-

data/lib/gir_ffi/in_pointer.rb

@@ -10,8 +10,10 @@ module GirFFI
         from_utf8_array ary
       when Symbol
         from_basic_type_array type, ary
-      when FFI::Enum
-        from_enum_array type, ary
+      when Module
+        from_enum_array type::Enum, ary
+      when Array
+        from_interface_pointer_array ary
       else
         raise NotImplementedError, type
       end
@@ -22,14 +24,14 @@ module GirFFI
       case type
       when :utf8, :filename
         from_utf8 val
-      when :gint32, :gint8
+      when :gint32, :guint32, :gint8
         self.new val
-      when FFI::Enum
+      when Module
         self.new type[val]
       when :void
         ArgHelper.object_to_inptr val
       else
-        raise NotImplementedError
+        raise NotImplementedError, type
       end
     end
 

data/lib/gir_ffi/info_ext/i_callable_info.rb

@@ -9,6 +9,10 @@ module GirFFI
       def return_ffi_type
         return_type.to_ffitype
       end
+
+      def to_ffitype
+        Builder.build_class self
+      end
     end
   end
 end

data/lib/gir_ffi/info_ext/i_enum_info.rb

@@ -0,0 +1,13 @@
+module GirFFI
+  module InfoExt
+    module IEnumInfo
+      def to_ffitype
+        # TODO: It would make more sense if it were called Enum
+        to_type::Enum
+      end
+    end
+  end
+end
+
+GObjectIntrospection::IEnumInfo.send :include, GirFFI::InfoExt::IEnumInfo
+

data/lib/gir_ffi/info_ext/i_field_info.rb

@@ -4,7 +4,7 @@ module GirFFI
     module IFieldInfo
       def layout_specification
         [ name.to_sym,
-          field_type.layout_specification_type,
+          field_type.to_ffitype,
           offset ]
       end
     end

data/lib/gir_ffi/info_ext/i_object_info.rb

@@ -0,0 +1,11 @@
+module GirFFI
+  module InfoExt
+    module IObjectInfo
+      def to_ffitype
+        to_type::Struct
+      end
+    end
+  end
+end
+
+GObjectIntrospection::IObjectInfo.send :include, GirFFI::InfoExt::IObjectInfo

data/lib/gir_ffi/info_ext/i_registered_type_info.rb

@@ -1,11 +1,22 @@
 require 'gir_ffi/builder_helper'
+require 'gir_ffi/info_ext/safe_constant_name'
 
 module GirFFI
   module InfoExt
     module IRegisteredTypeInfo
+      include SafeConstantName
+
       def full_type_name
         "::#{safe_namespace}::#{name}"
       end
+
+      def to_ffitype
+        to_type
+      end
+
+      def to_type
+        Builder.build_class self
+      end
     end
   end
 end

data/lib/gir_ffi/info_ext/i_struct_info.rb

@@ -0,0 +1,11 @@
+module GirFFI
+  module InfoExt
+    module IStructInfo
+      def to_ffitype
+        to_type::Struct
+      end
+    end
+  end
+end
+
+GObjectIntrospection::IStructInfo.send :include, GirFFI::InfoExt::IStructInfo

data/lib/gir_ffi/info_ext/i_type_info.rb

@@ -20,23 +20,6 @@ module GirFFI
         GObject::Value.for_g_type g_type
       end
 
-      def layout_specification_type
-        ffitype = self.to_ffitype
-        case ffitype
-        when Class
-          ffitype.const_get :Struct
-        when :array
-          subtype = param_type(0).layout_specification_type
-          # XXX Don't use pointer directly to appease JRuby.
-          if subtype == :pointer
-            subtype = :"uint#{FFI.type_size(:pointer)*8}"
-          end
-          [subtype, array_fixed_size]
-        else
-          ffitype
-        end
-      end
-
       def element_type
         case tag
         when :glist, :gslist, :array
@@ -117,8 +100,16 @@ module GirFFI
         return :pointer if pointer?
 
         type_tag = tag
-        if type_tag == :interface
-          Builder.build_class interface
+        case type_tag
+        when :interface
+          interface.to_ffitype
+        when :array
+          subtype = param_type(0).to_ffitype
+          # NOTE: Don't use pointer directly to appease JRuby.
+          if subtype == :pointer
+            subtype = :"uint#{FFI.type_size(:pointer)*8}"
+          end
+          [subtype, array_fixed_size]
         else
           TypeMap.map_basic_type type_tag
         end

data/lib/gir_ffi/info_ext/i_union_info.rb

@@ -0,0 +1,12 @@
+module GirFFI
+  module InfoExt
+    module IUnionInfo
+      def to_ffitype
+        # TODO: It would make more sense if it were called Union
+        to_type::Struct
+      end
+    end
+  end
+end
+
+GObjectIntrospection::IUnionInfo.send :include, GirFFI::InfoExt::IUnionInfo

data/lib/gir_ffi/info_ext/safe_constant_name.rb

@@ -16,7 +16,5 @@ module GirFFI
   end
 end
 
-GObjectIntrospection::IRegisteredTypeInfo.send :include, GirFFI::InfoExt::SafeConstantName
 GObjectIntrospection::ICallbackInfo.send :include, GirFFI::InfoExt::SafeConstantName
 GObjectIntrospection::IConstantInfo.send :include, GirFFI::InfoExt::SafeConstantName
-

data/lib/gir_ffi/info_ext.rb

@@ -1,10 +1,14 @@
 require 'gir_ffi/info_ext/i_arg_info'
 require 'gir_ffi/info_ext/i_callable_info'
+require 'gir_ffi/info_ext/i_enum_info'
 require 'gir_ffi/info_ext/i_field_info'
 require 'gir_ffi/info_ext/i_function_info'
+require 'gir_ffi/info_ext/i_object_info'
 require 'gir_ffi/info_ext/i_property_info'
 require 'gir_ffi/info_ext/i_registered_type_info'
 require 'gir_ffi/info_ext/i_signal_info'
+require 'gir_ffi/info_ext/i_struct_info'
 require 'gir_ffi/info_ext/i_type_info'
+require 'gir_ffi/info_ext/i_union_info'
 require 'gir_ffi/info_ext/safe_constant_name'
 require 'gir_ffi/info_ext/safe_function_name'

data/lib/gir_ffi/interface_base.rb

@@ -13,4 +13,3 @@ module GirFFI
     end
   end
 end
-

data/lib/gir_ffi/return_value_builder.rb

@@ -63,9 +63,10 @@ module GirFFI
       needs_wrapping? || [ :utf8, :c ].include?(specialized_type_tag)
     end
 
+    # TODO: Merge with ArgumentBuilder#needs_outgoing_parameter_conversion?
     def needs_wrapping?
-      [ :struct, :union, :interface, :object, :strv, :zero_terminated,
-        :byte_array, :ptr_array, :glist, :gslist, :ghash, :array
+      [ :array, :byte_array, :error, :ghash, :glist, :gslist, :interface,
+        :object, :ptr_array, :struct, :strv, :union, :zero_terminated
       ].include?(specialized_type_tag)
     end
 

data/lib/gir_ffi/type_map.rb

@@ -13,6 +13,9 @@ module GirFFI
       :c => :pointer,
       :object => :pointer,
       :struct => :pointer,
+      :error => :pointer,
+      :ptr_array => :pointer,
+      :utf8 => :pointer,
       :GType => gtype_type,
       :gboolean => :bool,
       :gunichar => :uint32,

data/lib/gir_ffi/version.rb

@@ -1,3 +1,3 @@
 module GirFFI
-  VERSION = "0.6.3"
+  VERSION = "0.6.4"
 end

data/lib/gir_ffi/zero_terminated.rb

@@ -26,7 +26,10 @@ module GirFFI
       return if @ptr.null?
       offset = 0
       while val = read_value(offset)
-        offset += FFI.type_size(:int32)
+        offset += FFI.type_size(ffi_type)
+        if complex_element_type?
+          val = element_class.wrap val
+        end
         yield val
       end
     end
@@ -34,8 +37,38 @@ module GirFFI
     private
 
     def read_value offset
-      val = @ptr.get_int32(offset)
-      return val unless val == 0
+      val = @ptr.send("get_#{ffi_type}", offset)
+      return val unless is_null_value(val)
+    end
+
+    def ffi_type
+      @ffi_type ||= TypeMap.map_basic_type_or_string basic_element_type
+    end
+
+    def complex_element_type?
+      Array === element_type
+    end
+
+    def basic_element_type
+      if complex_element_type?
+        element_type.first
+      else
+        element_type
+      end
+    end
+
+    def is_null_value value
+      if basic_element_type == :pointer
+        value.null?
+      else
+        value == 0
+      end
+    end
+
+    def element_class
+      if complex_element_type?
+        element_type.last
+      end
     end
   end
 end

data/lib/gir_ffi-base/gir_ffi/library.rb

@@ -0,0 +1,17 @@
+require 'ffi'
+
+module GirFFI
+  module Library
+    include FFI::Library
+
+    def find_type type
+      if type.is_a? Module
+        if type.const_defined?(:Enum)
+          return super type::Enum
+        end
+      end
+
+      super
+    end
+  end
+end

data/lib/gir_ffi-base/gobject/lib.rb

@@ -1,8 +1,8 @@
-require 'ffi'
+require 'gir_ffi-base/gir_ffi/library'
 
 module GObject
   module Lib
-    extend FFI::Library
+    extend GirFFI::Library
     ffi_lib "gobject-2.0"
     attach_function :g_type_init, [], :void
   end

data/lib/gir_ffi.rb

@@ -1,5 +1,6 @@
 require 'ffi'
 
+require 'gir_ffi/ffi_ext'
 require 'gir_ffi/class_base'
 require 'gir_ffi/type_map'
 

data/tasks/test.rake

@@ -102,6 +102,7 @@ namespace :test do
                    :overrides,
                    :integration]
 
+  desc "Create stubs for Regress and GIMarshallingTests tests"
   task :stub => :lib do
     file = File.new 'test/lib/Regress-1.0.gir'
     listener = Listener.new

data/test/base_test_helper.rb

@@ -10,6 +10,28 @@ end
 require 'minitest/autorun'
 require 'rr'
 
+require 'gir_ffi-base'
+require 'ffi-gobject_introspection'
+
+GObjectIntrospection::IRepository.prepend_search_path File.join(File.dirname(__FILE__), 'lib')
+module GObjectIntrospection
+  class IRepository
+    def shared_library_with_regress namespace
+      case namespace
+      when "Regress"
+        return File.join(File.dirname(__FILE__), 'lib', 'libregress.so')
+      when "GIMarshallingTests"
+        return File.join(File.dirname(__FILE__), 'lib', 'libgimarshallingtests.so')
+      else
+        return shared_library_without_regress namespace
+      end
+    end
+
+    alias shared_library_without_regress shared_library
+    alias shared_library shared_library_with_regress
+  end
+end
+
 Thread.abort_on_exception = true
 
 class Minitest::Test
@@ -71,5 +93,3 @@ class Minitest::Spec
     alias :context :describe
   end
 end
-
-require 'gir_ffi-base'

data/test/ffi-glib/ruby_closure_test.rb

@@ -40,7 +40,7 @@ describe GObject::RubyClosure do
       c = GObject::RubyClosure.new { 2 }
       gv = GObject::Value.new
       GObject::RubyClosure.marshaller(c, gv, 0, nil, nil, nil)
-      assert_equal 2, gv.ruby_value
+      assert_equal 2, gv.get_value
     end
   end
 

data/test/ffi-glib/variant_test.rb

@@ -0,0 +1,10 @@
+require 'gir_ffi_test_helper'
+
+describe GLib::Variant do
+  describe "#get_string" do
+    it "returns just the contained string" do
+      var = GLib::Variant.new_string("Foo")
+      var.get_string.must_equal "Foo"
+    end
+  end
+end

data/test/ffi-gobject/value_test.rb

@@ -42,25 +42,41 @@ describe GObject::Value do
     end
   end
 
-  describe "#ruby_value" do
+  describe "#set_value" do
+    it "handles :int64" do
+      value = 0x1234_5678_9012_3456
+      gv = GObject::Value.for_g_type GObject::TYPE_INT64
+      gv.set_value value
+      gv.get_int64.must_equal value
+    end
+  end
+
+  describe "#get_value" do
     it "unwraps a boolean false" do
       gv = GObject::Value.wrap_ruby_value false
-      result = gv.ruby_value
+      result = gv.get_value
       assert_equal false, result
     end
 
     it "unwraps a boolean true" do
       gv = GObject::Value.wrap_ruby_value true
-      result = gv.ruby_value
+      result = gv.get_value
       assert_equal true, result
     end
 
+    it "unwraps an int64" do
+      value = 0x1234_5678_9012_3456
+      gv = GObject::Value.for_g_type GObject::TYPE_INT64
+      gv.set_int64 value
+      gv.get_value.must_equal value
+    end
+
     it "works with a ByteArray" do
       ba = GLib::ByteArray.new.append("some bytes")
-      v = GObject::Value.new.init(GObject.type_from_name("GByteArray"))
+      v = GObject::Value.for_g_type GObject.type_from_name("GByteArray")
       v.set_boxed ba
 
-      result = v.ruby_value
+      result = v.get_value
 
       result.to_string.must_equal "some bytes"
       result.must_be_kind_of GLib::ByteArray
@@ -71,14 +87,14 @@ describe GObject::Value do
     it "creates a gint GValue from a Ruby Integer" do
       gv = GObject::Value.from 21
       gv.current_gtype_name.must_equal "gint"
-      gv.ruby_value.must_equal 21
+      gv.get_value.must_equal 21
     end
 
     it "returns its argument if given a GValue" do
       gv = GObject::Value.from 21
       gv2 = GObject::Value.from gv
       gv2.current_gtype_name.must_equal "gint"
-      gv2.ruby_value.must_equal 21
+      gv2.get_value.must_equal 21
     end
   end
 
@@ -97,7 +113,7 @@ describe GObject::Value do
       ba = GLib::ByteArray.new.append("some bytes")
       v = GObject::Value.new.init(GObject.type_from_name("GByteArray"))
       v.set_value ba
-      v.ruby_value.to_string.must_equal "some bytes"
+      v.get_value.to_string.must_equal "some bytes"
     end
   end
 end

data/test/ffi-gobject_introspection/i_enum_info_test.rb

@@ -0,0 +1,17 @@
+require 'introspection_test_helper'
+
+describe GObjectIntrospection::IEnumInfo do
+  describe "#find_method" do
+    setup do
+      gir = GObjectIntrospection::IRepository.default
+      gir.require 'Regress', nil
+      @info = gir.find_by_name 'Regress', 'TestEnum'
+    end
+
+    should "find a method by name" do
+      result = @info.find_method("param")
+      result.name.must_equal "param"
+    end
+  end
+end
+