watts 0.0.6 → 0.0.7

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.6'
+	s.version = '0.0.7'
 }
 
 Rake::RDocTask.new(:doc) { |t|

data/doc/TODO

@@ -0,0 +1,2 @@
+Perhaps use Rack::URLMap where applicable (and transparent) to speed things up,
+provided it doesn't preclude things like changing the app on the fly.

data/doc/examples/README

@@ -1,10 +1,11 @@
 All of the examples are standalone Watts applications, which you can run
-directly.  They could all be pretty easily turned into rackup files.
+directly.  To run them, you can use the command.
+	rackup file.ru
 
-hello_world.rb is the most basic demonstration.
-matching.rb shows how Watts's pattern-matching works.
-hoshi.rb is a demonstration of the view-wrapping resource.
-environment.rb shows what you have to work with in your request.
+* hello_world.ru is the most basic demonstration.
+* matching.ru shows how Watts's pattern-matching works.
+* hoshi.ru is a demonstration of the view-wrapping resource.
+* environment.ru shows what you have to work with in your request.
 
 Although they're all single-file applications, there's nothing that
 prevents you from splitting things up arbitrarily.  It's all just Ruby.

data/doc/examples/{environment.rb → environment.ru}

@@ -1,4 +1,3 @@
-#!/usr/bin/env ruby
 # This example gives you a feel for the environment in which Watts::Resources
 # run.  By "environment", of course, I really just mean that the 'env' value
 # Rack gives you on requests is accessible from inside your resources.  You can
@@ -34,5 +33,4 @@ end
 
 app = WattsEnvironment.new
 builder = Rack::Builder.new { run app }
-
-Rack::Handler::Mongrel.run builder, :Port => 8080
+run builder

data/doc/examples/{hello_world.rb → hello_world.ru}

@@ -14,5 +14,4 @@ end
 
 app = Simple.new
 builder = Rack::Builder.new { run app }
-
-Rack::Handler::Mongrel.run builder, :Port => 8080
+run builder

data/doc/examples/{hoshi.rb → hoshi.ru}

@@ -27,5 +27,4 @@ end
 
 app = HelloHTML.new
 builder = Rack::Builder.new { run app }
-
-Rack::Handler::Mongrel.run builder, :Port => 8080
+run builder

data/lib/watts.rb

@@ -70,6 +70,9 @@ module Watts
 				[400, {'Content-Type' => 'text/plain'}, ["400 Bad Request.\n"]],
 			404 =>
 				[404, {'Content-Type' => 'text/plain'}, ["404 Not Found\n"]],
+			501 =>
+				[501, {'Content-Type' => 'text/plain'},
+					["501 Not Implemented.\n"]],
 		}
 
 		class << self
@@ -153,7 +156,7 @@ module Watts
 		# Our interaction with Rack.
 		def call env, req_path = nil
 			rm = env['REQUEST_METHOD'].downcase.to_sym
-			return(Errors[400]) unless Resource::HTTPMethods.include?(rm)
+			return(Errors[501]) unless Resource::HTTPMethods.include?(rm)
 
 			req_path ||= decypher_path env['PATH_INFO']
 			resource_class, args = match req_path

metadata

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

data/doc/examples/matching.rb

@@ -1,61 +0,0 @@
-#!/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 }
-
-Rack::Handler::Mongrel.run builder, :Port => 8080