gir_ffi 0.0.11 → 0.0.12

data/History.txt

@@ -1,3 +1,8 @@
+== 0.0.12 / 2011-09-04
+
+* No longer use _id2ref to locate objects past as user data pointers.
+* Fix failing tests on JRuby.
+
 == 0.0.11 / 2011-08-22
 
 * Change interface to the underlying builder in generated modules and

data/examples/print_class.rb

@@ -0,0 +1,59 @@
+require 'gir_ffi'
+
+# File activesupport/lib/active_support/inflector/methods.rb, line 48
+def underscore(camel_cased_word)
+  word = camel_cased_word.to_s.dup
+  word.gsub!(/::/, '/')
+  word.gsub!(/([A-Z]+)([A-Z][a-z])/,'\1_\2')
+  word.gsub!(/([a-z\d])([A-Z])/,'\1_\2')
+  word.tr!("-", "_")
+  word.downcase!
+  word
+end
+
+namespace = 'Tracker'
+GirFFI.setup namespace
+
+gir = GirFFI::IRepository.default
+gir.require namespace, nil
+infos = gir.infos namespace
+
+main_file = File.open(File.join('.', "#{underscore(namespace)}.rb"), 'w')
+
+main_file.write "module #{namespace}\n"
+
+infos.each do |info|
+  case info.info_type
+  when :function
+    fbuilder = GirFFI::Builder::Function.new info, Tracker::Lib
+    main_file.write "\n"
+    main_file.write fbuilder.generate
+    main_file.write "\n"
+  when :object
+    main_file.write "class #{info.name} < #{info.parent.name}\n"
+    info.get_methods.each do |minfo|
+      main_file.write "\n"
+      unless minfo.method?
+        main_file.write "class << self\n"
+      end
+      if minfo.constructor?
+        main_file.write "# This method is a constructor\n"
+      end
+      main_file.write "# @return [#{minfo.return_type.tag}]\n"
+
+      fbuilder = GirFFI::Builder::Function.new minfo, Tracker::Lib
+      main_file.write fbuilder.generate
+      unless minfo.method?
+        main_file.write "end\n"
+      end
+      main_file.write "\n"
+    end
+    main_file.write "end\n"
+  else
+    puts "#{info.info_type}: #{info.name}\n"
+  end
+end
+
+main_file.write "end\n"
+main_file.close
+

data/lib/gir_ffi/arg_helper.rb

@@ -4,6 +4,8 @@ require 'gir_ffi/builder'
 
 module GirFFI
   module ArgHelper
+    OBJECT_STORE = {}
+
     POINTER_SIZE = FFI.type_size(:pointer)
 
     SIMPLE_G_TYPES = [
@@ -16,6 +18,8 @@ module GirFFI
       return obj.to_ptr if obj.respond_to? :to_ptr
       return nil if obj.nil?
       return obj if obj.is_a? FFI::Pointer
+
+      OBJECT_STORE[obj.object_id] = obj
       FFI::Pointer.new(obj.object_id)
     end
 

data/lib/gir_ffi/callback_helper.rb

@@ -45,12 +45,7 @@ module GirFFI
       if arg.null?
         nil
       else
-        begin
-          # TODO: Use custom object store.
-          ObjectSpace._id2ref arg.address
-        rescue RangeError
-          arg
-        end
+        GirFFI::ArgHelper::OBJECT_STORE[arg.address]
       end
     end
   end

data/lib/gir_ffi/in_out_pointer.rb

@@ -29,7 +29,7 @@ module GirFFI
     def self.for type
       ffi_type = type_to_ffi_type type
       ptr = AllocationHelper.safe_malloc(FFI.type_size ffi_type)
-      ptr.send "put_#{ffi_type}", 0, 0
+      ptr.send "put_#{ffi_type}", 0, nil_value_for(type)
       self.new ptr, type, ffi_type
     end
 
@@ -70,6 +70,15 @@ module GirFFI
           value
         end
       end
+
+      def nil_value_for type
+        case type
+        when :utf8, :pointer
+          nil
+        else
+          0
+        end
+      end
     end
   end
 end

data/lib/gir_ffi/overrides/gobject.rb

@@ -218,15 +218,7 @@ module GirFFI
 
 	  # User Data
 	  arg = args.shift
-	  arg = if FFI::Pointer === arg
-		  begin
-		    ObjectSpace._id2ref arg.address
-		  rescue RangeError
-		    arg
-		  end
-		else
-		  arg
-		end
+          arg = GirFFI::ArgHelper::OBJECT_STORE[arg.address]
 	  result << arg
 
 	  return result

data/lib/gir_ffi/version.rb

@@ -1,4 +1,4 @@
 module GirFFI
-  VERSION = "0.0.11"
+  VERSION = "0.0.12"
 end
 

data/tasks/rdoc.rake

@@ -1,6 +1,9 @@
-require "rdoc/task"
+begin
+  require "rdoc/task"
 
-RDoc::Task.new(:rdoc => "rdoc", :clobber_rdoc => "rdoc:clean", :rerdoc => "rdoc:force") do |rdoc|
-  rdoc.main = "README.rdoc"
-  rdoc.rdoc_files.include "README.rdoc", "DESIGN.rdoc", "TODO.rdoc", "lib/**/*.rb"
+  RDoc::Task.new(:rdoc => "rdoc", :clobber_rdoc => "rdoc:clean", :rerdoc => "rdoc:force") do |rdoc|
+    rdoc.main = "README.rdoc"
+    rdoc.rdoc_files.include "README.rdoc", "DESIGN.rdoc", "TODO.rdoc", "lib/**/*.rb"
+  end
+rescue LoadError
 end

data/tasks/yardoc.rake

@@ -1,6 +1,9 @@
-require 'yard'
+begin
+  require 'yard'
 
-YARD::Rake::YardocTask.new do |t|
-  t.files   = ['lib/**/*.rb']
-  t.options = ['--private', '--protected', '--readme',  'README.rdoc', "--files", "DESIGN.rdoc,TODO.rdoc"]
+  YARD::Rake::YardocTask.new do |t|
+    t.files   = ['lib/**/*.rb']
+    t.options = ['--private', '--protected', '--readme',  'README.rdoc', "--files", "DESIGN.rdoc,TODO.rdoc"]
+  end
+rescue LoadError
 end

data/test/builder_test.rb

@@ -112,7 +112,7 @@ class BuilderTest < MiniTest::Spec
       end
 
       should "have correct introspection data" do
-	@gir.require "Gtk", nil
+	@gir.require "Gtk", "2.0"
 	go2 = @gir.find_by_name "Gtk", "main"
 	assert_equal go2, @go
       end
@@ -213,6 +213,7 @@ class BuilderTest < MiniTest::Spec
       end
 
       should "set up struct members with the correct types" do
+        skip "JRuby creates new type wrappers every time, so this test fails" if RUBY_PLATFORM == 'java'
 	tags = [:int, :int8, :double, Regress::TestEnum]
 	assert_equal tags.map {|t| FFI.find_type t},
 	  Regress::TestStructA::Struct.layout.fields.map {|f| f.type}

data/test/test_helper.rb

@@ -34,6 +34,10 @@ module GirFFI
   end
 end
 
+# Preload data for Gtk+ version 2.0.
+gir = GirFFI::IRepository.default
+gir.require "Gtk", "2.0"
+
 # Need a dummy module for some tests.
 module Lib
 end

data/test/unit/i_repository_test.rb

@@ -0,0 +1,57 @@
+require File.expand_path('../test_helper.rb', File.dirname(__FILE__))
+
+describe GirFFI::IRepository do
+  describe "an instance" do
+    should "not be created by calling new()" do
+      assert_raises NoMethodError do
+        GirFFI::IRepository.new
+      end
+    end
+
+    should "be created by calling default()" do
+      gir = GirFFI::IRepository.default
+      assert_kind_of GirFFI::IRepository, gir
+    end
+
+    should "be a singleton" do
+      gir = GirFFI::IRepository.default
+      gir2 = GirFFI::IRepository.default
+      assert_equal gir, gir2
+    end
+  end
+
+  describe "#namespace" do
+    should "raise an error if the namespace doesn't exist" do
+      assert_raises RuntimeError do
+        GirFFI::IRepository.default.require 'VeryUnlikelyGObjectNamespaceName', nil
+      end
+    end
+
+    should "allow version to be nil" do
+      assert_nothing_raised do
+        GirFFI::IRepository.default.require 'GObject', nil
+      end
+    end
+
+    should "allow version to be left out" do
+      assert_nothing_raised do
+        GirFFI::IRepository.default.require 'GObject'
+      end
+    end
+  end
+
+  describe "enumerating the infos for Gtk" do
+    setup do
+      @gir = GirFFI::IRepository.default
+      @gir.require 'Gtk', "2.0"
+    end
+
+    should "yield more than one object" do
+      assert_operator @gir.n_infos('Gtk'), :>, 0
+    end
+
+    should "yield IBaseInfo objects" do
+      assert_kind_of GirFFI::IBaseInfo, @gir.info('Gtk', 0)
+    end
+  end
+end

data/test/unit/in_out_pointer_test.rb

@@ -9,7 +9,7 @@ describe GirFFI::InOutPointer do
     end
 
     it "holds a pointer to the given value" do
-      assert_equal 23, @result.read_int32
+      assert_equal 23, @result.get_int32(0)
     end
 
     it "is an instance of GirFFI::InOutPointer" do
@@ -72,7 +72,7 @@ describe GirFFI::InOutPointer do
     end
 
     it "holds a pointer to a null value" do
-      assert_equal 0, @result.read_int32
+      assert_equal 0, @result.get_int32(0)
     end
 
     it "is an instance of GirFFI::InOutPointer" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gir_ffi
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 7
   prerelease: 
   segments: 
   - 0
   - 0
-  - 11
-  version: 0.0.11
+  - 12
+  version: 0.0.12
 platform: ruby
 authors: 
 - Matijs van Zuijlen
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-22 00:00:00 Z
+date: 2011-09-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ffi
@@ -141,7 +141,6 @@ files:
 - lib/gir_ffi/i_interface_info.rb
 - lib/gir_ffi/i_arg_info.rb
 - lib/gir_ffi/i_type_info.rb
-- test/i_repository_test.rb
 - test/unintrospectable_type_builder_test.rb
 - test/function_definition_builder_test.rb
 - test/g_object_test.rb
@@ -157,6 +156,7 @@ files:
 - test/module_builder_test.rb
 - test/i_object_info_test.rb
 - test/g_object_overrides_test.rb
+- test/unit/i_repository_test.rb
 - test/unit/constant_builder_test.rb
 - test/unit/in_out_pointer_test.rb
 - test/unit/callback_helper_test.rb
@@ -178,6 +178,7 @@ files:
 - tasks/test.rake
 - tasks/setup.rb
 - tasks/notes.rake
+- examples/print_class.rb
 - examples/05_notification.rb
 - examples/demo_ffi_safe_inherited_layout.rb
 - examples/04_webkit.rb
@@ -237,7 +238,6 @@ test_files:
 - test/glib_overrides_test.rb
 - test/gtk_overrides_test.rb
 - test/i_object_info_test.rb
-- test/i_repository_test.rb
 - test/integration/generated_gimarshallingtests_test.rb
 - test/integration/generated_gio_test.rb
 - test/integration/generated_gobject_test.rb
@@ -256,6 +256,7 @@ test_files:
 - test/unit/callback_helper_test.rb
 - test/unit/constant_builder_test.rb
 - test/unit/i_constant_info_test.rb
+- test/unit/i_repository_test.rb
 - test/unit/in_out_pointer_test.rb
 - test/unit/in_pointer_test.rb
 - test/unit/object_type_builder_test.rb

data/test/i_repository_test.rb

@@ -1,59 +0,0 @@
-require File.expand_path('test_helper.rb', File.dirname(__FILE__))
-
-module GirFFI
-  class IRepositoryTest < MiniTest::Spec
-    context "An IRepository object" do
-      should "not be created by calling new()" do
-	assert_raises NoMethodError do
-	  IRepository.new
-	end
-      end
-
-      should "be created by calling default()" do
-	gir = IRepository.default
-	assert_kind_of IRepository, gir
-      end
-
-      should "be a singleton" do
-	gir = IRepository.default
-	gir2 = IRepository.default
-	assert_equal gir, gir2
-      end
-    end
-
-    context "The namespace method" do
-      should "raise an error if the namespace doesn't exist" do
-	assert_raises RuntimeError do
-	  IRepository.default.require 'VeryUnlikelyGObjectNamespaceName', nil
-	end
-      end
-
-      should "allow version to be nil" do
-	assert_nothing_raised do
-	  IRepository.default.require 'GObject', nil
-	end
-      end
-
-      should "allow version to be left out" do
-	assert_nothing_raised do
-	  IRepository.default.require 'GObject'
-	end
-      end
-    end
-
-    context "Enumerating the infos for Gtk" do
-      setup do
-	@gir = IRepository.default
-        @gir.require 'Gtk'
-      end
-
-      should "yield more than one object" do
-	assert_operator @gir.n_infos('Gtk'), :>, 0
-      end
-
-      should "yield IBaseInfo objects" do
-	assert_kind_of IBaseInfo, @gir.info('Gtk', 0)
-      end
-    end
-  end
-end