watts 0.0.2 → 0.0.3

data/Rakefile

@@ -19,10 +19,10 @@ spec = Gem::Specification.new { |s|
 
 	s.name = 'watts'
 	s.summary =
-		"Another Rack-based web framework.  Yes, another one.  Sorry, guys."
+		"Resource-oriented, Rack-based, minimalist web framework."
 	s.homepage = "http://debu.gs/#{s.name}"
 	%w(metaid).each &s.method(:add_dependency)
-	s.version = '0.0.2'
+	s.version = '0.0.3'
 }
 
 Rake::RDocTask.new(:doc) { |t|
@@ -51,3 +51,8 @@ desc "Runs IRB, automatically require()ing #{spec.name}."
 task(:irb) {
 	exec "irb -Ilib -r#{spec.name}"
 }
+
+desc "Runs tests."
+task(:test) {
+	system "ruby -Ilib test/*_test.rb"
+}

data/lib/watts.rb

@@ -18,7 +18,7 @@ module Watts
 
 		def match path, args
 			if path.empty?
-				[resource, args]
+				[resource, args] if resource
 			elsif(sub = self[path[0]])
 				sub.match(path[1..-1], args)
 			else
@@ -36,6 +36,28 @@ module Watts
 			end
 		end
 
+		def rmatch res, args, acc = []
+			return "/#{acc.join('/')}" if args.empty? && resource == res
+
+			rest = args[1..-1]
+			accnext = acc.dup << args[0]
+
+			each { |k,sub|
+				t = sub.rmatch res, args, [k] + acc
+				return t if t
+
+				if k.kind_of?(Regexp) && k.match(args[0])
+					t = sub.rmatch res, rest, accnext
+					return t if t
+				elsif k.kind_of?(Symbol)
+					t = sub.rmatch res, rest, accnext
+					return t if t
+				end
+			}
+
+			nil
+		end
+
 		def_delegators :sub_paths, :'[]', :'[]=', :each
 	end
 
@@ -60,11 +82,12 @@ module Watts
 		def self.decypher_path p
 			return p if p.kind_of?(Array)
 			return [] if ['/', ''].include?(p)
+			return [p] if p.kind_of?(Regexp)
 			p = p.split('/')
 			p.select { |sub| sub != '' }
 		end
 
-		to_instance :path_map, :decypher_path
+		to_instance :path_map, :decypher_path, :path_to
 
 		# If you want your Watts application to do anything at all, you're very
 		# likely to want to call this method at least once.  The basic purpose
@@ -115,6 +138,12 @@ module Watts
 			res
 		end
 
+		# Given a resource (and, optionally, arguments if the path requires
+		# them), this method returns an absolute path to the resource.
+		def self.path_to res, *args
+			path_map.rmatch res, args
+		end
+
 		# Given a path, returns the matching resource, if any.
 		def match req_path
 			req_path = decypher_path req_path
@@ -249,7 +278,9 @@ module Watts
 		# By default, we return "405 Method Not Allowed" and set the Allow:
 		# header appropriately.
 		def default_http_method(*args)
-			[405, { 'Allow' => http_methods.join(', ') }, 'Method not allowed.']
+			[405,
+				{ 'Allow' => http_methods.join(', ') },
+				['Method not allowed.']]
 		end
 	end
 

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: watts
 version: !ruby/object:Gem::Version 
-  hash: 27
   prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Pete Elmore
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-02 00:00:00 -07:00
+date: 2011-01-27 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,7 +25,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -66,7 +64,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -75,7 +72,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -85,6 +81,6 @@ rubyforge_project:
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Another Rack-based web framework.  Yes, another one.  Sorry, guys.
+summary: Resource-oriented, Rack-based, minimalist web framework.
 test_files: []