rory 0.3.5 → 0.3.6

data/lib/rory/application.rb

@@ -40,13 +40,13 @@ module Rory
       end
     end
 
-    def autoload_paths
-      @autoload_paths ||= %w(models controllers helpers)
+    def auto_require_paths
+      @auto_require_paths ||= %w(models controllers helpers)
     end
 
-    def autoload_all_files
-      autoload_paths.each do |path|
-        Rory::Support.autoload_all_files_in_directory root_path.join(path)
+    def require_all_files
+      auto_require_paths.each do |path|
+        Rory::Support.require_all_files_in_directory root_path.join(path)
       end
     end
 

data/lib/rory/dispatcher.rb

@@ -5,46 +5,21 @@ module Rory
     attr_reader :request
     def initialize(rack_request, context = nil)
       @request = rack_request
-      @request[:route] ||= nil
-      @request[:dispatcher] = self
       @context = context
     end
 
-    def route_map
-      @context ? @context.routes : []
-    end
-
-    def get_route
-      match = nil
-      route = route_map.detect do |route_hash|
-        path_name = @request.path_info[1..-1] || ''
-        match = route_hash[:regex].match(path_name)
-        methods = route_hash[:methods] || []
-        match && (methods.empty? || methods.include?(method.to_sym))
-      end
-      if route
-        symbolized_param_names = match.names.map { |name| name.to_sym }
-        @request.params.merge! Hash[symbolized_param_names.zip(match.captures)]
-      end
-      route
+    def route
+      @request[:route] ||= get_route
     end
 
     def dispatch
-      route = set_route_if_empty
-
-      if route
-        controller_name = Rory::Support.camelize("#{route[:controller]}_controller")
-        controller_class = Object.const_get(controller_name)
-        controller_class.new(@request, @context).present
+      if controller
+        controller.present
       else
         render_not_found
       end
     end
 
-    def set_route_if_empty
-      @request[:route] ||= get_route
-    end
-
     def method
       override_method = @request.params.delete('_method')
       method = if override_method && ['put', 'patch', 'delete'].include?(override_method.downcase)
@@ -66,8 +41,43 @@ module Rory
       return [ 404, {'Content-type' => 'text/html' }, ['Four, oh, four.'] ]
     end
 
-    def inspect
-      @request.inspect # fixes issue for rspec and pretty_print
+  private
+
+    def controller
+      if klass = controller_class
+        klass.new(@request.merge(:dispatcher => self), @context)
+      end
+    end
+
+    def controller_class
+      if route
+        controller_name = Rory::Support.camelize("#{route[:controller]}_controller")
+        const_scope = if route[:module]
+          Object.const_get(Rory::Support.camelize("#{route[:module]}"))
+        else
+          Object
+        end
+        const_scope.const_get(controller_name)
+      end
+    end
+
+    def get_route
+      match = nil
+      mapped_route = route_map.detect do |route_hash|
+        path_name = @request.path_info[1..-1] || ''
+        match = route_hash[:regex].match(path_name)
+        methods = route_hash[:methods] || []
+        match && (methods.empty? || methods.include?(method.to_sym))
+      end
+      if mapped_route
+        symbolized_param_names = match.names.map { |name| name.to_sym }
+        @request.params.merge! Hash[symbolized_param_names.zip(match.captures)]
+      end
+      mapped_route
+    end
+
+    def route_map
+      @context ? @context.routes : []
     end
   end
 end

data/lib/rory/route_mapper.rb

@@ -12,13 +12,22 @@ module Rory
 
     def initialize
       @routes = []
+      @scope_options = {}
     end
 
     def routing_map
       @routes
     end
 
+    def scope(options = {}, &block)
+      previous_options, @scope_options =
+        @scope_options, @scope_options.merge(options)
+      yield
+      @scope_options = previous_options
+    end
+
     def match(mask, options = {})
+      options.merge!(@scope_options)
       options[:to] ||= mask.split('/').first
       mask.gsub!(/^\//, '')
       regex = /^#{mask.gsub(/:([\w_]+)/, "(?<\\1>\[\^\\\/\]+)")}$/
@@ -28,6 +37,7 @@ module Rory
         :action => action,
         :regex => regex
       }
+      route[:module] = options[:module] if options[:module]
       route[:methods] = options[:methods] if options[:methods]
       @routes << route
     end

data/lib/rory/support.rb

@@ -9,20 +9,9 @@ module Rory
       string = string.gsub(/(?:_|(\/))([a-z\d]*)/) { "#{$1}#{$2.capitalize}" }.gsub('/', '::')
     end
 
-    def extract_class_name_from_path(path)
-      name = File.basename(path).sub(/(.*)\.rb$/, '\1')
-      name = camelize(name)
-    end
-
-    def autoload_file(path)
-      path = File.expand_path(path)
-      name = extract_class_name_from_path(path)
-      Object.autoload name.to_sym, path
-    end
-
-    def autoload_all_files_in_directory(path)
+    def require_all_files_in_directory(path)
       Dir[Pathname.new(path).join('**', '*.rb')].each do |file|
-        Rory::Support.autoload_file file
+        require file
       end
     end
   end

data/lib/rory/version.rb

@@ -1,3 +1,3 @@
 module Rory
-  VERSION = '0.3.5'
+  VERSION = '0.3.6'
 end

data/rory.gemspec

@@ -36,6 +36,7 @@ EOF
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'yard'
   s.add_development_dependency 'reek'
+  s.add_development_dependency 'simplecov'
   s.add_development_dependency 'bundler', '~> 1.0'
 end
 

data/spec/application_spec.rb

@@ -76,6 +76,7 @@ describe Rory::Application do
         { :controller => 'foo', :action => 'bar', :regex => /^foo\/(?<id>[^\/]+)\/bar$/, :methods => [:get, :post] },
         { :controller => 'monkeys', :action => nil, :regex => /^foo$/, :methods => [:put] },
         { :controller => 'awesome', :action => 'rad', :regex => /^this\/(?<path>[^\/]+)\/is\/(?<very_awesome>[^\/]+)$/},
+        { :controller => 'lumpies', :action => 'show', :regex => /^lumpies\/(?<lump>[^\/]+)$/, :module => 'goose', :methods => [:get] },
         { :controller => 'root', :action => 'vegetable', :regex => /^$/, :methods => [:get] }
       ].inspect
     end
@@ -90,27 +91,27 @@ describe Rory::Application do
 
   describe '.autoload_paths' do
     after(:each) do
-      Fixture::Application.instance.instance_variable_set(:@autoload_paths, nil)
+      Fixture::Application.instance.instance_variable_set(:@auto_require_paths, nil)
     end
 
     it 'includes models, controllers, and helpers by default' do
-      Fixture::Application.autoload_paths.should == ['models', 'controllers', 'helpers']
+      Fixture::Application.auto_require_paths.should == ['models', 'controllers', 'helpers']
     end
 
     it 'accepts new paths' do
-      Fixture::Application.autoload_paths << 'chocolates'
-      Fixture::Application.autoload_paths.should == ['models', 'controllers', 'helpers', 'chocolates']
+      Fixture::Application.auto_require_paths << 'chocolates'
+      Fixture::Application.auto_require_paths.should == ['models', 'controllers', 'helpers', 'chocolates']
     end
   end
 
-  describe '.autoload_all_files' do
-    it 'autoloads all files in autoload_paths' do
-      Fixture::Application.any_instance.stub(:autoload_paths).and_return(['goats', 'rhubarbs'])
+  describe '.require_all_files' do
+    it 'requires all files in auto_require_paths' do
+      Fixture::Application.any_instance.stub(:auto_require_paths).and_return(['goats', 'rhubarbs'])
       [:goats, :rhubarbs].each do |folder|
-        Rory::Support.should_receive(:autoload_all_files_in_directory).
+        Rory::Support.should_receive(:require_all_files_in_directory).
           with(Pathname.new(Fixture::Application.root).join("#{folder}"))
       end
-      Fixture::Application.autoload_all_files
+      Fixture::Application.require_all_files
     end
   end
 end

data/spec/dispatcher_spec.rb

@@ -22,52 +22,54 @@ describe Rory::Dispatcher do
   end
 
   describe "#dispatch" do
+    let(:dispatcher) { Rory::Dispatcher.new(request, Fixture::Application) }
+    let(:request) {
+      request = { :whatever => :yay }
+      request.stub(:path_info => '/', :request_method => 'GET', :params => {})
+      request
+    }
+
     it "renders a 404 if the requested path is invalid" do
-      @request = {}
-      @request.stub(:path_info => nil, :request_method => 'GET', :params => {})
-      @dispatcher = Rory::Dispatcher.new(@request, Fixture::Application)
-      @dispatcher.stub(:get_route).and_return(nil)
-      @dispatcher.dispatch[0..1].should == [404, {"Content-type"=>"text/html"}]
+      dispatcher.stub(:get_route).and_return(nil)
+      dispatcher.dispatch[0..1].should == [404, {"Content-type"=>"text/html"}]
     end
 
     it "instantiates a controller with the parsed request and calls present" do
-      @request = {:whatever => :yay}
-      @request.stub(:path_info => '/', :request_method => 'GET', :params => {})
-      @dispatcher = Rory::Dispatcher.new(@request, Fixture::Application)
-      route = { :controller => 'stub' }
-      @dispatcher.stub(:get_route).and_return(route)
-      @dispatcher.dispatch.should == {
+      request[:route] = { :controller => 'stub' }
+      dispatcher.dispatch.should == {
         :whatever => :yay,
-        :route => route,
-        :dispatcher => @dispatcher,
+        :route => request[:route],
+        :dispatcher => dispatcher,
         :present_called => true # see StubController in /spec/fixture_app
       }
     end
 
-    it "uses existing route if given in request" do
-      @request = {:whatever => :yay, :route => { :controller => 'stub' } }
-      @request.stub(:path_info => '/', :request_method => 'GET', :params => {})
-      @dispatcher = Rory::Dispatcher.new(@request, Fixture::Application)
-      @dispatcher.should_receive(:get_route).never
-      @dispatcher.dispatch.should == {
+    it "dispatches properly to a scoped controller" do
+      request[:route] = { :controller => 'lumpies', :module => 'goose' }
+      dispatcher.dispatch.should == {
         :whatever => :yay,
-        :route => { :controller => 'stub' },
-        :dispatcher => @dispatcher,
-        :present_called => true # see StubController in /spec/fixture_app
+        :route => request[:route],
+        :dispatcher => dispatcher,
+        :in_scoped_controller => true # see Goose::LumpiesController in /spec/fixture_app
       }
     end
   end
 
-  describe "#get_route" do
+  describe "#route" do
     before(:each) do
       @request = {}
       @request.stub(:params => {})
       @dispatcher = Rory::Dispatcher.new(@request, Fixture::Application)
     end
 
+    it "returns route from request if already set" do
+      @request[:route] = 'snaky pigeons'
+      @dispatcher.route.should == 'snaky pigeons'
+    end
+
     it "matches the path from the request to the routes table" do
       @request.stub(:path_info => '/foo', :request_method => 'PUT')
-      @dispatcher.get_route.should == {
+      @dispatcher.route.should == {
         :controller => 'monkeys',
         :action => nil,
         :regex => /^foo$/,
@@ -77,7 +79,7 @@ describe Rory::Dispatcher do
 
     it "works with empty path" do
       @request.stub(:path_info => '', :request_method => 'GET')
-      @dispatcher.get_route.should == {
+      @dispatcher.route.should == {
         :controller => 'root',
         :action => 'vegetable',
         :regex => /^$/,
@@ -87,7 +89,7 @@ describe Rory::Dispatcher do
 
     it "works with root url represented by slash" do
       @request.stub(:path_info => '/', :request_method => 'GET')
-      @dispatcher.get_route.should == {
+      @dispatcher.route.should == {
         :controller => 'root',
         :action => 'vegetable',
         :regex => /^$/,
@@ -97,22 +99,22 @@ describe Rory::Dispatcher do
 
     it "returns nil if no route found" do
       @request.stub(:path_info => '/umbrellas', :request_method => 'GET')
-      @dispatcher.get_route.should be_nil
+      @dispatcher.route.should be_nil
     end
 
     it "returns nil if no context" do
       @dispatcher = Rory::Dispatcher.new(@request)
-      @dispatcher.get_route.should be_nil
+      @dispatcher.route.should be_nil
     end
 
     it "returns nil if route found but method is not allowed" do
       @request.stub(:path_info => '/foo', :request_method => 'GET')
-      @dispatcher.get_route.should be_nil
+      @dispatcher.route.should be_nil
     end
 
     it "assigns named matches to params hash" do
       @request.stub(:path_info => '/this/some-thing_or-other/is/wicked', :request_method => 'GET')
-      @dispatcher.get_route.inspect.should == {
+      @dispatcher.route.inspect.should == {
         :controller => 'awesome',
         :action => 'rad',
         :regex => /^this\/(?<path>[^\/]+)\/is\/(?<very_awesome>[^\/]+)$/,

data/spec/fixture_app/config/routes.rb

@@ -2,5 +2,8 @@ Fixture::Application.set_routes do
   match 'foo/:id/bar', :to => 'foo#bar', :methods => [:get, :post]
   match '/foo', :to => 'monkeys', :methods => [:put]
   match 'this/:path/is/:very_awesome', :to => 'awesome#rad'
+  scope :module => 'goose' do
+    match 'lumpies/:lump', :to => 'lumpies#show', :methods => [:get]
+  end
   match '/', :to => 'root#vegetable', :methods => [:get]
 end

data/spec/fixture_app/controllers/goose/lumpies_controller.rb

@@ -0,0 +1,12 @@
+module Goose
+  class LumpiesController
+    def initialize(args, context)
+      @args = args
+    end
+
+    def present
+      @args[:in_scoped_controller] = true
+      @args
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,3 +1,6 @@
+require 'simplecov'
+SimpleCov.start
+
 ENV['RORY_STAGE'] = 'test'
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
@@ -12,7 +15,7 @@ Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 require_relative 'fixture_app/config/application'
 Fixture::Application.root = File.join(File.dirname(__FILE__), 'fixture_app')
 
-Fixture::Application.autoload_all_files
+Fixture::Application.require_all_files
 
 RSpec.configure do |config|
 

data/spec/support_spec.rb

@@ -7,21 +7,13 @@ describe Rory::Support do
     end
   end
 
-  describe '.autoload_file' do
-    it 'adds basename of given path to autoload list by default' do
-      path = '/fake_root/gas/is/cheap/in/good_old_america.rb'
-      Object.should_receive(:autoload).with(:GoodOldAmerica, path)
-      Rory::Support.autoload_file(path)
-    end
-  end
-
-  describe '.autoload_all_files_in_directory' do
-    it 'autoloads all files from given path' do
+  describe '.require_all_files_in_directory' do
+    it 'requires all files from given path' do
       Dir.stub(:[]).with(Pathname.new('spinach').join('**', '*.rb')).
         and_return(["pumpkins", "some_guy_dressed_as_liberace"])
-      Rory::Support.should_receive(:autoload_file).with("pumpkins")
-      Rory::Support.should_receive(:autoload_file).with("some_guy_dressed_as_liberace")
-      Rory::Support.autoload_all_files_in_directory('spinach')
+      Rory::Support.should_receive(:require).with("pumpkins")
+      Rory::Support.should_receive(:require).with("some_guy_dressed_as_liberace")
+      Rory::Support.require_all_files_in_directory('spinach')
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rory
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-19 00:00:00.000000000 Z
+date: 2014-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -123,6 +123,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -172,6 +188,7 @@ files:
 - spec/dispatcher_spec.rb
 - spec/fixture_app/config/application.rb
 - spec/fixture_app/config/routes.rb
+- spec/fixture_app/controllers/goose/lumpies_controller.rb
 - spec/fixture_app/controllers/stub_controller.rb
 - spec/fixture_app/views/layouts/surround.html.erb
 - spec/fixture_app/views/test/dynamic.html.erb