sinatra-mapping 1.0.4 → 1.0.5

data/CHANGES

@@ -1,5 +1,11 @@
 = Changes
 
+[1.0.5 - July 2009]
+  * Fixes in the HTML attributes into helper method for link attributes.
+  * Fixes in the map path method which check script name in environment.
+  * Improvements helper methods.
+  * Updates in documentation.
+
 [1.0.4 - July 2009]
   * Error in root path without application/script name has been fixed.
   * Helper for mapping has been registered automatically.

data/VERSION

@@ -1,7 +1,7 @@
 --- 
 :release: 
-:date: 2009-07-27
+:date: 2009-07-30
 :cycle: Release
 :major: 1
 :minor: 0
-:patch: 4
+:patch: 5

data/lib/sinatra/mapping.rb

@@ -52,10 +52,11 @@ module Sinatra
     #   mapping:
     #     root: tasks
     #     status: changes
-    #   # In Web application.
-    #   class WebApp << Sinatra::Base
-    #     mapping YAML.load_file("settings.yml")[:mapping]
-    #   end
+    #
+    #   # 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
@@ -63,11 +64,13 @@ module Sinatra
     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
+      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
 
@@ -76,17 +79,14 @@ 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)
-      script_name = args.shift if args.first.to_s =~ /\/\w.*/
+      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(script_name, *args)
-      if !args.empty?
-        cleanup_paths("/#{script_name}/#{@locations[:root]}/#{args.join('/')}")
-      else
-        cleanup_paths("/#{script_name}/#{@locations[:root]}")
-      end
+      return cleanup_paths("/#{script_name}/#{@locations[:root]}") if args.empty?
+      cleanup_paths("/#{script_name}/#{@locations[:root]}/#{args.join('/')}")
     end
 
     # Get paths from location maps.

data/lib/sinatra/mapping_helpers.rb

@@ -10,6 +10,23 @@ module Sinatra
 
     # 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
@@ -19,35 +36,44 @@ module Sinatra
     # Creates anchor links for name and extract path and HTML options from
     # arguments. Example:
     #
-    #   # In Web application, add a map.
+    #   # 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
-    #     status = "finished"
-    #     erb :status, :locals => { :status => status }
+    #     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.*?:/
-      "<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>"
+      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:
+    #   # In Sinatra application:
+    #
     #   map :post, "articles"
     #   map :tags, "labels"
-    #   # use the following instructions:
+    #
+    #   # Use the following instructions:
+    #
     #   path_to :tags, "ruby", :posts
-    #   # returns "/labels/ruby/articles"
+    #   # => "/labels/ruby/articles"
     def path_to(*args)
       options.build_path_to(env['SCRIPT_NAME'], *args)
     end
@@ -55,22 +81,31 @@ module Sinatra
   private
 
     # Extract all tag attributes from a hash keys and values.
-    def extract_tags_attributes(hash)
-      hash.select do |key, value|
-        [ :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 ].include? key
-      end.map do |attr, value|
-        "#{attr}=\"#{value}\""
+    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

data/test/test_mapping.rb

@@ -74,7 +74,11 @@ class AppForTest < Sinatra::Base
   end
 
   get search_path do
-    "#{title_path :search}:#{path_to :search, :keywords => 'ruby'}"
+    <<-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
 
 end
@@ -188,7 +192,9 @@ class TestMapping < Test::Unit::TestCase
     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
+      assert_equal "Find articles:#{@locations[:search_path]}?keywords=ruby", response.body.split("\n")[0]
+      assert_equal "<a href=\"#{@locations[:search_path]}\" title=\"Search\">Search</a>", response.body.split("\n")[1]
+      assert_equal "<a href=\"#{@locations[:search_path]}?keywords=ruby\" title=\"Search\">Search</a>", response.body.split("\n")[2]
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra-mapping
 version: !ruby/object:Gem::Version 
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors: 
 - Hallison Batista
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-27 00:00:00 -04:00
+date: 2009-07-30 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency