gir_ffi 0.8.5 → 0.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 33c7535a4e04bc9db6d60c9b92fd70d7b6d15942
-  data.tar.gz: f2a04471af13eda5efbd038f1f7fa80cb1b0458c
+  metadata.gz: fffb54bf2eca76e21e43bb5838e0f307063c2b6d
+  data.tar.gz: 4ab64e4d22d1deba88e930a3a7b046a19558b6aa
 SHA512:
-  metadata.gz: f4542926a9b0514a68855b00991381fbeb40393001c8da662d2f711107b9276a1803a74910308338b2e7e7a73c32aff8c48d4fef96d10cbb8fe8619e80b09f95
-  data.tar.gz: 9333b2763f9db28c70fee615905ce0e20d9eff912ac222fb136a1ed07cc1f8b4793dd27bbaa8814f44453e781528d7d3be5b25365fbb8dc846a2533dc1114d08
+  metadata.gz: 482f25f7934b20c3cb1768225f630081198b321e081c3ae74d70d6c7bd9f8ed45f10dc6c40bbca2d247d9637909e134e988b59811354f6f77f71cb392c45c60c
+  data.tar.gz: 8b0ed87c864d9af6f5b8c80f02bc457f0a0858a3c00f53d48b8b22e0cfe5fae768ae730b7b00c939efad503581cf126fd5c4e75f51a18d5957846e3c8c9795d0

data/Changelog.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 0.8.6 / 2015-12-09
+
+* Change handling of initializers in subclasses
+  * Subclasses with their own GType revert to the default GObject constructor
+  * Subclasses cannot use their parent classes' non-default contructors
+* Find signals in ancestor classes of unintrospectable types
+
 ## 0.8.5 / 2015-12-04
 
 * Improve GObject::Value

data/lib/ffi-gobject/object.rb

@@ -11,6 +11,9 @@ module GObject
 
     alias_method :initialize_without_automatic_gtype, :initialize
     alias_method :initialize, :initialize_with_automatic_gtype
+    alias_method :base_initialize, :initialize
+
+    private :base_initialize
 
     def store_pointer(ptr)
       super

data/lib/gir_ffi/builders/constructor_builder.rb

@@ -31,7 +31,14 @@ module GirFFI
       end
 
       def preparation
-        ['obj = allocate']
+        if @info.safe_name == 'new'
+          ['obj = allocate']
+        else
+          [
+            "raise NoMethodError unless self == #{@info.container.full_type_name}",
+            'obj = allocate'
+          ]
+        end
       end
 
       def invocation

data/lib/gir_ffi/builders/object_builder.rb

@@ -51,6 +51,7 @@ module GirFFI
         end
         setup_vfunc_invokers
         setup_interfaces
+        provide_initializer
       end
 
       # FIXME: Private method only used in subclass
@@ -108,6 +109,16 @@ module GirFFI
         "
       end
 
+      def provide_initializer
+        return if info.find_method 'new'
+
+        klass.class_eval "
+          def initialize(properties = {})
+            base_initialize(properties)
+          end
+        "
+      end
+
       def setup_interfaces
         interfaces.each do |iface|
           klass.send :include, iface

data/lib/gir_ffi/builders/unintrospectable_builder.rb

@@ -19,12 +19,6 @@ module GirFFI
       def setup_instance_method(_method)
         false
       end
-
-      private
-
-      def ancestor_infos
-        info.interfaces
-      end
     end
   end
 end

data/lib/gir_ffi/unintrospectable_type_info.rb

@@ -43,5 +43,9 @@ module GirFFI
     def fields
       []
     end
+
+    def find_signal(_any)
+      nil
+    end
   end
 end

data/lib/gir_ffi/version.rb

@@ -1,4 +1,4 @@
 # Current GirFFI version
 module GirFFI
-  VERSION = '0.8.5'
+  VERSION = '0.8.6'
 end

data/test/gir_ffi/builders/constructor_builder_test.rb

@@ -23,6 +23,7 @@ describe GirFFI::Builders::ConstructorBuilder do
       it 'builds a custom constructor' do
         code.must_equal <<-CODE.reset_indentation
           def self.new_from_file(*args)
