watts 1.0.3 → 1.0.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: e1090395dfbb1d65792a782eed0d9dbc90f3fed7
+  data.tar.gz: 23150b42d9ace03b338056648de0d67ee8d4174b
+SHA512:
+  metadata.gz: 97165d036da3a810ddf8bcea7296d0c426adbe5b0cc968bd3d000e9ef07338c6d7b255e30a26ea89521d9ba1a6505fb8c2a598d550a1a09c21e382d923886cf4
+  data.tar.gz: 0f7325024edf7b709b16071fe385a6be7cc0be9c09aa428154020fd265c059eb65a5f3a862b278bab816ebbd4d829917d718d6a93a1db187d933707cdba19bab

data/Rakefile

@@ -1,4 +1,4 @@
-require 'rake/gempackagetask'
+require 'rubygems/package_task'
 require 'rdoc/task'
 
 $: << "#{File.dirname(__FILE__)}/lib"
@@ -20,9 +20,9 @@ spec = Gem::Specification.new { |s|
 	s.name = 'watts'
 	s.summary =
 		"Resource-oriented, Rack-based, minimalist web framework."
-	s.homepage = "http://debu.gs/#{s.name}"
+	s.homepage = "http://github.com/pete/watts"
 	%w().each &s.method(:add_dependency)
-	s.version = '1.0.3'
+	s.version = '1.0.4'
 }
 
 Rake::RDocTask.new(:doc) { |t|
@@ -33,7 +33,7 @@ Rake::RDocTask.new(:doc) { |t|
 	t.rdoc_dir = 'doc/rdoc'
 }
 
-Rake::GemPackageTask.new(spec) { |pkg|
+Gem::PackageTask.new(spec) { |pkg|
 	pkg.need_tar_bz2 = true
 }
 desc "Cleans out the packaged files."
@@ -55,5 +55,8 @@ task(:irb) {
 desc "Runs tests."
 task(:test) {
 	tests = Dir['test/*_test.rb'].map { |t| "-r#{t}" }
+	if ENV['COVERAGE']
+		tests.unshift "-rtest/coverage"
+	end
 	system 'ruby', '-Ilib', '-I.', *tests, '-e', ''
 }

data/doc/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010 Peter Elmore (pete at debu.gs)
+Copyright (c) 2010-2016 Peter Elmore (pete at debu.gs)
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),

data/doc/TODO

@@ -1,2 +1,7 @@
 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.
+
+Tweaks to make inheritance behave better.
+
+Hooks?  I keep running into places where I'd like to have them, but a clean way
+to do this is not yet obvious.

data/doc/examples/README

@@ -1,5 +1,5 @@
 All of the examples are standalone Watts applications, which you can run
-directly.  To run them, you can use the command.
+directly.  To run them, you can use the command:
 	rackup file.ru
 
 * hello_world.ru is the most basic demonstration.

data/lib/watts.rb

@@ -1,6 +1,7 @@
 %w(
 	forwardable
 	rack
+	set
 	watts/monkey_patching
 ).each &method(:require)
 
@@ -74,6 +75,18 @@ module Watts
 					["501 Not Implemented.\n"]],
 		}
 
+		# The "empty" set.
+		ESet = Set.new(['/', ''])
+
+		# Method name cache.  Maps HTTP methods to object methods.
+		MNCache = Hash.new { |h,k|
+			h[k] = k.downcase.to_sym
+		}
+		# Prefill MNCache above with the likely culprits:
+		%w(
+			GET PUT POST DELETE OPTIONS HEAD TRACE CONNECT PATCH
+		).each &MNCache.method(:'[]')
+
 		class << self
 			attr_new Hash, :http_methods
 			attr_new Watts::Path, :path_map
@@ -83,11 +96,10 @@ module Watts
 
 		def self.decypher_path p
 			return p if p.kind_of?(Array)
-			return [] if ['/', ''].include?(p)
+			return [] if ESet.include?(p)
 			return [p] if p.kind_of?(Regexp)
