apotomo 1.0.3 → 1.0.4

data/CHANGES.textile

@@ -1,3 +1,18 @@
+h2. 1.0.4
+
+h3. Bugfixes
+  * Caching states works, again. Thanks to Gudleik Rasch for spotting.
+  * We cleanly require cells-3.4.x now. Thanks to Ryan Bates who remarked that Apotomo 1.0.x tries to require cells-3.5, which was wrong.
+  
+h3. Notes
+  * Removed the usage of state-args. If you want the event instance in your triggered state, use @opts[:event] or upgrade to apotomo-1.1.
+  
+h2. 1.0.3
+
+h3. Bugfixes
+  * fixed gemspec to not require useless gem dependencies.
+
+
 h2. 1.0.2
 
 h3. Changes

data/apotomo.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   
   s.add_dependency "rails",   "~> 3.0"
-  s.add_dependency "cells",   "~> 3.4"
+  s.add_dependency "cells",   "~> 3.4.0"
   s.add_dependency "onfire",  "~> 0.1.1"
   s.add_dependency "hooks",   "~> 0.1.3"
 

data/lib/apotomo.rb

@@ -47,7 +47,7 @@ module Apotomo
   # Piotr Sarnacki: Railtie :P
   class Railtie < Rails::Railtie
     rake_tasks do
-      load "tasks.rake"
+      load "apotomo/apotomo.rake"
     end
     
     # As we are a Railtie only, the routes won't be loaded automatically. Beside that, we want our 

data/lib/{tasks.rake → apotomo/apotomo.rake}

@@ -1,5 +1,7 @@
+require "rake/testtask"
+
 namespace "test" do
-  TestTaskWithoutDescription.new(:widgets => "test:prepare") do |t|
+  Rake::TestTask.new(:widgets) do |t|
     t.libs << "test"
     t.pattern = 'test/widgets/**/*_test.rb'
   end

data/lib/apotomo/version.rb

@@ -1,3 +1,3 @@
 module Apotomo
-  VERSION = '1.0.3'
+  VERSION = '1.0.4'
 end

data/lib/apotomo/widget.rb

@@ -92,10 +92,10 @@ module Apotomo
       
       #render_state(state)
       
-      return process(state, event) if method(state).arity == 1
+      return render_state(state, event) if method(state).arity == 1
       
       opts[:event] = event
-      process(state)
+      render_state(state)
     end
     
     

data/test/rails/caching_test.rb

@@ -0,0 +1,38 @@
+require 'test_helper'
+
+
+
+class CachingTest < ActiveSupport::TestCase
+  include Apotomo::TestCaseMethods::TestController
+  
+  class CheeseWidget < Apotomo::Widget
+    cache :holes
+    
+    @@holes = 0
+    cattr_accessor :holes
+    
+    
+    #def self.reset!
+    #  @@counter = 0
+    #end
+    
+    def increment!
+      self.class.holes += 1
+    end
+    
+    def holes
+      render :text => increment!
+    end 
+  end
+  
+  context "A caching widget" do
+    setup do
+      @cheese = CheeseWidget.new(parent_controller, 'cheese', :holes)
+    end
+    
+    should "invoke the cached state only once" do
+      assert_equal "1", @cheese.invoke
+      assert_equal "1", @cheese.invoke
+    end
+  end
+end

data/test/unit/event_methods_test.rb

@@ -43,19 +43,6 @@ class EventMethodsTest < Test::Unit::TestCase
       @mum.respond_to_event :answer_squeak
       @mum.fire :answer_squeak
       assert_equal ['answer squeak'], @mum.list
-    end 
-    
-    should "make pass the event into the triggered state" do
-      @mum.instance_eval do
-        respond_to_event :footsteps
-          
-        def footsteps(evt)
-          list << evt.type
-        end
-      end
-      
-      @mum.trigger :footsteps
-      assert_equal ["escape", :footsteps], @mum.list
     end
     
     should "accept payload data for the event" do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 3
-  version: 1.0.3
+  - 4
+  version: 1.0.4
 platform: ruby
 authors: 
 - Nick Sutterer
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-10 00:00:00 +01:00
+date: 2011-02-09 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,7 +42,8 @@ dependencies:
         segments: 
         - 3
         - 4
-        version: "3.4"
+        - 0
+        version: 3.4.0
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -106,6 +107,7 @@ files:
 - apotomo.gemspec
 - config/routes.rb
 - lib/apotomo.rb
+- lib/apotomo/apotomo.rake
 - lib/apotomo/container_widget.rb
 - lib/apotomo/event.rb
 - lib/apotomo/event_handler.rb
@@ -131,7 +133,6 @@ files:
 - lib/generators/apotomo/templates/widget.rb
 - lib/generators/apotomo/templates/widget_test.rb
 - lib/generators/apotomo/widget_generator.rb
-- lib/tasks.rake
 - test/dummy/Rakefile
 - test/dummy/app/controllers/application_controller.rb
 - test/dummy/app/helpers/application_helper.rb
@@ -177,6 +178,7 @@ files:
 - test/fixtures/mouse/make_me_squeak.html.erb
 - test/fixtures/mouse/posing.html.erb
 - test/fixtures/mouse/snuggle.html.erb
+- test/rails/caching_test.rb
 - test/rails/controller_methods_test.rb
 - test/rails/rails_integration_test.rb
 - test/rails/view_helper_test.rb