ffi-efl 0.0.6 → 0.0.7

data/spec/eina_list_spec.rb

@@ -6,13 +6,13 @@ require 'efl/eina_list'
 #
 describe Efl::EinaList do
     #
-    before(:all) {
+    before(:all) do
         REinaList = Efl::EinaList::REinaList
-        Efl::Eina.init.should == 1
-    }
-    after(:all) {
-        Efl::Eina.shutdown.should == 0
-    }
+        Efl::Eina.init
+    end
+    after(:all) do
+        Efl::Eina.shutdown
+    end
     #
     it "should append prepend and fetch" do
         l = REinaList.new
@@ -38,7 +38,7 @@ describe Efl::EinaList do
     end
     #
     it "should be able to convert into ruby Array from empty REinaList" do
-        ary = REinaList.new.to_ary
+        ary = REinaList.new.to_a
         ary.empty?.should be_true
         ary.is_a?(Array).should be_true
     end
@@ -71,7 +71,7 @@ describe Efl::EinaList do
         l.prepend d2
         l << d4
         l.unshift d1
-        ary = l.to_ary
+        ary = l.to_a
         ary.length.should == 4
         0.upto 3 do |i|
             ary[i].read_string.should == "D#{i}"
@@ -79,7 +79,25 @@ describe Efl::EinaList do
         l.free
     end
     #
-    it "should be able to build from ruby Array" do
+    it "should be able to convert into ruby Array from non empty REinaList pointer" do
+        l = REinaList.new
+        d1 = ::FFI::MemoryPointer.from_string "D0"
+        d2 = ::FFI::MemoryPointer.from_string "D1"
+        d3 = ::FFI::MemoryPointer.from_string "D2"
+        d4 = ::FFI::MemoryPointer.from_string "D3"
+        l.append d3
+        l.prepend d2
+        l << d4
+        l.unshift d1
+        ary = l.to_a :string
+        ary.length.should == 4
+        0.upto 3 do |i|
+            ary[i].should == "D#{i}"
+        end
+        l.free
+    end
+    #
+    it "should be able to build from a ruby Array of pointers" do
         a =  []
         a << ::FFI::MemoryPointer.from_string("D0")
         a << ::FFI::MemoryPointer.from_string("D1")
@@ -92,6 +110,15 @@ describe Efl::EinaList do
         l.free
     end
     #
+    it "should be able to build from a ruby Array of int" do
+        a =  [3,4,5,6]
+        l = REinaList.from_a a, :int
+        0.upto 3 do |i|
+            l.nth(i).read_int.should == i+3
+        end
+        l.free
+    end
+    #
     it "Enumerable" do
         l = REinaList.new
         d1 = ::FFI::MemoryPointer.from_string "D0"

data/spec/eina_log_spec.rb

@@ -6,54 +6,42 @@ require 'efl/eina_log'
 require './spec/helper'
 #
 describe Efl::EinaLog do
-    before(:all) {
+    before(:all) do
         Efl::Eina.init
         EinaLog = Efl::EinaLog
-    }
-    after(:all) {
+    end
+    after(:all) do
         Efl::Eina.shutdown
-    }
+    end
     #
     it "level set/get" do
         EinaLog.level_set 2
         EinaLog.level_get.should == 2
-        EinaLog.level_set 3
-        EinaLog.level_get.should == 3
+        EinaLog.level = 3
+        EinaLog.level.should == 3
     end
     #
     it "color_disable set/get" do
-        EinaLog.color_disable_set true
-        EinaLog.color_disable_get.should be_true
-        EinaLog.color_disable_set false
-        EinaLog.color_disable_get.should be_false
+        bool_check EinaLog, 'color_disable'
     end
     #
     it "file_disable set/get" do
-        EinaLog.file_disable_set true
-        EinaLog.file_disable_get.should be_true
-        EinaLog.file_disable_set false
-        EinaLog.file_disable_get.should be_false
+        bool_check EinaLog, 'file_disable'
     end
     #
     it "function_disable set/get" do
-        EinaLog.function_disable_set true
-        EinaLog.function_disable_get.should be_true
-        EinaLog.function_disable_set false
-        EinaLog.function_disable_get.should be_false
+        bool_check EinaLog, 'function_disable'
     end
     #
     it "abort_on_critical set/get" do
-        EinaLog.abort_on_critical_set true
-        EinaLog.abort_on_critical_get.should be_true
-        EinaLog.abort_on_critical_set false
-        EinaLog.abort_on_critical_get.should be_false
+        bool_check EinaLog, 'abort_on_critical'
     end
     #
     it "abort_on_critical_level set/get" do
         EinaLog.abort_on_critical_level_set 2
         EinaLog.abort_on_critical_level_get.should == 2
