mynyml-simple_router 0.8.1 → 0.9

data/README

@@ -22,10 +22,10 @@ class App
 
   def call(env)
     verb, path  = ENV['REQUEST_METHOD'], ENV['PATH_INFO']
-    route, args = self.class.routes.match(verb, path)
+    route = self.class.routes.match(verb, path)
     route.nil? ?
       [404, {'Content-Type' => 'text/html'}, '404 page not found'] :
-      [200, {'Content-Type' => 'text/html'}, route.action.call(*args)]
+      [200, {'Content-Type' => 'text/html'}, route.action.call(*route.values)]
   end
 end
 
@@ -46,6 +46,7 @@ example above:
   route.verb    = :get
   route.path    = '/archives/:year/:month/:day'
   route.action  = lambda {|year, month, day| Article.archived.find_by_date(year, month, day) }
+  route.values  = ['2008', '07', '01'] # after being matched with path '/archives/2008/07/01'
 
 See examples/ directory for executable code examples.
 
@@ -64,7 +65,7 @@ This allows, for instance, a new faster engine to be used by an app without
 changes in the top level DSL.
 
 Engines can also allow route definitions to include more (or less!) features.
-For example, the built-in SimpleEngine allows route variables and extention
+For example, the built-in SimpleEngine allows route variables and extension
 handling. Others could add variable conditions ( :id => Integer ), mime-type
 restrictions, etc.
 

data/Rakefile

@@ -22,7 +22,7 @@ end
 
 spec = Gem::Specification.new do |s|
   s.name            = 'simple_router'
-  s.version         = '0.8.1'
+  s.version         = '0.9'
   s.summary         = "Simple, minimalistic, standalone router meant to be used with pure rack applications."
   s.description     = "Simple, minimalistic, standalone router meant to be used with pure rack applications."
   s.author          = "Martin Aumont"

data/examples/rack_app.ru

@@ -35,10 +35,10 @@ class App
     verb = request.request_method.downcase.to_sym
     path = Rack::Utils.unescape(request.path_info)
 
-    route, args = self.class.routes.match(verb, path)
+    route = self.class.routes.match(verb, path)
     route.nil? ?
       [404, {'Content-Type' => 'text/html'}, '404 page not found'] :
-      [200, {'Content-Type' => 'text/html'}, [route.action.call(*args.push(request.params))]]
+      [200, {'Content-Type' => 'text/html'}, [route.action.call(*route.values.push(request.params))]]
   end
 end
 

data/lib/simple_router/routes.rb

@@ -6,29 +6,30 @@ module SimpleRouter
     end
 
     def match(verb, path)
-      none = [nil, nil]
-      return none if self.empty?
+      return nil if self.empty?
 
       verb = verb.to_s.downcase.strip.to_sym
 
       routes = self.select {|route| route.verb == verb }
       paths  = routes.map  {|route| route.path }
 
-      path, vars = SimpleRouter.engine.match(path, paths)
-      return none if path.nil?
+      path, values = SimpleRouter.engine.match(path, paths)
+      return nil if path.nil?
 
       route = routes.detect {|route| route.path == path }
-      [route, vars]
+      route.values = values
+      route
     end
 
     class Route
-      attr_accessor :verb,:path,:options,:action
+      attr_accessor :verb,:path,:options,:action, :values
 
       def initialize(verb, path, options, &action)
         self.verb    = verb
         self.path    = path
         self.options = options
         self.action  = action
+        self.values  = nil
       end
     end
   end

data/simple_router.gemspec

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: simple_router
 version: !ruby/object:Gem::Version 
-  version: 0.8.1
+  version: "0.9"
 platform: ruby
 authors: 
 - Martin Aumont
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-19 00:00:00 -04:00
+date: 2009-05-23 00:00:00 -04:00
 default_executable: 
 dependencies: []
 

data/test/engines/test_simple_engine.rb

@@ -33,7 +33,7 @@ class SimpleEngineTest < Test::Unit::TestCase
     vars.should be([])
   end
 
-  test "treats extention as pattern part" do
+  test "treats extension as pattern part" do
     path, vars = Base.match('/a/b.xml', ['/:foo/:bar', '/:foo/:bar.:type'])
     path.should be('/:foo/:bar.:type')
     vars.should be(['a','b','xml'])
@@ -65,7 +65,7 @@ class PatternTest < Test::Unit::TestCase
     pattern.vars.should be(%w( foo bar baz ))
   end
 
-  test "pattern variables with extention" do
+  test "pattern variables with extension" do
     path    = Path.new('/foo/bar/baz.xml')
     pattern = Pattern.new('/:a/:b/:c.:type')
 
@@ -73,35 +73,35 @@ class PatternTest < Test::Unit::TestCase
     pattern.vars.should be(%w( foo bar baz xml ))
   end
 
-  test "variable pattern matches a path with static extention" do
+  test "variable pattern matches a path with static extension" do
     path    = Path.new('/foo/bar.xml')
     pattern = Pattern.new('/:foo/:bar.xml')
 
     assert pattern == path
   end
 
-  test "variable pattern matches a path with variable extention" do
+  test "variable pattern matches a path with variable extension" do
     path    = Path.new('/foo/bar.xml')
     pattern = Pattern.new('/:foo/:bar.:type')
 
     assert pattern == path
   end
 
-  test "pattern without extention doesn't match path with extention" do
+  test "pattern without extension doesn't match path with extension" do
     path    = Path.new('/foo/bar.xml')
     pattern = Pattern.new('/:foo/:bar')
 
     assert pattern != path
   end
 
-  test "pattern with static extention doesn't match path without extention" do
+  test "pattern with static extension doesn't match path without extension" do
     path    = Path.new('/foo/bar')
     pattern = Pattern.new('/:foo/:bar.xml')
 
     assert pattern != path
   end
 
-  test "pattern with variable extention doesn't match path without extention" do
+  test "pattern with variable extension doesn't match path without extension" do
     path    = Path.new('/foo/bar')
     pattern = Pattern.new('/:foo/:bar.:type')
 
@@ -116,7 +116,7 @@ class PatternTest < Test::Unit::TestCase
     pattern.variables.should be(%w( foo bar.baz abc ))
   end
 
-  test "doesn't get confused with extention when path contains other dots" do
+  test "doesn't get confused with extension when path contains other dots" do
     path    = Path.new('/foo/bar.baz/abc.xml')
     pattern = Pattern.new('/:a/:b/:c.:type')
 

data/test/test_dsl.rb

@@ -33,6 +33,6 @@ class DslTest < Test::Unit::TestCase
     App.get('/bar') { 'bar' }
 
     App.routes.match(:get, '/foo').should_not  be( nil )
-    App.routes.match(:get, '/foo').first.action.call.should be('foo')
+    App.routes.match(:get, '/foo').action.call.should be('foo')
   end
 end

data/test/test_routes.rb

@@ -21,23 +21,23 @@ class RoutesTest < Test::Unit::TestCase
     @routes.add(:get, '/bar', {}, &@action)
 
     @routes.match(:get, '/bar').should_not  be(nil)
-    @routes.match(:get, '/bar').first.path.should be('/bar')
+    @routes.match(:get, '/bar').path.should be('/bar')
   end
 
   test "returns nil when no route matches" do
     @routes.add(:get, '/foo', {}, &@action)
     @routes.add(:get, '/bar', {}, &@action)
 
-    @routes.match('/baz', :get).should be([nil,nil])
+    @routes.match('/baz', :get).should be(nil)
   end
 
   test "normalizes passed in verb string" do
     @routes.add(:get, '/foo', {}, &@action)
     @routes.add(:get, '/bar', {}, &@action)
 
-    @routes.match('get',  '/bar').first.path.should be('/bar')
-    @routes.match('GET',  '/bar').first.path.should be('/bar')
-    @routes.match(' GET ','/bar').first.path.should be('/bar')
+    @routes.match('get',  '/bar').path.should be('/bar')
+    @routes.match('GET',  '/bar').path.should be('/bar')
+    @routes.match(' GET ','/bar').path.should be('/bar')
   end
 end
 
@@ -51,5 +51,6 @@ class RouteTest < Test::Unit::TestCase
     route.path    .should be(path)
     route.options .should be(options)
     route.action  .should be(action)
+    route.values  .should be(nil)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mynyml-simple_router
 version: !ruby/object:Gem::Version 
-  version: 0.8.1
+  version: "0.9"
 platform: ruby
 authors: 
 - Martin Aumont
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-18 21:00:00 -07:00
+date: 2009-05-22 21:00:00 -07:00
 default_executable: 
 dependencies: []