cuba 3.0.0.rc4 → 3.0.0.rc5

data/{README.markdown → README.md}

@@ -42,7 +42,7 @@ Cuba.define do
       res.write "Hello world!"
     end
 
-    on true do
+    on root do
       res.redirect "/hello"
     end
   end
@@ -86,7 +86,7 @@ Cuba.define do
   on get do
 
     # /
-    on "" do
+    on root do
       res.write "Home"
     end
 
@@ -264,7 +264,6 @@ Admin.settings[:layout] = "admin"
 
 assert_equal "guest", Users.settings[:layout]
 assert_equal "admin", Admin.settings[:layout]
-
 ```
 
 Feel free to store whatever you find convenient.

data/cuba.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name              = "cuba"
-  s.version           = "3.0.0.rc4"
+  s.version           = "3.0.0.rc5"
   s.summary           = "Microframework for web applications."
   s.description       = "Cuba is a microframework for web applications."
   s.authors           = ["Michel Martens"]
@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.files = Dir[
     "LICENSE",
     "CHANGELOG",
-    "README.markdown",
+    "README.md",
     "Rakefile",
     "lib/**/*.rb",
     "*.gemspec",

data/lib/cuba.rb

@@ -2,8 +2,6 @@ require "rack"
 require "time"
 
 class Cuba
-  class RedefinitionError < StandardError; end
-
   class Response
     attr_accessor :status
 
@@ -50,16 +48,6 @@ class Cuba
     end
   end
 
-  @@methods = []
-
-  class << self
-    undef method_added
-  end
-
-  def self.method_added(meth)
-    @@methods << meth
-  end
-
   def self.reset!
     @app = nil
     @prototype = nil
@@ -287,6 +275,18 @@ class Cuba
     true
   end
 
+  # Access the root of the application.
+  #
+  # @example
+  #
+  #   # GET /
+  #   on root do
+  #     res.write "Home"
+  #   end
+  def root
+    env["PATH_INFO"] == "/" || env["PATH_INFO"] == ""
+  end
+
   # Syntatic sugar for providing HTTP Verb matching.
   #
   # @example
@@ -320,16 +320,4 @@ class Cuba
   def halt(response)
     throw :halt, response
   end
-
-  class << self
-    undef method_added
-  end
-
-  # In order to prevent people from overriding the standard Cuba
-  # methods like `get`, `put`, etc, we add this as a safety measure.
-  def self.method_added(meth)
-    if @@methods.include?(meth)
-      raise RedefinitionError, meth
-    end
-  end
 end

data/test/helper.rb

@@ -8,4 +8,5 @@ def assert_response(body, expected)
   body.each { |line| arr << line }
 
   flunk "#{arr.inspect} != #{expected.inspect}" unless arr == expected
+  print "."
 end

data/test/root.rb

@@ -38,3 +38,46 @@ test "nested empty segments" do
 
   assert_response resp, ["IT WORKS!", "///1"]
 end
+
+test "/events/? scenario" do
+  class Events < Cuba
+    define do
+      on root do
+        res.write "Hooray"
+      end
+    end
+  end
+
+  Cuba.define do
+    on "events" do
+      run Events
+    end
+  end
+
+  env = {
+    "SCRIPT_NAME" => "",
+    "PATH_INFO" => "/events"
+  }
+
+  _, _, resp = Cuba.call(env)
+
+  assert_response resp, ["Hooray"]
+
+  env = {
+    "SCRIPT_NAME" => "",
+    "PATH_INFO" => "/events/"
+  }
+
+  _, _, resp = Cuba.call(env)
+
+  assert_response resp, ["Hooray"]
+
+  env = {
+    "SCRIPT_NAME" => "",
+    "PATH_INFO" => "/events/a"
+  }
+
+  _, _, resp = Cuba.call(env)
+
+  assert_response resp, []
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cuba
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc4
+  version: 3.0.0.rc5
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-03 00:00:00.000000000 Z
+date: 2012-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &2151932520 !ruby/object:Gem::Requirement
+  requirement: &2151872760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2151932520
+  version_requirements: *2151872760
 - !ruby/object:Gem::Dependency
   name: cutest
-  requirement: &2151931480 !ruby/object:Gem::Requirement
+  requirement: &2151870200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151931480
+  version_requirements: *2151870200
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &2151929660 !ruby/object:Gem::Requirement
+  requirement: &2151869640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151929660
+  version_requirements: *2151869640
 description: Cuba is a microframework for web applications.
 email:
 - michel@soveran.com
@@ -53,7 +53,7 @@ extra_rdoc_files: []
 files:
 - LICENSE
 - CHANGELOG
-- README.markdown
+- README.md
 - Rakefile
 - lib/cuba/render.rb
 - lib/cuba/test.rb
@@ -74,7 +74,6 @@ files:
 - test/param.rb
 - test/path.rb
 - test/plugin.rb
-- test/redefinition.rb
 - test/redirect.rb
 - test/render.rb
 - test/root.rb

data/test/redefinition.rb

@@ -1,17 +0,0 @@
-require File.expand_path("helper", File.dirname(__FILE__))
-
-test "adding your new custom helpers is ok" do
-  class Cuba
-    def foobar
-    end
-  end
-end
-
-test "redefining standard Cuba methods fails" do
-  assert_raise Cuba::RedefinitionError do
-    class Cuba
-      def get
-      end
-    end
-  end
-end