freightrain 0.8.2 → 0.8.3

data/Rakefile

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

data/lib/extensions/gtk/interface_builder.rb

@@ -1,3 +1,4 @@
+require 'rexml/document'
 
 module Freightrain
 
@@ -14,7 +15,9 @@ module Freightrain
       end
 
       def create_objects_from_file(file_name)
-        @builder.add_from_file(get_glade_file(file_name))
+        file = get_glade_file(file_name)
+        corrected_xml = replace_faulty_gtkboxes(File.read(file))
+        @builder.add_from_string(corrected_xml)
         objects = @builder.objects        
         if objects.first.respond_to? :toplevel
           @control = objects.first.toplevel
@@ -51,6 +54,19 @@ module Freightrain
         results = Dir.glob(search_path)
         return results.first
       end
+      
+      def replace_faulty_gtkboxes(xml)
+        document = REXML::Document.new(xml)
+        document.elements.each("//object[@class='GtkBox']") do |box|
+          substitute_class = nil
+          box.elements.each("property[@name='orientation']") do |orientation|
+            substitute_class = orientation == "vertical" ? "GtkVBox" : "GtkHBox"
+          end
+          p "here3"
+          box.attributes["class"] = substitute_class
+        end
+        return document.to_s
+      end
 
       def control
         return @control

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

@@ -9,6 +9,10 @@ module Gtk
       file.close
       self.pixbuf = Gdk::Pixbuf.new(File.join(Dir.tmpdir,"tempimg#{self.object_id.to_s}"))
     end
+
+    def image_file=(file_name)
+      self.image=(File.open(file_name).read)
+    end
     
   end
-end
+end

data/lib/freightrain/ioc/registry.rb

@@ -14,6 +14,7 @@ module Freightrain
     end
     
     def resolve(class_name)
+      raise "Could not instance class #{class_name}" unless @classes.has_key?(class_name)
       return @cache[class_name] || @classes[class_name].new
     end
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: freightrain
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-18 00:00:00.000000000 Z
+date: 2012-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: require_all
-  requirement: &11079940 !ruby/object:Gem::Requirement
+  requirement: &13172380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *11079940
+  version_requirements: *13172380
 description: ruby desktop development made easy
 email: andrea@andreadallera.com
 executables:
@@ -32,78 +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/code_interface_builder.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: 
@@ -124,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