rugui 1.6.0 → 2.0.0.beta2

data/spec/helpers/observables.rb

@@ -1,7 +1,7 @@
 # Defines some observables and custom types used in specs.
 
 class FakeObservable < RuGUI::BaseObject
-  attr_accessor :property_changed_message 
+  attr_accessor :property_changed_message
 
   def framework_adapter
     framework_adapter_for('BaseController')
@@ -14,24 +14,16 @@ end
 
 class AnotherFakeObserver < RuGUI::BaseObject
   attr_accessor :property_updated_message
-  
-  def value_to_s(value)
-    if value.is_a?(Hash)
-      value.keys.sort
-    else
-      value
-    end
-  end
-  
+
   def property_updated(observable, property, new_value, old_value)
-    
-    @property_updated_message = "#{observable} property #{property} changed from #{value_to_s(old_value)} to #{value_to_s(new_value)}"
+
+    @property_updated_message = "#{observable} property #{property} changed from #{old_value.inspect} to #{new_value.inspect}"
   end
 end
 
 class AnotherFakeObservable < RuGUI::BaseObject
   include RuGUI::ObservablePropertySupport
-  
+
   observable_property :my_observable_property
   observable_property :my_array_observable_property, :initial_value => []
   observable_property :my_hash_observable_property, :initial_value => {}
@@ -39,19 +31,23 @@ class AnotherFakeObservable < RuGUI::BaseObject
   observable_property :resetable_observable_property, :reset_value => "some_reset_value"
   observable_property :initialized_and_resetable_observable_property, :initial_value => "some_initial_value", :reset_value => "some_reset_value"
   observable_property :core_observable_property, :core => true, :initial_value => "some_initial_value"
-  
+
   def to_s
     self.class.name
   end
+
+  def inspect
+    to_s
+  end
 end
 
 class SomeOtherFakeObservable < RuGUI::BaseObject
   include RuGUI::ObservablePropertySupport
-  
+
   observable_property :another_observable_property, :initial_value => "some_other_initial_value"
   observable_property :first_core_observable_property, :core => true, :initial_value => "first"
   observable_property :second_core_observable_property, :core => true, :initial_value => "second"
-  
+
   def to_s
     self.class.name
   end
@@ -59,9 +55,9 @@ end
 
 class CustomTypeFakeObservable < RuGUI::BaseObject
   include RuGUI::ObservablePropertySupport
-  
+
   observable_property :custom_type_observable_property, :core => true, :initial_value => AnotherFakeObservable.new
-  
+
   def to_s
     self.class.name
   end
@@ -69,10 +65,10 @@ end
 
 class ResetPreventedFakeObservable < RuGUI::BaseObject
   include RuGUI::ObservablePropertySupport
-  
+
   observable_property :reset_prevented_observable_property, :prevent_reset => true
   observable_property :reset_prevented_with_reset_value_observable_property, :reset_value => 'foo', :prevent_reset => true
-  
+
   def to_s
     self.class.name
   end
@@ -80,10 +76,10 @@ end
 
 class BooleanPropertiesFakeObservable < RuGUI::BaseObject
   include RuGUI::ObservablePropertySupport
-  
+
   observable_property :boolean_observable_property, :boolean => true
   observable_property :non_boolean_observable_property
-  
+
   def to_s
     self.class.name
   end
@@ -91,10 +87,10 @@ end
 
 class ParentFakeObservable < RuGUI::BaseObject
   include RuGUI::ObservablePropertySupport
-  
+
   observable_property :my_own_observable_property
   observable_property :child_observable_property
-  
+
   def to_s
     self.class.name
   end
@@ -102,9 +98,9 @@ end
 
 class ChildFakeObservable < RuGUI::BaseObject
   include RuGUI::ObservablePropertySupport
-  
+
   observable_property :my_observable_property, :core => true
-  
+
   def to_s
     self.class.name
   end
