freightrain 0.5.10 → 0.5.11

data/Rakefile

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

data/lib/extensions/gtk/dialog_helper.rb

@@ -43,6 +43,25 @@ module Freightrain
 
       end
 
+      def message_dialog(description, secondary_text = "", title = "Information")
+        raise "toplevel not implemented. If you want to use " +
+               "DialogHelper inside your class you should provide " +
+               "a toplevel widget via the toplevel method" unless respond_to? :toplevel
+          result = false
+          dialog = Gtk::MessageDialog.new(
+          toplevel,
+          Gtk::Dialog::MODAL,
+          Gtk::MessageDialog::INFO,
+          Gtk::MessageDialog::BUTTONS_OK,
+          description)
+          dialog.title = title
+          dialog.secondary_text = secondary_text
+          dialog.run
+          dialog.destroy
+          return result
+
+      end
+
     end #DialogHelper
 
   end #Toolkit

data/lib/extensions/gtk/widgets/gtk_treeview.rb

@@ -16,6 +16,7 @@ module Gtk
 
     def bind(options)
       if options[:property].to_sym == :elements
+        options[:force] = true
         columns = normalize_column_bindings(options[:columns])
         @paths  = get_paths(columns)
         columns.each do |column|

data/lib/freightrain/binding/freight_binding.rb

@@ -28,9 +28,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

@@ -23,8 +23,10 @@ module Freightrain
       get_services
       build_regions
       create_signals
-      @view.signals.each do |key,signal|
-        signal.connect(method("on_#{key}")) if self.respond_to? "on_#{key}"
+      @view.hook_to_signals(self)
+      services.each do |service_key|
+        service = instance_variable_get("@#{service_key}")
+        service.hook_to_signals(self, service_key)
       end
       @view.data_source = self     
     end

data/lib/freightrain/regions/freight_region.rb

@@ -20,11 +20,7 @@ module Freightrain
     end
 
     def connect_to(host)
-      @viewmodel.signals.each do |key, signal|
-        if host.respond_to? "#{@name.to_s}_on_#{key.to_s}".to_sym
-          signal.connect(host.method("#{@name.to_s}_on_#{key.to_s}".to_sym))
-        end
-      end
+      @viewmodel.hook_to_signals(host, @name.to_s)
     end
 
   end

data/lib/freightrain/services/freight_service.rb

@@ -12,15 +12,10 @@ module Freightrain
 
     def initialize
       get_services
-      create_signals
-      services = self.class.instance_variable_get(:@services)
-      services ||= []
+      create_signals       
       services.each do |service_key|
         service = instance_variable_get("@#{service_key}")
-        service.signals.each do |signal_key, signal|
-          method_name = "#{service_key}_on_#{signal_key}"
-          signal.connect(method_name) if self.respond_to?(method_name)
-        end
+        service.hook_to_signals(self, service_key)
       end
     end
 

data/lib/freightrain/services/service_host.rb

@@ -15,7 +15,11 @@ module Freightrain
             service_instance = Freightrain["#{service}_service".to_sym]
             instance_variable_set("@#{service}".to_sym, service_instance)
           end
-        end      
+        end
+
+        def services
+          return self.class.instance_variable_get(:@services) || []
+        end
 
       end
     end
@@ -23,7 +27,7 @@ module Freightrain
     def service(name)
       @services ||= []
       @services << name.to_sym
-    end
+    end    
 
   end
 

data/lib/freightrain/signals/signal_host.rb

@@ -18,13 +18,21 @@ module Freightrain
         
         def create_signals
           @signals = {}
-          signals = self.class.instance_variable_get(:@signals)
-          signals ||= []
-          signals.each do |signal|
+          signal_keys = self.class.instance_variable_get(:@signals)
+          signal_keys ||= []
+          signal_keys.each do |signal|
             @signals[signal] = FreightSignal.new
           end
         end
 
+        def hook_to_signals(host, prefix = nil)
+          @signals.each do |signal_key, signal|
+            method_name = "on_#{signal_key}"
+            method_name = "#{prefix}_#{method_name}" if prefix
+            signal.connect(host.method(method_name)) if host.respond_to?(method_name)
+          end
+        end
+
         
       end
     end

metadata

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