gir_ffi 0.0.7 → 0.0.8

data/lib/gir_ffi.rb

@@ -2,8 +2,8 @@ require 'gir_ffi/i_repository'
 require 'gir_ffi/builder'
 
 module GirFFI
-  def self.setup module_name
+  def self.setup module_name, version=nil
     module_name = module_name.to_s
-    GirFFI::Builder.build_module module_name
+    GirFFI::Builder.build_module module_name, version
   end
 end

data/test/builder_test.rb

@@ -308,7 +308,7 @@ class BuilderTest < Test::Unit::TestCase
       end
 
       should "know its own class builder" do
-	assert GirFFI::Builder::Class === Regress::TestObj.gir_ffi_builder
+	assert GirFFI::Builder::Type::Base === Regress::TestObj.gir_ffi_builder
       end
 
       context "its #torture_signature_0 method" do

data/test/girffi_test.rb

@@ -2,8 +2,10 @@ require File.expand_path('test_helper.rb', File.dirname(__FILE__))
 
 class GirFFITest < Test::Unit::TestCase
   context "GirFFI" do
-    should "not be tested yet" do
-      assert true
+    should "be able to set up cairo" do
+      assert_nothing_raised {
+        GirFFI.setup :cairo
+      }
     end
   end
 end

data/test/{class_builder_test.rb → type_builder_test.rb}

@@ -1,7 +1,7 @@
 require File.expand_path('test_helper.rb', File.dirname(__FILE__))
 
-class ClassBuilderTest < Test::Unit::TestCase
-  context "The Builder::Class class" do
+class TypeBuilderTest < Test::Unit::TestCase
+  context "The Builder::Type class" do
     setup do
       @gir = GirFFI::IRepository.default
     end
@@ -11,11 +11,11 @@ class ClassBuilderTest < Test::Unit::TestCase
 
       stub(info = Object.new).parent { @gir.find_by_name 'GObject', 'Object' }
       stub(info).fields { [] }
-      stub(info).type { :object }
+      stub(info).info_type { :object }
       stub(info).name { 'Bar' }
       stub(info).namespace { 'Foo' }
 
-      @classbuilder = GirFFI::Builder::Class.new info
+      @classbuilder = GirFFI::Builder::Type::Object.new info
 
       spec = @classbuilder.send :layout_specification
       assert_equal [:parent, GObject::Object::Struct, 0], spec
@@ -23,7 +23,7 @@ class ClassBuilderTest < Test::Unit::TestCase
 
     context "for Gtk::Widget" do
       setup do
-	@cbuilder = GirFFI::Builder::Class.new @gir.find_by_name('Gtk', 'Widget')
+	@cbuilder = GirFFI::Builder::Type::Object.new @gir.find_by_name('Gtk', 'Widget')
       end
 
       context "looking at Gtk::Widget#show" do
@@ -42,19 +42,19 @@ class ClassBuilderTest < Test::Unit::TestCase
 
     context 'the find_signal method' do
       should 'find the signal "test" for TestObj' do
-	builder = GirFFI::Builder::Class.new @gir.find_by_name('Regress', 'TestObj')
+	builder = GirFFI::Builder::Type::Object.new @gir.find_by_name('Regress', 'TestObj')
 	sig = builder.find_signal 'test'
 	assert_equal 'test', sig.name
       end
 
       should 'find the signal "test" for TestSubObj' do
-	builder = GirFFI::Builder::Class.new @gir.find_by_name('Regress', 'TestSubObj')
+	builder = GirFFI::Builder::Type::Object.new @gir.find_by_name('Regress', 'TestSubObj')
 	sig = builder.find_signal 'test'
 	assert_equal 'test', sig.name
       end
 
       should 'find the signal "changed" for Gtk::Entry' do
-	builder = GirFFI::Builder::Class.new @gir.find_by_name('Gtk', 'Entry')
+	builder = GirFFI::Builder::Type::Object.new @gir.find_by_name('Gtk', 'Entry')
 	sig = builder.find_signal 'changed'
 	assert_equal 'changed', sig.name
       end
@@ -62,7 +62,7 @@ class ClassBuilderTest < Test::Unit::TestCase
 
     context "for GObject::TypeCValue (a union)" do
       setup do
-	@cbuilder = GirFFI::Builder::Class.new @gir.find_by_name('GObject', 'TypeCValue')
+	@cbuilder = GirFFI::Builder::Type::Union.new @gir.find_by_name('GObject', 'TypeCValue')
       end
 
       should "not raise an error looking for a method that doesn't exist" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gir_ffi
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: 
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - Matijs van Zuijlen
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-01 00:00:00 +02:00
+date: 2011-04-08 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -66,7 +66,7 @@ dependencies:
         version: 1.0.2
   type: :development
   version_requirements: *id003