@@ -112,9 +108,9 @@ end
 
 class FakeObservableForPropertyObserverTest < RuGUI::BaseObject
   include RuGUI::ObservablePropertySupport
-  
+
   observable_property :my_observable_property
-  
+
   def to_s
     self.class.name
   end
@@ -122,9 +118,9 @@ end
 
 class FakeNamedObservableTest < RuGUI::BaseObject
   include RuGUI::ObservablePropertySupport
-  
+
   observable_property :my_observable_property
-  
+
   def to_s
     self.class.name
   end
@@ -132,7 +128,7 @@ end
 
 class FakeObserverForPropertyObserverTest < RuGUI::BaseObject
   include RuGUI::PropertyObserver
-  
+
   attr_accessor :property_updated_message
   attr_accessor :class_specific_method_called_message
   attr_accessor :instance_specific_method_called_message
@@ -140,19 +136,19 @@ class FakeObserverForPropertyObserverTest < RuGUI::BaseObject
   attr_accessor :observable
   attr_accessor :named_observable
   attr_accessor :fake_named_observable_test
-  
+
   attr_accessor :property_changed_counter
-  
+
   def initialize
     @observable = FakeObservableForPropertyObserverTest.new
     @observable.register_observer(self)
-    
+
     @named_observable = FakeObservableForPropertyObserverTest.new
     @named_observable.register_observer(self, 'named_observable')
-    
+
     @fake_named_observable_test = FakeNamedObservableTest.new
     @fake_named_observable_test.register_observer(self, 'fake_named_observable_test')
-    
+
     @property_changed_counter = 0
   end
 
@@ -160,26 +156,18 @@ class FakeObserverForPropertyObserverTest < RuGUI::BaseObject
     framework_adapter_for('BaseController')
   end
 
-  def value_to_s(value)
-    if value.is_a?(Hash)
-      value.keys.sort
-    else
-      value
-    end
-  end
-  
   def property_my_observable_property_changed(observable, new_value, old_value)
-    @property_updated_message = "#{observable} property my_observable_property changed from #{value_to_s(old_value)} to #{value_to_s(new_value)}"
+    @property_updated_message = "#{observable} property my_observable_property changed from #{old_value.inspect} to #{new_value.inspect}"
   end
-  
+
   def property_fake_observable_for_property_observer_test_my_observable_property_changed(observable, new_value, old_value)
     @class_specific_method_called_message = "Property my_observable_property changed, called from class specific method"
   end
-  
+
   def property_named_observable_my_observable_property_changed(observable, new_value, old_value)
     @instance_specific_method_called_message = "Property my_observable_property changed, called from named instance specific method"
   end
-  
+
   def property_fake_named_observable_test_my_observable_property_changed(observable, new_value, old_value)
     @property_changed_counter += 1
   end
@@ -191,19 +179,19 @@ class CustomType < RuGUI::BaseObject
   def custom_method
     "foo"
   end
-  
+
   def custom_method_with_parameters(first_param, second_param, *args)
     "#{first_param}, #{second_param}, #{args.join(', ')}"
   end
-  
+
   def change_custom_property(new_value)
     @custom_property = new_value
   end
-  
+
   def ==(obj)
     obj.is_a?(CustomType) and obj.custom_property == self.custom_property
   end
-  
+
   def to_s
     self.custom_property
   end

data/spec/helpers/views.rb

@@ -6,31 +6,31 @@ class MyView < RuGUI::BaseView
   include InitializeHooksHelper
 
   use_builder
-  builder_file File.join(File.dirname(__FILE__), '..', 'resource_files', 'my_view.glade')
+  builder_file File.join(File.dirname(__FILE__), '..', 'resource_files', 'my_view.xml')
   root :top_window
-  
+
   attr_accessor :message
-  
+
   def setup_view_helpers
     register_helper :my_view_helper, :my_other_view_helper_instance
   end
-  
+
   def on_button_above_clicked(widget)
     @message = "#{self.class} button above clicked."
   end
