arcadia 0.2.0 → 0.3.0

data/ext/ae-shell/ae-shell.rb

@@ -9,8 +9,8 @@ require "tk"
 class Shell < ArcadiaExt
 
   def on_before_build(_event)
-    Arcadia.add_listener(self, SystemExecEvent)
-    Arcadia.add_listener(self, RunRubyFileEvent)
+    Arcadia.attach_listener(self, SystemExecEvent)
+    Arcadia.attach_listener(self, RunRubyFileEvent)
   end
 
   def on_build(_event)
@@ -32,13 +32,14 @@ class Shell < ArcadiaExt
     else
       Process.fork{
         open(_cmd_,"r"){|f|
-          Arcadia.new_debug_msg(self, f.read)
+          Arcadia.console(self,'msg'=>f.read, 'level'=>'debug')
           #Arcadia.new_debug_msg(self, f.read)
         }
       }
     end
     rescue Exception => e
-      Arcadia.new_debug_msg(self, e)
+      Arcadia.console(self,'msg'=>e, 'level'=>'debug')
+      #Arcadia.new_debug_msg(self, e)
     end
 
   end
@@ -52,11 +53,13 @@ class Shell < ArcadiaExt
         _cmd_ = "|"+@arcadia['conf']['shell.ruby']+" "+_filename+" 2>&1"
         open(_cmd_,"r"){|f|
            _readed = f.read
-           Arcadia.new_debug_msg(self, _readed)
+           Arcadia.console(self,'msg'=>_readed, 'level'=>'debug')
+           #Arcadia.new_debug_msg(self, _readed)
            _event.add_result(self, 'output'=>_readed)
         }
       rescue Exception => e
-        Arcadia.new_debug_msg(self, e)
+        Arcadia.console(self,'msg'=>e, 'level'=>'debug')
+        #Arcadia.new_debug_msg(self, e)
       end
     end
   end
@@ -66,19 +69,23 @@ class Shell < ArcadiaExt
     (RUBY_PLATFORM.include?('mswin32'))?_cmd="cmd":_cmd='sh'
     if is_windows?
       Thread.new{
-        Arcadia.new_debug_msg(self, 'inizio')
+        Arcadia.console(self,'msg'=>'begin', 'level'=>'debug')      
+        #Arcadia.new_debug_msg(self, 'inizio')
         @io = IO.popen(_cmd,'r+')
         @io.puts(command)
         result = ''
         while line = @io.gets
            result << line
         end 
-        Arcadia.new_debug_msg(self, result)
+        #Arcadia.new_debug_msg(self, result)
+        Arcadia.console(self,'msg'=>result, 'level'=>'debug')
+        
       }
     else
       Process.fork{
         open(_cmd_,"r"){|f|
-          Arcadia.new_debug_msg(self, f.read)
+          Arcadia.console(self,'msg'=>f.read, 'level'=>'debug')
+          #Arcadia.new_debug_msg(self, f.read)
         }
       }
     end
@@ -118,11 +125,13 @@ class Shell < ArcadiaExt
           _cmd_ = "|"+$arcadia['conf']['shell.ruby']+" "+_filename+" 2>&1"
           #  Arcadia.new_debug_msg(self, _cmd_)
           @cmd = open(_cmd_,"r"){|f|
-              Arcadia.new_debug_msg(self, f.read)
+              Arcadia.console(self, 'msg'=>f.read ,'level'=>'debug')          
+              #Arcadia.new_debug_msg(self, f.read)
           }
         end
       rescue Exception => e
-        Arcadia.new_debug_msg(self, e)
+        Arcadia.console(self, 'msg'=>e ,'level'=>'debug')          
+        #Arcadia.new_debug_msg(self, e)
       end
     end
   end

data/{base → lib}/a-commons.rb

@@ -10,32 +10,176 @@ require 'singleton'
 #      Extension
 # +------------------------------------------+
 
+
+class AbstractFrameWrapper
+#  def AbstractFrameWrapper.inherited(sub)
+#    unless sub.respond_to? :hinner_frame
+#      raise NoMethodError, "#{sub} needs to respond to `:hinner_frame'" 
+#    end
+#    unless sub.respond_to? :title
+#      raise NoMethodError, "#{sub} needs to respond to `:title'" 
+#    end
+#  
+#    unless sub.respond_to? :show
+#      raise NoMethodError, "#{sub} needs to respond to `:show'" 
+#    end
+#  
+#    unless sub.respond_to? :hide
+#      raise NoMethodError, "#{sub} needs to respond to `:hide'" 
+#    end
+#  
+#    unless sub.respond_to? :free
+#      raise NoMethodError, "#{sub} needs to respond to `:free'" 
+#    end
+#  end
+
+  def initialize
+    unless sub.respond_to? :hinner_frame
+      raise NoMethodError, "#{sub} needs to respond to `:hinner_frame'" 
+    end
+    unless sub.respond_to? :title
+      raise NoMethodError, "#{sub} needs to respond to `:title'" 
+    end
+  
+    unless sub.respond_to? :show
+      raise NoMethodError, "#{sub} needs to respond to `:show'" 
+    end
+  
+    unless sub.respond_to? :hide
+      raise NoMethodError, "#{sub} needs to respond to `:hide'" 
+    end
+  
+    unless sub.respond_to? :free
+      raise NoMethodError, "#{sub} needs to respond to `:free'" 
+    end
+  end
+
+end
+
+#module AbstractFrameWrapper
+#  def hinner_frame
+#     raise NoMethodError, "#{self} needs to respond to `:hinner_frame'" 
+#  end
+#end
+
+class FixedFrameWrapper < AbstractFrameWrapper
+#  include AbstractFrameWrapper
+  def initialize(_arcadia, _point, _name, _title='')
+    @arcadia = _arcadia
+    @point =_point
+    @name = _name
+    @title = _title
+    fixed_frame_forge
+  end
+  
+  def fixed_frame_forge
+    @fixed_frame = @arcadia.layout.register_panel(@point, @name, @title) if @fixed_frame.nil?
+  end
+  private :fixed_frame_forge
+  
+  def hinner_frame
+    fixed_frame_forge
+    @fixed_frame
+  end
+  
+  def title(_title=nil)
+    fixed_frame_forge
+    @arcadia.layout.domain(@point)['root'].top_text(_title)
+  end
+
+  def show
+    fixed_frame_forge
+    @arcadia.layout.raise_panel(@point, @name)
+  end
+  
+  def hide
+  end
+  
+  def free
+    @arcadia.layout.unregister_panel(@point, @name)
+    @fixed_frame = nil
+  end
+end
+
+
+class FloatFrameWrapper < AbstractFrameWrapper
+#  include AbstractFrameWrapper
+  def initialize(_arcadia, _geometry=nil, _title=nil)
+    @arcadia = _arcadia
+    @geometry = _geometry
+    @title= _title
+    float_frame_forge
+  end
+
+  def float_frame_forge
+    if @obj.nil?
+      a = @geometry.scan(/[+-]*\d\d*%*/)
+      p_height = TkWinfo.screenheight(@arcadia.layout.root)    
+      p_width = TkWinfo.screenwidth(@arcadia.layout.root)    
+      if a[0][-1..-1]=='%'
+        n = a[0][0..-2].to_i.abs
+      		a[0] = (p_width/100*n).to_i
+      end
+      if a[1][-1..-1]=='%'
+        n = a[1][0..-2].to_i.abs
+      		a[1] = (p_height/100*n).to_i
+      end
+      if a[2][-1..-1]=='%'
+        n = a[2][0..-2].to_i.abs
+      		a[2] = (p_width/100*n).to_i
+      end
+      if a[3][-1..-1]=='%'
+        n = a[3][0..-2].to_i.abs
+      		a[3] = (p_height/100*n).to_i
+      end
+      
+      args = {'width'=>a[0], 'height'=>a[1], 'x'=>a[2], 'y'=>a[3]}
+      @obj = @arcadia.layout.new_float_frame(args)
+      @obj.title(@title) if @title
+    end
+  end
+
+  def hinner_frame
+    float_frame_forge
+    @obj.frame if @obj
+  end
+  
+  def title(_title=nil)
+    float_frame_forge
+    @obj.title(_title)  if @obj
+  end
+
+  def show
+    float_frame_forge
+    @obj.show if @obj 
+  end
+  
+  def hide
+    float_frame_forge
+    @obj.hide if @obj 
+  end
+  
+  def free
+    @obj.destroy if @obj 
+    @obj = nil
+  end
+end
+
 class ArcadiaExt
   attr_reader :arcadia
-
   def initialize(_arcadia, _name=nil)
     @arcadia = _arcadia
-    Arcadia.add_listener(self, BuildEvent)
-    Arcadia.add_listener(self, ExitQueryEvent)
-    Arcadia.add_listener(self, FinalizeEvent)
+    Arcadia.attach_listener(self, BuildEvent)
+    Arcadia.attach_listener(self, ExitQueryEvent)
+    Arcadia.attach_listener(self, FinalizeEvent)
     @name = _name
     @frames = Array.new
     @frames_points = conf_array("#{_name}.frames")
     @frames_labels = conf_array("#{_name}.labels")
     @float_frames = Array.new
-#    unless self.respond_to? :build
-#      raise NoMethodError, "ArcadiaExt needs to respond to `:build'" 
-#    end
-#    unless self.respond_to? :before_build
-#      raise NoMethodError, "ArcadiaExt needs to respond to `:before_build'" 
-#    end
-#    unless self.respond_to? :after_build
-#      raise NoMethodError, "ArcadiaExt needs to respond to `:after_build'" 
-#    end
-#    if self.respond_to? :arcadia_update
-#    		ObserverCallback.new(@arcadia.main_contract, self, :arcadia_update)
-#    end
-    ObjectSpace.define_finalizer(self, self.method(:finalize).to_proc)
+    @float_geometries = conf_array("#{_name}.float_frames")
+    @float_labels = conf_array("#{_name}.float_labels")
+    #ObjectSpace.define_finalizer(self, self.method(:finalize).to_proc)
   end
   
   def conf_array(_name)
@@ -48,67 +192,27 @@ class ArcadiaExt
   def frame(_n=0)
 	  if @frames[_n] == nil && @frames_points[_n]
 	    (@frames_labels[_n].nil?)? _label = @name : _label = @frames_labels[_n]
-	    @frames[_n] = @arcadia.layout.register_panel(@frames_points[_n],@name, _label)
+	    @frames[_n] =  FixedFrameWrapper.new(@arcadia, @frames_points[_n], @name, _label)
 	  end
     return @frames[_n]
   end
-
-  def frame_free(_n=0)
-	  if _n.nil?
-      @frames.each_index{|i|
-        @arcadia.layout.unregister_panel(@frames_points[i],@name)
-        @frames[i]=nil
-      }
-	  else
-  	   @arcadia.layout.unregister_panel(@frames_points[_n],@name)
-  	   @frames[_n] = nil
-	  end
-	  
-  end
-
-  def frame_raise(_n=0)
-	  if _n.nil?
-      @frames.each_index{|i|
-        @arcadia.layout.raise_panel(@frames_points[i],@name)
-      }
-	  else
-  	   @arcadia.layout.raise_panel(@frames_points[_n],@name)
-	  end
-  end
-
-
-  def frame_title(_title=nil, _n=0)
-	  self.frames(_n) if @frames[_n] == nil
-    @arcadia.layout.domain(@frames_points[_n])['root'].top_text(_title)
-  end
-
+  
   def float_frame(_n=0, _args=nil)
 	  if @float_frames[_n].nil? 
-	    @float_frames[_n] =  @arcadia.layout.new_float_frame(_args)
+	    (@float_labels[_n].nil?)? _label = @name : _label = @float_labels[_n]
+	    @float_frames[_n] =  FloatFrameWrapper.new(@arcadia, @float_geometries[_n], _label)
 	  end
      @float_frames[_n]
   end
 
-	def conf(_property)
+  def conf(_property)
 	  @arcadia['conf'][@name+'.'+_property]
-	end
-	
-#  def arcadia_update(_sender, _event)
-    #must be implemented to activate
-#  end
-
-  def can_exit_query
-    return true
-  end
-
-  def finalize
-  		#may be extendeded in child
   end
 
-  def verbose
-    '??????'
-  end
-  
+#  def conf_global(_property)
+#	  @arcadia['conf'][_property]
+#  end
+	
   def exec(_method, _args=nil)
     if self.respond_to(_method)
       self.send(_method, _args)
@@ -268,25 +372,29 @@ module EventBus #(or SourceEvent)
     if _class != _event.class
       sub_method_name = _method_name(_event.class)
       @@listeners[_class].each do|_listener|
-      #p "--- method_name=>#{method_name}"
-      #p "--- sub_method_name=>#{sub_method_name}"
-      #p "--- for listener #{_listener}"
-	 if _listener.respond_to?(sub_method_name)
-	   Thread.new{_listener.send(sub_method_name, _event)}
-         elsif _listener.respond_to?(method_name)
-           Thread.new{_listener.send(method_name, _event)}
-         end
+        if _listener.respond_to?(sub_method_name)
+  	         Thread.new{_listener.send(sub_method_name, _event)}
+        elsif _listener.respond_to?(method_name)
+             Thread.new{_listener.send(method_name, _event)}
+        end
       end
     else
       @@listeners[_class].each do|_listener|
-        _listener.send(method_name, _event) if _listener.respond_to?(method_name)
+        Thread.new{
+          _listener.send(method_name, _event) if _listener.respond_to?(method_name)
+        }
       end
     end
   end
   private :_broadcast_fase
 
+  def detach_listener(_listener, _class_event)
+    if @@listeners[_class_event]
+      @@listeners[_class_event].delete(_listener)
+    end
+  end
   
-  def add_listener(_listener, _class_event)
+  def attach_listener(_listener, _class_event)
     @@listeners = {} unless defined? @@listeners
     @@listeners[_class_event] = []   unless @@listeners.has_key?(_class_event)
     @@listeners[_class_event] << _listener
@@ -317,7 +425,8 @@ module Autils
 end
 
 module Configurable
-  def properties_file2hash(_property_file)
+  
+  def properties_file2hash(_property_file, _link_hash=nil)
     r_hash = Hash.new
     if _property_file &&  FileTest::exist?(_property_file)
       f = File::open(_property_file,'r')
@@ -339,6 +448,9 @@ module Configurable
             if var.length > 1
               _value = var[1].strip
               var[2..-1].collect{|x| _value=_value+'='+x} if var.length > 2
+              if _link_hash 
+                _value = resolve_link(_value, _link_hash)
+              end
               r_hash[var[0].strip]=_value
             end
           end
@@ -349,6 +461,63 @@ module Configurable
       return r_hash      
     end
   end
