ffi-efl 0.0.2 → 0.0.3

data/lib/efl/ffi.rb

@@ -5,9 +5,7 @@ require 'ffi'
 #
 module Efl
     #
-    module API
-        #
-        extend FFI::Library
+    module FFIHelper
         #
         def attach_fcts fcts
             fcts.each do |func|
@@ -18,53 +16,98 @@ module Efl
                 end
             end
         end
-        module_function :attach_fcts
         #
-        typedef :pointer, :char_p
-        typedef :pointer, :short_p
-        typedef :pointer, :int_p
-        typedef :pointer, :long_p
-        typedef :pointer, :float_p
-        typedef :pointer, :double_p
-        typedef :pointer, :uchar_p
-        typedef :pointer, :ushort_p
-        typedef :pointer, :uint_p
-        typedef :pointer, :ulong_p
-        typedef :pointer, :ufloat_p
-        typedef :pointer, :udouble_p
-        typedef :pointer, :void_p
-        typedef :pointer, :string_array
-        typedef :pointer, :string_array_p
+        def ffi_typedefs
+            @ffi_typedefs
+        end
         #
-        typedef :pointer, :eina_list_p
-        typedef :pointer, :eina_iterator_p
-        typedef :pointer, :eina_accessor_p
-        typedef :pointer, :evas_p
-        typedef :pointer, :evas_object_p
+        def steal_ffitype mod, sym
+            typedef mod.ffi_typedefs[sym], sym
+        end
+        #
+        def self.extended mod
+            #
+            mod.extend FFI::Library
+            #
+            mod.typedef :pointer, :char_p
+            mod.typedef :pointer, :short_p
+            mod.typedef :pointer, :int_p
+            mod.typedef :pointer, :long_p
+            mod.typedef :pointer, :float_p
+            mod.typedef :pointer, :double_p
+            mod.typedef :pointer, :uchar_p
+            mod.typedef :pointer, :ushort_p
+            mod.typedef :pointer, :uint_p
+            mod.typedef :pointer, :ulong_p
+            mod.typedef :pointer, :ufloat_p
+            mod.typedef :pointer, :udouble_p
+            mod.typedef :pointer, :void_p
+            mod.typedef :pointer, :string_array
+            mod.typedef :pointer, :string_array_p
+            mod.typedef :uint_p,  :uintptr_t
+            #
+            mod.typedef :bool,    :eina_bool
+            mod.typedef :pointer, :eina_bool_p
+            mod.typedef :pointer, :eina_list_p
+            mod.typedef :pointer, :eina_hash_p
+            mod.typedef :pointer, :eina_iterator_p
+            mod.typedef :pointer, :eina_accessor_p
+            mod.typedef :pointer, :evas_p
+            mod.typedef :pointer, :evas_object_p
+            mod.typedef :pointer, :evas_object_pp
+            mod.typedef :pointer, :ecore_getopt_p
+            mod.typedef :pointer, :ecore_getopt_desc_p
+            mod.typedef :pointer, :ecore_getopt_value_p
+            #
+            mod.callback :eina_compare_cb, [ :void_p, :void_p ], :int
+            mod.callback :eina_each_cb, [ :void_p, :void_p, :void_p ], :eina_bool
+            mod.callback :eina_free_cb, [ :void_p ], :void
+            #
+        end
         #
     end
     #
-    module Helper
-        def self.included m
-            m.class_eval "def ptr; @ptr; end"
-            m.class_eval "def self.func_prefixes; @func_prefixes; end"
-            m.class_eval "def self.inherited sub; sub.class_eval 'def self.func_prefixes; superclass.func_prefixes; end'; end"
+    module ClassHelper
+        def to_ptr; @ptr; end
+        def === o; @ptr === o.to_ptr; end
+        def address; @ptr.address; end
+        def self.included kls
+            # create class instance @proxy_list
+            kls.class_eval "@proxy_list ||=[]"
+            # access and prepend *args to @proxy_list
+            kls.class_eval "def self.proxy_list *args; @proxy_list.unshift *args unless args.empty?; @proxy_list; end"
+            # on inheritance, copy ancestor's @proxy_list
+            kls.class_eval <<-EOF
+            def self.inherited sub
+                sub.class_eval '@proxy_list = []'
+                sub.proxy_list *self.proxy_list
+            end
+            EOF
         end
         def method_missing m, *args, &block
