sinatra-mapping 0.2.0 → 0.2.1

data/CHANGES

@@ -1,5 +1,13 @@
 = Changes
 
+[0.2.1 - July 2009]
+    * The helper method for show title path has been fixed.
+
+    * Added new task for show the current version.
+
+[0.2.0 - July 2009]
+    * New method for mapping of paths has been added.
+
 [0.1.1 - July 2009]
   * New helper methods have been added.
 

data/Rakefile

@@ -4,21 +4,24 @@ require 'rake/gempackagetask'
 require 'rake/rdoctask'
 load    'sinatra-mapping.gemspec'
 
+def current_version(file = "VERSION")
+  @current_value ||= YAML.load_file(file) || {}
+end
+
 desc "Generate version for release and tagging."
 task :version, [:major, :minor, :patch, :release, :date, :cycle] do |taskspec, version|
   require 'parsedate'
-  current      = YAML.load_file(taskspec.name.upcase) || {}
-  version_date = Date.new(*ParseDate.parsedate(version[:date] || current[:date].to_s).compact) unless version or current
+  version_date = Date.new(*ParseDate.parsedate(version[:date] || current_version[:date].to_s).compact) unless version or current_version
   newer        = {
-    :major   => version[:major].to_i   || current[:major].to_i,
-    :minor   => version[:minor].to_i   || current[:minor].to_i,
-    :patch   => version[:patch].to_i   || current[:patch].to_i,
+    :major   => version[:major].to_i   || current_version[:major].to_i,
+    :minor   => version[:minor].to_i   || current_version[:minor].to_i,
+    :patch   => version[:patch].to_i   || current_version[:patch].to_i,
     :release => version[:release].to_s.empty? ? nil : version[:release].to_i,
     :date    => version_date           || Date.today,
-    :cycle   => version[:cycle]        || current[:cycle]
+    :cycle   => version[:cycle]        || current_version[:cycle]
   }
 
-  newer.merge(current) do |key, new_value, current_value|
+  newer.merge(current_version) do |key, new_value, current_value|
     new_value || current_value
   end
 
@@ -27,6 +30,16 @@ task :version, [:major, :minor, :patch, :release, :date, :cycle] do |taskspec, v
   end
 end
 
+namespace :version do
+  desc "Show the current version."
+  task :show do
+    version = [:major, :minor, :patch, :release].map do |info|
+      current_version[info]
+    end.compact.join('.')
+    puts "#{@spec.name} v#{version} released at #{current_version[:date]} (#{current_version[:cycle]})"
+  end
+end
+
 Rake::TestTask.new
 
 Rake::GemPackageTask.new(@spec) do |pkg|

data/VERSION

@@ -1,7 +1,7 @@
 --- 
 :release: 
-:date: 2009-07-18
+:date: 2009-07-20
 :cycle: Alpha release
 :major: 0
 :minor: 2
-:patch: 0
+:patch: 1

data/lib/sinatra/mapping.rb

@@ -9,6 +9,9 @@ module Sinatra
   # 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:
@@ -78,6 +81,7 @@ module Sinatra
 
     # Returns all paths mapped by root path in prefix.
     def path_mapped(*args)
+      puts "ARGS: #{args.inspect}"
       !args.empty? ? cleanup_paths("/#{@root_path}/#{args.join('/')}") : @root_root
     end
 

data/lib/sinatra/mapping_helpers.rb

@@ -11,9 +11,9 @@ module Sinatra
     # Creates a title using a path mapped. Otherwise, returns just arguments
     # joined by spaces and capitalised.
     def title_path(path, *args)
-      title = (options.send("#{path}_path") || path).to_s.gsub('/',' ').strip
+      title = (options.locations[path] || path).to_s.gsub('/',' ').strip
       title.gsub!(/\W/,' ') # Cleanup
-      (args.empty? ? title : "#{title} #{args.join(' ')}").capitalize
+      (args.empty? ? title : "#{title} #{args.join(' ')}").strip.capitalize
     end
 
     # Returns all paths with query parameters. Example:

data/test/test_mapping.rb

@@ -23,11 +23,11 @@ class AppForTest < Sinatra::Base
   end
 
   get root_path do
-    "#{title_path :root}:#{path_to :root}"
+    "#{title_path :root, :path}:#{path_to :root}"
   end
 
   get posts_path do
-    "#{title_path :posts}:#{path_to :posts}"
+    "#{title_path :posts, :published}:#{path_to :posts}"
   end
 
   get posts_path "/" do
@@ -98,7 +98,7 @@ class TestMapping < Test::Unit::TestCase
     get "#{@locations[:root_path]}" do |response|
       assert response.ok?
       assert_equal "http://example.org#{@locations[:root_path]}", last_request.url
-      assert_equal ":#{@locations[:root_path]}", response.body
+      assert_equal "Path:#{@locations[:root_path]}", response.body
     end
   end
 
@@ -106,7 +106,7 @@ class TestMapping < Test::Unit::TestCase
     get "#{@locations[:posts_path]}" do |response|
       assert response.ok?
       assert_equal "http://example.org#{@locations[:posts_path]}", last_request.url
-      assert_equal "Articles:#{@locations[:posts_path]}", response.body
+      assert_equal "Articles published:#{@locations[:posts_path]}", response.body
     end
 
     get "#{@locations[:posts_path]}/" do

metadata

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