sinatra-mapping 1.0.1 → 1.0.2

data/CHANGES

@@ -1,5 +1,8 @@
 = Changes
 
+[1.0.2 - July 2009]
+  * The method for creates paths with parameters has been fixed.
+
 [1.0.1 - July 2009]
   * The method for creates links has been fixed.
 

data/README.rdoc

@@ -1,5 +1,6 @@
-= Sinatra::Mapping - Map easily URLs paths
+= Sinatra::Mapping
 
+Map easily URLs paths.
 
 * {Repository}[http://github.com/hallison/sinatra-mapping]
 * {Project}[http://rubyforge.org/projects/sinatra-mapping]
@@ -33,10 +34,8 @@ Example:
     map :root,    "blog"              # => /blog/
     map :posts,   "articles"          # => /blog/articles
 
-    mapping do
-      :tags    => "labels"            # => /blog/labels
-      :archive => "archived-articles" # => /blog/archived-articles
-    end
+    mapping :tags    => "labels"            # => /blog/labels
+            :archive => "archived-articles" # => /blog/archived-articles
 
     get root_path do
       # /blog/

data/VERSION

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

data/lib/sinatra/mapping.rb

@@ -81,7 +81,7 @@ module Sinatra
 
     # Returns all paths mapped by root path in prefix.
     def path_mapped(*args)
-      !args.empty? ? cleanup_paths("/#{@root_path}/#{args.join('/')}") : @root_root
+      !args.empty? ? cleanup_paths("/#{@locations[:root]}/#{args.join('/')}") : @locations[:root]
     end
 
     # Get paths from location maps.

data/test/test_mapping.rb

@@ -15,8 +15,9 @@ class AppForTest < Sinatra::Base
   map :root   # root_path    => /
   map :about  # about_path   => /about
 
-  mapping :posts   => "articles",        # posts_path   => /articles
-          :archive => "archive/articles" # archive_path => /archive/articles
+  mapping :posts   => "articles",         # posts_path   => /articles
+          :archive => "archive/articles", # archive_path => /archive/articles
+          :search  => "find-articles"     # search_path  => /find-articles
 
   before do
     @date = Date.today
@@ -66,6 +67,10 @@ class AppForTest < Sinatra::Base
     redirect path_to(:about), 301
   end
 
+  get search_path do
+    "#{title_path :search}:#{path_to :search, :keywords => 'ruby'}"
+  end
+
 end
 
 class TestMapping < Test::Unit::TestCase
@@ -78,7 +83,8 @@ class TestMapping < Test::Unit::TestCase
       :root_path    => "/",
       :posts_path   => "/articles",
       :archive_path => "/archive/articles",
-      :about_path   => "/about"
+      :about_path   => "/about",
+      :search_path  => "/find-articles"
     }
   end
 
@@ -95,7 +101,7 @@ class TestMapping < Test::Unit::TestCase
   end
 
   def test_should_return_ok_in_root_path
-    get "#{@locations[:root_path]}" do |response|
+    get app.root_path do |response|
       assert response.ok?
       assert_equal "http://example.org#{@locations[:root_path]}", last_request.url
       assert_equal "Path:#{@locations[:root_path]}", response.body
@@ -103,19 +109,19 @@ class TestMapping < Test::Unit::TestCase
   end
 
   def test_should_return_ok_in_posts_path
-    get "#{@locations[:posts_path]}" do |response|
+    get app.posts_path do |response|
       assert response.ok?
       assert_equal "http://example.org#{@locations[:posts_path]}", last_request.url
       assert_equal "Articles published:#{@locations[:posts_path]}", response.body
     end
 
-    get "#{@locations[:posts_path]}/" do
+    get app.posts_path "/" do
       follow_redirect!
       assert last_response.ok?
       assert_equal "http://example.org#{@locations[:posts_path]}", last_request.url
     end
 
-    path = "#{@locations[:posts_path]}/#{@date.to_s.gsub('-','/')}/post-permalink"
+    path = app.posts_path "/#{@date.to_s.gsub('-','/')}/post-permalink"
     get path do |response|
       assert response.ok?
       assert_equal "http://example.org#{path}", last_request.url
@@ -131,19 +137,19 @@ class TestMapping < Test::Unit::TestCase
   end
 
   def test_should_return_ok_in_archive_path
-    get "#{@locations[:archive_path]}" do |response|
+    get app.archive_path do |response|
       assert response.ok?
       assert_equal "http://example.org#{@locations[:archive_path]}", last_request.url
       assert_equal "Archive articles:#{@locations[:archive_path]}", response.body
     end
 
-    get "#{@locations[:archive_path]}/" do
+    get app.archive_path "/" do
       follow_redirect!
       assert last_response.ok?
       assert_equal "http://example.org#{@locations[:archive_path]}", last_request.url
     end
 
-    path = "#{@locations[:archive_path]}/#{@date.to_s.gsub('-','/')}/post-permalink"
+    path = app.archive_path "/#{@date.to_s.gsub('-','/')}/post-permalink"
     get path do |response|
       assert response.ok?
       assert_equal "http://example.org#{path}", last_request.url
@@ -159,17 +165,26 @@ class TestMapping < Test::Unit::TestCase
   end
 
   def test_should_return_ok_in_about_path
-    get "#{@locations[:about_path]}" do |response|
+    get app.about_path do |response|
       assert response.ok?
       assert_equal "http://example.org#{@locations[:about_path]}", last_request.url
       assert_equal "About:#{@locations[:about_path]}", response.body
     end
 
-    get "#{@locations[:about_path]}/" do
+    get app.about_path "/" do
       follow_redirect!
       assert last_response.ok?
       assert_equal "http://example.org#{@locations[:about_path]}", last_request.url
     end
   end
+
+  def test_should_return_ok_in_search_path
+    get "#{app.search_path}?keywords=ruby" do |response|
+      assert response.ok?
+      assert_equal "http://example.org#{@locations[:search_path]}?keywords=ruby", last_request.url
+      assert_equal "Find articles:#{@locations[:search_path]}?keywords=ruby", response.body
+    end
+  end
+
 end
 

metadata

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