rory 0.3.6 → 0.3.7

data/lib/rory/dispatcher.rb

@@ -52,12 +52,10 @@ module Rory
     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
+        if route[:module]
+          controller_name.prepend "#{Rory::Support.camelize("#{route[:module]}")}/"
         end
-        const_scope.const_get(controller_name)
+        Rory::Support.constantize(controller_name)
       end
     end
 

data/lib/rory/support.rb

@@ -9,6 +9,13 @@ module Rory
       string = string.gsub(/(?:_|(\/))([a-z\d]*)/) { "#{$1}#{$2.capitalize}" }.gsub('/', '::')
     end
 
+    def constantize(string)
+      camelized = camelize(string)
+      camelized.split('::').inject(Object) { |scope, const|
+        scope.const_get(const)
+      }
+    end
+
     def require_all_files_in_directory(path)
       Dir[Pathname.new(path).join('**', '*.rb')].each do |file|
         require file

data/lib/rory/version.rb

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

data/spec/application_spec.rb

@@ -77,6 +77,7 @@ describe Rory::Application do
         { :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 => 'rabbits', :action => 'chew', :regex => /^rabbits\/(?<chew>[^\/]+)$/, :module => 'goose/wombat', :methods => [:get] },
         { :controller => 'root', :action => 'vegetable', :regex => /^$/, :methods => [:get] }
       ].inspect
     end

data/spec/dispatcher_spec.rb

@@ -53,6 +53,16 @@ describe Rory::Dispatcher do
         :in_scoped_controller => true # see Goose::LumpiesController in /spec/fixture_app
       }
     end
+
+    it "dispatches properly to a nested scoped controller" do
+      request[:route] = { :controller => 'rabbits', :module => 'goose/wombat' }
+      dispatcher.dispatch.should == {
+        :whatever => :yay,
+        :route => request[:route],
+        :dispatcher => dispatcher,
+        :in_scoped_controller => true # see Goose::Wombat::RabbitsController in /spec/fixture_app
+      }
+    end
   end
 
   describe "#route" do

data/spec/fixture_app/config/routes.rb

@@ -5,5 +5,8 @@ Fixture::Application.set_routes do
   scope :module => 'goose' do
     match 'lumpies/:lump', :to => 'lumpies#show', :methods => [:get]
   end
+  scope :module => 'goose/wombat' do
+    match 'rabbits/:chew', :to => 'rabbits#chew', :methods => [:get]
+  end
   match '/', :to => 'root#vegetable', :methods => [:get]
 end

data/spec/fixture_app/controllers/goose/wombat/rabbits_controller.rb

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

data/spec/support_spec.rb

@@ -5,6 +5,10 @@ describe Rory::Support do
     it "camelizes given snake-case string" do
       Rory::Support.camelize('water_under_bridge').should == 'WaterUnderBridge'
     end
+
+    it "leaves already camel-cased string alone" do
+      Rory::Support.camelize('OliverDrankGasoline').should == 'OliverDrankGasoline'
+    end
   end
 
   describe '.require_all_files_in_directory' do
@@ -16,4 +20,32 @@ describe Rory::Support do
       Rory::Support.require_all_files_in_directory('spinach')
     end
   end
+
+  describe '.constantize' do
+    before(:all) do
+      Object.const_set('OrigamiDeliveryMan', Module.new)
+      OrigamiDeliveryMan.const_set('UnderWhere', Module.new)
+      OrigamiDeliveryMan::UnderWhere.const_set('Skippy', Module.new)
+    end
+
+    after(:all) do
+      Object.send(:remove_const, :OrigamiDeliveryMan)
+    end
+
+    it 'returns constant from camelized name' do
+      Rory::Support.constantize('OrigamiDeliveryMan').
+        should == OrigamiDeliveryMan
+    end
+
+    it 'returns constant from snake-case string' do
+      Rory::Support.constantize('origami_delivery_man').
+        should == OrigamiDeliveryMan
+    end
+
+    it 'returns namespaced constant' do
+      Rory::Support.constantize(
+        'origami_delivery_man/under_where/skippy'
+      ).should == OrigamiDeliveryMan::UnderWhere::Skippy
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rory
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
   prerelease: 
 platform: ruby
 authors:
@@ -189,6 +189,7 @@ files:
 - spec/fixture_app/config/application.rb
 - spec/fixture_app/config/routes.rb
 - spec/fixture_app/controllers/goose/lumpies_controller.rb
+- spec/fixture_app/controllers/goose/wombat/rabbits_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