+            raise NoMethodError unless self == Regress::TestObj
             obj = allocate
             obj.__send__ :initialize_from_file, *args
             obj

data/test/gir_ffi/builders/unintrospectable_builder_test.rb

@@ -46,6 +46,11 @@ describe GirFFI::Builders::UnintrospectableBuilder do
         end
         assert_match(/^Signal/, msg)
       end
+
+      it 'finds signals in ancestor classes' do
+        signal = @bldr.find_signal 'notify'
+        signal.name.must_equal 'notify'
+      end
     end
   end
 end

data/test/gir_ffi/builders/user_defined_builder_test.rb

@@ -111,5 +111,14 @@ describe GirFFI::Builders::UserDefinedBuilder do
       other_klass = other_builder.build_class
       other_klass.gtype.must_equal gtype
     end
+
+    it 'creates a class with a new GType' do
+      klass.gtype.wont_equal GIMarshallingTests::Object.gtype
+    end
+
+    it 'makes the registered class return objects with the correct GType' do
+      obj = klass.new
+      GObject.type_from_instance(obj).must_equal klass.gtype
+    end
   end
 end

data/test/gir_ffi/unintrospectable_type_info_test.rb

@@ -108,4 +108,12 @@ describe GirFFI::UnintrospectableTypeInfo do
       info.safe_name.must_equal 'GSomeType'
     end
   end
+
+  describe '#find_signal' do
+    it 'indicates that no signals can be found' do
+      info = GirFFI::UnintrospectableTypeInfo.new(:some_type)
+      result = info.find_signal 'any'
+      result.must_be_nil
+    end
+  end
 end

data/test/integration/generated_gimarshallingtests_test.rb

@@ -1206,11 +1206,13 @@ describe GIMarshallingTests do
 
   describe 'GIMarshallingTests::SubObject' do
     it 'creates an instance using #new' do
-      so = GIMarshallingTests::SubObject.new 42
-      assert_instance_of GIMarshallingTests::SubObject, so
+      so = GIMarshallingTests::SubObject.new
+      so.must_be_instance_of GIMarshallingTests::SubObject
+      GObject.type_name(GObject.type_from_instance so).
+        must_equal 'GIMarshallingTestsSubObject'
     end
 
-    let(:instance) { GIMarshallingTests::SubObject.new 0 }
+    let(:instance) { GIMarshallingTests::SubObject.new }
 
     it 'has a working method #overwritten_method' do
       instance.overwritten_method
@@ -1230,11 +1232,13 @@ describe GIMarshallingTests do
 
   describe 'GIMarshallingTests::SubSubObject' do
     it 'creates an instance using #new' do
-      so = GIMarshallingTests::SubSubObject.new 42
+      so = GIMarshallingTests::SubSubObject.new
       assert_instance_of GIMarshallingTests::SubSubObject, so
+      GObject.type_name(GObject.type_from_instance so).
+        must_equal 'GIMarshallingTestsSubSubObject'
     end
 
-    let(:instance) { GIMarshallingTests::SubSubObject.new 0 }
+    let(:instance) { GIMarshallingTests::SubSubObject.new }
 
     it 'does not have field accessors' do
       assert_raises(NoMethodError) { instance.parent_instance }

data/test/integration/generated_regress_test.rb

@@ -2230,6 +2230,10 @@ describe Regress do
       assert_instance_of Regress::TestSubObj, tso
     end
 
+    it "does not create an instance using its parent object's custom constructors" do
+      proc { Regress::TestSubObj.constructor }.must_raise NoMethodError
+    end
+
     let(:instance) { Regress::TestSubObj.new }
 
     it 'has a working method #instance_method' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gir_ffi
 version: !ruby/object:Gem::Version
-  version: 0.8.5
+  version: 0.8.6
 platform: ruby
 authors:
 - Matijs van Zuijlen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-04 00:00:00.000000000 Z
+date: 2015-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -387,7 +387,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.0
 signing_key: 
 specification_version: 4
 summary: FFI-based GObject binding using the GObject Introspection Repository