gir_ffi 0.6.0 → 0.6.1

data/History.txt

@@ -1,3 +1,7 @@
+== 0.6.1 / 2013-06-09
+
+* Handle SizedArray containing enums
+
 == 0.6.0 / 2013-06-07
 
 * Support Rubinius

data/lib/gir_ffi/arg_helper.rb

@@ -26,11 +26,14 @@ module GirFFI
     end
 
     def self.ptr_to_typed_array type, ptr, size
-      if type.is_a? Class
+      case type
+      when Class
         ptr_to_interface_array type, ptr, size
-      elsif type.is_a? Array
+      when Array
         ptr_to_interface_pointer_array type[1], ptr, size
-      elsif type == :utf8
+      when FFI::Enum
+        ptr_to_enum_array type, ptr, size
+      when :utf8
         ptr_to_utf8_array ptr, size
       else
         self.send "ptr_to_#{type}_array", ptr, size
@@ -73,6 +76,10 @@ module GirFFI
       end
     end
 
+    def self.ptr_to_enum_array enum, ptr, size
+      ptr_to_gint32_array(ptr, size).map {|val| enum[val] }
+    end
+
     if RUBY_VERSION < "1.9"
       def self.ptr_to_utf8 ptr
         ptr.null? ? nil : ptr.read_string

data/lib/gir_ffi/version.rb

@@ -1,3 +1,3 @@
 module GirFFI
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end

data/test/base_test_helper.rb

@@ -7,13 +7,12 @@ if RUBY_VERSION >= "1.9"
   SimpleCov.start
 end
 
-require 'minitest/spec'
 require 'minitest/autorun'
 require 'rr'
 
 Thread.abort_on_exception = true
 
-class MiniTest::Unit::TestCase
+class Minitest::Test
   include RR::Adapters::TestUnit
 
   def assert_nothing_raised
@@ -64,7 +63,7 @@ class MiniTest::Unit::TestCase
   end
 end
 
-class MiniTest::Spec
+class Minitest::Spec
   class << self
     alias :setup :before
     alias :teardown :after

data/test/ffi-gobject_introspection/i_object_info_test.rb

@@ -1,20 +1,15 @@
 require 'introspection_test_helper'
 
-module GirFFI
-  class IObjectInfoTest < MiniTest::Spec
-    context "An IObjectInfo object" do
-
-      setup do
-        gir = GObjectIntrospection::IRepository.default
-        gir.require 'GObject', nil
-        @info = gir.find_by_name 'GObject', 'Object'
-      end
-
-      should "find a vfunc by name" do
-        assert_not_nil @info.find_vfunc("finalize")
-      end
+describe GObjectIntrospection::IObjectInfo do
+  describe "#find_vfunc" do
+    setup do
+      gir = GObjectIntrospection::IRepository.default
+      gir.require 'GObject', nil
+      @info = gir.find_by_name 'GObject', 'Object'
     end
 
+    should "find a vfunc by name" do
+      assert_not_nil @info.find_vfunc("finalize")
+    end
   end
 end
-

data/test/gir_ffi/arg_helper_test.rb

@@ -51,6 +51,27 @@ describe GirFFI::ArgHelper do
       end
     end
 
+    describe "for pointers to arrays of enums" do
+      let(:enum) { FFI::Enum.new([:foo, 1, :bar, 2]) }
+      it "returns an empty array when passed a null pointer" do
+        result = GirFFI::ArgHelper.ptr_to_typed_array enum, FFI::Pointer.new(0), 0
+        result.must_equal []
+      end
+
+      it "returns an empty array when passed nil" do
+        result = GirFFI::ArgHelper.ptr_to_typed_array enum, nil, 0
+        result.must_equal []
+      end
+
+      it "returns an array of symbols when passed a pointer to ints" do
+        block = FFI::MemoryPointer.new(:int32, 2)
+        block.write_array_of_int32 [1, 2]
+        result = GirFFI::ArgHelper.ptr_to_typed_array enum, block, 2
+        result.must_equal [:foo, :bar]
+      end
+
+    end
+
     describe "for pointers to arrays of base types" do
       it "returns an empty array when passed a null pointer" do
         result = GirFFI::ArgHelper.ptr_to_typed_array :gint32, FFI::Pointer.new(0), 0

data/test/gir_ffi_test_helper.rb

@@ -33,7 +33,7 @@ class Sequence
   end
 end
 
-class MiniTest::Unit::TestCase
+class Minitest::Test
   def cws code
     code.gsub(/(^\s*|\s*$)/, "")
   end

data/test/integration/generated_pango_test.rb

@@ -0,0 +1,25 @@
+# coding: utf-8
+require 'gir_ffi_test_helper'
+
+require 'gir_ffi'
+
+GirFFI.setup :Pango
+
+# Tests generated methods and functions in the Pango namespace.
+describe Pango do
+  describe Pango::Language do
+    it "has a working method get_scripts" do
+      lang = Pango::Language.from_string 'ja'
+      result = lang.get_scripts
+
+      if GLib::SizedArray === result
+        scripts = result
+      else
+        ptr, size = *result
+        scripts = GLib::SizedArray.new Pango::Script, size, ptr
+      end
+
+      scripts.to_a.must_equal [:han, :katakana, :hiragana]
+    end
+  end
+end

data/test/introspection_test_helper.rb

@@ -2,7 +2,7 @@ require 'base_test_helper'
 
 require 'ffi-gobject_introspection'
 
-class MiniTest::Unit::TestCase
+class Minitest::Test
   def get_introspection_data namespace, name
     gir = GObjectIntrospection::IRepository.default
     gir.require namespace, nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gir_ffi
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-08 00:00:00.000000000 Z
+date: 2013-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: rr
   requirement: !ruby/object:Gem::Requirement
@@ -216,6 +216,7 @@ files:
 - test/integration/method_lookup_test.rb
 - test/integration/generated_gimarshallingtests_test.rb
 - test/integration/generated_gio_test.rb
+- test/integration/generated_pango_test.rb
 - test/integration/generated_gobject_test.rb
 - test/gir_ffi/builder/type/user_defined_test.rb
 - test/gir_ffi/builder/type/enum_test.rb
@@ -382,6 +383,7 @@ test_files:
 - test/integration/generated_gimarshallingtests_test.rb
 - test/integration/generated_gio_test.rb
 - test/integration/generated_gobject_test.rb
+- test/integration/generated_pango_test.rb
 - test/integration/generated_regress_test.rb
 - test/integration/method_lookup_test.rb
 - test/introspection_test_helper.rb