-description: Ruby-FFI-based binding of the GObject Introspection Repository
+description: 
 email: 
 - matijs@matijs.net
 executables: []
@@ -89,7 +89,16 @@ files:
 - lib/gir_ffi/builder.rb
 - lib/gir_ffi/builder/module.rb
 - lib/gir_ffi/builder/function.rb
-- lib/gir_ffi/builder/class.rb
+- lib/gir_ffi/builder/type/base.rb
+- lib/gir_ffi/builder/type/interface.rb
+- lib/gir_ffi/builder/type/struct_based.rb
+- lib/gir_ffi/builder/type/struct.rb
+- lib/gir_ffi/builder/type/enum.rb
+- lib/gir_ffi/builder/type/registered_type.rb
+- lib/gir_ffi/builder/type/callback.rb
+- lib/gir_ffi/builder/type/union.rb
+- lib/gir_ffi/builder/type/object.rb
+- lib/gir_ffi/builder/type.rb
 - lib/gir_ffi/builder/argument.rb
 - lib/gir_ffi/i_enum_info.rb
 - lib/gir_ffi/i_value_info.rb
@@ -130,12 +139,12 @@ files:
 - test/lib/m4/jhflags.m4
 - test/class_base_test.rb
 - test/test_helper.rb
-- test/class_builder_test.rb
 - test/girffi_test.rb
 - test/module_builder_test.rb
 - test/i_object_info_test.rb
 - test/g_object_overrides_test.rb
 - test/generated_gtk_test.rb
+- test/type_builder_test.rb
 - test/builder_test.rb
 - test/gtk_overrides_test.rb
 - test/generated_gio_test.rb
@@ -189,12 +198,11 @@ rubyforge_project:
 rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
-summary: Ruby-FFI-based binding of the GObject Introspection Repository
+summary: FFI-based GObject binding using the GObject Introspection Repository
 test_files: 
 - test/arg_helper_test.rb
 - test/builder_test.rb
 - test/class_base_test.rb
-- test/class_builder_test.rb
 - test/function_definition_builder_test.rb
 - test/g_object_overrides_test.rb
 - test/g_object_test.rb
@@ -211,3 +219,4 @@ test_files:
 - test/lib/m4/jhflags.m4
 - test/module_builder_test.rb
 - test/test_helper.rb
+- test/type_builder_test.rb

data/lib/gir_ffi/builder/class.rb

@@ -1,286 +0,0 @@
-require 'gir_ffi/builder_helper'
-module GirFFI
-  # Builds a class based on information found in the introspection
-  # repository.
-  class Builder::Class
-    include BuilderHelper
-
-    def initialize info
-      @info = info
-      @namespace = @info.namespace
-      @classname = @info.name.gsub(/^(.)/) { $1.upcase }
-    end
-
-    def generate
-      build_class
-    end
-
-    def setup_method method
-      klass = build_class
-      meta = (class << klass; self; end)
-
-      go = method_introspection_data method
-      raise NoMethodError unless go
-      attach_and_define_method method, go, meta
-    end
-
-    def setup_instance_method method
-      go = instance_method_introspection_data method
-      result = attach_and_define_method method, go, build_class
-
-      unless result
-        if parent
-          return superclass.gir_ffi_builder.setup_instance_method method
-        else
-          return false
-        end
-      end
-
-      true
-    end
-
-    def find_signal signal_name
-      signal_definers.each do |inf|
-        inf.signals.each do |sig|
-          return sig if sig.name == signal_name
-        end
-      end
-      if parent
-        return superclass.gir_ffi_builder.find_signal signal_name
-      end
-    end
-
-    private
-
-    def build_class
-      unless defined? @klass
-        case info.type
-        when :object, :struct, :interface
-          instantiate_struct_class
-        when :union
-          instantiate_union_class
-        when :enum, :flags
-          instantiate_enum_class
-        when :callback
-          instantiate_callback_class
-        else
-          raise NotImplementedError, "Cannot build classes of type #{info.type}"
-        end
-      end
-      @klass
-    end
-
-    def info
-      unless defined? @info
-        @info = gir.find_by_name @namespace, @classname
-        raise "Class #{@classname} not found in namespace #{@namespace}" if @info.nil?
-      end
-      @info
-    end
-
-    def parent
-      unless defined? @parent
-        if info.type == :object
-	  pr = info.parent
-	  if pr.nil? or (pr.name == @classname and pr.namespace == @namespace)
-	    @parent = nil
-	  else
-	    @parent = pr
-	  end
-	else
-	  @parent = nil
-	end
-      end
-      @parent
-    end
-
-    def superclass
-      unless defined? @superclass
-        if parent
-          @superclass = Builder.build_class parent
-        else
-          @superclass = GirFFI::ClassBase
-        end
-      end
-      @superclass
-    end
-
-    def namespace_module
-      @namespace_module ||= Builder.build_module @namespace
-    end
-
-    def lib
-      @lib ||= namespace_module.const_get :Lib
-    end
-
-    def instantiate_struct_class
-      @klass = get_or_define_class namespace_module, @classname, superclass
-      @structklass = get_or_define_class @klass, :Struct, FFI::Struct
-      setup_class unless already_set_up
-    end
-
-    def instantiate_union_class
-      @klass = get_or_define_class namespace_module, @classname, superclass
-      @structklass = get_or_define_class @klass, :Struct, FFI::Union
-      setup_class unless already_set_up
-    end
-
-    def instantiate_enum_class
-      @klass = optionally_define_constant namespace_module, @classname do
-        vals = info.values.map {|vinfo| [vinfo.name.to_sym, vinfo.value]}.flatten
-        lib.enum(@classname.to_sym, vals)
-      end
-    end
-
-    def instantiate_callback_class
-      @klass = optionally_define_constant namespace_module, @classname do
-	args = Builder.ffi_function_argument_types info
-	ret = Builder.ffi_function_return_type info
-	lib.callback @classname.to_sym, args, ret
-      end
-    end
-
-    def setup_class
-      setup_layout
-      setup_constants
-      stub_methods
-      setup_gtype_getter
-
-      setup_vfunc_invokers if info.type == :object
-      provide_struct_constructor if info.type == :struct
-    end
-
-    def setup_layout
-      spec = layout_specification
-      @structklass.class_eval { layout(*spec) }
-    end
-
-    def layout_specification
-      fields = if info.type == :interface
-                 []
-               else
-                 info.fields
-               end
-
-      if fields.empty?
-        if parent
-          return [:parent, superclass.const_get(:Struct), 0]
-        else
-          return [:dummy, :char, 0]
-        end
-      end
-
-      fields.map do |finfo|
-        [ finfo.name.to_sym,
-          itypeinfo_to_ffitype_for_struct(finfo.type),
-          finfo.offset ]
-      end.flatten
-    end
-
-    def itypeinfo_to_ffitype_for_struct typeinfo
-      ffitype = Builder.itypeinfo_to_ffitype typeinfo
-      if ffitype.kind_of?(Class) and const_defined_for ffitype, :Struct
-        ffitype = ffitype.const_get :Struct
-      end
-      if ffitype == :bool
-        ffitype = :int
-      end
-      ffitype
-    end
-
-    def stub_methods
-      info.methods.each do |minfo|
-        @klass.class_eval method_stub(minfo.name, minfo.method?)
-      end
-    end
-
-    def method_stub symbol, is_instance_method
-      "
-        def #{is_instance_method ? '' : 'self.'}#{symbol} *args, &block
-          setup_and_call :#{symbol}, *args, &block
-        end
-      "
-    end
-
-    def setup_gtype_getter
-      getter = info.type_init
-      return if getter.nil? or getter == "intern"
-      lib.attach_function getter.to_sym, [], :size_t
-      @klass.class_eval "
-        def self.get_gtype
-          ::#{lib}.#{getter}
-        end
-      "
-    end
-
-    def setup_vfunc_invokers
-      info.vfuncs.each do |vfinfo|
-        invoker = vfinfo.invoker
-        next if invoker.nil?
-        next if invoker.name == vfinfo.name
-
-        @klass.class_eval "
-          def #{vfinfo.name} *args, &block
-            #{invoker.name}(*args, &block)
-          end
-        "
-      end
-    end
-
-    def provide_struct_constructor
-      return if info.find_method 'new'
-
-      (class << @klass; self; end).class_eval {
-        alias_method :new, :allocate
-      }
-    end
-
-    def setup_constants
-      @klass.const_set :GIR_INFO, info
-      @klass.const_set :GIR_FFI_BUILDER, self
-    end
-
-    def already_set_up
-      const_defined_for @klass, :GIR_FFI_BUILDER
-    end
-
-    def method_introspection_data method
-      info.find_method method
-    end
-
-    def instance_method_introspection_data method
-      data = method_introspection_data method
-      return !data.nil? && data.method? ? data : nil
-    end
-
-    def function_definition go
-      Builder::Function.new(go, lib).generate
-    end
-
-    def attach_and_define_method method, go, modul
-      return false if go.nil?
-      Builder.attach_ffi_function lib, go
-      modul.class_eval { remove_method method }
-      modul.class_eval function_definition(go)
-      true
-    end
-
-    def gir
-      unless defined? @gir
-        @gir = IRepository.default
-        @gir.require @namespace, nil
-      end
-      @gir
-    end
-
-    def get_or_define_class namespace, name, parent
-      optionally_define_constant(namespace, name) {
-        Class.new parent
-      }
-    end
-
-    def signal_definers
-      [info] + (info.type == :object ? info.interfaces : [])
-    end
-  end
-end