sinatra-namespace 0.4.1 → 0.5.0

data/README.md

@@ -34,6 +34,16 @@ Classic style:
     end
     
     namspace "/ruby" do
+      before { @an_important_note = "filters work, too" }
+      
+      after do
+        @an_important_note = nil # don't tell
+      end
+      
+      not_found do
+        "ruby does not know this ditty"
+      end
+      
       helpers do
         def posts
           super.where :topic => "ruby"
@@ -108,7 +118,7 @@ So, how does one create a namespace from a module without that auto detection? S
 Installation
 ------------
 
-    gem install sinatra-namespace --prerelease
+    gem install sinatra-namespace
 
 Alternatives
 ------------
@@ -119,7 +129,7 @@ If that is no what you are looking for, you have two alternative directions.
 Simple prefixing, shares all state/helpers:
 
     require "sinatra/base"
-    require "monkey"
+    require "monkey-lib"
     
     admin_prefix = "/this/is/the/admin/prefix"
     get(admin_prefix) { haml :admin_index }

data/lib/sinatra/namespace.rb

@@ -1,13 +1,17 @@
-require "monkey"
+require "monkey-lib"
 require "sinatra/base"
 require "sinatra/sugar"
 require "sinatra/advanced_routes"
 
 module Sinatra
   module Namespace
-    DONT_FORWARD = %w[after before call configure disable enable error new not_found register reset! run! set use]
+    DONT_FORWARD = %w[call configure disable enable new register reset! run! set use template]
 
     module NestedMethods
+      def errors
+        @errors ||= {}
+      end
+
       def prefix(value = nil)
         @prefix = value if value
         @prefix
@@ -29,6 +33,14 @@ module Sinatra
       def delete(name = nil, options = {}, &block); prefixed(:delete, name, options, &block); end
       def head(name = nil, options = {}, &block);   prefixed(:head,   name, options, &block); end
 
+      def error(codes=Exception, &block)
+        [*codes].each { |c| errors[c] = block }
+      end
+
+      def not_found(&block)
+        error(404, &block)
+      end
+
       def respond_to?(name)
         super or (base.respond_to? name and forward? name)
       end
@@ -37,8 +49,28 @@ module Sinatra
         (super + base.methods(*args).select { |m| forward? m }).uniq
       end
 
+      def before_filters
+        @before_filters ||= []
+      end
+
+      def after_filters
+        @after_filters ||= []
+      end
+
+      def before(&block)
+        before_filters << block
+      end
+
+      def after(&block)
+        after_filters << block
+      end
+
       private
 
+      def always_activate
+        get(/.*/) { pass }
+      end
+
       def application
         klass = self
         klass = klass.base while klass.respond_to? :base
@@ -63,8 +95,22 @@ module Sinatra
         base.send(verb, path, options, &wrapper)
       end
 
-      def wrap(unbound_method, app, *args)
+      def prepare_instance(app)
+        return if app.is_a? self
+        base.prepare_instance app if base.respond_to? :prepare_instance
+        class << app
+          @filters ||= {}
+          @filters[:after] ||= []
+          @after_filters ||= []
+        end
+        before_filters.each { |block| app.instance_eval(&block) }
+        after_filters.each { |block| app.singleton_class.after(&block) }
         app.extend self
+      end
+
+      def wrap(unbound_method, app, *args)
+        prepare_instance app
+        app.current_namespace = self
         unbound_method.bind(app).call(*args)
       end
 
@@ -82,7 +128,8 @@ module Sinatra
 
     def self.registered(klass)
       klass.register Sinatra::Sugar
-      klass.set :merge_namespaces => false, :auto_namespace => true
+      klass.__send__ :include, InstanceMethods
+      klass.enable :merge_namespaces, :auto_namespace, :always_activate_namespaces
     end
 
     def self.make_namespace(mod, options = {})
@@ -96,9 +143,44 @@ module Sinatra
       mod.extend self
       mod.extend NestedMethods
       options.each { |k,v| mod.send(k, v) }
+      mod.send(:always_activate) if options[:base].always_activate_namespaces?
       mod
     end
 
+    module InstanceMethods
+      attr_accessor :current_namespace
+
+      if Sinatra::VERSION > '1.0' or Sinatra::Base.respond_to? :filters # master is still 1.0
+        def filter!(type, base = self.class)
+          super
+          if type == :after and base == self.class and singleton_class.filters and singleton_class.after_filters
+            singleton_class.after_filters.each { |b| instance_eval(&b) }
+          end
+        end
+      else
+        def after_filter!(base = self.class)
+          super
+          if base == self.class and singleton_class.after_filters
+            singleton_class.after_filters.each { |b| instance_eval(&b) }
+          end
+        end
+      end
+
+      def error_block!(*keys)
+        keys.detect do |key|
+          base = current_namespace || self.class
+          while base.respond_to? :errors
+            if block = base.errors[key]
+              # found a handler, eval and return result
+              return instance_eval(&block)
+            else
+              base = base.respond_to?(:base) ? base.base : base.superclass
+            end
+          end
+        end
+      end
+    end
+
     def make_namespace(mod, options = {})
       Sinatra::Namespace.make_namespace mod, options.merge(:base => self)
     end
@@ -108,6 +190,7 @@ module Sinatra
         @namespaces ||= {}
         @namespaces[prefix] ||= namespace prefix, false
         @namespaces[prefix].class_eval(&block) if block
+        @namespaces[prefix]
       else
         mod = make_namespace Module.new, :prefix => prefix
         mod.class_eval(&block) if block

data/spec/sinatra/namespace_spec.rb

@@ -1,6 +1,8 @@
 require File.expand_path("../../spec_helper", __FILE__)
 
 describe Sinatra::Namespace do
+  it_should_behave_like 'sinatra'
+
   [:get, :head, :post, :put, :delete].each do |verb|
     describe "HTTP #{verb.to_s.upcase}" do
       before :each do
@@ -20,7 +22,7 @@ describe Sinatra::Namespace do
           browse_route(verb, "/foo/bar").body.should == "baz" unless verb == :head
         end
 
-        it "should allowes adding routes with no path" do
+        it "should allows adding routes with no path" do
           app.namespace "/foo" do
             send(verb) { "bar" }
           end
@@ -28,6 +30,18 @@ describe Sinatra::Namespace do
           browse_route(verb, "/foo").body.should == "bar" unless verb == :head
         end
 
+        it "allows nesting" do
+          app.namespace "/foo" do
+            namespace "/bar" do
+              namespace "/baz" do
+                send(verb) { 'foobarbaz' }
+              end
+            end
+          end
+          browse_route(verb, "/foo/bar/baz").should be_ok
+          browse_route(verb, "/foo/bar/baz").body.should == "foobarbaz" unless verb == :head
+        end
+
         it "allows regular expressions" do
           app.namespace %r{/\d\d} do
             send(verb) { "foo" }
@@ -48,6 +62,28 @@ describe Sinatra::Namespace do
         end
       end
 
+      describe :filters do
+        it 'should trigger before filters for namespaces' do
+          app.before { settings.set :foo, 0 }
+          app.namespace('/foo') do
+            before { settings.set :foo, settings.foo + 1 }
+            send(verb) { }
+          end
+          browse_route(verb, '/foo').should be_ok
+          app.foo.should == 1
+        end
+        it 'should trigger after filters for namespaces' do
+          $foo = 0
+          app.after { $foo += 2 }
+          app.namespace('/foo') do
+            after { $foo += 1 }
+            send(verb) { }
+          end
+          browse_route(verb, '/foo').should be_ok
+          $foo.should == 3
+        end
+      end
+
       describe :make_namespace do
         it "extends modules make_namespace is called on" do
           mod = Module.new
@@ -181,4 +217,34 @@ describe Sinatra::Namespace do
 
     end
   end
+
+  describe :errors do
+    it "should allow custom error handlers with not found" do
+      app.namespace('/en') { always_activate }
+      app.namespace('/de') do
+        always_activate
+        not_found { 'nicht gefunden' }
+      end
+      get('/foo').status.should     == 404
+      last_response.body.should_not == 'nicht gefunden'
+      get('/en/foo').status.should  == 404
+      last_response.body.should_not == 'nicht gefunden'
+      get('/de/foo').status.should  == 404
+      last_response.body.should     == 'nicht gefunden'
+    end
+
+    it "should allow custom error handlers with error" do
+      app.namespace('/en') { always_activate }
+      app.namespace('/de') do
+        always_activate
+        error(404) { 'nicht gefunden' }
+      end
+      get('/foo').status.should     == 404
+      last_response.body.should_not == 'nicht gefunden'
+      get('/en/foo').status.should  == 404
+      last_response.body.should_not == 'nicht gefunden'
+      get('/de/foo').status.should  == 404
+      last_response.body.should     == 'nicht gefunden'
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -1,2 +1,2 @@
-require "sinatra/rspec"
+require "sinatra/rspec/shared"
 require "sinatra/namespace"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra-namespace
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: false
   segments: 
   - 0
-  - 4
-  - 1
-  version: 0.4.1
+  - 5
+  - 0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Konstantin Haase
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-04 00:00:00 +02:00
+date: 2010-07-09 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,12 +26,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 11
         segments: 
         - 0
-        - 4
+        - 5
         - 0
-        version: 0.4.0
+        version: 0.5.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -42,12 +42,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 11
         segments: 
         - 0
-        - 4
+        - 5
         - 0
-        version: 0.4.0
+        version: 0.5.0
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -58,12 +58,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 11
         segments: 
         - 0
-        - 4
+        - 5
         - 0
-        version: 0.4.0
+        version: 0.5.0
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency