sinatra-mapping 1.0.3 → 1.0.4

data/CHANGES

@@ -1,5 +1,9 @@
 = Changes
 
+[1.0.4 - July 2009]
+  * Error in root path without application/script name has been fixed.
+  * Helper for mapping has been registered automatically.
+
 [1.0.3 - July 2009]
   * Error in root path without script name in environment have been fixed.
 

data/VERSION

@@ -4,4 +4,4 @@
 :cycle: Release
 :major: 1
 :minor: 0
-:patch: 3
+:patch: 4

data/lib/sinatra/mapping.rb

@@ -23,10 +23,9 @@ module Sinatra
     #   map :root,    "tasks"       # => /tasks/
     #   map :changes, "last-changes # => /tasks/last-changes
     def map(name, path = nil)
-      @env       ||= {}
       @locations ||= {}
       if name.to_sym == :root
-        @locations[:root] = cleanup_paths("/#{@env['SCRIPT_NAME']}/#{path}/")
+        @locations[:root] = cleanup_paths("/#{path}/")
         metadef "#{name}_path" do |*paths|
           @locations[:root]
         end
@@ -64,10 +63,10 @@ module Sinatra
     end
 
     # Returns URL path with query instructions.
-    def query_path_to(*args)
+    def build_path_to(script_name = nil, *args)
       args.compact!
       query  = args.pop if args.last.kind_of?(Hash)
-      path   = map_path_to(*args)
+      path   = map_path_to(script_name, *args)
       path  << "?" << Rack::Utils::build_query(query) if query
       path
     end
@@ -77,16 +76,22 @@ module Sinatra
     # Check arguments. If argument is a symbol and exist map path before
     # setted, then return path mapped by symbol name.
     def map_path_to(*args)
-      path_mapped(*locations_get_from(*args))
+      script_name = args.shift if args.first.to_s =~ /\/\w.*/
+      path_mapped(script_name, *locations_get_from(*args))
     end
 
     # Returns all paths mapped by root path in prefix.
-    def path_mapped(*args)
-      !args.empty? ? cleanup_paths("/#{@locations[:root]}/#{args.join('/')}") : @locations[:root]
+    def path_mapped(script_name, *args)
+      if !args.empty?
+        cleanup_paths("/#{script_name}/#{@locations[:root]}/#{args.join('/')}")
+      else
+        cleanup_paths("/#{script_name}/#{@locations[:root]}")
+      end
     end
 
     # Get paths from location maps.
     def locations_get_from(*args)
+      args.delete(:root)
       args.collect do |path|
         @locations.has_key?(path) ? @locations[path] : path
       end
@@ -94,6 +99,7 @@ module Sinatra
 
     # Clean all duplicated slashes.
     def cleanup_paths(*paths)
+      #.gsub(%r{#{@locations[:root]}/#{@locations[:root]}}, @locations[:root])
       paths.join('/').gsub(/[\/]{2,}/,'/')
     end
 

data/lib/sinatra/mapping_helpers.rb

@@ -32,8 +32,12 @@ module Sinatra
     #   # => <a href="/tasks/status/finished">All finished</a>
     def link_to(name = nil, *args)
       options = args.last.kind_of?(Hash) ? args.pop : {}
-      url     = args.shift if args.first.to_s =~ /^\w.*:\/\//
-      "<a href=\"#{url || path_to(*args)}\" #{extract_tags_attributes options}>#{name}</a>"
+      url     = args.shift if args.first.to_s =~ /^\w.*?:/
+      "<a href=\"#{url || path_to(*args)}\" #{extract_tags_attributes(options)}>#{name || url}</a>"
+    end
+
+    def link_to_query(name, action, query = {}, options = {})
+      "<a href=\"#{path_to(action,query)}\" #{extract_tags_attributes(options)}>#{name}</a>"
     end
 
     # Returns all paths with query parameters. Example:
@@ -45,7 +49,7 @@ module Sinatra
     #   path_to :tags, "ruby", :posts
     #   # returns "/labels/ruby/articles"
     def path_to(*args)
-      options.query_path_to(*args)
+      options.build_path_to(env['SCRIPT_NAME'], *args)
     end
 
   private
@@ -67,7 +71,9 @@ module Sinatra
       end
     end
 
-  end # module MapHelpers
+  end # module MappingHelpers
+
+  helpers MappingHelpers
 
 end # module Sinatra
 

data/test/test_mapping.rb

@@ -9,7 +9,7 @@ require 'ruby-debug'
 
 class Sinatra::Base
   def env
-    {'SCRIPT_NAME' => 'blog'}
+    @env ||= { 'SCRIPT_NAME' => '/blog' }
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra-mapping
 version: !ruby/object:Gem::Version 
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors: 
 - Hallison Batista