-            self.class.func_prefixes.each do |p|
-                sym = p+m.to_s
-                if Efl::API.respond_to? sym
-                    self.class.class_eval "def #{m} *args, &block; r=Efl::API.#{sym}(@ptr,*args); yield r if block_given?; r; end" 
+            if m =~/^(.*)=$/
+                m_s = $1+'_set'
+                args_s = '*args[0]'
+            elsif m =~/^(.*)\?$/
+                m_s = $1+'_get'
+                args_s = '*args'
+            else
+                m_s = m.to_s
+                args_s = '*args'
+            end
+            self.class.proxy_list.each do |mod,p|
+                sym = p+m_s
+                if mod.respond_to? sym
+                    self.class.class_eval "def #{m} *args, &block; r=#{mod.name}.#{sym}(@ptr,#{args_s}); yield r if block_given?; r; end"
+                    return self.send m, *args, &block
+                elsif mod.respond_to? m
+                    self.class.class_eval "def #{m} *args, &block; r=#{mod.name}.#{m}(@ptr,#{args_s}); yield r if block_given?; r; end"
                     return self.send m, *args, &block
                 end
             end
-            r = Efl::API.send m, @ptr, *args
-            self.class.class_eval "def #{m} *args, &block; r=Efl::API.#{m}(@ptr,*args); yield r if block_given?; r; end" 
-            r
+            raise NameError.new "#{self.class} is unable to resolve #{m} within #{self.class.proxy_list.inspect}"
         end
     end
 end
 #
-require 'efl/eina/eina_types-ffi'
-#
 # EOF

data/lib/efl.rb

@@ -4,14 +4,19 @@
 #
 module Efl
     #
-    VERSION = '0.0.2'
+    VERSION = '0.0.3'
     #
-    autoload :Eet,          './lib/efl/eet.rb'
-    autoload :Evas,         './lib/efl/evas.rb'
-    autoload :Ecore,        './lib/efl/ecore.rb'
+    autoload :EcoreEvas,    './lib/efl/ecore_evas.rb'
     autoload :EcoreGetopt,  './lib/efl/ecore_getopt.rb'
+    autoload :EcoreInput,   './lib/efl/ecore_input.rb'
+    autoload :Ecore,        './lib/efl/ecore.rb'
     autoload :Edje,         './lib/efl/edje.rb'
+    autoload :Eet,          './lib/efl/eet.rb'
+    autoload :EinHash,      './lib/efl/eina_hash.rb'
+    autoload :EinaList,     './lib/efl/eina_list.rb'
+    autoload :Eina,         './lib/efl/eina.rb'
     autoload :Elm,          './lib/efl/elementary.rb'
+    autoload :Evas,         './lib/efl/evas.rb'
 end
 #
 # EOF

data/spec/ecore_evas_spec.rb

@@ -0,0 +1,24 @@
+#! /usr/bin/env ruby
+# -*- coding: UTF-8 -*-
+#
+require 'efl/ecore_evas'
+#
+describe Efl::EcoreEvas do
+    #
+    before(:all) do
+        EcoreEvas = Efl::EcoreEvas
+    end
+    #
+    it "should init" do
+        EcoreEvas.init.should eql 1
+        EcoreEvas.init.should eql 2
+        EcoreEvas.init.should eql 3
+    end
+    #
+    it "should shutdown" do
+        EcoreEvas.shutdown.should eql 2
+        EcoreEvas.shutdown.should eql 1
+        EcoreEvas.shutdown.should eql 0
+    end
+    #
+end

