sinatra_more 0.3.16 → 0.3.18

data/VERSION

@@ -1 +1 @@
-0.3.16
+0.3.18

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)] = File.join(@app.uri_root, path)
+      @app.named_paths[@names.unshift(@app.app_name)] = path
     end
 
     # Used to define the url mappings for child aliases within a namespace

data/lib/sinatra_more/routing_plugin/routing_helpers.rb

@@ -9,7 +9,7 @@ module SinatraMore
       values = route_name.extract_options!
       mapped_url = self.class.named_paths[route_name] || self.class.named_paths[route_name.dup.unshift(self.class.app_name)]
       raise SinatraMore::RouteNotFound.new("Route alias #{route_name.inspect} is not mapped to a url") unless mapped_url
-      result_url = String.new(mapped_url)
+      result_url = String.new(File.join(self.class.uri_root, mapped_url))
       result_url.scan(%r{/?(:\S+?)(?:/|$)}).each do |placeholder|
         value_key = placeholder[0][1..-1].to_sym
         result_url.gsub!(Regexp.new(placeholder[0]), values[value_key].to_s)

data/sinatra_more.gemspec

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

data/test/test_routing_plugin.rb

@@ -28,12 +28,14 @@ class TestRoutingPlugin < Test::Unit::TestCase
       demo = app.new
       demo.class.stubs(:uri_root).returns("/")
       demo.class.map(:demo).to('/demo')
+      assert_equal "/demo", demo.class.named_paths[[:routing_demo, :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 "/demo", demo.class.named_paths[[:routing_demo, :demo]]
       assert_equal "/blog/demo", demo.url_for(:demo)
     end
   end

metadata

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