freightrain 0.8.0 → 0.8.1

data/README.rdoc

@@ -9,20 +9,34 @@ Freightrain is a MVVM (model/view/viewmodel) framework for developing desktop ap
 
 If you plan to use the gtk+ extensions (the best supported at the moment), you should also have the gtk2 gem installed. Before installing the gem you should also have the dev library for pango, cairo, glib and gtk2 installed. On ubuntu you can get all you need with:
 
-	sudo apt-get install libgtk2.0-dev
-	sudo apt-get install libruby1.8 ruby1.8-dev
+	sudo apt-get install libgtk2.0-dev libruby1.9 ruby1.9-dev
+
 	gem install gtk2
 
 When you're done with that you can install freightrain with:
 
 	gem install freightrain
 
+== QUICK START
+
+	gem install freightrain
+
+	gem install gtk2
+
+	ftrain app testapp
+
+	cd testapp
+
+	ruby testapp.rb
+
+
+	after that, you should see an empty window.
 
 == HOW DO I USE IT?
+
 There are small examples in the /examples repository folder. There is also a tutorial (under construction, by Eric Cunningham) here : http://sites.google.com/site/freightrainlib
 
 An up to date larger example : http://github.com/bolthar/intersect
-Note that the project is currently in ALPHA state. Use it in production at your own risk :-) 
 
 After installing the freightrain gem using the above instructions, to get a working stub open a terminal and type in:
 	ftrain app my_app
@@ -34,17 +48,6 @@ this should pop up an empty window with the title 'my_app'.
 
 'ftrain' command not working? Look here => http://stackoverflow.com/questions/909673/gems-and-ubuntu-9-04
 
-Documentation coming soon.
-
-== WHERE DO I REPORT BUGS/FEATURE REQUESTS?
-
-andrea@andreadallera.com
-
-Would also be very appreciated:
-
-=== Reports about installation issues (GTK2, ruby/gnome, ftrain)
-=== Reports about different platforms (could you install on OSX? Let me know!)
-
 = THANKS TO:
 == Jan Pliz 
 For his help with the qtruby bindings

data/Rakefile

@@ -8,7 +8,7 @@ require 'rake/testtask'
 
 spec = Gem::Specification.new do |s|
   s.name = 'freightrain'
-  s.version = '0.8.0'
+  s.version = '0.8.1'
   s.add_dependency('require_all', '>= 1.1.0')
   s.has_rdoc = false
   s.homepage = "http://github.com/bolthar/freightrain"

data/lib/extensions/gtk/gtk_bootstrapper.rb

@@ -33,6 +33,10 @@ module Freightrain
       Gtk.main_quit
     end
 
+    def self.default_builder
+      return :glade
+    end
+
   end
 
-end
+end

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

@@ -8,7 +8,7 @@ module Gtk
       @defaults = {} unless @defaults
       return @defaults
     end
-    
+
     #made for easier compatibility (other toolkits use show/hide)
     def show
       self.visible = true

data/lib/extensions/qt/qt_bootstrapper.rb

@@ -20,7 +20,11 @@ module Freightrain
       yield
       app.exec
     end
+
+    def self.default_toolkit
+      return :none
+    end
     
   end
 
-end
+end

data/lib/extensions/wx/wx_bootstrapper.rb

@@ -30,6 +30,10 @@ module Freightrain
       app.main_loop
     end
 
+    def self.default_toolkit
+      return :none
+    end
+
   end
 
-end
+end

data/lib/freightrain/views/code_interface_builder.rb

@@ -0,0 +1,55 @@
+
+module Freightrain
+
+  class CodeInterfaceBuilder
+
+    def initialize
+      @builder = Freightrain.get_interface_builder
+    end
+
+    def file_found?(file_name)
+      return get_code_definition_file(file_name)
+    end
+
+    def create_objects_from_file(file_name)
+      code_widgets = eval_script(file_found?(file_name))
+      code_widgets.each do |k, v|
+        v.builder_name = k
+      end #HACK - gtk only
+      @widgets = code_widgets.values
+      @builder.instance_variable_set(:@control, @widgets.first.toplevel) ##HACK: breaking toolkit agnostic
+      return @widgets
+    end
+   
+    def connect_to_callback(widget, event_name, method)
+      @builder.connect_to_callback(widget, event_name, method)
+    end
+    
+    def create_object_accessors(widgets, view) 
+      @builder.create_object_accessors(widgets,view)
+    end
+    
+    def control
+      return @builder.control
+    end
+
+    private
+    def get_code_definition_file(file_name)
+      search_path = File.join(
+        Freightrain.app_path,
+        "views",
+        "**",
+        file_name.to_convention + ".rb.def")
+      results = Dir.glob(search_path)
+      return results.first
+    end
+
+    def eval_script(file_name) 
+    widgets = {}
+      eval(File.read(file_name), binding)
+      return widgets
+    end
+    
+  end  
+
+end

