focused_controller 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4520f2d723515817447f6298824b627fd5cd610d
-  data.tar.gz: 5396abeb1c3bd9c627f67ce079bfb9113a660572
+  metadata.gz: 50328909d601965e71fb57ca5bbd7b1018388643
+  data.tar.gz: 2b620c4a51d034a1b4d2ddcad005c7ef32831e6a
 SHA512:
-  metadata.gz: 59ea160ee59f7fe685cc2f97db55f14c7625f061ccbe9dfe0da5626affce78e65cd6a519234f2161c182d0c86a8b014a035af9d0bc1d60a391dab55247e8e606
-  data.tar.gz: 48429585b521b53d891064926918333a4c8a8a35bf9414e6b0ac758fd496d9cb4db1e8156e4e8cbad52d70592d36cf73b832e6c0c30d3fe99483fb59857247a4
+  metadata.gz: 172bf02aabc5827c994fe2e6f5354bc83c9dda4f00db222dbd0360fde8e977dd08f955116ec10058339cb559491b860bb030f1bf8ffa7e77a3618c0c74b2c44c
+  data.tar.gz: 121d5d4ce59ad2f3866f380542fb617ee372abc4b177a9b8c2a8556e3ee82db0e3c451e60315007714a130e04e4617cb1b13f8583bc5761df59fd9a638e481f3

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.0.1 ##
+
+* Routing bug fix
+
 ## 2.0.0 ##
 
 * Rails 3.X and 4.0 no longer supported

data/lib/focused_controller/route_mapper.rb

@@ -25,14 +25,14 @@ module FocusedController
     private
 
     def to_option
-      if @options[:to] && !@options[:to].respond_to?(:call)
+      if @options[:controller]
+        @options[:controller]
+      elsif @options[:to] && !@options[:to].respond_to?(:call)
         if @options[:to].include?('#')
           stringify_controller_and_action(*@options[:to].split('#'))
         else
           @options[:to]
         end
-      elsif @options[:controller]
-        @options[:controller]
       elsif @options[:action] && @scope[:controller]
         stringify_controller_and_action(@scope[:controller], @options[:action])
       end

data/lib/focused_controller/version.rb

@@ -1,3 +1,3 @@
 module FocusedController
-  VERSION = "2.0.0"
+  VERSION = "2.0.1"
 end

data/test/unit/route_mapper_test.rb

@@ -24,8 +24,9 @@ module FocusedController
     it 'creates routes that map to focused controllers' do
       route_set.draw do
         focused_controller_routes do
-          get 'posts'     => 'PostsController::Index'
-          get 'posts/all' => 'posts#index'
+          get 'posts'      => 'PostsController::Index'
+          get 'posts/all'  => 'posts#index'
+          get 'posts/all2' => 'PostsController::Index'
 
           resources :comments do
             resources :replies
@@ -55,6 +56,7 @@ module FocusedController
         [:get, '/comments/a/omg']     => 'PostsController::Index',
         [:get, '/comments/b/omg']     => 'CommentsController::Index',
         [:get, '/admin/foo']          => 'Admin::FooController::Show',
+        [:get, '/posts/all2']         => 'PostsController::Index',
       }
 
       mappings.each do |(method, path), controller|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: focused_controller
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Jon Leighton