-        EinaLog.abort_on_critical_level_set 3
-        EinaLog.abort_on_critical_level_get.should == 3
+        EinaLog.abort_on_critical_level = 3
+        EinaLog.abort_on_critical_level.should == 3
     end
     #
     it "domain register, unregister, level set/get" do

data/spec/eina_spec.rb

@@ -4,23 +4,34 @@
 require 'efl/eina'
 #
 describe "Efl::Eina #{Efl::Eina.version.full}" do
-    before(:all) {
-        @i = Efl::Eina.init
-    }
-    after(:all) {
+    before(:all) do
+        @init = Efl::Eina.init
+    end
+    after(:all) do
         Efl::Eina.shutdown
-    }
+    end
     #
     it "should init" do
-        Efl::Eina.init.should == @i+1
-        Efl::Eina.init.should == @i+2
-        Efl::Eina.init.should == @i+3
+        Efl::Eina.init.should == @init+1
+        Efl::Eina.init.should == @init+2
+        Efl::Eina.init.should == @init+3
+    end
+    #
+    it "should be main thread" do
+        Efl::Eina.main_loop_is.should be_true
+        if RUBY_VERSION > "1.9.0"
+            Thread.new do
+                Efl::Eina.main_loop_is.should be_false
+            end.join
+        else
+            puts "  no bother on 1.8 branch"
+        end
     end
     #
     it "should shutdown" do
-        Efl::Eina.shutdown.should == @i+2
-        Efl::Eina.shutdown.should == @i+1
-        Efl::Eina.shutdown.should == @i+0
+        Efl::Eina.shutdown.should == @init+2
+        Efl::Eina.shutdown.should == @init+1
+        Efl::Eina.shutdown.should == @init
     end
     #
 end

data/spec/elm_spec.rb

@@ -6,13 +6,24 @@ require './spec/helper'
 #
 describe "Efl::Elm #{Efl::Elm.version.full}" do
     #