data/spec/ecore_getopt_spec.rb

@@ -1,7 +1,6 @@
 #! /usr/bin/env ruby
 # -*- coding: UTF-8 -*-
 #
-require 'efl/ecore'
 require 'efl/ecore_getopt'
 #
 describe Efl::EcoreGetopt do
@@ -9,7 +8,7 @@ describe Efl::EcoreGetopt do
     before(:all) do
         Efl::Ecore.init
         #
-        @p = Efl::EcoreGetopt::Parser.new :prog =>"Prog", :usage => "Usage", :version => "0.0.0", :copyright => "less", :license => "MIT", :description => "description", :strict => 1
+        @p = Efl::EcoreGetopt::REcoreGetopt.new :prog =>"Prog", :usage => "Usage", :version => "0.0.0", :copyright => "less", :license => "MIT", :description => "description", :strict => 1
         @callback = Proc.new do |parser, desc, string, data, value|
             parser.address.should eql @p.to_ptr.address
             string.should eql "my_data"

data/spec/ecore_input_spec.rb

@@ -0,0 +1,24 @@
+#! /usr/bin/env ruby
+# -*- coding: UTF-8 -*-
+#
+require 'efl/ecore_input'
+#
+describe Efl::EcoreInput do
+    #
+    before(:all) do
+        EcoreInput = Efl::EcoreInput
+    end
+    #
+    it "should init" do
+        EcoreInput.init.should eql 1
+        EcoreInput.init.should eql 2
+        EcoreInput.init.should eql 3
+    end
+    #
+    it "should shutdown" do
+        EcoreInput.shutdown.should eql 2
+        EcoreInput.shutdown.should eql 1
+        EcoreInput.shutdown.should eql 0
+    end
+    #
+end

data/spec/ecore_spec.rb

@@ -4,10 +4,9 @@
 require 'efl/ecore'
 #
 describe Efl::Ecore do
-    #
-    include Efl
     #
     before(:all) do
+        Ecore = Efl::Ecore
         USER_SIGNAL_CB = Proc.new do |data, type, event|
             data.read_string.should eql "ok"
             type.should eql Ecore::EVENT_SIGNAL_USER
@@ -51,7 +50,7 @@ describe Efl::Ecore do
             bytes.should eql 12
         end
         Ecore.init
-        pipe = Ecore::EcorePipe.new cb, data
+        pipe = Ecore::REcorePipe.new cb, data
         pipe.write("hello world").should be_true
         Ecore.main_loop_iterate
         pipe.read_close

data/spec/edje_spec.rb

@@ -5,7 +5,7 @@ require 'efl/edje'
 #
 describe Efl::Edje do
     #
-    include Efl
+    before(:all) { Edje = Efl::Edje }
     #
     it "should init" do
         Edje.init.should eql 1

data/spec/eet_spec.rb

@@ -5,7 +5,10 @@ require 'efl/eet'
 #
 describe Efl::Eet do
     #
-    include Efl
+    before(:all) {
+        Eet = Efl::Eet
+        REetFile = Efl::Eet::REetFile
+    }
     #
     FP = '/tmp/_eet.cfg'
     #
@@ -28,80 +31,76 @@ describe Efl::Eet do
     end
     #
     it "should have good enums" do
-        Efl::API.enum_type(:eet_file_mode)[:eet_file_mode_invalid].should eql -1
-        Efl::API.enum_type(:eet_file_mode)[:eet_file_mode_read].should eql 0
-        Efl::API.enum_type(:eet_file_mode)[:eet_file_mode_write].should eql 1
-        Efl::API.enum_type(:eet_file_mode)[:eet_file_mode_read_write].should eql 2
+        Eet.enum_type(:eet_file_mode)[:eet_file_mode_invalid].should eql -1
+        Eet.enum_type(:eet_file_mode)[:eet_file_mode_read].should eql 0
+        Eet.enum_type(:eet_file_mode)[:eet_file_mode_write].should eql 1
+        Eet.enum_type(:eet_file_mode)[:eet_file_mode_read_write].should eql 2
     end
     #
