freightrain 0.6.0 → 0.6.1

data/Rakefile

@@ -9,7 +9,7 @@ require 'rake/testtask'
 
 spec = Gem::Specification.new do |s|
   s.name = 'freightrain'
-  s.version = '0.6.0'
+  s.version = '0.6.1'
   s.add_dependency('require_all', '>= 1.1.0')
   s.add_dependency('needle', '>= 1.3.0')  
   s.has_rdoc = false

data/lib/extensions/gtk/interface_builder.rb

@@ -15,10 +15,11 @@ module Freightrain
 
       def create_objects_from_file(file_name)
         @builder.add_from_file(get_glade_file(file_name))
-        if @builder.objects.first.respond_to? :toplevel
-          @control = @builder.objects.first.toplevel
+        objects = @builder.objects
+        if objects.first.respond_to? :toplevel
+          @control = objects.first.toplevel
         end
-        return @builder.objects.select do |obj|
+        return objects.select do |obj|
           obj.respond_to? :name
         end
       end
@@ -30,16 +31,14 @@ module Freightrain
         end
       end
 
-#      def connect_signals()
-#        @builder.connect_signals do |signal|
-#          yield(signal)
-#        end
-#      end
-
       def connect_to_callback(widget, event_name, method)
+        begin
         widget.signal_connect(event_name) do |instance, *args|
           method.call(*args)
         end
+        rescue Exception => ex
+          #TODO:handle this
+        end
       end
 
       def get_glade_file(file_name)

data/lib/freightrain/signals/signal_host.rb

@@ -18,13 +18,22 @@ module Freightrain
         
         def create_signals
           @signals = {}
-          signal_keys = self.class.instance_variable_get(:@signals)
-          signal_keys ||= []
-          signal_keys.each do |signal|
+          signals = self.class.instance_variable_get(:@signals)
+          signals ||= {}
+          signals.keys.each do |signal|
+            create_forward_method(signals[signal][:forwards], signal) if signals[signal]
             @signals[signal] = FreightSignal.new
           end
         end
 
+        def create_forward_method(target_description, signal)
+          target = target_description.split(".")[0]
+          event  = target_description.split(".")[1]
+          self.class.send(:define_method, "#{target}_on_#{event}") do
+            fire signal.to_sym
+          end
+        end
+
         def hook_to_signals(host, prefix = nil)
           @signals.each do |signal_key, signal|
             method_name = "on_#{signal_key}"
@@ -32,14 +41,13 @@ module Freightrain
             signal.connect(host.method(method_name)) if host.respond_to?(method_name)
           end
         end
-
         
       end
     end
 
-    def signal(signal_name)
-      @signals ||= []
-      @signals << signal_name.to_sym
+    def signal(signal_name, options = nil)
+      @signals ||= {}
+      @signals[signal_name.to_sym] = options
     end
     
   end

data/lib/freightrain/viewmodels/freight_view_model.rb

@@ -19,10 +19,10 @@ module Freightrain
     end
 
     def self.new(*args, &block)
-      @viewmodel = allocate
-      @viewmodel.bootstrap
-      @viewmodel.send(:initialize, *args, &block)
-      return @viewmodel
+      viewmodel = allocate
+      viewmodel.bootstrap
+      viewmodel.send(:initialize, *args, &block)
+      return viewmodel
     end
 
     def bootstrap

data/lib/freightrain/views/callback_wrapper.rb

@@ -7,14 +7,12 @@ class CallbackWrapper
     @method = method
   end
 
-  def matches_widget?(widget)
-    method_target_and_event = @method.name.sub("on_", "")
-    return method_target_and_event.scan(/^#{widget.name}/).any?
+  def target
+    return @method.name.split("_on_")[0]
   end
 
-  def event_name(widget)
-    event_name = @method.name.split(widget.name)[1]
-    return event_name.sub("_", "").gsub("_", "-")
+  def event
+    return @method.name.split("_on_")[1].gsub("_", "-")
   end
 
 end

data/lib/freightrain/views/freight_view.rb

@@ -15,7 +15,7 @@ module Freightrain
 
     def get_all_callbacks
       return self.methods.select do |method_name|
-        method_name =~ /^on_/i
+        method_name =~ /_on_/i
       end.map { |method_name| CallbackWrapper.new(method(method_name)) }
     end
 
@@ -32,6 +32,7 @@ module Freightrain
     end
 
     def initialize()
+      create_signals
       @widgets = []
       if(Freightrain.toolkit)
         self.class.instance_eval("include Toolkit::DialogHelper")
@@ -39,8 +40,7 @@ module Freightrain
         load_from_file(self.class.name, @builder)
       end
       hook_to_layout_widgets()
-      load_bindings_from_file(@widgets)
-      create_signals
+      load_bindings_from_file(@widgets)      
     end
 
     def hook_to_layout_widgets

data/lib/freightrain/views/interface_builder.rb

@@ -12,8 +12,8 @@ module Freightrain
         @widgets = builder.create_objects_from_file(file_name)
         builder.create_object_accessors(@widgets, self)
         self.get_all_callbacks.each do |callback|
-          target = @widgets.select { |widget| callback.matches_widget?(widget)}.first
-          builder.connect_to_callback(target, callback.event_name(target), callback.method) if target
+          target = @widgets.select { |widget| callback.target == widget.name }.first
+          builder.connect_to_callback(target, callback.event, callback.method) if target
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: freightrain
 version: !ruby/object:Gem::Version 
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors: 
 - Andrea Dallera
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-26 00:00:00 +01:00
+date: 2010-03-31 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency