catalyst 0.0.5 → 0.0.6

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.6

data/catalyst.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{catalyst}
-  s.version = "0.0.5"
+  s.version = "0.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ari Lerner"]
-  s.date = %q{2011-07-26}
+  s.date = %q{2011-07-27}
   s.description = %q{Quickly build a framework for providing a middleware-like structure}
   s.email = %q{arilerner@mac.com}
   s.extra_rdoc_files = [

data/lib/catalyst/runner.rb

@@ -26,7 +26,7 @@ module Catalyst
         klass.new(*[self, args].flatten.compact, &block)
       elsif klass.respond_to?(:call)
         lambda do |env|
-          self.call(klass.call(env))
+          klass.call(*[env, self].flatten.compact)
         end
       else
         raise

data/test/test_catalyst.rb

@@ -28,11 +28,24 @@ class TestCatalyst < Test::Unit::TestCase
       end
     end
     
+    should "not call the next app if @app.call is not invoked" do
+      @@count = 0
+      rs = Catalyst::RunStack.new do
+        use lambda {|env, app| @@count += 1; app.call(env) }
+        use lambda {|env, app| @@count += 1 }
+        use lambda {|env, app| @@count += 1 }
+        use lambda {|env, app| @@count += 1 }
+      end
+      
+      rs.call({'i' => 0})
+      assert_equal 2, @@count
+    end
+    
     should "be able to call a stack" do
       @@filtered_through_stack = false
       @rs = Catalyst::RunStack.new do
         use TestCatalystMiddleware
-        use lambda {|env| @@filtered_through_stack = true }
+        use lambda {|env, app| @@filtered_through_stack = true }
       end
       
       @rs.call({})
@@ -42,9 +55,9 @@ class TestCatalyst < Test::Unit::TestCase
     should "be able to define a Catalyst run_Stack from the module" do
       @@count = 0
       rs = Catalyst.run_stack do
-        use lambda {|env| @@count += 1}
-        use lambda {|env| @@count += 1}
-        use lambda {|env| @@count += 1}
+        use lambda {|env, app| @@count += 1; app.call}
+        use lambda {|env, app| @@count += 1; app.call}
+        use lambda {|env, app| @@count += 1; app.call}
       end
       rs.call()
       assert_equal @@count, 3
@@ -54,8 +67,9 @@ class TestCatalyst < Test::Unit::TestCase
   should "be able to call run in place of use" do
     @@count = 0
     rs = Catalyst.run_stack do
-      use lambda {|env| @@count += 1}
-      run lambda {|env| @@count += 1}
+
+      use lambda {|env, app| @@count += 1; app.call()}
+      run lambda {|env, app| @@count += 1; app.call()}
     end
     
     rs.call

data/test/test_runner.rb

@@ -26,7 +26,7 @@ class TestRunner < Test::Unit::TestCase
         env = new_environment
         env.expects(:foo).once
 
-        func = lambda { |x| x.foo }
+        func = lambda { |x, app| x.foo }
         @instance.setup_action(func).call(env)
       end
       

metadata

@@ -2,7 +2,7 @@
 name: catalyst
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors: 
 - Ari Lerner
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-26 00:00:00 -07:00
+date: 2011-07-27 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -127,7 +127,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2270288001949601855
+      hash: 1632582077347683059
       segments: 
       - 0
       version: "0"