Changeset 648

Timestamp:

09/18/07 07:34:49 (1 year ago)

Author:

duane.johns..@gmail.com

Message:

Add _subclasses to Controller class so that the dispatcher can know in advance what constitutes a valid controller class. This will permit gems and plugins to have controllers and views since the dispatcher (Request class) no longer relies on a file-system check to see if the controller file exists where it expects. Also fixed the DOS bug with to_const_string (thanks chris) (closes #181)

Files:

• trunk/lib/merb/controller.rb (modified) (2 diffs)
• trunk/lib/merb/core_ext/string.rb (modified) (2 diffs)
• trunk/lib/merb/request.rb (modified) (1 diff)
• trunk/specs/merb/merb_core_ext_spec.rb (modified) (1 diff)
• trunk/specs/merb/merb_dispatch_spec.rb (modified) (1 diff)
• trunk/specs/merb/merb_request_spec.rb (modified) (2 diffs)

trunk/lib/merb/controller.rb

@@ -8 +8 @@
-  # puts that into params as well.
-  class Controller < AbstractController
+    cattr_accessor :_subclasses
+    self._subclasses = []
-    
-    class_inheritable_accessor :_session_id_key, :_session_expiry
@@ -18 +20 @@
-    
-    class << self
+      def inherited(klass)
+        _subclasses << klass.to_s
+        super
+      end
+      
-      def callable_actions
-        @callable_actions ||= Set.new(public_instance_methods - hidden_actions)

trunk/lib/merb/core_ext/string.rb

@@ -2 +2 @@
-
-class String
+  class InvalidPathConversion < Exception; end
-  
-  def escape_regexp
@@ -22 +23 @@
-    input = StringScanner.new(self)
-    until input.eos?
-
+|\/
-        new_string << input[1].capitalize
-
-
+
+
+
-      end
-    end

trunk/lib/merb/request.rb

@@ -126 +126 @@
-    
-    def controller_class
-      path = "#{MERB_ROOT}/app/controllers/#{controller_name}.rb"
-      cnt = controller_name.to_const_string
-      
-File.exist?(path
-Bad controller! #{cnt}
- unless $TESTING
+Controller._subclasses.include?(cnt
+Controller '#{cnt}' not found
+
-      
-      begin

trunk/specs/merb/merb_core_ext_spec.rb

@@ -394 +394 @@
-    "snake_case/path/with_several_parts".to_const_string.should == "SnakeCase::Path::WithSeveralParts"
-  end
-
+
+
+
+
+
+
+
+
+

trunk/specs/merb/merb_dispatch_spec.rb

@@ -35 +35 @@
-  it "should handle request: GET /foo/bar and return Foo#bar" do
-    controller, action = request(:get, '/foo/bar')
+    e = controller.params[:exception]
-    controller.class.should == Foo
-    action.should == "bar"

trunk/specs/merb/merb_request_spec.rb

@@ -2 +2 @@
-
-describe Merb::Request do
+  include Mocha::SetupAndTeardown
+  
+  class GoodPosts < Merb::Controller
+    def show() end
+  end
-  
-  before(:all) do
+    setup_stubs
-    @in = Merb::Test::FakeRequest.new
+    Merb::Request.any_instance.stubs(:route_params).returns({})
+  end
+  
+  after(:all) do
+    teardown_stubs
-  end
-  
@@ -171 +182 @@
-    request.params[:title].should == "hello"
-  end
+
+  it "should not raise a NotFound exception when the controller class exists" do
+    @in['REQUEST_URI'] = "/good_posts/show/1"
+    @in['REQUEST_METHOD'] = 'GET'
+    @in['CONTENT_TYPE'] = "application/x-www-form-urlencoded"
+    request = Merb::Request.new(@in)
+    request.expects(:controller_name).returns("good_posts")
+    request.controller_name.should == "good_posts"
+    lambda { request.controller_class }.should_not raise_error(Merb::ControllerExceptions::NotFound)
+  end
+  
+  it "should raise a NotFound exception when the controller does not exist" do
+    @in['REQUEST_URI'] = "/bad_posts/show/1"
+    @in['REQUEST_METHOD'] = 'GET'
+    @in['CONTENT_TYPE'] = "application/x-www-form-urlencoded"
+    request = Merb::Request.new(@in)
+    request.expects(:controller_name).returns("bad_posts")
+    request.controller_name.should == "bad_posts"
+    lambda { request.controller_class }.should raise_error(Merb::ControllerExceptions::NotFound)
+  end
-end