cuba 0.3.0 → 1.0.0

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010 Michel Martens and Damian Janowski
+Copyright (c) 2010 Michel Martens, Damian Janowski and Cyril David
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.markdown

@@ -8,13 +8,17 @@ Rum based microframework for web development.
 Description
 -----------
 
-Cuba is a light wrapper around [Rum](http://github.com/chneukirchen/rum),
-a tiny but powerful mapper for [Rack](http://github.com/chneukirchen/rack)
-applications.
+Cuba is a microframework for web development heavily inspired by [Rum][rum],
+a tiny but powerful mapper for [Rack][rack] applications.
 
-It integrates many templates via [Tilt](http://github.com/rtomayko/tilt),
-and testing via [Cutest](http://github.com/djanowski/cutest) and
-[Capybara](http://github.com/jnicklas/capybara).
+It integrates many templates via [Tilt][tilt], and testing via
+[Cutest][cutest] and [Capybara][capybara].
+
+[rum]: http://github.com/chneukirchen/rum
+[rack]: http://github.com/chneukirchen/rack
+[tilt]: http://github.com/rtomayko/tilt
+[cutest]: http://github.com/djanowski/cutest
+[capybara]: http://github.com/jnicklas/capybara
 
 Usage
 -----
@@ -32,7 +36,7 @@ Here's a simple application:
           res.write "Hello world!"
         end
 
-        on default do
+        on true do
           res.redirect "/hello"
         end
       end
@@ -56,40 +60,77 @@ To run it, you can create a `config.ru`:
 
     run Cuba
 
+Here's an example showcasing how different matchers work:
+
+    require "cuba"
+
+    Cuba.use Rack::Session::Cookie
+
+    Cuba.define do
+
+      # /about
+      on path("about") do
+        res.write "About"
+      end
+
+      # /styles/basic.css
+      on path("styles"), extension("css") do |file|
+        res.write "Filename: #{file}" #=> "Filename: basic"
+      end
+
+      # /post/2011/02/16/hello
+      on path("post"), number, number, number, segment do |y, m, d, slug|
+        res.write "#{y}-#{m}-#{d} #{slug}" #=> "2011-02-16 hello"
+      end
+
+      # /username/foobar
+      on path("username"), segment do |username|
+
+        user = User.find_by_username(username) # username == "foobar"
+
+        # /username/foobar/posts
+        on path("posts") do
+
+          # You can access `user` here, because the `on` blocks
+          # are closures.
+          res.write "Total Posts: #{user.posts.size}" #=> "Total Posts: 6"
+        end
+
+        # /username/foobar/following
+        on path("following") do
+          res.write user.following.size #=> "1301"
+        end
+      end
+
+      # /search?q=barbaz
+      on path("search"), param("q") do |query|
+        res.write "Searched for #{query}" #=> "Searched for barbaz"
+      end
+
+      on post
+        on path("login")
+
+          # POST /login, user: foo, pass: baz
+          on param("user"), param("pass") do |user, pass|
+            res.write "#{user}:#{pass}" #=> "foo:baz"
+          end
+
+          # If the params `user` and `pass` are not provided, this block will
+          # get executed.
+          on true do
+            res.write "You need to provide user and pass!"
+          end
+        end
+      end
+    end
+
+
 That's it, you can now run `rackup` and enjoy what you have just created.
 
-For more information about what you can do, check [Rum's
-documentation](http://github.com/chneukirchen/rum). To see how you can test it,
-check the documentation for [Cutest](http://github.com/djanowski/cutest) and
-[Capybara](http://github.com/jnicklas/capybara).
+To read more about testing, check the documentation for [Cutest][cutest] and
+[Capybara][capybara].
 
 Installation
 ------------
 
     $ gem install cuba
-
-License
--------
-
-Copyright (c) 2010 Michel Martens and Damian Janowski
-
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
-files (the "Software"), to deal in the Software without
-restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.

data/cuba.gemspec

@@ -1,12 +1,12 @@
 Gem::Specification.new do |s|
   s.name              = "cuba"
-  s.version           = "0.3.0"
+  s.version           = "1.0.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"]
   s.email             = ["michel@soveran.com"]
   s.homepage          = "http://github.com/soveran/cuba"
-  s.files = ["LICENSE", "README.markdown", "Rakefile", "lib/cuba/ron.rb", "lib/cuba/rum.rb", "lib/cuba/test.rb", "lib/cuba/version.rb", "lib/cuba.rb", "cuba.gemspec", "test/integration.rb", "test/webrat.log"]
+  s.files = ["LICENSE", "README.markdown", "Rakefile", "lib/cuba/ron.rb", "lib/cuba/test.rb", "lib/cuba/version.rb", "lib/cuba.rb", "cuba.gemspec", "test/accept.rb", "test/captures.rb", "test/extension.rb", "test/helper.rb", "test/integration.rb", "test/number.rb", "test/on.rb", "test/path.rb", "test/run.rb", "test/segment.rb"]
   s.add_dependency "rack", "~> 1.2"
   s.add_dependency "tilt", "~> 1.1"
   s.add_development_dependency "cutest", "~> 0.1"

data/lib/cuba/ron.rb

@@ -1,20 +1,309 @@
-require "cuba/rum"
+require "rack"
 require "tilt"
 
+class Rack::Response
+  # 301 Moved Permanently
+  # 302 Found
+  # 303 See Other
+  # 307 Temporary Redirect
+  def redirect(target, status = 302)
+    self.status = status
+    self["Location"] = target
+  end
+end
+
+# Based on Rum: http://github.com/chneukirchen/rum
+#
+# Summary of changes
+#
+# 1. Only relevant captures are yielded.
+# 2. The #extension matcher is used more like #path.
+# 3. Miscellaneous coding style changes.
+#
 module Cuba
-  class Ron < Rum
+  class Ron
+    attr :env
+    attr :req
+    attr :res
+    attr :captures
+
+    def initialize(&blk)
+      @blk = blk
+      @captures = []
+    end
+
+    def call(env)
+      dup._call(env)
+    end
+
+    def _call(env)
+      @env = env
+      @req = Rack::Request.new(env)
+      @res = Rack::Response.new
+      @matched = false
+
+      catch(:rum_run_next_app) do
+        instance_eval(&@blk)
+
+        @res.status = 404 unless @matched || !@res.empty?
+
+        return @res.finish
+      end.call(env)
+    end
+
+    # @private Used internally by #render to cache the
+    #          Tilt templates.
     def _cache
       Thread.current[:_cache] ||= Tilt::Cache.new
     end
+    private :_cache
 
-    def render(template, locals = {})
+    # Render any type of template file supported by Tilt.
+    #
+    # @example
+    #
+    #   # Renders home, and is assumed to be HAML.
+    #   render("home.haml")
+    #
+    #   # Renders with some local variables
+    #   render("home.haml", site_name: "My Site")
+    #
+    #   # Renders with HAML options
+    #   render("home.haml", {}, ugly: true, format: :html5)
+    #
+    def render(template, locals = {}, options = {})
       _cache.fetch(template, locals) {
-        Tilt.new(template)
+        Tilt.new(template, 1, options)
       }.render(self, locals)
     end
 
+    # Basic wrapper for using Rack session.
     def session
       @session ||= env['rack.session']
     end
+
+    # The heart of the path / verb / any condition matching.
+    #
+    # @example
+    #
+    #   on get do
+    #     res.write "GET"
+    #   end
+    #
+    #   on get, path("signup") do
+    #     res.write "Signup
+    #   end
+    #
+    #   on path("user"), segment do |uid|
+    #     res.write "User: #{uid}"
+    #   end
+    #
+    #   on path("styles"), extension("css") do |file|
+    #     res.write render("styles/#{file}.sass")
+    #   end
+    #
+    def on(*args, &block)
+      # No use running any other matchers if we've already found a
+      # proper matcher.
+      return if @matched
+
+      try do
+        # For every block, we make sure to reset captures so that
+        # nesting matchers won't mess with each other's captures.
+        @captures = []
+
+        # We stop evaluation of this entire matcher unless
+        # each and every `arg` defined for this matcher evaluates
+        # to a non-false value.
+        #
+        # Short circuit examples:
+        #    on true, false do
+        #
+        #    # PATH_INFO=/user
+        #    on true, path("signup")
+        args.each do |arg|
+          return unless arg == true || arg != false && arg.call
+        end
+
+        # The captures we yield here were generated and assembled
+        # by evaluating each of the `arg`s above. Most of these
+        # are carried out by #path.
+        yield *captures
+
+        # At this point, we've successfully matched with some corresponding
+        # matcher, so we can skip all other matchers defined.
+        @matched = true
+      end
+    end
+
+    # @private Used internally by #on to ensure that SCRIPT_NAME and
+    #          PATH_INFO are reset to their proper values.
+    def try
+      script, path = env["SCRIPT_NAME"], env["PATH_INFO"]
+
+      yield
+
+      env["SCRIPT_NAME"], env["PATH_INFO"] = script, path
+
+    ensure
+      unless @matched
+        env["SCRIPT_NAME"], env["PATH_INFO"] = script, path
+      end
+    end
+    private :try
+
+    # Probably the most useful helper for writing matchers.
+    #
+    # @example
+    #   # matches PATH_INFO=/signup
+    #   on path("signup") do
+    #
+    #   # matches PATH_INFO=/user123
+    #   on path("user(\\d+)") do |uid|
+    #
+    #   # matches PATH_INFO=/user/1
+    #   on path("user"), path("(\\d+)") do |uid|
+    #
+    # In fact, the other matchers (#segment, #number, #extension)
+    # ride on this method.
+    def path(pattern)
+      lambda { consume(pattern) }
+    end
+
+    # @private Used by #path to adjust the `PATH_INFO` and `SCRIPT_NAME`.
+    #          This is done so that nesting of matchers would work.
+    #
+    # @example
+    #   # PATH_INFO=/doctors/account
+    #   on path("doctors") do
+    #     # PATH_INFO = /account
+    #     on path("account") do
+    #       res.write "Settings page"
+    #     end
+    #   end
+    def consume(pattern)
+      return unless match = env["PATH_INFO"].match(/\A\/(#{pattern})(?:\/|\z)/)
+
+      path, *vars = match.captures
+
+      env["SCRIPT_NAME"] += "/#{path}"
+      env["PATH_INFO"] = "/#{match.post_match}"
+
+      captures.push(*vars)
+    end
+    private :consume
+
+    # A matcher for numeric ids.
+    #
+    # @example
+    #   on path("user"), number do |uid|
+    #     res.write "User: #{uid}"
+    #   end
+    def number
+      path("(\\d+)")
+    end
+
+    # A matcher for anything without slashes. Useful for mapping to slugs.
+    #
+    # @example
+    #   on path("article"), segment do |slug|
+    #     Article.find_by_slug(slug)
+    #
+    #   end
+    def segment
+      path("([^\\/]+)")
+    end
+
+    # A matcher for files with a certain extension.
+    #
+    # @example
+    #   # PATH_INFO=/style/app.css
+    #   on path("style"), extension("css") do |file|
+    #     res.write file # writes app
+    #   end
+    def extension(ext = "\\w+")
+      path("([^\\/]+?)\.#{ext}\\z")
+    end
+
+    # Used to ensure that certain request parameters are present. Acts like a
+    # precondition / assertion for your route.
+    #
+    # @example
+    #   # POST with data like user[fname]=John&user[lname]=Doe
+    #   on path("signup"), param("user") do |atts|
+    #     User.create(atts)
+    #   end
+    def param(key, default = nil)
+      lambda { captures << (req[key] || default) }
+    end
+
+    def header(key, default = nil)
+      lambda { env[key.upcase.tr("-","_")] || default }
+    end
+
+    # Useful for matching against the request host (i.e. HTTP_HOST).
+    #
+    # @example
+    #   on host("account1.example.com"), path("api") do
+    #     res.write "You have reached the API of account1."
+    #   end
+    def host(hostname)
+      req.host == hostname
+    end
+
+    # If you want to match against the HTTP_ACCEPT value.
+    #
+    # @example
+    #   # HTTP_ACCEPT=application/xml
+    #   on accept("application/xml") do
+    #     # automatically set to application/xml.
+    #     res.write res["Content-Type"]
+    #   end
+    def accept(mimetype)
+      lambda do
+        env["HTTP_ACCEPT"].split(",").any? { |s| s.strip == mimetype } and
+          res["Content-Type"] = mimetype
+      end
+    end
+
+    # Syntactic sugar for providing catch-all matches.
+    #
+    # @example
+    #   on default do
+    #     res.write "404"
+    #   end
+    def default
+      true
+    end
+
+    # Syntatic sugar for providing HTTP Verb matching.
+    #
+    # @example
+    #   on get, path("signup") do
+    #   end
+    #
+    #   on post, path("signup") do
+    #   end
+    def get    ; req.get?    end
+    def post   ; req.post?   end
+    def put    ; req.put?    end
+    def delete ; req.delete? end
+
+    # If you want to halt the processing of an existing handler
+    # and continue it via a different handler.
+    #
+    # @example
+    #   def redirect(*args)
+    #     run Cuba::Ron.new { on(default) { res.redirect(*args) }}
+    #   end
+    #
+    #   on path("account") do
+    #     redirect "/login" unless session["uid"]
+    #
+    #     res.write "Super secure account info."
+    #   end
+    def run(app)
+      throw :rum_run_next_app, app
+    end
   end
-end
+end

data/lib/cuba/version.rb

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

data/test/accept.rb

@@ -0,0 +1,16 @@
+require File.expand_path("helper", File.dirname(__FILE__))
+
+test "accept mimetypes" do
+  Cuba.define do
+    on accept("application/xml") do
+      res.write res["Content-Type"]
+    end
+  end
+
+  env = { "HTTP_ACCEPT" => "application/xml", 
+          "SCRIPT_NAME" => "/", "PATH_INFO" => "/post" }
+
+   _, _, resp = Cuba.call(env)
+
+  assert_equal ["application/xml"], resp.body
+end

data/test/captures.rb

@@ -0,0 +1,127 @@
+require File.expand_path("helper", File.dirname(__FILE__))
+require "stringio"
+
+test "doesn't yield HOST" do
+  Cuba.define do
+    on host("example.com") do |*args|
+      res.write args.size
+    end
+  end
+
+  env = { "HTTP_HOST" => "example.com" }
+
+  _, _, resp = Cuba.call(env)
+
+  assert_equal ["0"], resp.body
+end
+
+test "doesn't yield the verb" do
+  Cuba.define do
+    on get do |*args|
+      res.write args.size
+    end
+  end
+
+  env = { "REQUEST_METHOD" => "GET" }
+
+  _, _, resp = Cuba.call(env)
+
+  assert_equal ["0"], resp.body
+end
+
+test "doesn't yield the path" do
+  Cuba.define do
+    on get, path("home") do |*args|
+      res.write args.size
+    end
+  end
+
+  env = { "REQUEST_METHOD" => "GET", "PATH_INFO" => "/home",
+          "SCRIPT_NAME" => "/" }
+
+  _, _, resp = Cuba.call(env)
+
+  assert_equal ["0"], resp.body
+end
+
+test "yields the segment" do
+  Cuba.define do
+    on get, path("user"), segment do |id|
+      res.write id
+    end
+  end
+
+  env = { "REQUEST_METHOD" => "GET", "PATH_INFO" => "/user/johndoe",
+          "SCRIPT_NAME" => "/" }
+
+  _, _, resp = Cuba.call(env)
+
+  assert_equal ["johndoe"], resp.body
+end
+
+test "yields a number" do
+  Cuba.define do
+    on get, path("user"), number do |id|
+      res.write id
+    end
+  end
+
+  env = { "REQUEST_METHOD" => "GET", "PATH_INFO" => "/user/101",
+          "SCRIPT_NAME" => "/" }
+
+  _, _, resp = Cuba.call(env)
+
+  assert_equal ["101"], resp.body
+end
+
+test "yields an extension" do
+  Cuba.define do
+    on get, path("css"), extension("css") do |file|
+      res.write file
+    end
+  end
+
+  env = { "REQUEST_METHOD" => "GET", "PATH_INFO" => "/css/app.css",
+          "SCRIPT_NAME" => "/" }
+
+  _, _, resp = Cuba.call(env)
+
+  assert_equal ["app"], resp.body
+end
+
+test "yields a param" do
+  Cuba.define do
+    on get, path("signup"), param("email") do |email|
+      res.write email
+    end
+  end
+
+  env = { "REQUEST_METHOD" => "GET", "PATH_INFO" => "/signup",
+          "SCRIPT_NAME" => "/", "rack.input" => StringIO.new,
+          "QUERY_STRING" => "email=john@doe.com" }
+
+  _, _, resp = Cuba.call(env)
+
+  assert_equal ["john@doe.com"], resp.body
+end
+
+test "yields a segment per nested block" do
+  Cuba.define do
+    on segment do |one|
+      on segment do |two|
+        on segment do |three|
+          res.write one
+          res.write two
+          res.write three
+        end
+      end
+    end
+  end
+
+  env = { "REQUEST_METHOD" => "GET", "PATH_INFO" => "/one/two/three",
+          "SCRIPT_NAME" => "/" }
+
+  _, _, resp = Cuba.call(env)
+
+  assert_equal ["one", "two", "three"], resp.body
+end

data/test/extension.rb

@@ -0,0 +1,21 @@
+require File.expand_path("helper", File.dirname(__FILE__))
+
+setup do
+  Cuba.define do
+    on path("styles") do
+      on extension("css") do |file|
+        res.write file
+      end
+    end
+  end
+
+  { "SCRIPT_NAME" => "/", "PATH_INFO" => "/styles" }
+end
+
+test "/styles/reset.css" do |env|
+  env["PATH_INFO"] += "/reset.css"
+
+  _, _, resp = Cuba.call(env)
+
+  assert_equal ["reset"], resp.body
+end

data/test/helper.rb

@@ -0,0 +1,5 @@
+$:.unshift(File.expand_path("../lib", File.dirname(__FILE__)))
+require "cuba"
+require "cutest"
+
+prepare { Cuba.reset! }

data/test/integration.rb

@@ -1,7 +1,4 @@
-$:.unshift(File.expand_path("../lib", File.dirname(__FILE__)))
-require "cuba"
-
-prepare { Cuba.reset! }
+require File.expand_path("helper", File.dirname(__FILE__))
 
 test "resetting" do
   old = Cuba.app

data/test/number.rb

@@ -0,0 +1,36 @@
+require File.expand_path("helper", File.dirname(__FILE__))
+
+setup do
+  { "SCRIPT_NAME" => "/", "PATH_INFO" => "/about/1/2" }
+end
+
+test "paths and numbers" do |env|
+  Cuba.define do
+    on path("about") do
+      on number, number do |one, two|
+        res.write one
+        res.write two
+      end
+    end
+  end
+
+  _, _, resp = Cuba.call(env)
+
+  assert_equal ["1", "2"], resp.body
+end
+
+test "paths and decimals" do |env|
+  Cuba.define do
+    on path("about") do
+      on number do |one|
+        res.write one
+      end
+    end
+  end
+
+  env["PATH_INFO"] = "/about/1.2"
+
+  _, _, resp = Cuba.call(env)
+
+  assert_equal [], resp.body
+end

data/test/on.rb

@@ -0,0 +1,91 @@
+require File.expand_path("helper", File.dirname(__FILE__))
+
+test "executes on true" do
+  Cuba.define do
+    on true do
+      res.write "+1"
+    end
+  end
+
+  _, _, resp = Cuba.call({})
+
+  assert_equal ["+1"], resp.body
+end
+
+test "restores SCRIPT_NAME and PATH_INFO" do
+  Cuba.define do
+    on true do
+      env["SCRIPT_NAME"] = "foo"
+      env["PATH_INFO"] = "/hello"
+
+      raise "Something went wrong"
+    end
+  end
+
+  env = { "SCRIPT_NAME" => "/", "PATH_INFO" => "/hello" }
+
+  begin
+    _, _, resp = Cuba.call(env)
+  rescue
+  end
+
+  assert_equal "/", env["SCRIPT_NAME"]
+  assert_equal "/hello", env["PATH_INFO"]
+end
+
+test "ensures SCRIPT_NAME and PATH_INFO are reverted" do
+  Cuba.define do
+    on lambda { env["SCRIPT_NAME"] = "/hello"; false } do
+      res.write "Unreachable"
+    end
+  end
+
+  env = { "SCRIPT_NAME" => "/", "PATH_INFO" => "/hello" }
+
+  _, _, resp = Cuba.call(env)
+
+  assert_equal "/", env["SCRIPT_NAME"]
+  assert_equal "/hello", env["PATH_INFO"]
+  assert_equal [], resp.body
+end
+
+test "skips consecutive matches" do
+  Cuba.define do
+    on true do
+      env["foo"] = "foo"
+
+      res.write "foo"
+    end
+
+    on true do
+      env["bar"] = "bar"
+
+      res.write "bar"
+    end
+  end
+
+  env = {}
+
+  _, _, resp = Cuba.call(env)
+
+  assert_equal "foo", env["foo"]
+  assert_equal ["foo"], resp.body
+
+  assert ! env["bar"]
+end
+
+test "finds first match available" do
+  Cuba.define do
+    on false do
+      res.write "foo"
+    end
+
+    on true do
+      res.write "bar"
+    end
+  end
+
+  _, _, resp = Cuba.call({})
+
+  assert_equal ["bar"], resp.body
+end

data/test/path.rb

@@ -0,0 +1,73 @@
+require File.expand_path("helper", File.dirname(__FILE__))
+
+setup do
+  { "SCRIPT_NAME" => "/", "PATH_INFO" => "/about" }
+end
+
+test "one level path" do |env|
+  Cuba.define do
+    on path("about") do
+      res.write "About"
+    end
+  end
+
+  _, _, resp = Cuba.call(env)
+
+  assert_equal ["About"], resp.body
+  assert_equal({ "SCRIPT_NAME" => "/", "PATH_INFO" => "/about" }, env)
+end
+
+test "two level nested paths" do |env|
+  Cuba.define do
+    on path("about") do
+      on path("1") do
+        res.write "+1"
+      end
+
+      on path("2") do
+        res.write "+2"
+      end
+    end
+  end
+
+  env["PATH_INFO"] = "/about/1"
+
+  _, _, resp = Cuba.call(env)
+
+  assert_equal ["+1"], resp.body
+
+  env["PATH_INFO"] = "/about/2"
+
+  _, _, resp = Cuba.call(env)
+
+  assert_equal ["+2"], resp.body
+end
+
+test "two level inlined paths" do |env|
+  Cuba.define do
+    on path("a"), path("b") do
+      res.write "a"
+      res.write "b"
+    end
+  end
+
+  env["PATH_INFO"] = "/a/b"
+
+  _, _, resp = Cuba.call(env)
+
+  assert_equal ["a", "b"], resp.body
+end
+
+test "a path with some regex captures" do |env|
+  Cuba.define do
+    on path("user(\\d+)") do |uid|
+      res.write uid
+    end
+  end
+
+  env["PATH_INFO"] = "/user123"
+
+  _, _, resp = Cuba.call(env)
+
+  assert_equal ["123"], resp.body
+end

data/test/run.rb

@@ -0,0 +1,23 @@
+require File.expand_path("helper", File.dirname(__FILE__))
+
+test "redirect canonical example" do
+  Cuba.define do
+    def redirect(*args)
+      run Cuba::Ron.new { on(true) { res.redirect(*args) }}
+    end
+
+    on path("account") do
+      redirect "/login", 307
+
+      res.write "Super secure content"
+    end
+  end
+
+  env = { "SCRIPT_NAME" => "/", "PATH_INFO" => "/account" }
+
+   _, _, resp = Cuba.call(env)
+
+  assert_equal "/login", resp["Location"]
+  assert_equal 307, resp.status
+  assert_equal [], resp.body
+end

data/test/segment.rb

@@ -0,0 +1,45 @@
+require File.expand_path("helper", File.dirname(__FILE__))
+
+setup do
+  Cuba.define do
+    on path("post") do
+      on segment do |id|
+        res.write id
+      end
+    end
+  end
+
+  { "SCRIPT_NAME" => "/", "PATH_INFO" => "/post" }
+end
+
+test "matches numeric ids" do |env|
+  env["PATH_INFO"] += "/1"
+
+  _, _, resp = Cuba.call(env)
+
+  assert_equal ["1"], resp.body
+end
+
+test "matches decimal numbers" do |env|
+  env["PATH_INFO"] += "/1.1"
+
+  _, _, resp = Cuba.call(env)
+
+  assert_equal ["1.1"], resp.body
+end
+
+test "matches slugs" do |env|
+  env["PATH_INFO"] += "/my-blog-post-about-cuba"
+
+  _, _, resp = Cuba.call(env)
+
+  assert_equal ["my-blog-post-about-cuba"], resp.body
+end
+
+test "matches only the first segment available" do |env|
+  env["PATH_INFO"] += "/one/two/three"
+
+  _, _, resp = Cuba.call(env)
+
+  assert_equal ["one"], resp.body
+end

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: cuba
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 3
-  - 0
-  version: 0.3.0
+  prerelease: 
+  version: 1.0.0
 platform: ruby
 authors: 
 - Michel Martens
@@ -14,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-09 00:00:00 -03:00
+date: 2011-02-16 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,9 +21,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 2
         version: "1.2"
   type: :runtime
   version_requirements: *id001
@@ -39,9 +32,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 1
         version: "1.1"
   type: :runtime
   version_requirements: *id002
@@ -53,9 +43,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 1
         version: "0.1"
   type: :development
   version_requirements: *id003
@@ -67,9 +54,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 1
         version: "0.1"
   type: :development
   version_requirements: *id004
@@ -87,13 +71,20 @@ files:
 - README.markdown
 - Rakefile
 - lib/cuba/ron.rb
-- lib/cuba/rum.rb
 - lib/cuba/test.rb
 - lib/cuba/version.rb
 - lib/cuba.rb
 - cuba.gemspec
+- test/accept.rb
+- test/captures.rb
+- test/extension.rb
+- test/helper.rb
 - test/integration.rb
-- test/webrat.log
+- test/number.rb
+- test/on.rb
+- test/path.rb
+- test/run.rb
+- test/segment.rb
 has_rdoc: true
 homepage: http://github.com/soveran/cuba
 licenses: []
@@ -108,21 +99,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Rum based microframework for web applications.

data/lib/cuba/rum.rb

@@ -1,157 +0,0 @@
-# Rum, the gRand Unified Mapper
-#
-# Rum is a powerful mapper for your Rack applications that can be used
-# as a microframework.
-#
-# More information at http://github.com/chneukirchen/rum
-#
-# == Copyright
-#
-# Copyright (C) 2008, 2009 Christian Neukirchen <http://purl.org/net/chneukirchen>
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to
-# deal in the Software without restriction, including without limitation the
-# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-# sell copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-# THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-require 'rack'
-
-class Rack::Response
-  # 301 Moved Permanently
-  # 302 Found
-  # 303 See Other
-  # 307 Temporary Redirect
-  def redirect(target, status=302)
-    self.status = status
-    self["Location"] = target
-  end
-end
-
-class Rum
-  attr_reader :env, :req, :res
-
-  def initialize(&blk)
-    @blk = blk
-  end
-
-  def call(env)
-    dup._call(env)
-  end
-
-  def _call(env)
-    @env = env
-    @req = Rack::Request.new(env)
-    @res = Rack::Response.new
-    @matched = false
-    catch(:rum_run_next_app) {
-      instance_eval(&@blk)
-      @res.status = 404  unless @matched || !@res.empty?
-      return @res.finish
-    }.call(env)
-  end
-
-  def on(*arg, &block)
-    return  if @matched
-    s, p = env["SCRIPT_NAME"], env["PATH_INFO"]
-    yield *arg.map { |a| a == true || (a != false && a.call) || return }
-    env["SCRIPT_NAME"], env["PATH_INFO"] = s, p
-    @matched = true
-  ensure
-    unless @matched
-      env["SCRIPT_NAME"], env["PATH_INFO"] = s, p
-    end
-  end
-
-  def any(*args)
-    args.any? { |a| a == true || (a != false && a.call) }
-  end
-
-  def also
-    @matched = false
-  end
-
-  def path(p)
-    lambda {
-      if env["PATH_INFO"] =~ /\A\/(#{p})(\/|\z)/   #/
-        env["SCRIPT_NAME"] += "/#{$1}"
-        env["PATH_INFO"] = $2 + $'
-        $1
-      end
-    }
-  end
-
-  def number
-    path("\\d+")
-  end
-
-  def segment
-    path("[^\\/]+")
-  end
-
-  def extension(e="\\w+")
-    lambda { env["PATH_INFO"] =~ /\.(#{e})\z/ && $1 }
-  end
-
-  def param(p, default=nil)
-    lambda { req[p] || default }
-  end
-
-  def header(p, default=nil)
-    lambda { env[p.upcase.tr('-','_')] || default }
-  end
-
-  def default
-    true
-  end
-
-  def host(h)
-    req.host == h
-  end
-
-  def method(m)
-    req.request_method = m
-  end
-
-  def get; req.get?; end
-  def post; req.post?; end
-  def put; req.put?; end
-  def delete; req.delete?; end
-
-  def accept(mimetype)
-    lambda {
-      env['HTTP_ACCEPT'].split(',').any? { |s| s.strip == mimetype }  and
-        res['Content-Type'] = mimetype
-    }
-  end
-
-  def check(&block)
-    block
-  end
-
-  def run(app)
-    throw :rum_run_next_app, app
-  end
-
-  def puts(*args)
-    args.each { |s|
-      res.write s
-      res.write "\n"
-    }
-  end
-
-  def print(*args)
-    args.each { |s| res.write s }
-  end
-end

data/test/webrat.log

@@ -1,5 +0,0 @@
-# Logfile created on 2010-06-11 01:04:00 -0300 by logger.rb/20321
-D, [2010-06-11T01:04:00.071479 #37917] DEBUG -- : REQUESTING PAGE: GET / with {} and HTTP headers {}
-D, [2010-06-11T01:04:00.082487 #37917] DEBUG -- : REQUESTING PAGE: GET /login with {} and HTTP headers {"HTTP_REFERER"=>"/"}
-D, [2010-06-11T01:04:00.084940 #37917] DEBUG -- : REQUESTING PAGE: POST /login with {"user"=>"Michel"} and HTTP headers {"HTTP_REFERER"=>"/login"}
-D, [2010-06-11T01:04:00.087758 #37917] DEBUG -- : REQUESTING PAGE: GET / with {} and HTTP headers {"HTTP_REFERER"=>"/login"}