gir_ffi 0.6.6 → 0.6.7

data/lib/gir_ffi/version.rb

@@ -1,3 +1,3 @@
 module GirFFI
-  VERSION = "0.6.6"
+  VERSION = "0.6.7"
 end

data/tasks/test.rake

@@ -9,15 +9,21 @@ class Listener
 
   def initialize
     @inside_class = false
+    @stack = []
+    @skip_state = []
   end
 
   attr_accessor :result
   attr_accessor :namespace
 
   def tag_start name, attrs
-    return if attrs['disguised'] == '1'
-    return if attrs['introspectable'] == '0'
-    return if attrs['glib:is-gtype-struct-for']
+    @stack.push [name, attrs]
+    if @skip_state.last || skippable?(attrs)
+      @skip_state.push true
+      return
+    else
+      @skip_state.push false
+    end
 
     obj_name = attrs['name']
     case name
@@ -25,26 +31,86 @@ class Listener
       result.puts "  it \"has the constant #{obj_name}\" do"
     when "record", "class", "enumeration", "bitfield", "interface", "union"
       result.puts "  describe \"#{namespace}::#{obj_name}\" do"
-      @inside_class = true
+      @inside_class = name
     when "constructor"
       result.puts "    it \"creates an instance using ##{obj_name}\" do"
+    when "field"
+      if @inside_class != 'class'
+        if attrs['private'] == "1"
+          result.puts "    it \"has a private field #{obj_name}\" do"
+        elsif attrs['writable'] == "1"
+          result.puts "    it \"has a writable field #{obj_name}\" do"
+        else
+          result.puts "    it \"has a read-only field #{obj_name}\" do"
+        end
+      end
     when "function", "method"
       spaces = @inside_class ? "  " : ""
       result.puts "  #{spaces}it \"has a working #{name} ##{obj_name}\" do"
     when "member"
       result.puts "    it \"has the member :#{obj_name}\" do"
-    when "type", "return-value", "parameters", "parameter", "doc", "array"
+    when "namespace"
+      result.puts "describe #{obj_name} do"
+    when "property"
+      accessor_name = obj_name.gsub(/-/, '_')
+      result.puts "    describe \"its '#{obj_name}' property\" do"
+      result.puts "      it \"can be retrieved with #get_property\" do"
+      result.puts "      end"
+      result.puts "      it \"can be retrieved with ##{accessor_name}\" do"
+      result.puts "      end"
+      if attrs['writable'] == '1'
+        result.puts "      it \"can be set with #set_property\" do"
+        result.puts "      end"
+        result.puts "      it \"can be set with ##{accessor_name}=\" do"
+        result.puts "      end"
+      end
+    when "glib:signal"
+      result.puts "    it \"handles the '#{obj_name}' signal\" do"
+    when "type", "alias", "return-value", "parameters",
+      "instance-parameter", "parameter", "doc", "array",
+      "repository", "include", "package"
+      # Not printed"
     else
-      puts "Skipping #{name}"
+      puts "Skipping #{name}: #{attrs}"
     end
   end
 
   def tag_end name
+    org_name, _ = *@stack.pop
+    skipping = @skip_state.pop
+    raise "Expected #{org_name}, got #{name}" if org_name != name
+    return if skipping
+
     case name
-    when "record", "class", "enumeration", "bitfield", "interface", "union"
+    when "constant"
+      result.puts "  end"
+    when "record", "class", "enumeration", "bitfield",
+      "interface", "union"
+      result.puts "  end"
       @inside_class = false
+    when "function", "method"
+      if @inside_class
+        result.puts "    end"
+      else
+        result.puts "  end"
+      end
+    when "constructor", "member", "property", "glib:signal"
+      result.puts "    end"
+    when "field"
+      if @inside_class != 'class'
+        result.puts "    end"
+      end
+    when "namespace"
+      result.puts "end"
     end
   end
+
+  def skippable? attrs
+    return true if attrs['disguised'] == '1'
+    return true if attrs['introspectable'] == '0'
+    return true if attrs['glib:is-gtype-struct-for']
+    false
+  end
 end
 
 namespace :test do

data/test/base_test_helper.rb

@@ -4,7 +4,9 @@ end
 
 if RUBY_VERSION >= "1.9"
   require 'simplecov'
-  SimpleCov.start
+  SimpleCov.start do
+    add_filter "/test/"
+  end
 end
 
 require 'minitest/autorun'
@@ -37,15 +39,6 @@ Thread.abort_on_exception = true
 class Minitest::Test
   include RR::Adapters::TestUnit
 
-  def assert_nothing_raised
-    yield
-    assert true
-  end
-
-  def assert_not_nil it
-    refute_nil it
-  end
-
   def assert_defines_singleton_method klass, method, msg = nil
     method = method.to_sym
     methods = klass.singleton_methods(false).map { |name| name.to_sym }
@@ -84,12 +77,3 @@ class Minitest::Test
     refute_includes methods, method, msg
   end
 end
-
-class Minitest::Spec
-  class << self
-    alias :setup :before
-    alias :teardown :after
-    alias :should :it
-    alias :context :describe
-  end
-end

data/test/ffi-glib/array_test.rb

@@ -146,5 +146,11 @@ describe GLib::Array do
       arr = GLib::Array.from GObject::EnumValue, vals
       arr.index(1).value.must_equal 2
     end
+
+    it "raises an error if the index is out of bounds" do
+      arr = GLib::Array.from :gint32, [1, 2, 3]
+      lambda { arr.index(16) }.must_raise IndexError
+      lambda { arr.index(-1) }.must_raise IndexError
+    end
   end
 end

data/test/ffi-glib/ptr_array_test.rb

@@ -94,4 +94,17 @@ describe GLib::PtrArray do
       arr.wont_be :==, other
     end
   end
+
+  describe "#index" do
+    it "returns the correct element" do
+      arr = GLib::PtrArray.from :utf8, ["1", "2", "3"]
+      arr.index(1).must_equal "2"
+    end
+
+    it "raises an error if the index is out of bounds" do
+      arr = GLib::PtrArray.from :utf8, ["1", "2", "3"]
+      lambda { arr.index(16) }.must_raise IndexError
+      lambda { arr.index(-1) }.must_raise IndexError
+    end
+  end
 end

data/test/ffi-glib/ruby_closure_test.rb

@@ -1,18 +1,18 @@
 require 'gir_ffi_test_helper'
 
 describe GObject::RubyClosure do
-  should "have a constructor with a mandatory block argument" do
+  it "has a constructor with a mandatory block argument" do
     assert_raises ArgumentError do
       GObject::RubyClosure.new
     end
   end
 
-  should "be a kind of Closure" do
+  it "is a kind of Closure" do
     c = GObject::RubyClosure.new {}
     assert_kind_of GObject::Closure, c
   end
 
-  should "be able to retrieve its block from its struct" do
+  it "is able to retrieve its block from its struct" do
     a = 0
     c = GObject::RubyClosure.new { a = 2 }
     c2 = GObject::RubyClosure.wrap(c.to_ptr)
@@ -21,14 +21,14 @@ describe GObject::RubyClosure do
   end
 
   describe "its #marshaller singleton method" do
-    should "invoke its closure argument's block" do
+    it "invokes its closure argument's block" do
       a = 0
       c = GObject::RubyClosure.new { a = 2 }
       GObject::RubyClosure.marshaller(c, nil, 0, nil, nil, nil)
       assert_equal 2, a
     end
 
-    should "work when its closure argument is a GObject::Closure" do
+    it "works when its closure argument is a GObject::Closure" do
       a = 0
       c = GObject::RubyClosure.new { a = 2 }
       c2 = GObject::Closure.wrap(c.to_ptr)
@@ -36,7 +36,7 @@ describe GObject::RubyClosure do
       assert_equal 2, a
     end
 
-    should "store the closure's return value in the proper gvalue" do
+    it "stores the closure's return value in the proper gvalue" do
       c = GObject::RubyClosure.new { 2 }
       gv = GObject::Value.new
       GObject::RubyClosure.marshaller(c, gv, 0, nil, nil, nil)
@@ -44,7 +44,7 @@ describe GObject::RubyClosure do
     end
   end
 
-  should "have GObject::Closure#invoke call its block" do
+  it "has GObject::Closure#invoke call its block" do
     a = 0
     c = GObject::RubyClosure.new { a = 2 }
     c2 = GObject::Closure.wrap(c.to_ptr)

data/test/ffi-glib/sized_array_test.rb

@@ -36,7 +36,7 @@ describe GLib::SizedArray do
   end
 
   describe "::from" do
-    context "from a Ruby array" do
+    describe "from a Ruby array" do
       it "creates a GLib::SizedArray with the same elements" do
         arr = GLib::SizedArray.from :gint32, 3, [3, 2, 1]
         arr.must_be_instance_of GLib::SizedArray
@@ -53,7 +53,7 @@ describe GLib::SizedArray do
       end
     end
 
-    context "from a GLib::SizedArray" do
+    describe "from a GLib::SizedArray" do
       it "return its argument" do
         arr = GLib::SizedArray.from :gint32, 3, [3, 2, 1]
         arr2 = GLib::SizedArray.from :gint32, 3, arr

data/test/ffi-gobject/gobject_test.rb

@@ -5,19 +5,10 @@ require 'ffi-gobject'
 GirFFI.setup :GIMarshallingTests
 
 describe GObject do
-  it "has type_init as a public method" do
-    assert GObject.respond_to?('type_init')
-  end
-
-  it "does not have g_type_init as a public method" do
-    assert GObject.respond_to?('g_type_init') == false
-  end
-
-  context "::type_init" do
+  describe ".type_init" do
     it "does not raise an error" do
-      assert_nothing_raised do
-        GObject.type_init
-      end
+      GObject.type_init
+      pass
     end
   end
 

data/test/ffi-gobject/object_test.rb

@@ -8,9 +8,40 @@ describe GObject::Object do
       assert_equal 1,
         GObject::Object.instance_method("get_property").arity
     end
+  end
+
+  describe "automatic accessor methods" do
+    class AccessorTest < GObject::Object
+      def get_x
+        @x
+      end
+      def set_x(val)
+        @x = val
+      end
+    end
+
+    subject { AccessorTest.new GObject::TYPE_OBJECT, nil }
+
+    it 'reads x by calling get_x' do
+      subject.set_x(1)
+      assert_equal 1, subject.x
+    end
+
+    it 'writes x by calling set_x' do
+      subject.x = 2
+      assert_equal 2, subject.x
+    end
+  end
+
+  describe "#signal_connect" do
+    subject { GObject::Object.new GObject::TYPE_OBJECT, nil }
+    it 'delegates to GObject' do
+      mock(GObject).signal_connect(subject, 'some-event')
+      subject.signal_connect('some-event') do
+        nothing
+      end
 
-    it 'includes GObject::RubyStyle' do
-      assert GObject::Object.included_modules.include?(GObject::RubyStyle)
+      RR.verify
     end
   end
 end

data/test/ffi-gobject/value_test.rb

@@ -43,12 +43,69 @@ describe GObject::Value do
   end
 
   describe "#set_value" do
-    it "handles :int64" do
+    it "handles char values" do
+      value = 83
+      gv = GObject::Value.for_g_type GObject::TYPE_CHAR
+      gv.set_value value
+      gv.get_char.must_equal value
+    end
+
+    it "handles GType values" do
+      value = GObject::TYPE_STRING
+      gv = GObject::Value.for_g_type GObject::TYPE_GTYPE
+      gv.set_value value
+      gv.get_gtype.must_equal value
+    end
+
+    it "handles int64 values" do
       value = 0x1234_5678_9012_3456
       gv = GObject::Value.for_g_type GObject::TYPE_INT64
       gv.set_value value
       gv.get_int64.must_equal value
     end
