gir_ffi 0.1.0 → 0.2.0

data/lib/gir_ffi/class_base.rb

@@ -5,7 +5,7 @@ module GirFFI
   class ClassBase
     # TODO: Make separate base for :struct, :union, :object.
     extend Forwardable
-    def_delegators :@struct, :[], :[]=, :to_ptr
+    def_delegators :@struct, :to_ptr
 
     def initialize(*args)
       @struct = ffi_structure.new(*args)
@@ -50,6 +50,10 @@ module GirFFI
         _builder.find_signal name
       end
 
+      def _find_property name
+        _builder.find_property name
+      end
+
       def _setup_method name
         _builder.setup_method name
       end
@@ -63,6 +67,9 @@ module GirFFI
 
       def wrap ptr
 	return nil if ptr.nil? or ptr.null?
+        unless ptr.is_a? FFI::Pointer
+          ptr = ptr.to_ptr
+        end
 	_real_new ptr
       end
 

data/lib/gir_ffi/in_out_pointer.rb

@@ -2,17 +2,28 @@ module GirFFI
   # The InOutPointer class handles conversion between ruby types and
   # pointers for arguments with direction :inout and :out.
   class InOutPointer < FFI::Pointer
-    def initialize ptr, type, ffi_type
+    def initialize ptr, type, ffi_type, sub_type=nil
       super ptr
       @ffi_type = ffi_type
       @value_type = type
+      @sub_type = sub_type
     end
 
+    private :initialize
+
     def to_value
       value = self.send "get_#{@ffi_type}", 0
       adjust_value_out value
     end
 
+    def to_sized_array_value size
+      # FIXME: Simulated Polymorphism.
+      raise "Not allowed" if @value_type != :pointer or @sub_type.nil?
+      block = self.read_pointer
+      return nil if block.null?
+      ArgHelper.ptr_to_typed_array @sub_type, block, size
+    end
+
     private
 
     def adjust_value_out value
@@ -27,39 +38,27 @@ module GirFFI
     end
 
     def self.for type
-      ffi_type = type_to_ffi_type type
+      ffi_type = TypeMap.map_basic_type_or_string type
       ptr = AllocationHelper.safe_malloc(FFI.type_size ffi_type)
       ptr.send "put_#{ffi_type}", 0, nil_value_for(type)
       self.new ptr, type, ffi_type
     end
 
-    def self.from type, value
+    def self.from type, value, sub_type=nil
       value = adjust_value_in type, value
-      ffi_type = type_to_ffi_type type
+      ffi_type = TypeMap.map_basic_type_or_string type
       ptr = AllocationHelper.safe_malloc(FFI.type_size ffi_type)
       ptr.send "put_#{ffi_type}", 0, value
-      self.new ptr, type, ffi_type
+      self.new ptr, type, ffi_type, sub_type
     end
 
     def self.from_array type, array
       return nil if array.nil?
       ptr = InPointer.from_array(type, array)
-      self.from :pointer, ptr
+      self.from :pointer, ptr, type
     end
 
     class << self
-      # TODO: Make separate module to hold type info.
-      def type_to_ffi_type type
-        case type
-        when :gboolean
-          :int32
-        when :utf8
-          :pointer
-        else
-          TypeMap.map_basic_type type
-        end
-      end
-
       def adjust_value_in type, value
         case type
         when :gboolean

data/lib/gir_ffi/in_pointer.rb

@@ -17,7 +17,14 @@ module GirFFI
 
     def self.from type, val
       return nil if val.nil?
-      from_utf8 val
+      case type
+      when :utf8
+        from_utf8 val
+      when :gint32, :gint8
+        self.new val
+      else
+        raise NotImplementedError
+      end
     end
 
     class << self

data/lib/gir_ffi/type_map.rb

@@ -25,5 +25,17 @@ module GirFFI
     def self.map_basic_type type
       TAG_TYPE_MAP[type] || type
     end
+
+    # FIXME: Make name more descriptive.
+    def self.map_basic_type_or_string type
+      case type
+      when :gboolean
+        :int32
+      when :utf8
+        :pointer
+      else
+        map_basic_type(type)
+      end
+    end
   end
 end

data/lib/gir_ffi/variable_name_generator.rb

@@ -0,0 +1,12 @@
+module GirFFI
+  class VariableNameGenerator
+    def initialize
+      @varno = 0
+    end
+
+    def new_var
+      @varno += 1
+      "_v#{@varno}"
+    end
+  end
+end

data/lib/gir_ffi/version.rb

@@ -1,4 +1,4 @@
 module GirFFI
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end
 

data/test/ffi-glib/array_test.rb

