gir_ffi 0.6.1 → 0.6.2

data/History.txt

@@ -1,3 +1,7 @@
+== 0.6.2 / 2013-06-14
+
+* Handle introspectable types with introspectable parent types
+
 == 0.6.1 / 2013-06-09
 
 * Handle SizedArray containing enums

data/lib/gir_ffi/unintrospectable_type_info.rb

@@ -21,7 +21,8 @@ module GirFFI
     end
 
     def parent
-      @gir.find_by_gtype @gobject.type_parent(@g_type)
+      parent_gtype = @gobject.type_parent(@g_type)
+      @gir.find_by_gtype(parent_gtype) || self.class.new(parent_gtype, @gir, @gobject)
     end
 
     def namespace

data/lib/gir_ffi/version.rb

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

data/test/gir_ffi/unintrospectable_type_info_test.rb

@@ -10,16 +10,32 @@ describe GirFFI::UnintrospectableTypeInfo do
   end
 
   describe "#parent" do
-    it "finds the parent's info by gtype" do
-      gobject = Object.new
-      gir = Object.new
+    context "when the GIR knows about the parent gtype" do
+      it "finds the parent's info by gtype" do
+        gobject = Object.new
+        gir = Object.new
 
-      mock(gobject).type_parent(:some_type) { :foo }
-      mock(gir).find_by_gtype(:foo) { :foo_info }
+        mock(gobject).type_parent(:some_type) { :foo }
+        mock(gir).find_by_gtype(:foo) { :foo_info }
 
-      info = GirFFI::UnintrospectableTypeInfo.new(:some_type, gir, gobject)
+        info = GirFFI::UnintrospectableTypeInfo.new(:some_type, gir, gobject)
+
+        info.parent.must_equal :foo_info
+      end
+    end
+
+    context "when the GIR does not know about the parent gtype" do
+      it "creates a new UnintrospectableTypeInfo from the parent gtype" do
+        gobject = Object.new
+        gir = Object.new
+
+        mock(gobject).type_parent(:some_type) { :foo }
+        mock(gir).find_by_gtype(:foo) { nil }
+
+        info = GirFFI::UnintrospectableTypeInfo.new(:some_type, gir, gobject)
 
-      info.parent.must_equal :foo_info
+        info.parent.g_type.must_equal :foo
+      end
     end
   end
 

data/test/integration/generated_pango_ft2_test.rb

@@ -0,0 +1,17 @@
+# coding: utf-8
+require 'gir_ffi_test_helper'
+
+GirFFI.setup :PangoFT2
+
+# Tests generated methods and functions in the PangoFT2 namespace.
+describe PangoFT2 do
+  describe PangoFT2::FontMap do
+    it "has a working method #load_font" do
+      font_map = PangoFT2::FontMap.new
+      context = font_map.create_context
+      font_description = Pango::FontDescription.new
+      font_map.load_font context, font_description
+    end
+  end
+end
+

data/test/integration/generated_pango_test.rb

@@ -1,14 +1,12 @@
 # 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
+    it "has a working method #get_scripts" do
       lang = Pango::Language.from_string 'ja'
       result = lang.get_scripts
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gir_ffi
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-09 00:00:00.000000000 Z
+date: 2013-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -91,6 +91,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 10.0.3
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - matijs@matijs.net
@@ -211,6 +227,7 @@ files:
 - test/lib/autogen.sh
 - test/gir_ffi_test_helper.rb
 - test/ffi-gobject_test.rb
+- test/integration/generated_pango_ft2_test.rb
 - test/integration/derived_classes_test.rb
 - test/integration/generated_regress_test.rb
 - test/integration/method_lookup_test.rb
@@ -383,6 +400,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_ft2_test.rb
 - test/integration/generated_pango_test.rb
 - test/integration/generated_regress_test.rb
 - test/integration/method_lookup_test.rb