-			p = p.split('/')
-			p.select { |sub| sub != '' }
-		end
+			p.split('/').tap { |a| a.reject!(&''.method(:'==')) }
+ 		end
 
 		to_instance :path_map, :decypher_path, :path_to
 
@@ -139,6 +151,8 @@ module Watts
 			end
 			res
 		end
+		# And because res(...) is a little less distracting than resource(...):
+		class << self; alias_method :res, :resource; end
 
 		# Given a resource (and, optionally, arguments if the path requires
 		# them), this method returns an absolute path to the resource.
@@ -154,15 +168,15 @@ module Watts
 
 		# Our interaction with Rack.
 		def call env, req_path = nil
-			rm = env['REQUEST_METHOD'].downcase.to_sym
+			rm = MNCache[env['REQUEST_METHOD']]
 			return(Errors[501]) unless Resource::HTTPMethods.include?(rm)
 
 			req_path ||= decypher_path env['PATH_INFO']
-			resource_class, args = match req_path
+			resource_class, args = path_map.match req_path, []
 
 			if resource_class
-				env = env.merge :watts_app => self
-				res = resource_class.new(env)
+				env[:watts_app] ||= self
+				res = resource_class.new env
 				res.send(rm, *args)
 			else
 				Errors[404]
@@ -199,7 +213,7 @@ module Watts
 	# (for OPTIONS) manually.  Have a look at the README and doc/examples.
 	class Resource
 		HTTPMethods =
-			[:get, :post, :put, :delete, :head, :options, :trace, :connect]
+			Set.new([:get, :post, :put, :delete, :head, :options, :trace, :connect])
 
 		class << self
 			attr_new Array, :http_methods
@@ -211,21 +225,23 @@ module Watts
 		HTTPMethods.each { |http_method|
 			define_singleton_method(http_method) { |&b|
 				(http_methods << http_method.to_s.upcase).uniq!
-				bmname = "__#{http_method}".to_sym
+				bmname = :"__#{http_method}"
 				define_method(bmname, &b)
 				define_method(http_method) { |*args|
 					begin
 						resp = send bmname, *args
 					rescue ArgumentError => e
 						# TODO:  Arity/path args mismatch handler here.
+						# ...Maybe.  It seems appropriate, but I've never
+						# needed it.
 						raise e
 					end
 
 					# TODO:  Problems.
 					case resp
 					when nil
-						[response.status, response.headers, [response.body]]
-					when Array
+						response
+					when Array, Rack::Response
 						resp
 					else
 						resp = resp.to_s
@@ -266,7 +282,7 @@ module Watts
 
 		to_instance :http_methods
 		attr_new Rack::Response, :response
-		attr_accessor :env, :response, :app
+		attr_accessor :env, :app
 
 		# Every resource, on being instantiated, is given the Rack env.
 		def initialize(env)
@@ -274,7 +290,6 @@ module Watts
 				self.app = app
 			end
 			self.env = env
-			self.response = Rack::Response.new
 		end
 
 		# The default options method, to comply with RFC 2616, returns a list

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: watts
 version: !ruby/object:Gem::Version
-  version: 1.0.3
-  prerelease: 
+  version: 1.0.4
 platform: ruby
 authors:
 - Pete Elmore
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-25 00:00:00.000000000 Z
+date: 2016-11-01 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: pete@debu.gs
@@ -19,38 +18,37 @@ extra_rdoc_files:
 - doc/LICENSE
 - doc/TODO
 files:
-- lib/watts.rb
-- lib/watts/monkey_patching.rb
+- Rakefile
+- doc/LICENSE
+- doc/TODO
+- doc/examples/README
 - doc/examples/environment.ru
-- doc/examples/hoshi.ru
 - doc/examples/hello_world.ru
-- doc/examples/README
+- doc/examples/hoshi.ru
 - doc/examples/matching.ru
-- doc/LICENSE
-- doc/TODO
-- Rakefile
-homepage: http://debu.gs/watts
+- lib/watts.rb
+- lib/watts/monkey_patching.rb
+homepage: http://github.com/pete/watts
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 2.5.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Resource-oriented, Rack-based, minimalist web framework.
 test_files: []