apotomo 1.2.0 → 1.2.1

data/CHANGES.textile

@@ -1,3 +1,8 @@
+h2. 1.2.1
+
+h3. Changes
+  * Save the <code>@options</code> hash in the constructor since we cannot rely on cells anymore.
+  
 h2. 1.2.0
 
 h3. Changes

data/lib/apotomo/version.rb

@@ -1,3 +1,3 @@
 module Apotomo
-  VERSION = '1.2.0'
+  VERSION = '1.2.1'
 end

data/lib/apotomo/widget.rb

@@ -72,6 +72,7 @@ module Apotomo
     undef :display  # We don't want #display to be listed in #internal_methods.
     
     alias_method :widget_id, :name
+    attr_reader :options
     
     after_initialize do
       run_hook :has_widgets, self
@@ -79,7 +80,8 @@ module Apotomo
     
     
     def initialize(parent, id, options={})
-      super(parent, options)  # TODO: do that as long as cells do need a parent_controller. remember to remove options for cells 3.7.
+      super(parent)  # TODO: do that as long as cells do need a parent_controller.
+      @options      = options
       @name         = id
       @visible      = true
       
@@ -99,7 +101,7 @@ module Apotomo
     
     # Invokes +state+ and hopefully returns the rendered content.
     def invoke(state, *args)
-      return render_state(state, *args) if state_accepts_args?(state)
+      return render_state(state, *args) if method(state).arity != 0 # TODO: remove check and make trigger states receive the evt default. 
       render_state(state)
     end
     

data/test/rails/view_helper_test.rb

@@ -7,17 +7,9 @@ class ViewHelperTest < Apotomo::TestCase
   
   # TODO: use Cell::TestCase#in_view here.
   def in_view(subject, &block)
-    if subject.kind_of?(Apotomo::Widget)
-      subject.options[:block] = block
-    else
-      subject = subject.new(@controller, 'mum', :block => block)
-    end
-     
-    setup_test_states_in(subject) unless subject.respond_to?(:in_view)# add #in_view state to subject cell.
-    
-    subject.class.action_methods << "in_view"
-    
-    subject.invoke(:in_view)
+    subject = subject.new(@controller, :mum) unless subject.kind_of?(Apotomo::Widget)
+    setup_test_states_in(subject)
+    subject.invoke(:in_view, block)
   end
   def mouse_mock(id='mum', opts={}, &block)
     mouse = MouseWidget.new(parent_controller, id, opts)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 2
-  - 0
-  version: 1.2.0
+  - 1
+  version: 1.2.1
 platform: ruby
 authors: 
 - Nick Sutterer
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-12 00:00:00 +02:00
+date: 2011-10-14 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency