freightrain 0.5.14 → 0.6.0

data/Rakefile

@@ -9,7 +9,7 @@ require 'rake/testtask'
 
 spec = Gem::Specification.new do |s|
   s.name = 'freightrain'
-  s.version = '0.5.14'
+  s.version = '0.6.0'
   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

@@ -30,9 +30,15 @@ module Freightrain
         end
       end
 
-      def connect_signals()
-        @builder.connect_signals do |signal|
-          yield(signal)
+#      def connect_signals()
+#        @builder.connect_signals do |signal|
+#          yield(signal)
+#        end
+#      end
+
+      def connect_to_callback(widget, event_name, method)
+        widget.signal_connect(event_name) do |instance, *args|
+          method.call(*args)
         end
       end
 

data/lib/freightrain/binding/freight_binding.rb

@@ -22,9 +22,9 @@ module Freightrain
           @cache = value
         end
       rescue Exception => ex
-        p "#{@widget.name} - update"
-        p ex.message
-        p @path
+#        p "#{@widget.name} - update"
+#        p ex.message
+#        p @path
       end
     end
 

data/lib/freightrain/{freight_view_model.rb → 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

@@ -0,0 +1,20 @@
+
+class CallbackWrapper
+
+  attr_reader :method
+
+  def initialize(method)
+    @method = method
+  end
+
+  def matches_widget?(widget)
+    method_target_and_event = @method.name.sub("on_", "")
+    return method_target_and_event.scan(/^#{widget.name}/).any?
+  end
+
+  def event_name(widget)
+    event_name = @method.name.split(widget.name)[1]
+    return event_name.sub("_", "").gsub("_", "-")
+  end
+
+end

data/lib/freightrain/{freight_view.rb → views/freight_view.rb}

@@ -13,6 +13,12 @@ module Freightrain
       return @widgets.select { |widget| widget.kind_of? BindingBase }
     end
 
+    def get_all_callbacks
+      return self.methods.select do |method_name|
+        method_name =~ /^on_/i
+      end.map { |method_name| CallbackWrapper.new(method(method_name)) }
+    end
+
     def self.container_options
       return {:model => :prototype}
     end

data/lib/freightrain/{interface_builder.rb → views/interface_builder.rb}

@@ -11,10 +11,9 @@ module Freightrain
       if builder.file_found?(file_name)
         @widgets = builder.create_objects_from_file(file_name)
         builder.create_object_accessors(@widgets, self)
-        builder.connect_signals do |signal|
-          if self.respond_to? signal
-            method(signal)
-          end
+        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
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: freightrain
 version: !ruby/object:Gem::Version 
-  version: 0.5.14
+  version: 0.6.0
 platform: ruby
 authors: 
 - Andrea Dallera
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-21 00:00:00 +01:00
+date: 2010-03-26 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -82,19 +82,20 @@ files:
 - lib/freightrain/binding/converters/default_converter.rb
 - lib/freightrain/binding/converters/float_converter.rb
 - lib/freightrain/binding/converters/converter_factory.rb
-- lib/freightrain/interface_builder.rb
+- lib/freightrain/views/interface_builder.rb
+- lib/freightrain/views/freight_view.rb
+- lib/freightrain/views/callback_wrapper.rb
 - lib/freightrain/testhelpers/container_helpers.rb
 - lib/freightrain/string_patch.rb
-- lib/freightrain/dialog_extension.rb
 - lib/freightrain/regions/region_host.rb
 - lib/freightrain/regions/freight_region.rb
-- lib/freightrain/freight_view_model.rb
 - lib/freightrain/services/service_host.rb
 - lib/freightrain/services/freight_service.rb
 - lib/freightrain/testhelpers.rb
 - lib/freightrain/ioc/container.rb
 - lib/freightrain/ioc/container_hookable.rb
-- lib/freightrain/freight_view.rb
+- lib/freightrain/viewmodels/dialog_extension.rb
+- lib/freightrain/viewmodels/freight_view_model.rb
 - lib/freightrain/auto_requirer.rb
 - lib/freightrain/bootstrapper.rb
 - lib/freightrain/signals/freight_signal.rb