watts 1.0.2 → 1.0.3

data/Rakefile

@@ -21,8 +21,8 @@ spec = Gem::Specification.new { |s|
 	s.summary =
 		"Resource-oriented, Rack-based, minimalist web framework."
 	s.homepage = "http://debu.gs/#{s.name}"
-	%w(metaid).each &s.method(:add_dependency)
-	s.version = '1.0.2'
+	%w().each &s.method(:add_dependency)
+	s.version = '1.0.3'
 }
 
 Rake::RDocTask.new(:doc) { |t|

data/lib/watts.rb

@@ -1,6 +1,5 @@
 %w(
 	forwardable
-	metaid
 	rack
 	watts/monkey_patching
 ).each &method(:require)
@@ -39,14 +38,14 @@ module Watts
 		def rmatch res, args, acc = []
 			return "/#{acc.join('/')}" if args.empty? && resource == res
 
-			rest = args[1..-1]
+			rest = args[1..-1] || []
 			accnext = acc.dup << args[0]
 
 			each { |k,sub|
-				t = sub.rmatch res, args, acc + [k]
-				return t if t
-
-				if k.kind_of?(Regexp) && k.match(args[0])
+				if k.kind_of?(String)
+					t = sub.rmatch res, args, acc + [k]
+					return t if t
+				elsif k.kind_of?(Regexp) && k.match(args[0])
 					t = sub.rmatch res, rest, accnext
 					return t if t
 				elsif k.kind_of?(Symbol)
@@ -210,7 +209,7 @@ module Watts
 		# response, and a method for generating a method.  You may also just
 		# def methods, as seen below for the options method.
 		HTTPMethods.each { |http_method|
-			meta_def(http_method) { |&b|
+			define_singleton_method(http_method) { |&b|
 				(http_methods << http_method.to_s.upcase).uniq!
 				bmname = "__#{http_method}".to_sym
 				define_method(bmname, &b)

data/lib/watts/monkey_patching.rb

@@ -1,7 +1,5 @@
 # This is the place to stuff all of the monkey-patches.
 
-require 'metaid'
-
 class Class
 	# Has instances delegate methods to the class.
 	def to_instance *ms

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: watts
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,19 +9,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-28 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: metaid
-  requirement: &9112260 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *9112260
+date: 2012-10-25 00:00:00.000000000 Z
+dependencies: []
 description: 
 email: pete@debu.gs
 executables: []