+
+    it "handles long values" do
+      value = 0x1234_5678_9012_3456
+      gv = GObject::Value.for_g_type GObject::TYPE_LONG
+      gv.set_value value
+      gv.get_long.must_equal value
+    end
+
+    it "handles uchar values" do
+      value = 83
+      gv = GObject::Value.for_g_type GObject::TYPE_UCHAR
+      gv.set_value value
+      gv.get_uchar.must_equal value
+    end
+
+    it "handles uint values" do
+      value = 0x1234_5678
+      gv = GObject::Value.for_g_type GObject::TYPE_UINT
+      gv.set_value value
+      gv.get_uint.must_equal value
+    end
+
+    it "handles uint64 values" do
+      value = 0x1234_5678_9012_3456
+      gv = GObject::Value.for_g_type GObject::TYPE_UINT64
+      gv.set_value value
+      gv.get_uint64.must_equal value
+    end
+
+    it "handles ulong values" do
+      value = 0x1234_5678_9012_3456
+      gv = GObject::Value.for_g_type GObject::TYPE_ULONG
+      gv.set_value value
+      gv.get_ulong.must_equal value
+    end
+
+    it "handles variant values" do
+      value = GLib::Variant.new_string("Foo")
+      gv = GObject::Value.for_g_type GObject::TYPE_VARIANT
+      gv.set_value value
+      gv.get_variant.must_equal value
+    end
+
   end
 
   describe "#get_value" do
@@ -64,6 +121,20 @@ describe GObject::Value do
       assert_equal true, result
     end
 
+    it "unwraps a char" do
+      value = 3
+      gv = GObject::Value.for_g_type GObject::TYPE_CHAR
+      gv.set_char value
+      gv.get_value.must_equal value
+    end
+
+    it "unwraps a GType" do
+      value = GObject::TYPE_STRING
+      gv = GObject::Value.for_g_type GObject::TYPE_GTYPE
+      gv.set_gtype value
+      gv.get_value.must_equal value
+    end
+
     it "unwraps an int64" do
       value = 0x1234_5678_9012_3456
       gv = GObject::Value.for_g_type GObject::TYPE_INT64
@@ -71,6 +142,48 @@ describe GObject::Value do
       gv.get_value.must_equal value
     end
 
+    it "unwraps a long" do
+      value = 0x1234_5678_9012_3456
+      gv = GObject::Value.for_g_type GObject::TYPE_LONG
+      gv.set_long value
+      gv.get_value.must_equal value
+    end
+
+    it "unwraps an uchar" do
+      value = 3
+      gv = GObject::Value.for_g_type GObject::TYPE_UCHAR
+      gv.set_uchar value
+      gv.get_value.must_equal value
+    end
+
+    it "unwraps an uint" do
+      value = 0x1234_5678
+      gv = GObject::Value.for_g_type GObject::TYPE_UINT
+      gv.set_uint value
+      gv.get_value.must_equal value
+    end
+
+    it "unwraps an uint64" do
+      value = 0x1234_5678_9012_3456
+      gv = GObject::Value.for_g_type GObject::TYPE_UINT64
+      gv.set_uint64 value
+      gv.get_value.must_equal value
+    end
+
+    it "unwraps a ulong" do
+      value = 0x1234_5678_9012_3456
+      gv = GObject::Value.for_g_type GObject::TYPE_ULONG
+      gv.set_ulong value
+      gv.get_value.must_equal value
+    end
+
+    it "unwraps a variant" do
+      value = GLib::Variant.new_string("Foo")
+      gv = GObject::Value.for_g_type GObject::TYPE_VARIANT
+      gv.set_variant value
+      gv.get_value.must_equal value
+    end
+
     it "works with a ByteArray" do
       ba = GLib::ByteArray.new.append("some bytes")
       v = GObject::Value.for_g_type GObject.type_from_name("GByteArray")