+  
+  def Configurable.properties_group(_group, _hash_source)
+    @@conf_groups = Hash.new if !defined?(@@conf_groups)
+    if @@conf_groups[_group].nil?
+      @@conf_groups[_group] = Hash.new
+      glen=_group.length
+      _hash_source.keys.sort.each{|k|
+        if k[0..glen] == "#{_group}."
+          @@conf_groups[_group][k[glen+1..-1]]=_hash_source[k]
+        elsif @@conf_groups[_group].length > 0
+          break
+        end
+      }
+    end
+    Hash.new.update(@@conf_groups[_group])
+  end
+  
+
+  def resolve_link(_v, _hash_source, _link_symbol='>>>')
+      if _v.length > 3 && _v[0..2]==_link_symbol
+        _v=_hash_source[_v[3..-1]] if _hash_source[_v[3..-1]]
+      end
+      return _v
+  end
+  
+  def resolve_properties_link(_hash_target, _hash_source, _link_symbol='>>>')
+    loop_level_max = 10
+#    _hash_adding = Hash.new
+    _keys_to_extend = Array.new
+    _hash_target.each{|k,v|
+      loop_level = 0
+      while loop_level < loop_level_max && v.length > 3 && v[0..2]==_link_symbol
+        if k[-1..-1]=='.'
+          _keys_to_extend << k
+          break
+        elsif _hash_source[v[3..-1]]
+          v=_hash_source[v[3..-1]]
+        else
+          break
+        end
+        loop_level = loop_level + 1
+      end
+      _hash_target[k]=v
+      if loop_level == loop_level_max
+        raise("Link loop found for property : #{k}")
+      end
+    }
+    _keys_to_extend.each do |k|
+      v=_hash_target[k]
+      g=Configurable.properties_group(v[3..-1], _hash_target)
+      g.each do |key,value|
+        _hash_target["#{k[0..-2]}.#{key}"]=value if !_hash_target["#{k[0..-2]}.#{key}"]
+      end
+      _hash_target.delete(k)
+    end
+  end
+  
 end
 
 module Persistable
@@ -401,6 +570,27 @@ class Application
     @@instance
   end
 
+	def Application.conf(_property)
+	  @@instance['conf'][_property] if @@instance
+	end
+
+  def Application.conf_group(_group)
+    @@conf_groups = Hash.new if !defined?(@@conf_groups)
+    if @@conf_groups[_group].nil?
+      @@conf_groups[_group] = Hash.new
+      glen=_group.length
+      @@instance['conf'].keys.sort.each{|k|
+        if k[0..glen] == "#{_group}."
+          @@conf_groups[_group][k[glen+1..-1]]=@@instance['conf'][k]
+        elsif @@conf_groups[_group].length > 0
+          break
+        end
+      }
+    end
+    @@conf_groups[_group]
+  end
+
+
   def prepare
   end
 
@@ -435,13 +625,27 @@ class Application
           end
         else
           msg = "Locad dir "+'"'+local_dir+'"'+" must be writable!"
-          Arcadia.ok(self, 'title' => '(Arcadia)', 'msg' => msg, 'level'=>'error')
+          Arcadia.dialog(self, 'type'=>'ok','title' => '(Arcadia)', 'msg' => msg, 'level'=>'error')
           exit
-        
         end
       end
   end
   
+  def load_theme(_name=nil)
+    _theme_file = "conf/theme-#{_name}.conf" if !_name.nil?
+    if _theme_file && File.exist?(_theme_file)
+      self['conf'].update(self.properties_file2hash(_theme_file))
+      _theme_res_file = "conf/theme-#{_name}.res.rb"
+      if _theme_res_file && File.exist?(_theme_res_file)
+        begin
+          require _theme_res_file
+        rescue Exception => e  
+        end
+
+      end
+    end  
+  end
+  
   def local_dir
     _local_dir = File.join(ENV["HOME"],'.'+self['applicationParams'].name)  if ENV["HOME"] 
     if _local_dir && !File.exist?(_local_dir)
@@ -450,7 +654,7 @@ class Application
         @first_run = true
       else
         msg = "Locad dir "+'"'+ENV["HOME"]+'"'+" must be writable!"
-        Arcadia.ok(self, 'title' => "(#{self['applicationParams'].name})", 'msg' => msg, 'level'=>'error')
+        Arcadia.dialog(self, 'type'=>'ok', 'title' => "(#{self['applicationParams'].name})", 'msg' => msg, 'level'=>'error')
         exit
       end
     end
@@ -473,6 +677,13 @@ class Application
     end
   end
 
+  def []=(_name, _value)
+    if @objs[_name]
+      @objs[_name] = _value
+    end
+  end
+
+
   def run
   end
 end