rack-routes 0.1.1 → 0.2.0

data/lib/rack/routes.rb

@@ -2,9 +2,7 @@ require 'uri'
 
 module Rack
   class Routes
-    VERSION = '0.1.1'
-
-    class LocDirectiveError < RuntimeError; end
+    VERSION = '0.2.0'
 
     class << self
 
@@ -38,6 +36,8 @@ module Rack
       # === Args
       # +path+:: The path to match on. Can be String or Regexp.
       # +opts+:: Hash of options. see below.
+      # +app+:: Optional object which responds to :call
+      # +block+:: required if +app+ is missing
       #
       # +opts+ keys:
       # +:exact+:: Type of string matching. default false
@@ -53,6 +53,8 @@ module Rack
       #
       # yields +env+
       #
+      # raises ArgumentError if app or block is missing or if type is invalid
+      #
       # === Examples
       #
       # # config.ru
@@ -89,7 +91,12 @@ module Rack
       #
       # run Rack::Routes
 
-      def location path, opts = {}, &blk
+      def location path, *args, &blk
+        app = args.last.respond_to?(:call) ? args.pop : blk
+        raise ArgumentError, 'must provide either an app or a block' unless app
+
+        opts = Hash === args.last ? args.pop : {}
+
         type = opts.fetch(:type, nil)
         type = :regex if Regexp === path
         type ||= case opts.fetch(:exact, opts.fetch(:prefix, false))
@@ -101,11 +108,9 @@ module Rack
                    :string_break
                  end
 
-        raise LocDirectiveError, "unknown type `#{type}'" unless
+        raise ArgumentError, "unknown type `#{type}'" unless
           [:regex, :string, :exact, :string_break].include? type
 
-        app = blk
-
         locations[type] << [path, app, opts]
       end
 

data/test/test_rack_routes.rb

@@ -123,16 +123,34 @@ class TestRack::TestRoutes < RoutesTestCase
   end
 
   def test_invalid_types
-    assert_raises app::LocDirectiveError do
+    assert_raises ArgumentError do
       app.location '/', :prefix => nil do
       end
     end
-    assert_raises app::LocDirectiveError do
+    assert_raises ArgumentError do
       app.location '/', :prefix => 'unknown' do
       end
     end
   end
 
+  def test_app_or_block
+    app.location '/a', lambda{|e| '3' }
+    assert_location_match '3', '/a'
+
+    app.location '/b' do; '4' end
+    assert_location_match '4', '/b'
+
+    assert_raises ArgumentError do
+      app.location '/', 'doesnt respond to call'
+    end
+  end
+
+  def test_app_with_opts
+    app.location '/a', {:exact => true}, lambda{|e| '1'}
+
+    assert_equal '/a', app.locations[:exact][0][0]
+  end
+
   def assert_location_match expected, path, opts = {}
     @env.merge! opts
     @env['PATH_INFO'] = path

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-routes
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-22 00:00:00.000000000 Z
+date: 2012-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &10643260 !ruby/object:Gem::Requirement
+  requirement: &23243340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *10643260
+  version_requirements: *23243340
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &10642840 !ruby/object:Gem::Requirement
+  requirement: &23242740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: '2.13'
   type: :development
   prerelease: false
-  version_requirements: *10642840
+  version_requirements: *23242740
 description: ! 'Provides a routing layer for Rack similar to nginx location directive.
 
   http://wiki.nginx.org/HttpCoreModule#location