@@ -0,0 +1,54 @@
+require File.expand_path('../gir_ffi_test_helper.rb', File.dirname(__FILE__))
+
+describe GLib::Array do
+  it "knows its element type" do
+    arr = GLib::Array.new :gint32
+    assert_equal :gint32, arr.element_type
+  end
+
+  describe "#append_vals" do
+    before do
+      @arr = GLib::Array.new :gint32
+      @result = @arr.append_vals [1, 2, 3]
+    end
+
+    it "appends values" do
+      assert_equal 3, @arr.len
+    end
+
+    it "returns self" do
+      assert_equal @result, @arr
+    end
+  end
+
+  describe "#each" do
+    before do
+      @arr = GLib::Array.new(:gint32).append_vals [1, 2, 3]
+    end
+
+    it "iterates over the values" do
+      a = []
+      @arr.each {|v| a << v }
+
+      assert_equal [1, 2, 3], a
+    end
+
+    it "returns an enumerator if no block is given" do
+      en = @arr.each
+      assert_equal 1, en.next
+      assert_equal 2, en.next
+      assert_equal 3, en.next
+    end
+  end
+
+  it "includes Enumerable" do
+    GLib::Array.must_include Enumerable
+  end
+
+  it "has a working #to_a method" do
+    arr = GLib::Array.new :gint32
+    arr.append_vals [1, 2, 3]
+    assert_equal [1, 2, 3], arr.to_a
+  end
+end
+

data/test/ffi-glib/byte_array_test.rb

@@ -0,0 +1,21 @@
+require File.expand_path('../gir_ffi_test_helper.rb', File.dirname(__FILE__))
+
+describe GLib::ByteArray do
+  it "can succesfully be created with Glib::ByteArray.new" do
+    ba = GLib::ByteArray.new
+    assert_instance_of GLib::ByteArray, ba
+  end
+
+  it "allows strings to be appended to it" do
+    ba = GLib::ByteArray.new
+    ba.append "abdc"
+    pass
+  end
+
+  it "has a working #to_string method" do
+    ba = GLib::ByteArray.new
+    ba = ba.append "abdc"
+    assert_equal "abdc", ba.to_string
+  end
+end
+

data/test/ffi-glib/glib_overrides_test.rb

@@ -27,57 +27,12 @@ describe "With the GLib overrides" do
   end
 
   describe "HashTable" do
-    it "can be created (for now) with Glib.hash_table_new" do
-      h = GLib.hash_table_new :utf8, :utf8
-      h.to_hash.must_be :==, {}
-    end
-
     it "allows key-value pairs to be inserted" do
-      h = GLib.hash_table_new :utf8, :utf8
+      h = GLib::HashTable.new :utf8, :utf8
       h.insert "foo", "bar"
       h.to_hash.must_be :==, {"foo" => "bar"}
     end
   end
-
-  describe "ByteArray" do
-    it "can be created (for now) with Glib.byte_array_new" do
-      ba = GLib.byte_array_new
-      assert_instance_of GLib::ByteArray, ba
-    end
-
-    it "allows strings to be appended to it" do
-      ba = GLib.byte_array_new
-      GLib::byte_array_append ba, "abdc"
-      pass
-    end
-
-    it "has a working #to_s method" do
-      ba = GLib.byte_array_new
-      ba = GLib::byte_array_append ba, "abdc"
-      assert_equal "abdc", ba.to_string
-    end
-  end
-
-  describe "Array" do
-    it "can be created (for now) with Glib.array_new" do
-      arr = GLib.array_new :int32
-      assert_instance_of GLib::Array, arr
-      assert_equal :int32, arr.element_type
-    end
-
-    it "allows values to be appended to it" do
-      ba = GLib.array_new :int32
-      GLib.array_append_vals ba, [1, 2, 3]
-      assert_equal 3, ba[:len]
-    end
-
-    # TODO: Make GLib::Array a full Enumerable"
-    it "has a working #to_a method" do
-      ba = GLib.array_new :int32
-      GLib.array_append_vals ba, [1, 2, 3]
-      assert_equal [1, 2, 3], ba.to_a
-    end
-  end
 end
 
 

data/test/ffi-glib/hash_table_test.rb

@@ -0,0 +1,24 @@
+require File.expand_path('../gir_ffi_test_helper.rb', File.dirname(__FILE__))
+
+describe GLib::HashTable do
+  it "knows its key and value types" do
+    hsh = GLib::HashTable.new :gint32, :utf8
+    assert_equal :gint32, hsh.key_type
+    assert_equal :utf8, hsh.value_type
+  end
+
+  describe "::from_hash" do
+    it "creates a GHashTable from a Ruby array" do
+      hsh = GLib::HashTable.from_hash :utf8, :gint32,
+        {"foo" => 23, "bar" => 32}
+      assert_equal({"foo" => 23, "bar" => 32}, hsh.to_hash)
+    end
+
+    it "return its argument if given a GHashTable" do
+      hsh = GLib::HashTable.from_hash :utf8, :gint32, {"foo" => 23, "bar" => 32}
+      hsh2 = GLib::HashTable.from_hash :utf8, :gint32, hsh
+      assert_equal hsh, hsh2
+    end
+  end
+end
+