data/lib/freightrain/views/freight_view.rb

@@ -35,12 +35,29 @@ module Freightrain
       return control.toplevel
     end
 
+    def self.builder(config_value)
+      @builder_to_use = config_value
+    end
+
+    def builder
+      return self.class.instance_variable_get(:@builder_to_use) || Freightrain::Toolkit.default_builder
+    end
+
+    def define_interface
+      #none by default
+    end
+
     def initialize()
       create_signals
+      define_interface
       @widgets = []
       if(Freightrain.toolkit)
         self.class.instance_eval("include Toolkit::DialogHelper")
-        @builder = Freightrain.get_interface_builder
+        if builder != :none
+          @builder = Freightrain.get_interface_builder
+        else 
+          @builder = CodeInterfaceBuilder.new
+        end  
         load_from_file(self.class.name, @builder)
       end
       hook_to_layout_widgets()

data/lib/freightrain/views/interface_builder.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: freightrain
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-21 00:00:00.000000000 Z
+date: 2012-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: require_all
-  requirement: &7535040 !ruby/object:Gem::Requirement
+  requirement: &15146200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *7535040
+  version_requirements: *15146200
 description: ruby desktop development made easy
 email: andrea@andreadallera.com
 executables:
@@ -32,77 +32,78 @@ files:
 - README.rdoc
 - Rakefile
 - bin/ftrain
-- lib/freightrain-dev/auto_stubber.rb
-- lib/freightrain/services/freight_service.rb
-- lib/freightrain/services/service_host.rb
-- lib/freightrain/signals/signal_host.rb
+- lib/freightrain/viewmodels/freight_view_model.rb
+- lib/freightrain/viewmodels/dialog_extension.rb
+- lib/freightrain/auto_requirer.rb
+- lib/freightrain/string_patch.rb
+- lib/freightrain/bootstrapper.rb
 - lib/freightrain/signals/freight_signal.rb
-- lib/freightrain/regions/freight_region.rb
-- lib/freightrain/regions/region_host.rb
+- lib/freightrain/signals/signal_host.rb
+- lib/freightrain/views/freight_view.rb
+- lib/freightrain/views/code_interface_builder.rb
+- lib/freightrain/views/interface_builder.rb
+- lib/freightrain/views/callback_wrapper.rb
+- lib/freightrain/services/service_host.rb
+- lib/freightrain/services/freight_service.rb
 - lib/freightrain/ioc/container.rb
 - lib/freightrain/ioc/registry.rb
 - lib/freightrain/ioc/container_hookable.rb
-- lib/freightrain/string_patch.rb
+- lib/freightrain/elements/freight_element_view_model.rb
 - lib/freightrain/elements/layout_widget.rb
 - lib/freightrain/elements/freight_element_view.rb
-- lib/freightrain/elements/freight_element_view_model.rb
-- lib/freightrain/bootstrapper.rb
-- lib/freightrain/auto_requirer.rb
-- lib/freightrain/views/interface_builder.rb
-- lib/freightrain/views/freight_view.rb
-- lib/freightrain/views/callback_wrapper.rb
-- lib/freightrain/viewmodels/freight_view_model.rb
-- lib/freightrain/viewmodels/dialog_extension.rb
-- lib/freightrain/freight_color.rb
+- lib/freightrain/regions/freight_region.rb
+- lib/freightrain/regions/region_host.rb
 - lib/freightrain/binding/freight_binding.rb
-- lib/freightrain/binding/binding_base.rb
+- lib/freightrain/binding/binding_host.rb
 - lib/freightrain/binding/binding_loader.rb
-- lib/freightrain/binding/converters/float_converter.rb
-- lib/freightrain/binding/converters/boolean_converter.rb
+- lib/freightrain/binding/binding_base.rb
 - lib/freightrain/binding/converters/converter_factory.rb
+- lib/freightrain/binding/converters/boolean_converter.rb
+- lib/freightrain/binding/converters/float_converter.rb
 - lib/freightrain/binding/converters/integer_converter.rb
 - lib/freightrain/binding/converters/default_converter.rb
-- lib/freightrain/binding/binding_host.rb
-- lib/freightrain.rb
-- lib/scaffolding/scaffolding.rb
-- lib/scaffolding/commands/triad.rb
-- lib/scaffolding/commands/app.rb
-- lib/scaffolding/templates/view_bnd.ftt
-- lib/scaffolding/templates/view_toplevel.ftt
-- lib/scaffolding/templates/view_model.ftt
-- lib/scaffolding/templates/viewmodel_toplevel.ftt
-- lib/scaffolding/templates/view_control_glade.ftt
-- lib/scaffolding/templates/view.ftt
-- lib/scaffolding/templates/view_toplevel_glade.ftt
-- lib/scaffolding/templates/application.ftt
-- lib/scaffolding/generator.rb
-- lib/extensions/qt/widgets/qt_base.rb
+- lib/freightrain/freight_color.rb
+- lib/extensions/qt/qt_bootstrapper.rb
+- lib/extensions/qt/interface_builder.rb
 - lib/extensions/qt/widgets/qt_line_edit.rb
+- lib/extensions/qt/widgets/qt_layout.rb
+- lib/extensions/qt/widgets/qt_abstract_button.rb
+- lib/extensions/qt/widgets/qt_base.rb
 - lib/extensions/qt/widgets/qt_label.rb
 - lib/extensions/qt/widgets/qt_calendar_widget.rb
-- lib/extensions/qt/widgets/qt_abstract_button.rb
-- lib/extensions/qt/widgets/qt_layout.rb
-- lib/extensions/qt/interface_builder.rb
 - lib/extensions/qt/dialog_helper.rb
-- lib/extensions/qt/qt_bootstrapper.rb
-- lib/extensions/gtk/widgets/gtk_widget.rb
+- lib/extensions/wx/interface_builder.rb
+- lib/extensions/wx/wx_bootstrapper.rb
+- lib/extensions/wx/widgets/wx_panel.rb
+- lib/extensions/wx/widgets/wx_object.rb
+- lib/extensions/wx/dialog_helper.rb
+- lib/extensions/gtk/interface_builder.rb
+- lib/extensions/gtk/widgets/gtk_combo_box.rb
 - lib/extensions/gtk/widgets/gtk_image.rb
-- lib/extensions/gtk/widgets/gtk_treeview.rb
-- lib/extensions/gtk/widgets/gtk_calendar.rb
+- lib/extensions/gtk/widgets/gtk_widget.rb
 - lib/extensions/gtk/widgets/gtk_toggle_button.rb
-- lib/extensions/gtk/widgets/gtk_toggle_tool_button.rb
+- lib/extensions/gtk/widgets/gtk_calendar.rb
 - lib/extensions/gtk/widgets/gtk_layout.rb
+- lib/extensions/gtk/widgets/gtk_treeview.rb
+- lib/extensions/gtk/widgets/gtk_toggle_tool_button.rb
 - lib/extensions/gtk/widgets/gtk_statusicon.rb
-- lib/extensions/gtk/widgets/gtk_combo_box.rb
 - lib/extensions/gtk/widgets/gtk_treeviewcolumn.rb
-- lib/extensions/gtk/interface_builder.rb
 - lib/extensions/gtk/gtk_bootstrapper.rb
 - lib/extensions/gtk/dialog_helper.rb
-- lib/extensions/wx/wx_bootstrapper.rb
-- lib/extensions/wx/widgets/wx_panel.rb
-- lib/extensions/wx/widgets/wx_object.rb
-- lib/extensions/wx/interface_builder.rb
-- lib/extensions/wx/dialog_helper.rb
+- lib/freightrain-dev/auto_stubber.rb
+- lib/freightrain.rb
+- lib/scaffolding/generator.rb
+- lib/scaffolding/commands/app.rb
+- lib/scaffolding/commands/triad.rb
+- lib/scaffolding/scaffolding.rb
+- lib/scaffolding/templates/view_toplevel_glade.ftt
+- lib/scaffolding/templates/view.ftt
+- lib/scaffolding/templates/view_toplevel.ftt
+- lib/scaffolding/templates/viewmodel_toplevel.ftt
+- lib/scaffolding/templates/application.ftt
+- lib/scaffolding/templates/view_control_glade.ftt
+- lib/scaffolding/templates/view_bnd.ftt
+- lib/scaffolding/templates/view_model.ftt
 homepage: http://github.com/bolthar/freightrain
 licenses: []
 post_install_message: 
@@ -123,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: ruby desktop development made easy