watts 0.0.5 → 0.0.6

data/Rakefile

@@ -22,7 +22,7 @@ spec = Gem::Specification.new { |s|
 		"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.5'
+	s.version = '0.0.6'
 }
 
 Rake::RDocTask.new(:doc) { |t|

data/doc/examples/matching.ru

@@ -0,0 +1,60 @@
+#!/usr/bin/env ruby
+# An illustration of the pattern-matching capabilities of Watts.  Some URLs to
+# try if you start this one up:
+# 	http://localhost:8080/strlen/foo (Which should tell you '3'.)
+# 	http://localhost:8080/fib/15 (Which should give you 987.)
+# 	http://localhost:8080/fib/foo (Which is a 404.  'foo' isn't a number!)
+# 	http://localhost:8080/fib/f (Which should give you 0x3db.)
+# 	http://localhost:8080/fib/0x15 (Which should give you 0x452f.)
+
+require 'watts'
+
+class MatchingDemo < Watts::App
+	class Strlen < Watts::Resource
+		# Takes an argument, and just returns the length of the argument.
+		get { |str| str.length.to_s + "\n" }
+	end
+
+	class Fibonacci < Watts::Resource
+		# This resource takes an argument for GET.  It is filled in by Watts
+		# according to the argument pattern passed into resource below.
+		get { |n| fib(n.to_i).to_s + "\n" }
+
+		# A naive, recursive, slow, text-book implementation of Fibonacci.
+		def fib(n)
+			if n < 2
+				1
+			else
+				fib(n - 1) + fib(n - 2)
+			end
+		end
+	end
+
+	# As above, but with a base-16 number.
+	class HexFibonacci < Fibonacci
+		get { |n| "0x" + fib(n.to_i(16)).to_s(16) + "\n" }
+	end
+
+	resource('/') {
+		# A symbol can be used to indicate an 'argument' component of a path,
+		# which is in turn passed to the resource's method as paths.  It will
+		# match anything, making it almost equivalent to just using an empty
+		# regex (see below), except that it can serve as documentation.
+		resource(['strlen', :str], Strlen)
+
+		resource('fib') {
+			# You can match arguments based on a regex.  The path component for
+			# the regex is passed to the resource's method as part of the
+			# argument list.
+			resource([/^[0-9]+$/], Fibonacci)
+
+			# As above, but here we use hexadecimal.  If the pattern for
+			# Fibonacci doesn't match, then we'll end up hitting this one.
+			resource([/^(0x)?[0-9a-f]+$/i], HexFibonacci)
+		}
+	}
+end
+
+app = MatchingDemo.new
+builder = Rack::Builder.new { run app }
+run builder

data/lib/watts.rb

@@ -155,7 +155,7 @@ module Watts
 			rm = env['REQUEST_METHOD'].downcase.to_sym
 			return(Errors[400]) unless Resource::HTTPMethods.include?(rm)
 
-			req_path ||= decypher_path env['REQUEST_PATH']
+			req_path ||= decypher_path env['PATH_INFO']
 			resource_class, args = match req_path
 
 			if resource_class

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: watts
 version: !ruby/object:Gem::Version 
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Pete Elmore
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-10 00:00:00 -08:00
+date: 2011-03-15 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,6 +26,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -48,6 +50,7 @@ files:
 - doc/examples/README
 - doc/examples/matching.rb
 - doc/examples/hoshi.rb
+- doc/examples/matching.ru
 - doc/LICENSE
 - Rakefile
 has_rdoc: true
@@ -64,6 +67,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -72,6 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"