merb 0.0.1 → 0.0.2

data/test/unit/route_matcher_test.rb

@@ -1,8 +1,13 @@
 require File.dirname(__FILE__) + '/../test_helper'
 require File.dirname(__FILE__) + '/../../lib/merb'
-
+require 'set'
 class RouteMatcherTest < Test::Unit::TestCase
   
+  def assert_same_hash(hsh1, hsh2)
+    assert_equal hsh1.keys.map(&:to_s).sort_by{|k| k}, hsh2.keys.map(&:to_s).sort_by{|k| k}
+    assert_equal hsh1.values.map(&:to_s).sort_by{|k| k}, hsh2.values.map(&:to_s).sort_by{|k| k}
+  end
+  
   def setup
     Merb::RouteMatcher.prepare do |r|
       r.add '/foo/:bar/baz/:id', :class => 'Test', :method => 'foo'
@@ -25,28 +30,28 @@ class RouteMatcherTest < Test::Unit::TestCase
   
   def test_route_matching
     routes = Merb::RouteMatcher.new
-    assert_equal( {:class=>"Test", :bar=>"123", :id=>"456", :method=>"foo"}, routes.route_request("/foo/123/baz/456"))
+    assert_same_hash( {:class=>"Test", :id =>"456", :bar =>"123", :method=>"foo"}, routes.route_request("/foo/123/baz/456"))
     routes = Merb::RouteMatcher.new
-    assert_equal( {:class=>"Test", :there=>"jon", :guys=>"girls", :method=>"hello"},  routes.route_request( "/hey/jon/you/girls"))
+    assert_same_hash( {:class=>"Test", :guys =>"girls", :there =>"jon", :method=>"hello"},  routes.route_request( "/hey/jon/you/girls"))
     routes = Merb::RouteMatcher.new
-    assert_equal({:class=>"upload", :id=>"12", :method=>"test"},routes.route_request( "/upload/test/12"))
+    assert_same_hash({:class=>"upload", :id=>"12", :method=>"test"},routes.route_request( "/upload/test/12"))
     routes = Merb::RouteMatcher.new
-    assert_equal({:class=>"nik",  :method=>"nak"},routes.route_request( "/nik/nak"))
+    assert_same_hash({:class=>"nik",  :method=>"nak"},routes.route_request( "/nik/nak"))
     routes = Merb::RouteMatcher.new
-    assert_equal({:class=>"lots",  :method=>"of", :id => "12"},routes.route_request( "/lots/of/12"))
+    assert_same_hash({:class=>"lots",  :method=>"of", :id => "12"},routes.route_request( "/lots/of/12"))
     routes = Merb::RouteMatcher.new
-    assert_equal({:class => 'NoRouteFound', :method => 'noroute'},routes.route_request( "/"))
+    assert_same_hash({:class => 'NoRouteFound', :method => 'noroute'},routes.route_request( "/"))
     routes = Merb::RouteMatcher.new
-    assert_equal({:class => 'NoRouteFound', :method => 'noroute'},routes.route_request( "/dfnasfnafn"))
+    assert_same_hash({:class => 'NoRouteFound', :method => 'noroute'},routes.route_request( "/dfnasfnafn"))
     routes = Merb::RouteMatcher.new
-    assert_equal( {:class=>"Upload", :routes=>"234", :sweet=>"yup", :method=>"start"}, routes.route_request( "/these/234/are/yup"))
+    assert_same_hash( {:class=>"Upload", :routes=>"234", :sweet=>"yup", :method=>"start"}, routes.route_request( "/these/234/are/yup"))
     routes = Merb::RouteMatcher.new
-    assert_equal( {:class=>"Test", :a=>"12", :c=>"red", :id=>"12", :f=>"blue"}, routes.route_request( '/h/12/b/red/d/blue/g/12'))
+    assert_same_hash( {:class=>"Test", :a=>"12", :c=>"red", :id=>"12", :f=>"blue"}, routes.route_request( '/h/12/b/red/d/blue/g/12'))
   end  
   
   def test_route_doesnt_match
     routes = Merb::RouteMatcher.new
-    assert_equal({:class=>"NoRouteFound", :method=>"noroute"},routes.route_request( '/hdsfvsdfsdfdsf'))
+    assert_same_hash({:class=>"NoRouteFound", :method=>"noroute"},routes.route_request( '/hdsfvsdfsdfdsf'))
   end
   
   def test_regexes_included_in_compiled_statement

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: merb
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
-date: 2006-10-15 00:00:00 -07:00
+  version: 0.0.2
+date: 2006-10-16 00:00:00 -07:00
 summary: Merb == Mongrel + Erb. Pocket rocket web framework.
 require_paths: 
 - lib
@@ -34,6 +34,24 @@ files:
 - Rakefile
 - server.rb
 - bin/merb
+- doc/rdoc
+- doc/rdoc/classes
+- doc/rdoc/created.rid
+- doc/rdoc/files
+- doc/rdoc/fr_class_index.html
+- doc/rdoc/fr_file_index.html
+- doc/rdoc/fr_method_index.html
+- doc/rdoc/index.html
+- doc/rdoc/rdoc-style.css
+- doc/rdoc/classes/Merb
+- doc/rdoc/classes/Merb.html
+- doc/rdoc/classes/Merb/Config.html
+- doc/rdoc/files/lib
+- doc/rdoc/files/LICENSE.html
+- doc/rdoc/files/README.html
+- doc/rdoc/files/server_rb.html
+- doc/rdoc/files/lib/merb_config_rb.html
+- doc/rdoc/files/lib/merb_rb.html
 - test/test_helper.rb
 - test/unit
 - test/unit/route_matcher_test.rb
@@ -52,12 +70,19 @@ files:
 - examples/sample_app/log
 - examples/sample_app/public
 - examples/sample_app/app/controllers
+- examples/sample_app/app/models
 - examples/sample_app/app/views
 - examples/sample_app/app/controllers/noroutefound.rb
+- examples/sample_app/app/controllers/posts.rb
 - examples/sample_app/app/controllers/test.rb
 - examples/sample_app/app/controllers/upload.rb
+- examples/sample_app/app/models/post.rb
+- examples/sample_app/app/views/posts
 - examples/sample_app/app/views/test
 - examples/sample_app/app/views/upload
+- examples/sample_app/app/views/posts/list.rhtml
+- examples/sample_app/app/views/posts/new.rhtml
+- examples/sample_app/app/views/posts/show.rhtml
 - examples/sample_app/app/views/test/foo.rhtml
 - examples/sample_app/app/views/test/hello.rhtml
 - examples/sample_app/app/views/upload/start.rhtml