sinatra_more 0.3.15 → 0.3.16

data/VERSION

@@ -1 +1 @@
-0.3.15
+0.3.16

data/lib/sinatra_more/routing_plugin.rb

@@ -9,7 +9,8 @@ module SinatraMore
       # Named paths stores the named route aliases mapping to the url
       # i.e { [:account] => '/account/path', [:admin, :show] => '/admin/show/:id' }
       app.set :named_paths, {}
-      app.set :app_name, app.name.underscore.to_sym
+      app.set :app_name, app.name.underscore.to_sym unless app.respond_to?(:app_name)
+      app.set :uri_root, '/' unless app.respond_to?(:uri_root)
       app.helpers SinatraMore::RoutingHelpers
 
       # map constructs a mapping between a named route and a specified alias

data/lib/sinatra_more/routing_plugin/named_route.rb

@@ -11,7 +11,7 @@ module SinatraMore
     # Used to define the url mapping to the supplied alias
     # NamedRoute.new(@app, :account).to('/account/path')
     def to(path)
-      @app.named_paths[@names.unshift(@app.app_name)] = path
+      @app.named_paths[@names.unshift(@app.app_name)] = File.join(@app.uri_root, path)
     end
 
     # Used to define the url mappings for child aliases within a namespace

data/sinatra_more.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sinatra_more}
-  s.version = "0.3.15"
+  s.version = "0.3.16"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nathan Esquenazi"]

data/test/fixtures/routing_app/app.rb

@@ -4,11 +4,11 @@ require 'haml'
 
 class RoutingDemo < Sinatra::Base
   register SinatraMore::RoutingPlugin
-  
+
   configure do
     set :root, File.dirname(__FILE__)
   end
-  
+
   map(:admin, :show).to("/admin/:id/show")
   map :admin do |namespace|
     namespace.map(:update).to("/admin/:id/update/:name")

data/test/test_routing_plugin.rb

@@ -3,7 +3,7 @@ require 'fixtures/routing_app/app'
 
 class TestRoutingPlugin < Test::Unit::TestCase
   def app
-    RoutingDemo.tap { |app| app.set :environment, :test }
+    RoutingDemo.tap { |app| app.set :environment, :test }.tap { |app| app.set :uri_root, '/blog' }
   end
 
   context 'for links list displaying routes' do
@@ -22,15 +22,30 @@ class TestRoutingPlugin < Test::Unit::TestCase
       assert_have_selector :p, :class => 'app_admin_url', :content => '/admin/25/show'
     end
   end
-  
+
+  context 'for mounted application' do
+    should "support changing uri root no mount" do
+      demo = app.new
+      demo.class.stubs(:uri_root).returns("/")
+      demo.class.map(:demo).to('/demo')
+      assert_equal "/demo", demo.url_for(:demo)
+    end
+    should "support changing uri root with mount" do
+      demo = app.new
+      demo.class.stubs(:uri_root).returns("/blog")
+      demo.class.map(:demo).to('/demo')
+      assert_equal "/blog/demo", demo.url_for(:demo)
+    end
+  end
+
   context 'for failed or missing routes' do
     should "properly not raise when found" do
-      assert_nothing_raised { app.new.url_for(:accounts) } 
-      assert_nothing_raised { app.new.url_for(:routing_demo, :admin, :show, :id => 5) } 
+      assert_nothing_raised { app.new.url_for(:accounts) }
+      assert_nothing_raised { app.new.url_for(:routing_demo, :admin, :show, :id => 5) }
     end
     should "properly raise not found exception" do
-      assert_raises(SinatraMore::RouteNotFound) { visit '/failed_route' } 
-      assert_raises(SinatraMore::RouteNotFound) { app.new.url_for(:admin, :fake) } 
+      assert_raises(SinatraMore::RouteNotFound) { visit '/failed_route' }
+      assert_raises(SinatraMore::RouteNotFound) { app.new.url_for(:admin, :fake) }
     end
     should "properly raise about an invalid alias for route definition" do
       assert_raises(SinatraMore::RouteNotFound) { app.get(:fake) }
@@ -60,14 +75,14 @@ class TestRoutingPlugin < Test::Unit::TestCase
       assert_have_selector :p, :content => "admin show for id 50"
     end
   end
-  
+
   context 'for admin update url' do
     setup { visit '/admin/15/update/demo' }
     should "return proper update text" do
       assert_have_selector :p, :content => "updated admin with id 15 and name demo"
     end
   end
-  
+
   context 'for admin destroy url' do
     setup { visit '/admin/60/destroy' }
     should "return proper destroy text" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra_more
 version: !ruby/object:Gem::Version 
-  version: 0.3.15
+  version: 0.3.16
 platform: ruby
 authors: 
 - Nathan Esquenazi