catalyst 0.0.2 → 0.0.3

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/catalyst.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{catalyst}
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ari Lerner"]

data/lib/catalyst.rb

@@ -4,6 +4,10 @@ require 'moneta'
 module Catalyst
   autoload :Runner, 'catalyst/runner'
   
+  def self.run_stack(&block)
+    RunStack.new(&block)
+  end
+  
   class RunStack
     
     # Start a RunStack with a block
@@ -26,18 +30,13 @@ module Catalyst
       self
     end
     
-    # run is just another term for 'use'
-    def run
-      @run = app
-    end
-    
     # Turn this RunStack to a Runner
     def to_app
       Runner.new(stack)
     end
     
     # Start off the middleware
-    def call(env)
+    def call(env={})
       to_app.call(env)
     end 
   end

data/lib/catalyst/runner.rb

@@ -7,11 +7,11 @@ module Catalyst
       @actions = actions.map {|act| setup_action(act) }
     end
     
-    def call(env)
-      return if @actions.empty?
+    def call(env={})
+      return if actions.empty?
 
       begin
-        action = @history.unshift(@actions.shift).first
+        action = history.unshift(@actions.shift).first
         action.call(env)
       rescue Exception => e
         env["catalyst.error"] = e
@@ -26,8 +26,7 @@ module Catalyst
         klass.new(self, *args, &block)
       elsif klass.respond_to?(:call)
         lambda do |env|
-          klass.call(env)
-          self.call(env)
+          self.call(klass.call(env))
         end
       else
         raise

data/test/test_catalyst.rb

@@ -39,5 +39,16 @@ class TestCatalyst < Test::Unit::TestCase
       assert @@filtered_through_stack
     end
     
+    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}
+      end
+      rs.call()
+      assert_equal @@count, 3
+    end
+    
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: catalyst
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Ari Lerner