-    it "should open and close" do
-        Eet.init
-        f = Eet.open FP, Efl::API.enum_type(:eet_file_mode)[:eet_file_mode_write]
-        f.write 'fake', 'value'
-        f.close
-        Eet.shutdown
-    end
-    #
-    it "should be able to get file access mode" do
-        Eet.init
-        Efl::API.enum_type(:eet_file_mode).symbols.each do |m|
-            next if m==:eet_file_mode_invalid
-            Eet.open FP, Efl::API.enum_type(:eet_file_mode)[m] do |f|
-                f.mode_get.should eql m
+    describe Efl::Eet::REetFile do
+        before(:each) { Eet.init }
+        after(:each) { Eet.shutdown }
+        #
+        it "should open and close" do
+            f = REetFile.open FP, Eet.enum_type(:eet_file_mode)[:eet_file_mode_write]
+            f.write 'fake', 'value'
+            f.close
+        end
+        #
+        it "should be able to get file access mode" do
+            Eet.enum_type(:eet_file_mode).symbols.each do |m|
+                next if m==:eet_file_mode_invalid
+                REetFile.open FP, Eet.enum_type(:eet_file_mode)[m] do |f|
+                    f.mode_get.should eql m
+                end
             end
         end
-        Eet.shutdown
-    end
-    #
-    it "should write" do
-        Eet.init
-        f = Eet.open FP, :eet_file_mode_write
-        f.mode_get.should eql :eet_file_mode_write
-        f.write 'config', 'test key'
-        f.close
-        Eet.shutdown
-    end
-    #
-    it "should read" do
-        Eet.init
-        f = Eet.open FP, :eet_file_mode_read
-        f.mode_get.should eql :eet_file_mode_read
-        f.read('config').should eql 'test key'
-        f.close
-        Eet.shutdown
-    end
-    #
-    it "should read/write" do
-        Eet.init
-        f = Eet.open FP, :eet_file_mode_read_write
-        f.write 'configg', 'test key'
-        f.read('configg').should eql 'test key'
-        f.close
-        Eet.shutdown
-    end
-    #
-    it "should write in block" do
-        Eet.init
-        Eet.open FP, :eet_file_mode_write do |f|
-            f.write 'config2', 'test--key'
+        #
+        it "should write" do
+            f = REetFile.open FP, :eet_file_mode_write
+            f.mode_get.should eql :eet_file_mode_write
+            f.write 'config', 'test key'
+            f.close
         end
-        Eet.shutdown
-    end
-    #
-    it "should read in block" do
-        Eet.init
-        Eet.open FP, :eet_file_mode_read do |f|
-            f.read('config2').should eql 'test--key'
+        #
+        it "default mode should be read" do
+            f = REetFile.open FP
+            f.mode_get.should eql :eet_file_mode_read
+            f.close
         end
-        Eet.shutdown
-    end
-    #
-    it "should read/write in block" do
-        Eet.init
-        Eet.open FP, :eet_file_mode_read_write do |f|
-            f.write 'config22', 'test--key'
-            f.read('config22').should eql 'test--key'
+        #
+        it "should read" do
+            f = REetFile.open FP, :eet_file_mode_read
+            f.mode_get.should eql :eet_file_mode_read
+            f.read('config').should eql 'test key'
+            f.close
+        end
+        #
+        it "should read/write" do
+            f = REetFile.open FP, :eet_file_mode_read_write
+            f.write 'configg', 'test key'
+            f.read('configg').should eql 'test key'
+            f.close
+        end
+        #
+        it "should write in block" do
+            REetFile.open FP, :eet_file_mode_write do |f|
+                f.write 'config2', 'test--key'
+            end
+        end
+        #
+        it "should read in block" do
+            REetFile.open FP, :eet_file_mode_read do |f|
+                f.read('config2').should eql 'test--key'
+            end
+        end
+        #
+        it "should read/write in block" do
+            REetFile.open FP, :eet_file_mode_read_write do |f|
+                f.write 'config22', 'test--key'
+                f.read('config22').should eql 'test--key'
+            end
         end
