ffi-efl 0.0.10 → 0.0.11

data/spec/helper.rb

@@ -1,18 +1,19 @@
 #! /usr/bin/env ruby
 # -*- coding: UTF-8 -*-
 #
-require 'efl/eina'
-require 'efl/evas'
-require 'efl/ecore'
+require 'efl/eina_log'
+Efl::Eina.init
+Efl::EinaLog.level_set :eina_log_level_critical
 #
 def realize_evas
     width = 300
     height = 200
     @pixels = FFI::MemoryPointer.new :int, width*height
-    @e = Efl::Evas::REvas.new
-    @e.output_method_set Efl::Evas::render_method_lookup("buffer")
-    @e.output_viewport_set 0, 0, width, height
-    @e.output_size_set width, height
+    @e = Efl::Evas::REvas.new do
+        output_method_set Efl::Evas::render_method_lookup("buffer")
+        output_viewport_set 0, 0, width, height
+        output_size_set width, height
+    end
     einfo = Efl::Native::EngineInfoBufferStruct.new @e.engine_info
     einfo[:info][:depth_type] = Efl::Evas::EVAS_ENGINE_BUFFER_DEPTH_ARGB32
     einfo[:info][:dest_buffer] = @pixels
@@ -58,15 +59,15 @@ def char_check t, fct, delay=nil
 end
 #
 def realize_win
-    @win = Elm::ElmWin.new(nil, 'TEST') do |w|
-        w.title= 'spec win'
-        w.move 100, 100
-        w.resize 100, 100
+    @win = Elm::ElmWin.new(nil, 'TEST') do
+        title= 'spec win'
+        move 100, 100
+        resize 100, 100
     end
-    @bg = Elm::ElmBg.new(@win) do |bg|
-        bg.size_hint_weight_set 1.0, 1.0
-        bg.evas_object_color_set 200,255,100,150
-        bg.show
+    @bg = Elm::ElmBg.new(@win) do
+        size_hint_weight_set 1.0, 1.0
+        evas_object_color_set 200,255,100,150
+        show
     end
     @win.show
 end

data/tasks/constants.rb

@@ -27,19 +27,19 @@ if USE_RAKE_COMPILER
     ENV['RUBY_CC_VERSION'] = '1.8.7:1.9.2'
 end
 
-LIBEXT = case Config::CONFIG['host_os'].downcase
+LIBEXT = case RbConfig::CONFIG['host_os'].downcase
     when /darwin/
         "dylib"
     when /mswin|mingw/
         "dll"
     else
-        Config::CONFIG['DLEXT']
+        RbConfig::CONFIG['DLEXT']
     end
 
-CPU = case Config::CONFIG['host_cpu'].downcase
+CPU = case RbConfig::CONFIG['host_cpu'].downcase
     when /i[3456]86/
         # Darwin always reports i686, even when running in 64bit mode
-        if Config::CONFIG['host_os'] =~ /darwin/ && 0xfee1deadbeef.is_a?(Fixnum)
+        if RbConfig::CONFIG['host_os'] =~ /darwin/ && 0xfee1deadbeef.is_a?(Fixnum)
             "x86_64"
         else
         "i386"
@@ -51,10 +51,10 @@ CPU = case Config::CONFIG['host_cpu'].downcase
     when /ppc|powerpc/
         "powerpc"
     else
-        Config::CONFIG['host_cpu']
+        RbConfig::CONFIG['host_cpu']
     end
 
-OS = case Config::CONFIG['host_os'].downcase
+OS = case RbConfig::CONFIG['host_os'].downcase
     when /linux/
         "linux"
     when /darwin/
@@ -68,12 +68,12 @@ OS = case Config::CONFIG['host_os'].downcase
     when /mswin|mingw/
         "win32"
     else
-        Config::CONFIG['host_os'].downcase
+        RbConfig::CONFIG['host_os'].downcase
     end
 
-CC=ENV['CC'] || Config::CONFIG['CC'] || "gcc"
+CC=ENV['CC'] || RbConfig::CONFIG['CC'] || "gcc"
 
-GMAKE = Config::CONFIG['host_os'].downcase =~ /bsd|solaris/ ? "gmake" : "make"
+GMAKE = RbConfig::CONFIG['host_os'].downcase =~ /bsd|solaris/ ? "gmake" : "make"
 
 
 DIFF = if WIN32 then 'diff.exe'

data/test/test_elm_win-native.rb

@@ -1,12 +1,14 @@
 #! /usr/bin/env ruby
 # -*- coding: UTF-8 -*-
 #
-require 'efl/native'        # requires efl/native/* which populates Efl::Native
-require 'efl/elementary'    # for Efl::Elm.init convenience
+require 'efl/native/elm/elm_win'
+require 'efl/native/elm/elm_bg'
+require 'efl/native/elm/elm_label'
+require 'efl/native/elm/elm_object'
 #
 include Efl::Native
 #
-Efl::Elm.init
+elm_init 0, FFI::MemoryPointer::NULL
 #
 win_del = Proc.new { |data,evas_object,event_info|
     elm_exit();
@@ -22,7 +24,7 @@ elm_win_resize_object_add win, bg
 evas_object_show bg
 #
 lb = elm_label_add win
-elm_object_text_part_set lb, nil, "Hello World"
+elm_object_part_text_set lb, nil, "Hello World"
 evas_object_size_hint_weight_set lb, 1.0, 1.0
 elm_win_resize_object_add win, lb
 evas_object_show lb

data/test/test_elm_win.rb

@@ -1,32 +1,33 @@
 #! /usr/bin/env ruby
 # -*- coding: UTF-8 -*-
 #
-require 'efl/elementary'
+require 'efl/elm/elm_win'
+require 'efl/elm/elm_bg'
+require 'efl/elm/elm_label'
 #
 include Efl
 #
 class MyWin < Elm::ElmWin
     #
-    def initialize name, title
-        super FFI::MemoryPointer::NULL, name
-        title = title
+    def initialize name, title, &block
+        super FFI::MemoryPointer::NULL, name, &block
+        title_set title
         feed
         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.color = 200,255,100
-            bg.size_hint_weight_expand
-            bg.evas_object_color = 200,255,100,150
-            bg.show
+        @bg = Elm::ElmBg.new(self) do
+            size_hint_weight_expand
+            evas_object_color_set 200,255,100,150
+            show
         end
         resize_object_add @bg
-        @lb = Elm::ElmLabel.new(self) do |lb|
-            lb.text = "Hello World!"
-            lb.size_hint_align_fill
-            lb.size_hint_weight_expand
+        @lb = Elm::ElmLabel.new(self) do
+            text_set "Hello World!"
+            size_hint_align_fill
+            size_hint_weight_expand
+            show
         end
-        @lb.show
         resize_object_add @lb
     end
     def on_delete data, evas_object, event_info
@@ -37,11 +38,11 @@ end
 #
 Elm.init
 #
-win = MyWin.new "App name", "Window Title" do |w|
-    w.alpha = true
-    w.move 300, 300
-    w.resize 200, 100
-    w.show
+win = MyWin.new "App name", "Window Title" do
+    alpha_set true
+    resize 200, 100
+    center_set 600, 300
+    show
 end
 #
 Elm.run

data/test/test_evas.rb

@@ -59,19 +59,19 @@ h = 240
 #
 canvas, pixels = create_canvas w, h
 #
-bg = canvas.object_rectangle_add do |b|
-    b.color = 255, 255, 255, 255
-    b.move 0, 0
-    b.resize w, h
+bg = canvas.object_rectangle_add do
+    color_set 255, 255, 255, 255
+    move 0, 0
+    resize w, h
 end
 bg.show
 #
 draw_scene canvas
 #
-r1 = canvas.object_rectangle_add do |r|
-    r.color = 255, 0, 0, 255
-    r.move 10, 10
-    r.resize 100, 100
+r1 = canvas.object_rectangle_add do
+    color_set 0, 0, 0, 255
+    move 10, 10
+    resize 100, 100
 end
 r1.show
 #
@@ -82,10 +82,10 @@ r2 = canvas.object_rectangle_add do |r|
 end
 r2.show
 #
-r3 = canvas.object_rectangle_add do |r|
-    r.color = 0, 128, 0, 255
-    r.move 60, 60
-    r.resize 50, 50
+r3 = canvas.object_rectangle_add do
+    color_set 0, 128, 0, 255
+    move 60, 60
+    resize 50, 50
 end
 r3.show
 #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ffi-efl
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-10 00:00:00.000000000 Z
+date: 2012-02-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
-  requirement: &23302860 !ruby/object:Gem::Requirement
+  requirement: &10943460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *23302860
+  version_requirements: *10943460
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &23302280 !ruby/object:Gem::Requirement
+  requirement: &10937380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,18 +32,18 @@ dependencies:
         version: 0.8.7
   type: :development
   prerelease: false
-  version_requirements: *23302280
+  version_requirements: *10937380
 - !ruby/object:Gem::Dependency
   name: bones
-  requirement: &23301600 !ruby/object:Gem::Requirement
+  requirement: &10958660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.7.1
+        version: 3.7.3
   type: :development
   prerelease: false
-  version_requirements: *23301600
+  version_requirements: *10958660
 description: A ruby-ffi binding to efl libraries (Enlightenment Foundation Libraries).
 email: jeremy@asynk.ch
 executables: []
@@ -55,74 +55,225 @@ files:
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
-- lib/efl/eina_hash.rb
-- lib/efl/eina.rb
-- lib/efl/evas.rb
-- lib/efl/eina_log.rb
+- lib/efl.rb
 - lib/efl/ecore.rb
-- lib/efl/native.rb
+- lib/efl/ecore_evas.rb
+- lib/efl/ecore_getopt.rb
 - lib/efl/ecore_input.rb
+- lib/efl/edje.rb
+- lib/efl/eet.rb
+- lib/efl/eina.rb
+- lib/efl/eina_hash.rb
+- lib/efl/eina_list.rb
+- lib/efl/eina_log.rb
+- lib/efl/eina_rectangle.rb
 - lib/efl/elementary.rb
-- lib/efl/native/eina_hash.rb
+- lib/efl/elementary_all.rb
+- lib/efl/elm/elm_actionslider.rb
+- lib/efl/elm/elm_anchorblock.rb
+- lib/efl/elm/elm_anchorview.rb
+- lib/efl/elm/elm_bg.rb
+- lib/efl/elm/elm_box.rb
+- lib/efl/elm/elm_bubble.rb
+- lib/efl/elm/elm_button.rb
+- lib/efl/elm/elm_calendar.rb
+- lib/efl/elm/elm_check.rb
+- lib/efl/elm/elm_clock.rb
+- lib/efl/elm/elm_cnp.rb
+- lib/efl/elm/elm_colorselector.rb
+- lib/efl/elm/elm_conform.rb
+- lib/efl/elm/elm_ctxpopup.rb
+- lib/efl/elm/elm_cursor.rb
+- lib/efl/elm/elm_debug.rb
+- lib/efl/elm/elm_diskselector.rb
+- lib/efl/elm/elm_entry.rb
+- lib/efl/elm/elm_factory.rb
+- lib/efl/elm/elm_fileselector.rb
+- lib/efl/elm/elm_fileselector_button.rb
+- lib/efl/elm/elm_fileselector_entry.rb
+- lib/efl/elm/elm_flip.rb
+- lib/efl/elm/elm_flipselector.rb
+- lib/efl/elm/elm_focus.rb
+- lib/efl/elm/elm_frame.rb
+- lib/efl/elm/elm_gengrid.rb
+- lib/efl/elm/elm_genlist.rb
+- lib/efl/elm/elm_gesture_layer.rb
+- lib/efl/elm/elm_glview.rb
+- lib/efl/elm/elm_grid.rb
+- lib/efl/elm/elm_hover.rb
+- lib/efl/elm/elm_hoversel.rb
+- lib/efl/elm/elm_icon.rb
+- lib/efl/elm/elm_image.rb
+- lib/efl/elm/elm_index.rb
+- lib/efl/elm/elm_label.rb
+- lib/efl/elm/elm_layout.rb
+- lib/efl/elm/elm_list.rb
+- lib/efl/elm/elm_map.rb
+- lib/efl/elm/elm_mapbuf.rb
+- lib/efl/elm/elm_menu.rb
+- lib/efl/elm/elm_mirroring.rb
+- lib/efl/elm/elm_multibuttonentry.rb
+- lib/efl/elm/elm_naviframe.rb
+- lib/efl/elm/elm_notify.rb
+- lib/efl/elm/elm_object.rb
+- lib/efl/elm/elm_object_item.rb
+- lib/efl/elm/elm_panel.rb
+- lib/efl/elm/elm_panes.rb
+- lib/efl/elm/elm_photo.rb
+- lib/efl/elm/elm_photocam.rb
+- lib/efl/elm/elm_plug.rb
+- lib/efl/elm/elm_progressbar.rb
+- lib/efl/elm/elm_radio.rb
+- lib/efl/elm/elm_route.rb
+- lib/efl/elm/elm_scale.rb
+- lib/efl/elm/elm_scroll.rb
+- lib/efl/elm/elm_scroller.rb
+- lib/efl/elm/elm_segment_control.rb
+- lib/efl/elm/elm_separator.rb
+- lib/efl/elm/elm_slider.rb
+- lib/efl/elm/elm_slideshow.rb
+- lib/efl/elm/elm_spinner.rb
+- lib/efl/elm/elm_store.rb
+- lib/efl/elm/elm_table.rb
+- lib/efl/elm/elm_theme.rb
+- lib/efl/elm/elm_thumb.rb
+- lib/efl/elm/elm_toolbar.rb
+- lib/efl/elm/elm_tooltip.rb
+- lib/efl/elm/elm_transit.rb
+- lib/efl/elm/elm_video.rb
+- lib/efl/elm/elm_web.rb
+- lib/efl/elm/elm_win.rb
+- lib/efl/evas.rb
+- lib/efl/native.rb
+- lib/efl/native/ecore.rb
+- lib/efl/native/ecore_evas.rb
+- lib/efl/native/ecore_getopt.rb
+- lib/efl/native/ecore_input.rb
+- lib/efl/native/edje.rb
+- lib/efl/native/eet.rb
 - lib/efl/native/eina.rb
-- lib/efl/native/evas.rb
+- lib/efl/native/eina_hash.rb
+- lib/efl/native/eina_list.rb
 - lib/efl/native/eina_log.rb
-- lib/efl/native/ecore.rb
+- lib/efl/native/eina_types.rb
 - lib/efl/native/eina_xattr.rb
-- lib/efl/native/ecore_input.rb
 - lib/efl/native/elementary.rb
-- lib/efl/native/ecore_getopt.rb
+- lib/efl/native/elm/elm_actionslider.rb
+- lib/efl/native/elm/elm_anchorblock.rb
+- lib/efl/native/elm/elm_anchorview.rb
+- lib/efl/native/elm/elm_app.rb
+- lib/efl/native/elm/elm_bg.rb
+- lib/efl/native/elm/elm_box.rb
+- lib/efl/native/elm/elm_bubble.rb
+- lib/efl/native/elm/elm_button.rb
+- lib/efl/native/elm/elm_cache.rb
+- lib/efl/native/elm/elm_calendar.rb
+- lib/efl/native/elm/elm_check.rb
+- lib/efl/native/elm/elm_clock.rb
+- lib/efl/native/elm/elm_cnp.rb
+- lib/efl/native/elm/elm_colorselector.rb
+- lib/efl/native/elm/elm_config.rb
+- lib/efl/native/elm/elm_conform.rb
+- lib/efl/native/elm/elm_ctxpopup.rb
+- lib/efl/native/elm/elm_cursor.rb
+- lib/efl/native/elm/elm_debug.rb
+- lib/efl/native/elm/elm_diskselector.rb
+- lib/efl/native/elm/elm_engine.rb
+- lib/efl/native/elm/elm_entry.rb
+- lib/efl/native/elm/elm_factory.rb
+- lib/efl/native/elm/elm_fileselector.rb
+- lib/efl/native/elm/elm_fileselector_button.rb
+- lib/efl/native/elm/elm_fileselector_entry.rb
+- lib/efl/native/elm/elm_finger.rb
+- lib/efl/native/elm/elm_flip.rb
+- lib/efl/native/elm/elm_flipselector.rb
+- lib/efl/native/elm/elm_focus.rb
+- lib/efl/native/elm/elm_fonts.rb
+- lib/efl/native/elm/elm_frame.rb
+- lib/efl/native/elm/elm_general.rb
+- lib/efl/native/elm/elm_gengrid.rb
+- lib/efl/native/elm/elm_genlist.rb
+- lib/efl/native/elm/elm_gesture_layer.rb
+- lib/efl/native/elm/elm_glview.rb
+- lib/efl/native/elm/elm_grid.rb
+- lib/efl/native/elm/elm_hover.rb
+- lib/efl/native/elm/elm_hoversel.rb
+- lib/efl/native/elm/elm_icon.rb
+- lib/efl/native/elm/elm_image.rb
+- lib/efl/native/elm/elm_index.rb
+- lib/efl/native/elm/elm_label.rb
+- lib/efl/native/elm/elm_layout.rb
+- lib/efl/native/elm/elm_list.rb
+- lib/efl/native/elm/elm_map.rb
+- lib/efl/native/elm/elm_mapbuf.rb
+- lib/efl/native/elm/elm_menu.rb
+- lib/efl/native/elm/elm_mirroring.rb
+- lib/efl/native/elm/elm_multibuttonentry.rb
+- lib/efl/native/elm/elm_naviframe.rb
+- lib/efl/native/elm/elm_need.rb
+- lib/efl/native/elm/elm_notify.rb
+- lib/efl/native/elm/elm_object.rb
+- lib/efl/native/elm/elm_object_item.rb
+- lib/efl/native/elm/elm_panel.rb
+- lib/efl/native/elm/elm_panes.rb
+- lib/efl/native/elm/elm_password.rb
+- lib/efl/native/elm/elm_photo.rb
+- lib/efl/native/elm/elm_photocam.rb
+- lib/efl/native/elm/elm_plug.rb
+- lib/efl/native/elm/elm_progressbar.rb
+- lib/efl/native/elm/elm_radio.rb
+- lib/efl/native/elm/elm_route.rb
+- lib/efl/native/elm/elm_scale.rb
+- lib/efl/native/elm/elm_scroll.rb
+- lib/efl/native/elm/elm_scroller.rb
+- lib/efl/native/elm/elm_segment_control.rb
+- lib/efl/native/elm/elm_separator.rb
+- lib/efl/native/elm/elm_slider.rb
+- lib/efl/native/elm/elm_slideshow.rb
+- lib/efl/native/elm/elm_spinner.rb
+- lib/efl/native/elm/elm_store.rb
+- lib/efl/native/elm/elm_table.rb
+- lib/efl/native/elm/elm_theme.rb
+- lib/efl/native/elm/elm_thumb.rb
+- lib/efl/native/elm/elm_toolbar.rb
+- lib/efl/native/elm/elm_tooltip.rb
+- lib/efl/native/elm/elm_transit.rb
+- lib/efl/native/elm/elm_video.rb
+- lib/efl/native/elm/elm_web.rb
+- lib/efl/native/elm/elm_win.rb
 - lib/efl/native/emap.rb
-- lib/efl/native/eina_list.rb
-- lib/efl/native/eet.rb
-- lib/efl/native/edje.rb
-- lib/efl/native/eina_types.rb
-- lib/efl/native/ecore_evas.rb
-- lib/efl/ffi.rb
-- lib/efl/ecore_getopt.rb
-- lib/efl/eina_rectangle.rb
-- lib/efl/eina_list.rb
-- lib/efl/eet.rb
-- lib/efl/edje.rb
-- lib/efl/ecore_evas.rb
-- lib/efl.rb
-- spec/helper.rb
-- spec/elm_spec.rb
-- spec/eina_spec.rb
+- lib/efl/native/evas.rb
 - spec/ecore_evas_spec.rb
+- spec/ecore_getopt_spec.rb
 - spec/ecore_input_spec.rb
 - spec/ecore_spec.rb
+- spec/edje_spec.rb
 - spec/eet_spec.rb
+- spec/eina_hash_spec.rb
 - spec/eina_list_spec.rb
-- spec/evas_spec.rb
-- spec/edje_spec.rb
-- spec/ecore_getopt_spec.rb
 - spec/eina_log_spec.rb
-- spec/eina_hash_spec.rb
-- tasks/spec.rake
-- tasks/helpers.rb
-- tasks/git.rake
-- tasks/ffi.rake
-- tasks/test.rake
+- spec/eina_spec.rb
+- spec/elm_spec.rb
+- spec/evas_spec.rb
+- spec/helper.rb
+- tasks/ann.rake
 - tasks/constants.rb
-- tasks/svn.rake
+- tasks/ffi.rake
+- tasks/gem.rake
+- tasks/git.rake
+- tasks/helpers.rb
+- tasks/notes.rake
 - tasks/post_load.rake
+- tasks/rdoc.rake
 - tasks/rubyforge.rake
-- tasks/notes.rake
 - tasks/setup.rb
-- tasks/gem.rake
-- tasks/ann.rake
-- tasks/rdoc.rake
-- test/test_elementary.rb
-- test/test_elm_win.rb
-- test/test_evas.rb
-- test/tests/test_anchorbock.rb
-- test/tests/test_actionslider.rb
-- test/tests/test_box.rb
-- test/tests/test_bg.rb
-- test/tests/test_buttons.rb
+- tasks/spec.rake
+- tasks/svn.rake
+- tasks/test.rake
 - test/test_edje.rb
 - test/test_elm_win-native.rb
+- test/test_elm_win.rb
+- test/test_evas.rb
 homepage: https://github.com/jeremyz/ffi-efl
 licenses: []
 post_install_message: 
@@ -147,18 +298,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: ffi-efl
-rubygems_version: 1.8.8
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: A ruby-ffi binding to efl libraries (Enlightenment Foundation Libraries)
 test_files:
-- test/test_elementary.rb
 - test/test_elm_win.rb
 - test/test_evas.rb
-- test/tests/test_anchorbock.rb
-- test/tests/test_actionslider.rb
-- test/tests/test_box.rb
-- test/tests/test_bg.rb
-- test/tests/test_buttons.rb
 - test/test_edje.rb
 - test/test_elm_win-native.rb