dzl 1.0.0.beta2 → 1.0.0.beta3

data/config.ru

@@ -35,7 +35,12 @@ end
 #   run Dzl::Examples::FunWithHandlers
 # end
 
-require 'dzl/examples/fun_with_hooks'
+# require 'dzl/examples/fun_with_hooks'
+# map '/' do
+#   run Dzl::Examples::FunWithHooks
+# end
+
+require 'dzl/examples/fun_with_scopes'
 map '/' do
-  run Dzl::Examples::FunWithHooks
+  run Dzl::Examples::FunWithScopes
 end

data/lib/dzl/dsl_proxies/router.rb

@@ -13,6 +13,13 @@ class Dzl::DSLProxies::Router < Dzl::DSLProxy
   end
   alias_method :parameters, :pblock
 
+  def scope(path)
+    raise ArgumentError unless block_given?
+    raise ArgumentError.new("scope must start with a '/'") unless path.starts_with?('/')
+
+    @subject.call_with_scope(Proc.new, path)
+  end
+
   def endpoint(route, *request_methods)
     request_methods = [:get] if request_methods.empty?
     request_methods.uniq!
@@ -22,7 +29,12 @@ class Dzl::DSLProxies::Router < Dzl::DSLProxy
       request_methods: request_methods
     }
 
-    ept = Dzl::DSLSubjects::Endpoint.new(route, opts, @subject)
+    ept = Dzl::DSLSubjects::Endpoint.new(
+      [@subject.scope, route].join,
+      opts,
+      @subject
+    )
+
     @subject.add_endpoint(ept)
     @subject.call_with_subject(Proc.new, ept) if block_given?
   end

data/lib/dzl/dsl_subjects/endpoint.rb

@@ -74,6 +74,6 @@ class Dzl::DSLSubjects::Endpoint < Dzl::DSLSubject
       route_part.starts_with?(':') ? "/.*?" : "/#{route_part}"
     end.push('$').join('')
 
-    @route_regex = Regexp.new(route_regex_string)
+    @route_regex = Regexp.new('^' + route_regex_string)
   end
 end

data/lib/dzl/dsl_subjects/router.rb

@@ -9,6 +9,7 @@ class Dzl::DSLSubjects::Router < Dzl::DSLSubject
     @pblocks = {}
     @endpoints_by_route = {}
     @stack = []
+    @scope = []
     @defaults = {}
     @defaults_dslsub = Dzl::DSLSubjects::Defaults.new(self)
     @dsl_proxy = Dzl::DSLProxies::Router.new(self)
@@ -25,6 +26,16 @@ class Dzl::DSLSubjects::Router < Dzl::DSLSubject
     @stack.last
   end
 
+  def call_with_scope(proc, scope)
+    @scope.push(scope)
+    proc.call
+    @scope.pop
+  end
+
+  def scope
+    @scope.join
+  end
+
   def routes
     @endpoints_by_route.keys
   end

data/lib/dzl/dsl_subjects/scope.rb

@@ -0,0 +1,7 @@
+require 'dzl/dsl_proxies/scope'
+
+class Dzl::DSLSubjects::Scope < Dzl::DSLSubject
+  def initialize(path)
+    @path = path
+  end
+end

data/lib/dzl/examples/fun_with_scopes.rb

@@ -0,0 +1,27 @@
+require 'dzl/examples/base'
+
+class Dzl::Examples::FunWithScopes < Dzl::Examples::Base
+  scope '/foo' do
+    get '/bar'
+    get '/baz'
+  end
+
+  scope '/bar' do
+    get '/foo'
+    get '/baz'
+  end
+
+  scope '/nest' do
+    scope '/this' do
+      get '/first'
+    end
+
+    get '/and'
+
+    scope '/that' do
+      get '/second'
+    end
+  end
+
+  get '/zoom'
+end

data/lib/dzl/version.rb

@@ -1,3 +1,3 @@
 module Dzl
-  VERSION = "1.0.0.beta2"
+  VERSION = "1.0.0.beta3"
 end

data/spec/fun_with_params_spec.rb

@@ -115,6 +115,12 @@ describe Dzl::Examples::FunWithParams do
     end
   end
 
+  describe '/bar' do
+    it 'should 404 on /bar/anything' do
+      get('/bar/foo') {|r| r.status.should == 404}
+    end
+  end
+
   describe '/protected' do
     it 'should present http basic challenge with no credentials' do
       get '/protected' do |response|

data/spec/fun_with_scopes_spec.rb

@@ -0,0 +1,65 @@
+require 'spec_helper'
+require 'rack/test'
+require 'dzl/examples/fun_with_scopes'
+
+describe 'scopes' do
+  include Rack::Test::Methods
+  def app; Dzl::Examples::FunWithScopes; end
+
+  it 'make routes available under the specified path' do
+    get('/foo/bar') { |r| r.status.should == 200 }
+    get('/foo/foo') { |r| r.status.should == 404 }
+    get('/bar/foo') { |r| r.status.should == 200 }
+    get('/zoom')    { |r| r.status.should == 200 }
+  end
+
+  it 'can be nested' do
+    ['/nest/this/first', '/nest/and', '/nest/that/second'].each do |route|
+      get(route) { |r| r.status.should == 200 }
+    end
+
+    ['/nest/that/first', '/nest/this/and', '/nest/this/and/that', '/nest/that/first'].each do |route|
+      get(route) { |r| r.status.should == 404 }
+    end
+  end
+
+  it 'must start with a slash' do
+    expect {
+      class Dzl::Examples::FunWithScopes
+        scope 'not-a-slash' do
+          two = 1 + 1
+        end
+      end
+    }.to raise_error(ArgumentError)
+  end
+
+  it "don't brake pblocks" do
+    # pblocks aren't scoped
+    expect {
+      class Dzl::Examples::FunWithScopes
+        scope '/whatever' do
+          pblock :foo do
+            required :foo
+          end
+
+          get '/foo' do
+            import_pblock :foo
+          end
+        end
+
+        scope '/another_scope' do
+          get '/foo' do
+            import_pblock :foo
+          end
+        end
+      end
+    }.to_not raise_error
+
+    get('/another_scope/foo') do |response|
+      response.status.should == 404
+      JSON.parse(response.body)['errors']['/another_scope/foo'].should == {
+        'foo' => 'missing_required_param'
+      }
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dzl
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta2
+  version: 1.0.0.beta3
   prerelease: 6
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-20 00:00:00.000000000 Z
+date: 2012-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70297835742860 !ruby/object:Gem::Requirement
+  requirement: &70140311025420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 1.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *70297835742860
+  version_requirements: *70140311025420
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70297835740780 !ruby/object:Gem::Requirement
+  requirement: &70140311024920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,7 +33,7 @@ dependencies:
         version: 3.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *70297835740780
+  version_requirements: *70140311024920
 description: Small, fast racktivesupport web framework with handy DSL and explicit
   parameter validation.
 email:
@@ -74,12 +74,14 @@ files:
 - lib/dzl/dsl_subjects/parameter_block.rb
 - lib/dzl/dsl_subjects/protection.rb
 - lib/dzl/dsl_subjects/router.rb
+- lib/dzl/dsl_subjects/scope.rb
 - lib/dzl/errors.rb
 - lib/dzl/examples/base.rb
 - lib/dzl/examples/fun_with_handlers.rb
 - lib/dzl/examples/fun_with_hooks.rb
 - lib/dzl/examples/fun_with_params.rb
 - lib/dzl/examples/fun_with_requests.rb
+- lib/dzl/examples/fun_with_scopes.rb
 - lib/dzl/examples/route_profile.rb
 - lib/dzl/examples/trey.rb
 - lib/dzl/logger.rb
@@ -99,6 +101,7 @@ files:
 - spec/fun_with_hooks_spec.rb
 - spec/fun_with_params_spec.rb
 - spec/fun_with_requests_spec.rb
+- spec/fun_with_scopes_spec.rb
 - spec/logger_spec.rb
 - spec/route_params_spec.rb
 - spec/router_doc_spec.rb
@@ -136,6 +139,7 @@ test_files:
 - spec/fun_with_hooks_spec.rb
 - spec/fun_with_params_spec.rb
 - spec/fun_with_requests_spec.rb
+- spec/fun_with_scopes_spec.rb
 - spec/logger_spec.rb
 - spec/route_params_spec.rb
 - spec/router_doc_spec.rb