sinatra-namespace 0.4.0 → 0.4.1

data/LICENSE

@@ -0,0 +1,27 @@
+copyright (c) 2010 Konstantin Haase.  All rights reserved.
+
+Developed by: Konstantin Haase
+              http://github.com/rkh/big_band
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal with 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:
+  1. Redistributions of source code must retain the above copyright notice,
+     this list of conditions and the following disclaimers.
+  2. Redistributions in binary form must reproduce the above copyright
+     notice, this list of conditions and the following disclaimers in the
+     documentation and/or other materials provided with the distribution.
+  3. Neither the name of Konstantin Haase, nor the names of other contributors
+     may be used to endorse or promote products derived from this Software without
+     specific prior written permission.
+
+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
+CONTRIBUTORS 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
+WITH THE SOFTWARE.

data/README.md

@@ -81,7 +81,7 @@ Modular style (you can of course use the `namespace` method there, too):
     end
 
 Wait, did that module turn into a namespace all by itself? No, actually it got turned into one by `Application` when it
-tried to call `prefix`, which is not defined. `Sinatra::Namspace` sets up `nested_method_missing` (from `monkey-lib`) to
+tried to call `prefix`, which is not defined. `Sinatra::Namespace` sets up `nested_method_missing` (from `monkey-lib`) to
 catch that cases.
 
 You can influence that behavior by setting `auto_namespace`:
@@ -90,7 +90,7 @@ You can influence that behavior by setting `auto_namespace`:
       # enables auto namespacing, is default
       enable :auto_namespace
       
-      # disables auto namespacing, is default
+      # disables auto namespacing
       disable :auto_namespace
       
       # triggers auto namespaceing only on prefix and get

data/lib/sinatra/namespace.rb

@@ -47,7 +47,12 @@ module Sinatra
 
       def prefixed(verb, name = nil, options = {}, &block)
         name, options = nil, name if name.is_a? Hash and options.empty?
-        path = prefix.to_s + name.to_s
+        if prefix.is_a? Regexp or name.is_a? Regexp
+          path = /#{prefix}#{name}/
+          path = /^#{path}$/ if base.is_a? Class
+        else
+          path = prefix.to_s + name.to_s
+        end
         application.send(:define_method, "#{verb} #{path}", &block)
         unbound_method, container = application.instance_method("#{verb} #{path}"), self
         if block.arity != 0 
@@ -71,7 +76,7 @@ module Sinatra
       end
 
       def forward?(name)
-        not Sinatra::NameError::DONT_FORWARD.include? name.to_s
+        not Sinatra::Namespace::DONT_FORWARD.include? name.to_s
       end
     end
 
@@ -99,7 +104,6 @@ module Sinatra
     end
 
     def namespace(prefix, merge = nil, &block)
-      prefix = prefix.to_s
       if merge or (merge.nil? and merge_namespaces?)
         @namespaces ||= {}
         @namespaces[prefix] ||= namespace prefix, false

data/spec/sinatra/namespace_spec.rb

@@ -27,6 +27,25 @@ describe Sinatra::Namespace do
           browse_route(verb, "/foo").should be_ok
           browse_route(verb, "/foo").body.should == "bar" unless verb == :head
         end
+
+        it "allows regular expressions" do
+          app.namespace %r{/\d\d} do
+            send(verb) { "foo" }
+            namespace %r{/\d\d} do
+              send(verb) { "bar" }
+            end
+            namespace "/0000" do
+              send(verb) { "baz" }
+            end
+          end
+          browse_route(verb, '/20').should be_ok
+          browse_route(verb, '/20').body.should == "foo" unless verb == :head
+          browse_route(verb, '/20/20').should be_ok
+          browse_route(verb, '/20/20').body.should == "bar" unless verb == :head
+          browse_route(verb, '/20/0000').should be_ok
+          browse_route(verb, '/20/0000').body.should == "baz" unless verb == :head
+          browse_route(verb, '/20/200').should_not be_ok
+        end
       end
 
       describe :make_namespace do

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra-namespace
 version: !ruby/object:Gem::Version 
+  hash: 13
   prerelease: false
   segments: 
   - 0
   - 4
-  - 0
-  version: 0.4.0
+  - 1
+  version: 0.4.1
 platform: ruby
 authors: 
 - Konstantin Haase
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-14 00:00:00 +02:00
+date: 2010-06-04 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: monkey-lib
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 0
         - 4
@@ -35,9 +38,11 @@ dependencies:
   name: sinatra-sugar
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 0
         - 4
@@ -49,9 +54,11 @@ dependencies:
   name: sinatra-test-helper
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 0
         - 4
@@ -63,23 +70,26 @@ dependencies:
   name: sinatra
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
+        - 1
         - 0
-        - 9
-        - 4
-        version: 0.9.4
+        version: "1.0"
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 27
         segments: 
         - 1
         - 3
@@ -100,6 +110,7 @@ files:
 - spec/sinatra/namespace_spec.rb
 - spec/spec_helper.rb
 - README.md
+- LICENSE
 has_rdoc: yard
 homepage: http://github.com/rkh/sinatra-namespace
 licenses: []
@@ -110,23 +121,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Adds namespaces to Sinatra, allows namespaces to have local helpers (part of BigBand).