sinatra-mapping 1.0.7 → 1.1.0

data/CHANGES

@@ -1,5 +1,14 @@
 = Changes
 
+[1.1.1 - not released]
+  * The mapping methods works in classic application.
+
+[1.1.0 - 2009-08-25]
+  * Added suffix "/?" in all paths when no arguments.
+  * The helpers are registered automatically.
+  * Updates in documentation.
+  * Tests have been fixed.
+
 [1.0.6 - 2009-08-21]
   * Fixes in the method for build path mapped.
   * Updates in documentation.

data/INFO

@@ -9,6 +9,6 @@
 :email: email@hallisonbatista.com
 :homepage: http://sinatra-mapping.rubyforge.org/
 :dependencies:
-  rack: >= 1.0.0
-  sinatra: >= 0.9.2
+  rack: >= 0.9.1
+  sinatra: >= 0.9.1.1
 

data/README.rdoc

@@ -2,9 +2,9 @@
 
 Map easily URLs in your Web applications.
 
+* {Homepage}[:link:/]
 * {Repository}[http://github.com/hallison/sinatra-mapping]
 * {Project}[http://rubyforge.org/projects/sinatra-mapping]
-* {Documentation}[:link:Sinatra/Mapping.html]
 * {Issues}[http://github.com/hallison/sinatra-mapping/issues]
 
 The extension Sinatra::Mapping is a minimal module that is useful for
@@ -12,6 +12,7 @@ create map names for {Ruby}[http://www.ruby-lang.org]
 {Sinatra}[http://www.sinatrarb.com] web applications.
 
 == Getting start
+
 Install stable version gem from {RubyForge.org}[http://www.rubyforge.org/]:
 
   gem install sinatra-mapping
@@ -45,17 +46,12 @@ source of application. To better understand, copy and paste the following
 example in {Ruby}[http://www.ruby-lang.org] source file +webfoo.rb+:
 
   #!/usr/bin/env ruby
-
   require 'rubygems'
   require 'sinatra'
-  require 'sinatra/mapping'
-  require 'sinatra/mapping_helpers'
+  require 'sinatra/mapping' # only this line for use mapping!
 
   class Sinatra::Application
 
-    register Sinatra::Mapping
-    helpers  Sinatra::MappingHelpers
-
     map :root,    "blog"    # /blog/
     map :entries, "posts"   # /blog/posts
     map :tags,    "labels"  # /blog/labels
@@ -157,12 +153,7 @@ Run:
 
 Open Web browser http://localhost:3000/blog/ and look ... it works!
 
-== More informations
-
-* See the {changes}[:link:CHANGES.html] for understand the goals of
-  that release version.
-* {License}[:link:LICENSE.html]
-
 == Copyright
 
 :include:LICENSE
+

data/Rakefile

@@ -1,7 +1,12 @@
-require 'rdoc'
+begin
+  require 'hanna/rdoctask'
+rescue LoadError
+  require 'rdoc'
+  require 'rake/rdoctask'
+end
+
 require 'rake/testtask'
 require 'rake/gempackagetask'
-require 'rake/rdoctask'
 load    'sinatra-mapping.gemspec'
 
 def current_version(file = "VERSION")
@@ -48,16 +53,17 @@ Rake::GemPackageTask.new(@spec) do |pkg|
   pkg.need_tar_bz2 = true
 end
 
+desc "Generate RDoc API documentation."
 Rake::RDocTask.new("doc:api") do |rdoc|
-  rdoc.title    = "Sinatra::Mapping - API Documentation"
-  rdoc.main     = "README.rdoc"
-  rdoc.options  = [ '-SHN', '-f', 'darkfish' ]
-  rdoc.rdoc_dir = 'doc'
-  rdoc.rdoc_files.include(
-    "CHANGES",
-    "LICENSE",
-    "README.rdoc",
-    "lib/**/*.rb"
-  )
+  rdoc.title    = %q{Sinatra::Mapping - API Documentation}
+  rdoc.main     = %q{README.rdoc}
+  rdoc.options  = %w{--line-numbers --show-hash}
+  rdoc.rdoc_dir = %q{doc/api}
+  rdoc.rdoc_files.include %w{
+    CHANGES
+    LICENSE
+    README.rdoc
+    lib/**/*.rb
+  }
 end
 

data/VERSION

@@ -3,5 +3,5 @@
 :date: 2009-08-25
 :cycle: Stable release
 :major: 1
-:minor: 0
-:patch: 7
+:minor: 1
+:patch: 0

data/lib/sinatra/mapping.rb

@@ -4,109 +4,220 @@ require 'sinatra/base'
 # {official site}[http://www.sinatrarb.com/].
 module Sinatra
 
-  # This extension is useful for any Web application written using
-  # Sinatra DSL. The main goal is help developers to write URL path
-  # methods.
-  module Mapping
-
-    # All location paths mapped.
-    attr_reader :locations
-
-    # Write URL path method for use in HTTP methods.
-    #
-    # The map method most be used by following syntax:
-    #
-    #   map <name>, <path>
-    #
-    # If name is equal :root, then returns path ended by slash "/".
-    #
-    #   map :root,    "tasks"       # => /tasks/
-    #   map :changes, "last-changes # => /tasks/last-changes
-    def map(name, path = nil)
-      @locations ||= {}
-      if name.to_sym == :root
-        @locations[:root] = cleanup_paths("/#{path}/")
-        metadef "#{name}_path" do |*paths|
-          cleanup_paths("/#{@locations[:root]}/?")
-        end
-      else
-        @locations[name.to_sym] = cleanup_paths(path || name.to_s)
-        metadef "#{name}_path" do |*paths|
-          map_path_to(@locations[name.to_sym], *paths << "/?")
-        end
+# Copyright (c) 2009 Hallison Batista
+#
+# This extension is useful for any Web application written using
+# Sinatra DSL. The main goal is help developers to write URL path
+# methods.
+module Mapping
+
+  # All location paths mapped.
+  attr_reader :locations
+
+  # Write URL path method for use in HTTP methods.
+  #
+  # The map method most be used by following syntax:
+  #
+  #   map <name>, <path>
+  #
+  # If name is equal :root, then returns path ended by slash "/".
+  #
+  #   map :root,    "tasks"       # => /tasks/
+  #   map :changes, "last-changes # => /tasks/last-changes
+  def map(name, path = nil)
+    @locations ||= {}
+    if name.to_sym == :root
+      @locations[:root] = cleanup_paths("/#{path}/")
+      metadef "#{name}_path" do |*paths|
+        cleanup_paths("/#{@locations[:root]}/?")
+      end
+    else
+      @locations[name.to_sym] = cleanup_paths(path || name.to_s)
+      metadef "#{name}_path" do |*paths|
+        map_path_to(@locations[name.to_sym], *paths << "/?")
       end
     end
+  end
+
+  # Auto mapping from a hash. This method is very useful.
+  # Example:
+  #
+  #   # In Web application.
+  #   class WebApp << Sinatra::Base
+  #     mapping :root   => "tasks",   # /tasks
+  #             :status => "changes"  # /tasks/changes
+  #   end
+  #
+  # Or, it's possible use from configuration file.
+  #
+  #   # YAML file "settings.yml".
+  #   mapping:
+  #     root: tasks
+  #     status: changes
+  #
+  #   # In Sinatra application.
+  #   mapping YAML.load_file("settings.yml")[:mapping]
+  #   # root_path   # /tasks
+  #   # status_path # /tasks/changes
+  def mapping(hash)
+    hash.each do |name, path|
+      map name, path
+    end
+  end
+
+  # Returns URL path with query instructions.
+  # This method has been extracted from
+  # http://wiki.github.com/sinatra/sinatra/howto-generate-links.
+  def build_path_to(script_name = nil, *args)
+    args.compact!
+    query = args.pop if args.last.kind_of?(Hash)
+    path  = map_path_to(script_name, *args)
+    path << "?" << Rack::Utils::build_query(query) if query
+    path
+  end
+
+  # Register automatically all helpers in base application.
+  def self.registered(app)
+    app.helpers Mapping::Helpers
+  end
+
+private
+
+  # 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)
+    script_name = args.shift if args.first.to_s =~ %r{^/\w.*}
+    path_mapped(script_name, *locations_get_from(*args))
+  end
+
+  # Returns all paths mapped by root path in prefix.
+  def path_mapped(script_name, *args)
+    return cleanup_paths("/#{script_name}/#{@locations[:root]}") if args.empty?
+    cleanup_paths("/#{script_name}/#{@locations[:root]}/#{args.join('/')}")
+  end
+
+  # Get paths from location maps.
+  def locations_get_from(*args)
+    args.flatten.reject do |path|
+      path == :root
+    end.collect do |path|
+      @locations[path] || path
+    end
+  end
+
+  # Clean all duplicated slashes.
+  def cleanup_paths(*paths)
+    #.gsub(%r{#{@locations[:root]}/#{@locations[:root]}}, @locations[:root])
+    paths.join('/').gsub(/[\/]{2,}/,'/')
+  end
+
+  # This module contains several helper methods for paths written using 
+  # {map}[:link:./Sinatra/Mapping.html#map] method.
+  module Helpers
+
+    # Creates a title using a path mapped. Otherwise, returns just arguments
+    # joined by spaces and capitalised.
+    #
+    #   # In Sinatra application
+    #
+    #   map :posts,   "articles"
+    #   map :tags,    "labels"
+    #   map :archive, "archive/articles"
+    #
+    #   # In views
+    #
+    #   <%=title_path :posts%>
+    #   # => "Articles"
+    #
+    #   <%=title_path :tags%>
+    #   # => "Labels"
+    #
+    #   <%=title_path :archive%>
+    #   # => "Archive articles"
+    def title_path(path, *args)
+      title = (options.locations[path] || path).to_s.gsub('/',' ').strip
+      title.gsub!(/\W/,' ') # Cleanup
+      (args.empty? ? title : "#{title} #{args.join(' ')}").strip.capitalize
+    end
 
-    # Auto mapping from a hash. This method is very useful.
-    # Example:
+    # Creates anchor links for name and extract path and HTML options from
+    # arguments. Example:
     #
-    #   # In Web application.
-    #   class WebApp << Sinatra::Base
-    #     mapping :root   => "tasks",   # /tasks
-    #             :status => "changes"  # /tasks/changes
+    #   # In Sinatra application, add a map.
+    #
+    #   map :tasks,  "tasks"
+    #   map :status, "tasks/status"
+    #
+    #   get tasks_path do
+    #     erb :tasks, :locals => { :name => params.values.join(', ') }
     #   end
     #
-    # Or, it's possible use from configuration file.
+    #   get status_path do
+    #     erb :status, :locals => { :status => "finished" }
+    #   end
     #
-    #   # YAML file "settings.yml".
-    #   mapping:
-    #     root: tasks
-    #     status: changes
+    #   # In status view, add a link to status map.
     #
-    #   # In Sinatra application.
-    #   mapping YAML.load_file("settings.yml")[:mapping]
-    #   # root_path   # /tasks
-    #   # status_path # /tasks/changes
-    def mapping(hash)
-      hash.each do |name, path|
-        map name, path
-      end
+    #   <%= link_to "All finished", :status, status %>
+    #   # => <a href="/tasks/status/finished">All finished</a>
+    #
+    #   <%= link_to "All finished", :status, :name => status %>
+    #   # => <a href="/tasks/status?name=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.*?:/
+      args   << extract_query_attributes(options)
+      "<a href=\"#{url || path_to(*args)}\"#{extract_link_attributes(options)}>#{name || url}</a>"
     end
 
-    # Returns URL path with query instructions.
-    # This method has been extracted from
-    # http://wiki.github.com/sinatra/sinatra/howto-generate-links.
-    def build_path_to(script_name = nil, *args)
-      args.compact!
-      query = args.pop if args.last.kind_of?(Hash)
-      path  = map_path_to(script_name, *args)
-      path << "?" << Rack::Utils::build_query(query) if query
-      path
+    # Returns all paths with query parameters. Example:
+    #
+    #   # In Sinatra application:
+    #
+    #   map :post, "articles"
+    #   map :tags, "labels"
+    #
+    #   # Use the following instructions:
+    #
+    #   path_to :tags, "ruby", :posts
+    #   # => "/labels/ruby/articles"
+    def path_to(*args)
+      options.build_path_to(env['SCRIPT_NAME'], *args)
     end
 
   private
 
-    # 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)
-      script_name = args.shift if args.first.to_s =~ %r{^/\w.*}
-      path_mapped(script_name, *locations_get_from(*args))
+    # Extract all tag attributes from a hash keys and values.
+    def extract_link_attributes(hash)
+      select_link_attributes(hash).map do |attribute, value|
+        " #{attribute}=\"#{value}\""
+      end
     end
 
-    # Returns all paths mapped by root path in prefix.
-    def path_mapped(script_name, *args)
-      return cleanup_paths("/#{script_name}/#{@locations[:root]}") if args.empty?
-      cleanup_paths("/#{script_name}/#{@locations[:root]}/#{args.join('/')}")
+    # Returns only attributes for link tag.
+    def select_link_attributes(hash)
+      hash.select{ |key, value| link_attributes.include?key }
     end
 
-    # Get paths from location maps.
-    def locations_get_from(*args)
-      args.flatten.reject do |path|
-        path == :root
-      end.collect do |path|
-        @locations[path] || path
-      end
+    # Select all keys and values that not included in link attributes.
+    def extract_query_attributes(hash)
+      query = hash.select{ |key, value| !link_attributes.include?key }.flatten
+      Hash[*query] unless query.empty?
     end
 
-    # Clean all duplicated slashes.
-    def cleanup_paths(*paths)
-      #.gsub(%r{#{@locations[:root]}/#{@locations[:root]}}, @locations[:root])
-      paths.join('/').gsub(/[\/]{2,}/,'/')
+    # Attribute list for link tag.
+    def link_attributes
+      [:accesskey, :charset, :coords, :hreflang, :id, :lang, :name, :onblur,
+      :onclick, :ondblclick, :onfocus, :onkeydown, :onkeypress, :onkeyup,
+      :onmousedown, :onmousemove, :onmouseout, :onmouseover, :onmouseup,
+      :rel, :rev, :shape, :style, :tabindex, :target, :title, :type]
     end
 
-  end # module Mapping
+  end # module Helpers
+
+end # module Mapping
 
-  register Mapping
+register Mapping
 
 end # module Sinatra
 

data/test/classic_mapping_test.rb

@@ -0,0 +1,113 @@
+$LOAD_PATH.unshift("#{File.dirname(__FILE__)}/..")
+
+require 'rubygems'
+require 'test/unit'
+require 'rack/test'
+require 'ruby-debug'
+
+require 'test/fixtures/classic_application'
+
+class ModularTestMapping < Test::Unit::TestCase
+
+  include Rack::Test::Methods
+
+  def setup
+    @date = Date.today
+    @link_paths = {
+      :root_path    => "/test/blog",
+      :posts_path   => "/test/blog/articles",
+      :archive_path => "/test/blog/archive/articles",
+      :about_path   => "/test/blog/about",
+      :search_path  => "/test/blog/find-articles",
+      :drafts_path  => "/test/blog/unpublished"
+    }
+    @root_paths = @link_paths.inject({}) do |hash, (name, path)|
+      hash[name] = "#{path}/"
+      hash
+    end
+    @paths = @root_paths.inject({}) do |hash, (name, path)|
+      hash[name] = "#{path}?"
+      hash
+    end
+  end
+
+  def app
+    @app = ::ModularApplication
+    @app.set :environment, :test
+    @app
+  end
+
+  def test_check_map_locations
+    @paths.each do |name, location|
+      path = location.gsub(/\/test/,'')
+      assert_equal path, app.send(name)
+    end
+  end
+
+  def test_should_return_ok_in_root_path
+    get app.root_path do |response|
+      assert response.ok?
+      assert_equal "http://example.org#{@root_paths[:root_path]}", last_request.url
+      assert_equal "Blog path:#{@link_paths[:root_path]}/", response.body
+    end
+  end
+
+  def test_should_return_ok_in_posts_path
+    get app.posts_path do |response|
+      assert response.ok?
+      assert_equal "http://example.org#{@root_paths[:posts_path]}", last_request.url
+      assert_equal "Articles published:#{@link_paths[:posts_path]}", response.body
+    end
+
+    path_id = "#{@date.to_s.gsub('-','/')}/post-permalink"
+    get app.posts_path path_id do |response|
+      assert response.ok?
+      assert_equal "http://example.org#{@root_paths[:posts_path]}#{path_id}/", last_request.url
+      assert_equal "Articles:#{@link_paths[:posts_path]}/#{path_id}", response.body
+    end
+  end
+
+  def test_should_return_ok_in_archive_path
+    get app.archive_path do |response|
+      assert response.ok?
+      assert_equal "http://example.org#{@root_paths[:archive_path]}", last_request.url
+      assert_equal "Archive articles:#{@link_paths[:archive_path]}", response.body
+    end
+
+    path_id =  "#{@date.to_s.gsub('-','/')}/post-permalink"
+    get app.archive_path path_id do |response|
+      assert response.ok?
+      assert_equal "http://example.org#{@root_paths[:archive_path]}#{path_id}/", last_request.url
+      assert_equal "Archive articles:#{@link_paths[:archive_path]}/#{path_id}", response.body
+    end
+  end
+
+  def test_should_return_ok_in_about_path
+    get app.about_path do |response|
+      assert response.ok?
+      assert_equal "http://example.org#{@root_paths[:about_path]}", last_request.url
+      assert_equal "About:#{@link_paths[:about_path]}", response.body
+    end
+  end
+
+  def test_should_return_ok_in_search_path
+    path_params = "keywords=ruby"
+    get app.search_path, :keywords => "ruby" do |response|
+      assert response.ok?
+      assert_equal "http://example.org#{@root_paths[:search_path]}?keywords=ruby", last_request.url
+      assert_equal "Find articles:#{@link_paths[:search_path]}?keywords=ruby", response.body.split("\n")[0]
+      assert_equal "<a href=\"#{@link_paths[:search_path]}\" title=\"Search\">Search</a>", response.body.split("\n")[1]
+      assert_equal "<a href=\"#{@link_paths[:search_path]}?keywords=ruby\" title=\"Search\">Search</a>", response.body.split("\n")[2]
+    end
+  end
+
+  def test_should_check_path_method_with_array_params
+    get app.drafts_path do |response|
+      assert response.ok?
+      assert_equal "Unpublished:#{@link_paths[:drafts_path]}/articles", response.body.split("\n")[0]
+      body_link = "<a href=\"#{@link_paths[:drafts_path]}/articles\" title=\"Unpublished\">Unpublished</a>"
+      assert_equal body_link, response.body.split("\n")[1]
+    end
+  end
+end
+

data/test/fixtures/classic_application.rb

@@ -0,0 +1,63 @@
+require 'rubygems'
+$LOAD_PATH.unshift("#{File.dirname(__FILE__)}/../../lib/")
+
+require 'sinatra'
+require 'sinatra/mapping'
+require 'ruby-debug'
+
+#class Sinatra::Application
+#  def env
+#    @env.update('SCRIPT_NAME' => '/test')
+#  end
+#end
+
+map :root,  "blog"   # root_path    => /blog/
+map :about           # about_path   => /blog/about
+
+mapping :posts   => "articles",         # posts_path   => /blog/articles
+        :archive => "archive/articles", # archive_path => /blog/archive/articles
+        :search  => "find-articles",    # search_path  => /blog/find-articles
+        :drafts  => "unpublished"       # drafts_path  => /blog/unpublished
+
+before do
+  @date = Date.today
+end
+
+get root_path do
+  "#{title_path :root, :path}:#{path_to :root}"
+end
+
+get posts_path do
+  "#{title_path :posts, :published}:#{path_to :posts}"
+end
+
+get posts_path "/:year/:month/:day/:permalink" do |year, month, day, permalink|
+  "#{title_path :posts}:" + path_to(:posts, "#{@date.to_s.gsub('-','/')}/#{permalink}")
+end
+
+get archive_path do
+  "#{title_path :archive}:#{path_to :archive}"
+end
+
+get archive_path "/:year/:month/:day/:permalink" do |year, month, day, permalink|
+  "#{title_path :archive}:" + path_to(:archive, "#{@date.to_s.gsub('-','/')}/#{permalink}")
+end
+
+get about_path do
+  "#{title_path :about}:#{path_to :about}"
+end
+
+get search_path do
+  <<-end_content.gsub(/^      /,'')
+    #{title_path :search}:#{path_to :search, :keywords => 'ruby'}
+    #{link_to "Search", :search, :title => 'Search'}
+    #{link_to "Search", :search, :title => 'Search', :keywords => 'ruby'}
+  end_content
+end
+
+get drafts_path do
+  <<-end_content.gsub(/^      /,'')
+    #{title_path :drafts}:#{path_to [:drafts, :posts]}
+    #{link_to "Unpublished", :drafts, :posts, :title => 'Unpublished'}
+  end_content
+end

data/test/fixtures/modular_application.rb

@@ -3,7 +3,6 @@ $LOAD_PATH.unshift("#{File.dirname(__FILE__)}/../../lib/")
 require 'rubygems'
 require 'sinatra/base'
 require 'sinatra/mapping'
-require 'sinatra/mapping_helpers'
 
 class Sinatra::Base
   def env
@@ -14,7 +13,6 @@ end
 class ModularApplication < Sinatra::Base
 
   register Sinatra::Mapping
-  helpers  Sinatra::MappingHelpers
 
   map :root,  "blog"   # root_path    => /blog/
   map :about           # about_path   => /blog/about

data/test/modular_mapping_test.rb

@@ -47,23 +47,23 @@ class ModularTestMapping < Test::Unit::TestCase
   def test_should_return_ok_in_root_path
     get app.root_path do |response|
       assert response.ok?
-      assert_equal "http://example.org#{@paths[:root_path]}", last_request.url
-      assert_equal "Blog path:#{@link_paths[:root_path]}", response.body
+      assert_equal "http://example.org#{@root_paths[:root_path]}", last_request.url
+      assert_equal "Blog path:#{@link_paths[:root_path]}/", response.body
     end
   end
 
   def test_should_return_ok_in_posts_path
     get app.posts_path do |response|
       assert response.ok?
-      assert_equal "http://example.org#{@paths[:posts_path]}", last_request.url
+      assert_equal "http://example.org#{@root_paths[:posts_path]}", last_request.url
       assert_equal "Articles published:#{@link_paths[:posts_path]}", response.body
     end
 
-    path = app.posts_path "/#{@date.to_s.gsub('-','/')}/post-permalink"
-    get path do |response|
+    path_id = "#{@date.to_s.gsub('-','/')}/post-permalink"
+    get app.posts_path path_id do |response|
       assert response.ok?
-      assert_equal "http://example.org/test#{path}", last_request.url
-      assert_equal "Articles:/test#{path}", response.body
+      assert_equal "http://example.org#{@root_paths[:posts_path]}#{path_id}/", last_request.url
+      assert_equal "Articles:#{@link_paths[:posts_path]}/#{path_id}", response.body
     end
   end
 
@@ -74,11 +74,11 @@ class ModularTestMapping < Test::Unit::TestCase
       assert_equal "Archive articles:#{@link_paths[:archive_path]}", response.body
     end
 
-    path = app.archive_path "/#{@date.to_s.gsub('-','/')}/post-permalink"
-    get path do |response|
+    path_id =  "#{@date.to_s.gsub('-','/')}/post-permalink"
+    get app.archive_path path_id do |response|
       assert response.ok?
-      assert_equal "http://example.org/test#{path}", last_request.url
-      assert_equal "Archive articles:/test#{path}", response.body
+      assert_equal "http://example.org#{@root_paths[:archive_path]}#{path_id}/", last_request.url
+      assert_equal "Archive articles:#{@link_paths[:archive_path]}/#{path_id}", response.body
     end
   end
 
@@ -91,19 +91,20 @@ class ModularTestMapping < Test::Unit::TestCase
   end
 
   def test_should_return_ok_in_search_path
-    get "#{app.search_path}?keywords=ruby" do |response|
+    path_params = "keywords=ruby"
+    get app.search_path, :keywords => "ruby" do |response|
       assert response.ok?
-      assert_equal "http://example.org#{@paths[:search_path]}?keywords=ruby", last_request.url
-      assert_equal "Find articles:#{@paths[:search_path]}?keywords=ruby", response.body.split("\n")[0]
-      assert_equal "<a href=\"#{@paths[:search_path]}\" title=\"Search\">Search</a>", response.body.split("\n")[1]
-      assert_equal "<a href=\"#{@paths[:search_path]}?keywords=ruby\" title=\"Search\">Search</a>", response.body.split("\n")[2]
+      assert_equal "http://example.org#{@root_paths[:search_path]}?keywords=ruby", last_request.url
+      assert_equal "Find articles:#{@link_paths[:search_path]}?keywords=ruby", response.body.split("\n")[0]
+      assert_equal "<a href=\"#{@link_paths[:search_path]}\" title=\"Search\">Search</a>", response.body.split("\n")[1]
+      assert_equal "<a href=\"#{@link_paths[:search_path]}?keywords=ruby\" title=\"Search\">Search</a>", response.body.split("\n")[2]
     end
   end
 
   def test_should_check_path_method_with_array_params
     get app.drafts_path do |response|
       assert response.ok?
-      assert_equal "Unpublished:#{@link_paths[:drafts_path]}/articles".squeeze('/'), response.body.split("\n")[0]
+      assert_equal "Unpublished:#{@link_paths[:drafts_path]}/articles", response.body.split("\n")[0]
       body_link = "<a href=\"#{@link_paths[:drafts_path]}/articles\" title=\"Unpublished\">Unpublished</a>"
       assert_equal body_link, response.body.split("\n")[1]
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra-mapping
 version: !ruby/object:Gem::Version 
-  version: 1.0.7
+  version: 1.1.0
 platform: ruby
 authors: 
 - Hallison Batista
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.0.0
+        version: 0.9.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: sinatra
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.2
+        version: 0.9.1.1
     version: 
 description: Sinatra mapping extension is a minimal module that is useful for create map names for Sinatra web application.
 email: email@hallisonbatista.com
@@ -49,10 +49,10 @@ files:
 - Rakefile
 - VERSION
 - lib/sinatra/mapping.rb
-- lib/sinatra/mapping_helpers.rb
 - sinatra-mapping.gemspec
+- test/classic_mapping_test.rb
+- test/fixtures/classic_application.rb
 - test/fixtures/modular_application.rb
-- test/helper.rb
 - test/modular_mapping_test.rb
 has_rdoc: true
 homepage: http://sinatra-mapping.rubyforge.org/
@@ -83,7 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: sinatra-mapping
-rubygems_version: 1.3.3
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Sinatra mapping extension for web application.

data/lib/sinatra/mapping_helpers.rb

@@ -1,114 +0,0 @@
-module Sinatra
-
-  # This module contains several helper methods for paths written using 
-  # {map}[:link:./Sinatra/Mapping.html#map] method.
-  #
-  # For use this helper, add the following syntax in application source:
-  #
-  #   register Sinatra::MappingHelpers
-  module MappingHelpers
-
-    # Creates a title using a path mapped. Otherwise, returns just arguments
-    # joined by spaces and capitalised.
-    #
-    #   # In Sinatra application
-    #
-    #   map :posts,   "articles"
-    #   map :tags,    "labels"
-    #   map :archive, "archive/articles"
-    #
-    #   # In views
-    #
-    #   <%=title_path :posts%>
-    #   # => "Articles"
-    #
-    #   <%=title_path :tags%>
-    #   # => "Labels"
-    #
-    #   <%=title_path :archive%>
-    #   # => "Archive articles"
-    def title_path(path, *args)
-      title = (options.locations[path] || path).to_s.gsub('/',' ').strip
-      title.gsub!(/\W/,' ') # Cleanup
-      (args.empty? ? title : "#{title} #{args.join(' ')}").strip.capitalize
-    end
-
-    # Creates anchor links for name and extract path and HTML options from
-    # arguments. Example:
-    #
-    #   # In Sinatra application, add a map.
-    #
-    #   map :tasks,  "tasks"
-    #   map :status, "tasks/status"
-    #
-    #   get tasks_path do
-    #     erb :tasks, :locals => { :name => params.values.join(', ') }
-    #   end
-    #
-    #   get status_path do
-    #     erb :status, :locals => { :status => "finished" }
-    #   end
-    #
-    #   # In status view, add a link to status map.
-    #
-    #   <%= link_to "All finished", :status, status %>
-    #   # => <a href="/tasks/status/finished">All finished</a>
-    #
-    #   <%= link_to "All finished", :status, :name => status %>
-    #   # => <a href="/tasks/status?name=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.*?:/
-      args   << extract_query_attributes(options)
-      "<a href=\"#{url || path_to(*args)}\"#{extract_link_attributes(options)}>#{name || url}</a>"
-    end
-
-    # Returns all paths with query parameters. Example:
-    #
-    #   # In Sinatra application:
-    #
-    #   map :post, "articles"
-    #   map :tags, "labels"
-    #
-    #   # Use the following instructions:
-    #
-    #   path_to :tags, "ruby", :posts
-    #   # => "/labels/ruby/articles"
-    def path_to(*args)
-      options.build_path_to(env['SCRIPT_NAME'], *args)
-    end
-
-  private
-
-    # Extract all tag attributes from a hash keys and values.
-    def extract_link_attributes(hash)
-      select_link_attributes(hash).map do |attribute, value|
-        " #{attribute}=\"#{value}\""
-      end
-    end
-
-    # Returns only attributes for link tag.
-    def select_link_attributes(hash)
-      hash.select{ |key, value| link_attributes.include?key }
-    end
-
-    # Select all keys and values that not included in link attributes.
-    def extract_query_attributes(hash)
-      query = hash.select{ |key, value| !link_attributes.include?key }.flatten
-      Hash[*query] unless query.empty?
-    end
-
-    # Attribute list for link tag.
-    def link_attributes
-      [:accesskey, :charset, :coords, :hreflang, :id, :lang, :name, :onblur,
-       :onclick, :ondblclick, :onfocus, :onkeydown, :onkeypress, :onkeyup,
-       :onmousedown, :onmousemove, :onmouseout, :onmouseover, :onmouseup,
-       :rel, :rev, :shape, :style, :tabindex, :target, :title, :type]
-    end
-
-  end # module MappingHelpers
-
-  helpers MappingHelpers
-
-end # module Sinatra
-

data/test/helper.rb

@@ -1,6 +0,0 @@
-class Sinatra::Application
-  def env
-    @env.update('SCRIPT_NAME' => '/test')
-  end
-end
-