-    before(:all) {
+    before(:all) do
         Elm = Efl::Elm
-        Elm.init.should == 1
-    }
-    after(:all) {
-        Elm.shutdown.should == 0
-    }
+        @init = Elm.init
+    end
+    after(:all) do
+        Elm.shutdown
+    end
+    it "should init" do
+        Elm.init.should == @init+1
+        Elm.init.should == @init+2
+        Elm.init.should == @init+3
+    end
+    #
+    it "should shutdown" do
+        Elm.shutdown.should == @init+2
+        Elm.shutdown.should == @init+1
+        Elm.shutdown.should == @init
+    end
     #
     describe Efl::Elm::ElmWin do
         before(:each) {
@@ -234,43 +245,6 @@ describe "Efl::Elm #{Efl::Elm.version.full}" do
         end
     end
     #
-    describe Efl::Elm::ElmLayout do
-        before(:all) {
-            realize_win
-        }
-        after(:all) {
-            @bg.free
-            @win.free
-        }
-        # EAPI Evas_Object *elm_layout_add(Evas_Object *parent);
-        # EAPI Eina_Bool elm_layout_file_set(Evas_Object *obj, const char *file, const char *group);
-        # EAPI Eina_Bool elm_layout_theme_set(Evas_Object *obj, const char *clas, const char *group, const char *style);
-        # EAPI void elm_layout_content_set(Evas_Object *obj, const char *swallow, Evas_Object *content);
-        # EAPI Evas_Object *elm_layout_content_get(const Evas_Object *obj, const char *swallow);
-        # EAPI Evas_Object *elm_layout_content_unset(Evas_Object *obj, const char *swallow);
-        # EAPI void elm_layout_text_set(Evas_Object *obj, const char *part, const char *text);
-        # EAPI const char *elm_layout_text_get(const Evas_Object *obj, const char *part);
-        # EAPI void elm_layout_box_append(Evas_Object *obj, const char *part, Evas_Object *child);
-        # EAPI void elm_layout_box_prepend(Evas_Object *obj, const char *part, Evas_Object *child);
-        # EAPI void elm_layout_box_insert_before(Evas_Object *obj, const char *part, Evas_Object *child, const Evas_Object *reference);
-        # EAPI void elm_layout_box_insert_at(Evas_Object *obj, const char *part, Evas_Object *child, unsigned int pos);
-        # EAPI Evas_Object *elm_layout_box_remove(Evas_Object *obj, const char *part, Evas_Object *child);
-        # EAPI void elm_layout_box_remove_all(Evas_Object *obj, const char *part, Eina_Bool clear);
-        # EAPI void elm_layout_table_pack(Evas_Object *obj, const char *part, Evas_Object *child_obj, unsigned short col, unsigned short row, unsigned short colspan, unsigned short rowspan);
-        # EAPI Evas_Object *elm_layout_table_unpack(Evas_Object *obj, const char *part, Evas_Object *child_obj);
-        # EAPI void elm_layout_table_clear(Evas_Object *obj, const char *part, Eina_Bool clear);
-        # EAPI Evas_Object *elm_layout_edje_get(const Evas_Object *obj);
-        # EAPI const char *elm_layout_data_get(const Evas_Object *obj, const char *key);
-        # EAPI void elm_layout_sizing_eval(Evas_Object *obj);
-        # EAPI Eina_Bool elm_layout_part_cursor_set(Evas_Object *obj, const char *part_name, const char *cursor);
-        # EAPI const char *elm_layout_part_cursor_get(const Evas_Object *obj, const char *part_name);
-        # EAPI void elm_layout_part_cursor_unset(Evas_Object *obj, const char *part_name);
-        # EAPI Eina_Bool elm_layout_part_cursor_style_set(Evas_Object *obj, const char *part_name, const char *style);
-        # EAPI const char *elm_layout_part_cursor_style_get(const Evas_Object *obj, const char *part_name);
-        # EAPI Eina_Bool elm_layout_part_cursor_engine_only_set(Evas_Object *obj, const char *part_name, Eina_Bool engine_only);
-        # EAPI Eina_Bool elm_layout_part_cursor_engine_only_get(const Evas_Object *obj, const char *part_name);
-    end
-    #
     describe Efl::Elm::ElmLabel do
         #
         before(:all) {
@@ -283,13 +257,6 @@ describe "Efl::Elm #{Efl::Elm.version.full}" do
             @win.free
         }
         #
-        it "label set/get" do
-            @lb.label_set "label1"
-            @lb.label_get.should == "label1"
-            @lb.label= "label2"
-            @lb.label.should == "label2"
-        end
-        #
         it "line_wrap set/get" do
             @lb.line_wrap_set :elm_wrap_char
             @lb.line_wrap_get.should == :elm_wrap_char

data/spec/evas_spec.rb

@@ -8,23 +8,25 @@ require './spec/helper'
 #
 describe "Efl::Evas #{Efl::Evas.version.full}" do
     #
-    before(:all) {
+    before(:all) do
         Evas = Efl::Evas
         Native = Efl::Native unless Kernel.const_defined? 'Native'
-        Evas.init.should == 1
-    }
-    after(:all) {
+        @init = Evas.init
+    end
+    after(:all) do
         Evas.shutdown.should == 0
-    }
+    end
     #
     it "should init" do
-        Evas.init.should == 2
-        Evas.init.should == 3
+        Evas.init.should == @init+1
+        Evas.init.should == @init+2
+        Evas.init.should == @init+3
     end
     #
     it "should shutdown" do
-        Evas.shutdown.should == 2
-        Evas.shutdown.should == 1
+        Evas.shutdown.should == @init+2
+        Evas.shutdown.should == @init+1
+        Evas.shutdown.should == @init
     end
     #
     it "evas alloc error enum is ok" do
@@ -520,7 +522,7 @@ describe "Efl::Evas #{Efl::Evas.version.full}" do
             @o.anti_alias_get.should be_false
         end
         #
-        it "sccale set/get " do
+        it "scale set/get " do
             @o.scale_set 1.5
             @o.scale_get.should == 1.5
             @o.scale= 1.6
@@ -632,7 +634,7 @@ describe "Efl::Evas #{Efl::Evas.version.full}" do
             @t.horiz_advance_get.should > 0
             @t.vert_advance_get.should > 0
             @t.inset_get.should > 0
-            @t.direction_get.should == :evas_bidi_direction_ltr
+            @t.direction_get.should == :evas_bidi_direction_neutral
             @t.style_pad_get.length.should == 4
             @t.ascent.should > 0
             @t.descent.should > 0
@@ -641,7 +643,7 @@ describe "Efl::Evas #{Efl::Evas.version.full}" do
             @t.horiz_advance.should > 0
             @t.vert_advance.should > 0
             @t.inset.should > 0
-            @t.direction.should == :evas_bidi_direction_ltr
+            @t.direction.should == :evas_bidi_direction_neutral
             @t.style_pad.length.should == 4
         end
         #

data/tasks/gem.rake

@@ -77,7 +77,7 @@ class GemPackageTask < Rake::PackageTask
             end
         end
     end
-  
+
     def gem_file
         if @gem_spec.platform == Gem::Platform::RUBY
             "#{package_name}.gem"

data/tasks/helpers.rb

@@ -89,7 +89,7 @@ end
 #    files = []
 #    exclude = PROJ.exclude.dup
 #    comment = %r/^\s*#/
-# 
+#
 #    # process the ignore file and add the items there to the exclude list
 #    if test(?f, PROJ.ignore_file)
 #        ary = []

data/tasks/rdoc.rake

@@ -1,6 +1,6 @@
 # -*- coding: UTF-8 -*-
 #
-require 'rake/rdoctask'
+require 'rdoc/task'
 
 namespace :doc do
     desc 'Generate RDoc documentation'
@@ -8,7 +8,7 @@ namespace :doc do
         rdoc = PROJ.rdoc
         rd.main = rdoc.main
         rd.rdoc_dir = rdoc.dir
-        
+
         incl = Regexp.new(rdoc.include.join('|'))
         excl = Regexp.new(rdoc.exclude.join('|'))
         files = PROJ.gem.files.find_all do |fn|
@@ -24,12 +24,12 @@ namespace :doc do
         rd.options << "-t #{title}"
         rd.options.concat(rdoc.opts)
     end
-    
+
     desc 'Generate ri locally for testing'
     task :ri => :clobber_ri do
         sh "#{RDOC} --ri -o ri ."
     end
-    
+
     task :clobber_ri do
         rm_r 'ri' rescue nil
     end

data/tasks/svn.rake

@@ -35,7 +35,7 @@ namespace :svn do
 
         puts "Creating SVN tag '#{tag}'"
         unless system "svn cp -m '#{msg}' #{trunk} #{tag}"
-            abort "Tag creation failed" 
+            abort "Tag creation failed"
         end
     end
 

data/test/test_elm_win.rb

@@ -9,26 +9,27 @@ class MyWin < Elm::ElmWin
     #
     def initialize name, title
         super FFI::MemoryPointer::NULL, name
-        title_set title
+        title = title
         feed
-        smart_callback_add "delete,request", method(:exit), FFI::MemoryPointer.from_string("my data")
+        smart_callback_add "delete,request", method(:on_delete), FFI::MemoryPointer.from_string("my data")
     end
     def feed
         @bg = Elm::ElmBg.new(self) do |bg|
-            bg.size_hint_weight_set 1.0, 1.0
 #            bg.color = 200,255,100
-            bg.evas_object_color_set 200,255,100,150
+            bg.size_hint_weight_expand
+            bg.evas_object_color = 200,255,100,150
             bg.show
         end
         resize_object_add @bg
         @lb = Elm::ElmLabel.new(self) do |lb|
-            lb.label_set "Hello World!"
-            lb.size_hint_weight_set 1.0, 1.0
+            lb.label = "Hello World!"
+            lb.size_hint_align_fill
+            lb.size_hint_weight_expand
         end
         @lb.show
         resize_object_add @lb
     end
-    def exit data, evas_object, event_info
+    def on_delete data, evas_object, event_info
         puts "EXIT #{data.read_string}"
         Elm.exit
     end
@@ -37,7 +38,7 @@ end
 Elm.init
 #
 win = MyWin.new "App name", "Window Title" do |w|
-    w.alpha_set true
+    w.alpha = true
     w.move 300, 300
     w.resize 200, 100
     w.show

metadata

@@ -2,7 +2,7 @@
 name: ffi-efl
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors: 
 - "J\xC3\xA9r\xC3\xA9my Zurcher"
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-11 00:00:00 Z
+date: 2011-08-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ffi
@@ -42,7 +42,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 3.6.5
+        version: 3.7.1
   type: :development
   version_requirements: *id003
 description: A ruby-ffi binding to efl libraries (Enlightenment Foundation Libraries).
@@ -86,6 +86,7 @@ files:
 - lib/efl/native/eina_log.rb
 - lib/efl/native/eina_types.rb
 - lib/efl/native/elementary.rb
+- lib/efl/native/emap.rb
 - lib/efl/native/evas.rb
 - spec/ecore_evas_spec.rb
 - spec/ecore_getopt_spec.rb
@@ -144,12 +145,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: ffi-efl
-rubygems_version: 1.8.1
+rubygems_version: 1.8.8
 signing_key: 
 specification_version: 3
 summary: A ruby-ffi binding to efl libraries (Enlightenment Foundation Libraries)
 test_files: 
+- test/test_elm_win.rb
 - test/test_evas.rb
-- test/test_elm_win-native.rb
 - test/test_edje.rb
-- test/test_elm_win.rb
+- test/test_elm_win-native.rb