-  
+
   def on_button_below_clicked(widget)
     @message = "#{self.class} button below clicked."
   end
-  
+
   def on_top_window_delete_event(widget, event)
     @message = "#{self.class} top window deleted."
   end
-  
+
   def property_message_changed(observable, new_value, old_value)
     @message = "#{observable.class.name} property message changed from #{old_value} to #{new_value}"
   end
-  
+
   def property_my_other_view_helper_instance_message_changed(observable, new_value, old_value)
     @message = "Property message of my_other_view_helper_instance changed from #{old_value} to #{new_value}"
   end
@@ -38,11 +38,11 @@ end
 
 class MyChildView < MyView
   root :vertical_container
-  
+
   def on_button_above_clicked(widget)
     @message = "#{self.class} button above clicked."
   end
-  
+
   def on_button_below_clicked(widget)
     @message = "#{self.class} button below clicked."
   end
@@ -50,19 +50,19 @@ end
 
 class MyOtherView < RuGUI::BaseView
   use_builder
-  builder_file File.join(File.dirname(__FILE__), '..', 'resource_files', 'my_other_view.glade')
+  builder_file File.join(File.dirname(__FILE__), '..', 'resource_files', 'my_other_view.xml')
   root :top_window
-  
+
   attr_accessor :message
-  
+
   def on_button_right_clicked(widget)
     @message = "#{self.class} button right clicked."
   end
-  
+
   def on_button_left_clicked(widget)
     @message = "#{self.class} button left clicked."
   end
-  
+
   def on_top_window_delete_event(widget, event)
     @message = "#{self.class} top window deleted."
   end

data/spec/resource_files/my_other_view.xml

@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <!-- interface-requires gtk+ 2.6 -->
+  <!-- interface-naming-policy toplevel-contextual -->
+  <object class="GtkWindow" id="top_window">
+    <property name="can_focus">False</property>
+    <signal name="delete-event" handler="on_top_window_delete_event" swapped="no"/>
+    <child>
+      <object class="GtkHBox" id="horizontal_container">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <child>
+          <object class="GtkButton" id="button_left">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">True</property>
+            <signal name="clicked" handler="on_button_left_clicked" swapped="no"/>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="label">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">A label in the middle</property>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkButton" id="button_right">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">True</property>
+            <signal name="clicked" handler="on_button_right_clicked" swapped="no"/>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>

data/spec/resource_files/my_view.xml

@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <!-- interface-requires gtk+ 2.6 -->
+  <!-- interface-naming-policy toplevel-contextual -->
+  <object class="GtkWindow" id="top_window">
+    <property name="can_focus">False</property>
+    <signal name="delete-event" handler="on_top_window_delete_event" swapped="no"/>
+    <child>
+      <object class="GtkVBox" id="vertical_container">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <child>
+          <object class="GtkButton" id="button_above">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">True</property>
+            <signal name="clicked" handler="on_button_above_clicked" swapped="no"/>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="label">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">Some label in the middle</property>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkButton" id="button_below">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">True</property>
+            <signal name="clicked" handler="on_button_below_clicked" swapped="no"/>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>

data/spec/spec_helper.rb

@@ -1,5 +1,6 @@
-require 'rubygems'
-require 'spec'
+require 'bundler/setup'
+
+Bundler.require(:default, :test)
 
 $:.unshift File.join(File.dirname(__FILE__),'..','lib')
 
@@ -10,6 +11,11 @@ APPLICATION_ROOT = "#{File.dirname(__FILE__)}/.." unless defined?(APPLICATION_RO
 
 RuGUI::Initializer.run { |config| config.logger[:level] = :error }
 
-Spec::Runner.configure do |config|
+Dir["spec/helpers/**/*.rb"].each { |file| load file }
+
+RSpec.configure do |config|
   # No configuration here yet.
+  config.before(:each) do
+    HelperManager.clear!
+  end
 end