data/test/ffi-glib/list_test.rb

@@ -0,0 +1,46 @@
+require File.expand_path('../gir_ffi_test_helper.rb', File.dirname(__FILE__))
+
+describe GLib::List do
+  it "knows its element type" do
+    arr = GLib::List.new :gint32
+    assert_equal :gint32, arr.element_type
+  end
+
+  describe "#append" do
+    it "appends integer values" do
+      lst = GLib::List.new :gint32
+      res = lst.append 1
+      assert_equal 1, res.data
+    end
+
+    it "appends string values" do
+      lst = GLib::List.new :utf8
+      res = lst.append "bla"
+      assert_equal "bla", res.data
+    end
+
+    it "appends multiple values into a single list" do
+      lst = GLib::List.new :gint32
+
+      lst = lst.append 1
+      lst = lst.append 2
+
+      assert_equal 1, lst.data
+      nxt = lst.next
+      assert_equal 2, nxt.data
+    end
+  end
+
+  describe "::from_array" do
+    it "creates a GList from a Ruby array" do
+      lst = GLib::List.from_array :gint32, [3, 2, 1]
+      assert_equal [3, 2, 1], lst.to_a
+    end
+
+    it "return its argument if given a GList" do
+      lst = GLib::List.from_array :gint32, [3, 2, 1]
+      lst2 = GLib::List.from_array :gint32, lst
+      assert_equal lst, lst2
+    end
+  end
+end

data/test/ffi-glib/ptr_array_test.rb

@@ -0,0 +1,51 @@
+require File.expand_path('../gir_ffi_test_helper.rb', File.dirname(__FILE__))
+
+describe GLib::PtrArray do
+  it "knows its element type" do
+    arr = GLib::PtrArray.new :utf8
+    assert_equal :utf8, arr.element_type
+  end
+
+  describe "::add" do
+    it "correctly takes the type into account" do
+      arr = GLib::PtrArray.new :utf8
+      str = "test"
+      GLib::PtrArray.add arr, str
+
+      assert_equal str, arr.pdata.read_pointer.read_string
+    end
+  end
+
+  it "has a working #each method" do
+    arr = GLib::PtrArray.new :utf8
+
+    GLib::PtrArray.add arr, "test1"
+    GLib::PtrArray.add arr, "test2"
+    GLib::PtrArray.add arr, "test3"
+
+    a = []
+    arr.each {|v| a << v}
+
+    assert_equal ["test1", "test2", "test3"], a
+  end
+
+  it "includes Enumerable" do
+    GLib::PtrArray.must_include Enumerable
+  end
+
+  it "has a working #to_a method" do
+    arr = GLib::PtrArray.new :utf8
+
+    GLib::PtrArray.add arr, "test1"
+    GLib::PtrArray.add arr, "test2"
+    GLib::PtrArray.add arr, "test3"
+
+    assert_equal ["test1", "test2", "test3"], arr.to_a
+  end
+
+  it "has #add as an instance method too" do
+    arr = GLib::PtrArray.new :utf8
+    arr.add "test1"
+    assert_equal ["test1"], arr.to_a
+  end
+end

data/test/ffi-glib/s_list_test.rb

@@ -0,0 +1,46 @@
+require File.expand_path('../gir_ffi_test_helper.rb', File.dirname(__FILE__))
+
+describe GLib::SList do
+  it "knows its element type" do
+    arr = GLib::SList.new :gint32
+    assert_equal :gint32, arr.element_type
+  end
+
+  describe "#prepend" do
+    it "prepends integer values" do
+      lst = GLib::SList.new :gint32
+      res = lst.prepend 1
+      assert_equal 1, res.data
+    end
+
+    it "prepends string values" do
+      lst = GLib::SList.new :utf8
+      res = lst.prepend "bla"
+      assert_equal "bla", res.data
+    end
+
+    it "prepends multiple values into a single list" do
+      lst = GLib::SList.new :gint32
+
+      res = lst.prepend 1
+      res2 = res.prepend 2
+
+      assert_equal 2, res2.data
+      assert_equal 1, res.data
+      assert_equal res.to_ptr, res2.next.to_ptr
+    end
+  end
+
+  describe "::from_array" do
+    it "creates a GSList from a Ruby array" do
+      lst = GLib::SList.from_array :gint32, [3, 2, 1]
+      assert_equal [3, 2, 1], lst.to_a
+    end
+
+    it "return its argument if given a GSList" do
+      lst = GLib::SList.from_array :gint32, [3, 2, 1]
+      lst2 = GLib::SList.from_array :gint32, lst
+      assert_equal lst, lst2
+    end
+  end
+end