0
@@ -1,5 +1,8 @@
0
 module Zoid
0
   nsurl "http://strokedb.com/zoid"
0
+  
0
+  DocumentNotFound = StrokeDB::Meta.new
0
+  
0
   Application = StrokeDB::Meta.new do
0
     validates_presence_of :name
0
     validates_presence_of :nsurl
0
@@ -14,7 +17,7 @@ module Zoid
0
           entity
0
         end
0
       when /^\/(\w+)\/#{StrokeDB::UUID_RE}$/
0
-        store.find($2)
0
+        app_module.const_get($1.camelize).find($2) || DocumentNotFound.new(:path => path)
0
       when /^\/(\w+)\/#{StrokeDB::UUID_RE}.#{StrokeDB::UUID_RE}$/
0
         store.find($2,$3)
0
       end

0
@@ -4,6 +4,7 @@ module RoutingExample
0
   nsurl 'http://strokedb.com/zoid/spec#routing'
0
   remove_const(:SomeName) if defined?(SomeName)
0
   SomeName = StrokeDB::Meta.new
0
+  AnotherMeta = StrokeDB::Meta.new
0
   SomeView = StrokeDB::View.create!("SomeView") do |view|
0
     def view.map(key,val)
0
     end
0
@@ -33,6 +34,11 @@ describe Zoid::Application, "router" do
0
     @app.route_for('GET', "/some_name/#{doc.uuid}").should == doc
0
   end
0
 
0
+  it "should route GET + /name/uuid to DocumentNotFound document if specified UUID with given meta was not found" do
0
+    doc = RoutingExample::AnotherMeta.create!
0
+    @app.route_for('GET', "/some_name/#{doc.uuid}").should be_a_kind_of(Zoid::DocumentNotFound)
0
+  end
0
+
0
   it "should route GET + /name/uuid.version to a named entity with specified UUID" do
0
     doc = RoutingExample::SomeName.create!.versions.current
0
     @app.route_for('GET', "/some_name/#{doc.uuid}.#{doc.version}").should == doc