Merge branch 'master' into 0.4.x

hanami · Jul 3, 2015 · 6034dcb · 6034dcb
2 parents bf9763e + d4b49b2
commit 6034dcb
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/lib/lotus/router/version.rb b/lib/lotus/router/version.rb
@@ -1,6 +1,6 @@
 module Lotus
   class Router
     # @since 0.1.0
-    VERSION = '0.4.1'.freeze
+    VERSION = '0.4.2'.freeze
   end
 end
diff --git a/lotus-router.gemspec b/lotus-router.gemspec
@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 2.0.0'
 
   spec.add_dependency 'http_router', '~> 0.11'
-  spec.add_dependency 'lotus-utils', '~> 0.5'
+  spec.add_dependency 'lotus-utils', '~> 0.5', '>= 0.5.1'
 
   spec.add_development_dependency 'bundler',  '~> 1.5'
   spec.add_development_dependency 'minitest', '~> 5'

diff --git a/test/prefix_test.rb b/test/prefix_test.rb
@@ -40,6 +40,12 @@ def call(env)
         trace   '/home', to: 'home#index', as: :trace_home
         options '/home', to: 'home#index', as: :options_home
 
+        get  '/admin',      to: 'home#index', as: :get_admin
+        get  '/admin/new',  to: 'home#index', as: :new_admin
+        get  '/admin/edit', to: 'home#index', as: :edit_admin
+        post '/admin',      to: 'home#index', as: :create_admin
+        put  '/admin',      to: 'home#index', as: :put_admin
+
         resources :users
         resource :asteroid
 
@@ -64,6 +70,12 @@ def call(env)
       @router.path(:user, id: 1).must_equal      '/admin/users/1'
       @router.path(:edit_user, id: 1).must_equal '/admin/users/1/edit'
 
+      @router.path(:get_admin).must_equal    '/admin/admin'
+      @router.path(:new_admin).must_equal    '/admin/admin/new'
+      @router.path(:create_admin).must_equal '/admin/admin'
+      @router.path(:edit_admin).must_equal   '/admin/admin/edit'
+      @router.path(:put_admin).must_equal    '/admin/admin'
+
       @router.path(:new_asteroid).must_equal  '/admin/asteroid/new'
       @router.path(:asteroid).must_equal      '/admin/asteroid'
       @router.path(:edit_asteroid).must_equal '/admin/asteroid/edit'

diff --git a/test/version_test.rb b/test/version_test.rb
@@ -2,6 +2,6 @@
 
 describe Lotus::Router::VERSION do
   it 'exposes version' do
-    Lotus::Router::VERSION.must_equal '0.4.1'
+    Lotus::Router::VERSION.must_equal '0.4.2'
   end
 end