-        Eet.shutdown
+        #
     end
 end

data/spec/eina_hash_spec.rb

@@ -0,0 +1,180 @@
+#! /usr/bin/env ruby
+# -*- coding: UTF-8 -*-
+#
+require 'efl/eina_hash'
+#
+describe Efl::EinaHash do
+    #
+    before(:all) {
+        REinaHash = Efl::EinaHash::REinaHash
+        Efl::Eina.init.should eql 1
+        @d0 = FFI::MemoryPointer.from_string "D0"
+        @d1 = FFI::MemoryPointer.from_string "D1"
+        @d2 = FFI::MemoryPointer.from_string "D2"
+        @d3 = FFI::MemoryPointer.from_string "D3"
+    }
+    after(:all) {
+        Efl::Eina.shutdown.should eql 0
+    }
+    #
+    it "should append prepend and fetch" do
+        h = REinaHash.new
+        h.add 'k2', @d2
+        h.add 'k1', @d1
+        h['k3']=@d3
+        h['k0']=@d0
+        h['k0'].read_string.should eql "D0"
+        h['k1'].read_string.should eql "D1"
+        h['k2'].read_string.should eql "D2"
+        h['k3'].read_string.should eql "D3"
+        cpt=0
+        h.each { |k,v|
+            cpt+=1
+            v.read_string.empty?.should be_false
+        }
+        cpt.should eql 4
+    end
+    #
+    it "should be able to convert into ruby Hash from NULL pointer" do
+        h = Hash.from_eina_hash FFI::Pointer::NULL
+        h.empty?.should be_true
+        h.is_a?(Hash).should be_true
+    end
+    #
+    it "should be able to convert into ruby Hash from empty REinaHash" do
+        h = Hash.from_eina_hash REinaHash.new
+        h.empty?.should be_true
+        h.is_a?(Hash).should be_true
+    end
+    #
+    it "should be able to convert into ruby Hash from empty REinaHash pointer" do
+        h = Hash.from_eina_hash REinaHash.new.to_ptr
+        h.empty?.should be_true
+        h.is_a?(Hash).should be_true
+    end
+    #
+    it "should be able to convert into ruby Hash from non empty REinaHash" do
+        h = REinaHash.new
+        d0 = FFI::MemoryPointer.from_string "D0"
+        d1 = FFI::MemoryPointer.from_string "D1"
+        d2 = FFI::MemoryPointer.from_string "D2"
+        d3 = FFI::MemoryPointer.from_string "D3"
+        h.add 'k2', d2
+        h.add 'k1', d1
+        h['k3']=d3
+        h["k0"]=d0
+        h["k0"].read_string.should eql "D0"
+        h['k1'].read_string.should eql "D1"
+        h['k2'].read_string.should eql "D2"
+        h['k3'].read_string.should eql "D3"
+        cpt=0
+        h.each { |k,v|
+            cpt+=1
+            v.read_string.empty?.should be_false
+            true
+        }
+        cpt.should eql 4
+        rh =  Hash.from_eina_hash h
+        rh.length.should eql 4
+        rh2 = {}
+        rh.each { |k,v|
+            rh2[k.read_string]=v.read_string
+            true
+        }
+        rh2['k0'].should eql 'D0'
+        rh2['k1'].should eql 'D1'
+        rh2['k2'].should eql 'D2'
+        rh2['k3'].should eql 'D3'
+    end
+    #
+    it "should be able to convert into ruby Hash from non empty REinaHash pointer" do
+        h = REinaHash.new
+        d0 = FFI::MemoryPointer.from_string "D0"
+        d1 = FFI::MemoryPointer.from_string "D1"
+        d2 = FFI::MemoryPointer.from_string "D2"
+        d3 = FFI::MemoryPointer.from_string "D3"
+        h.add 'k2', d2
+        h.add 'k1', d1
+        h['k3']=d3
+        h['k0']=d0
+        h['k0'].read_string.should eql "D0"
+        h['k1'].read_string.should eql "D1"
+        h['k2'].read_string.should eql "D2"
+        h['k3'].read_string.should eql "D3"
+        rh =  Hash.from_eina_hash h.to_ptr
+        rh.length.should eql 4
+    end
+    #
+    it "should be able to convert into ruby Hash from non empty REinaHash pointer, with key from string" do
+        h = REinaHash.new
+        d0 = FFI::MemoryPointer.from_string "D0"
+        d1 = FFI::MemoryPointer.from_string "D1"
+        d2 = FFI::MemoryPointer.from_string "D2"
+        d3 = FFI::MemoryPointer.from_string "D3"
+        h.add 'k2', d2
+        h.add 'k1', d1
+        h['k3']=d3
+        h['k0']=d0
+        h['k0'].read_string.should eql "D0"
+        h['k1'].read_string.should eql "D1"
+        h['k2'].read_string.should eql "D2"
+        h['k3'].read_string.should eql "D3"
+        rh =  h.to_h_conv
+        rh.length.should eql 4
+        rh['k0'].read_string.should eql "D0"
+        rh['k1'].read_string.should eql "D1"
+        rh['k2'].read_string.should eql "D2"
+        rh['k3'].read_string.should eql "D3"
+    end
+    #
+    it "should be able to convert into ruby Hash from non empty REinaHash pointer, with key from string block" do
+        h = REinaHash.new
+        d0 = FFI::MemoryPointer.from_string "D0"
+        d1 = FFI::MemoryPointer.from_string "D1"
+        d2 = FFI::MemoryPointer.from_string "D2"
+        d3 = FFI::MemoryPointer.from_string "D3"
+        h.add 'k2', d2
+        h.add 'k1', d1
+        h['k3']=d3
+        h['k0']=d0
+        h['k0'].read_string.should eql "D0"
+        h['k1'].read_string.should eql "D1"
+        h['k2'].read_string.should eql "D2"
+        h['k3'].read_string.should eql "D3"
+        cpt=0
+        rh =  h.to_h_conv { |k| cpt+=1; k.read_string }
+        cpt.should eql 4
+        rh.length.should eql 4
+        rh['k0'].read_string.should eql "D0"
+        rh['k1'].read_string.should eql "D1"
+        rh['k2'].read_string.should eql "D2"
+        rh['k3'].read_string.should eql "D3"
+    end
+    #
+    it "should be able to build from ruby Hash" do
+        rh = {}
+        k0 = FFI::MemoryPointer.from_string "0"
+        k1 = FFI::MemoryPointer.from_string "1"
+        k2 = FFI::MemoryPointer.from_string "2"
+        k3 = FFI::MemoryPointer.from_string "3"
+        d0 = FFI::MemoryPointer.from_string "D0"
+        d1 = FFI::MemoryPointer.from_string "D1"
+        d2 = FFI::MemoryPointer.from_string "D2"
+        d3 = FFI::MemoryPointer.from_string "D3"
+        rh[k0]=d0
+        rh[k1]=d1
+        rh[k2]=d2
+        rh[k3]=d3
+        h = REinaHash.new rh
+        h[k0].read_string.should eql "D0"
+        h[k1].read_string.should eql "D1"
+        h[k2].read_string.should eql "D2"
+        h[k3].read_string.should eql "D3"
+    end
+    #
+    it "alternate constructor should work" do
+        cstr_cnt = 0
+        h = REinaHash.new { cstr_cnt+=1; Efl::EinaHash.eina_hash_string_superfast_new FFI::Pointer::NULL }
+        cstr_cnt.should eql 1
+    end
+end