cuba 0.2.0 → 0.3.0

data/README.markdown

@@ -66,7 +66,7 @@ check the documentation for [Cutest](http://github.com/djanowski/cutest) and
 Installation
 ------------
 
-    $ sudo gem install cuba
+    $ gem install cuba
 
 License
 -------

data/cuba.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name              = "cuba"
-  s.version           = "0.2.0"
+  s.version           = "0.3.0"
   s.summary           = "Rum based microframework for web applications."
   s.description       = "Cuba is a light wrapper for Rum, a microframework for Rack applications."
   s.authors           = ["Michel Martens"]

data/lib/cuba.rb

@@ -2,19 +2,28 @@ require "cuba/version"
 require "cuba/ron"
 
 module Cuba
+  def self.reset!
+    @app = nil
+    @prototype = nil
+  end
+
   def self.app
     @app ||= Rack::Builder.new
   end
 
-  def self.use(middleware)
-    app.use(middleware)
+  def self.use(middleware, *args, &block)
+    app.use(middleware, *args, &block)
   end
 
   def self.define(&block)
     app.run Cuba::Ron.new(&block)
   end
 
+  def self.prototype
+    @prototype ||= app.to_app
+  end
+
   def self.call(env)
-    app.call(env)
+    prototype.call(env)
   end
-end
+end

data/lib/cuba/version.rb

@@ -1,3 +1,3 @@
 module Cuba
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/test/integration.rb

@@ -1,4 +1,95 @@
+$:.unshift(File.expand_path("../lib", File.dirname(__FILE__)))
+require "cuba"
+
+prepare { Cuba.reset! }
+
+test "resetting" do
+  old = Cuba.app
+  assert old.object_id == Cuba.app.object_id
+
+  Cuba.reset!
+  assert old.object_id != Cuba.app.object_id
+end
+
+class Middle
+  def initialize(app, first, second, &block)
+    @app, @first, @second, @block = app, first, second, block
+  end
+
+  def call(env)
+    env["m.first"] = @first
+    env["m.second"] = @second
+    env["m.block"] = @block.call
+
+    @app.call(env)
+  end
+end
+
+test "use passes in the arguments and block" do
+  Cuba.use Middle, "First", "Second" do
+    "this is the block"
+  end
+
+  Cuba.define do
+    on get do
+      on path("hello") do
+        "Default"
+      end
+    end
+  end
+
+  env = { "REQUEST_METHOD" => "GET", "PATH_INFO" => "/hello",
+          "SCRIPT_NAME" => "/" }
+
+  Cuba.call(env)
+
+  assert "First" == env["m.first"]
+  assert "Second" == env["m.second"]
+  assert "this is the block" == env["m.block"]
+end
+
+test "reset and use" do
+  Cuba.use Middle, "First", "Second" do
+    "this is the block"
+  end
+
+  Cuba.define do
+    on get do
+      on path("hello") do
+        res.write "Default"
+      end
+    end
+  end
+
+  Cuba.reset!
+
+  Cuba.use Middle, "1", "2" do
+    "3"
+  end
+
+  Cuba.define do
+    on get do
+      on path("hello") do
+        res.write "2nd Default"
+      end
+    end
+  end
+
+  env = { "REQUEST_METHOD" => "GET", "PATH_INFO" => "/hello",
+          "SCRIPT_NAME" => "/" }
+
+  status, headers, resp = Cuba.call(env)
+
+  assert 200 == status
+  assert "text/html" == headers["Content-Type"]
+  assert ["2nd Default"] == resp.body
+
+  assert "1" == env["m.first"]
+  assert "2" == env["m.second"]
+  assert "3" == env["m.block"]
+end
+
 test "examples" do
   `cd example && rake -I../lib`
   assert $?.exitstatus == 0
-end
+end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Michel Martens
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-25 00:00:00 -03:00
+date: 2010-10-09 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency