journey 1.0.0.rc1 → 1.0.0.rc2

data/.travis.yml

@@ -0,0 +1,6 @@
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - jruby
+  - rbx
+  - ree

data/CHANGELOG.rdoc

@@ -1,4 +1,4 @@
-=== 1.0.0 / 2011-03-08
+=== 1.0.0 / (not released)
 
 * 1 major enhancement
 

data/Gemfile

@@ -5,7 +5,10 @@
 source :gemcutter
 
 
-gem "minitest", "~>2.5", :group => [:development, :test]
-gem "hoe", "~>2.10", :group => [:development, :test]
+gem "minitest", "~>2.3", :group => [:development, :test]
+gem "racc", ">=1.4.6", :group => [:development, :test]
+gem "rdoc", "~>3.11", :group => [:development, :test]
+gem "json", ">=0", :group => [:development, :test]
+gem "hoe", "~>2.12", :group => [:development, :test]
 
 # vim: syntax=ruby

data/Manifest.txt

@@ -1,5 +1,6 @@
 .autotest
 .gemtest
+.travis.yml
 CHANGELOG.rdoc
 Gemfile
 Manifest.txt

data/Rakefile

@@ -16,6 +16,7 @@ Hoe.spec 'journey' do
   self.extra_rdoc_files = FileList['*.rdoc']
   self.extra_dev_deps += [
     ["racc",            ">= 1.4.6"],
+    ["rdoc",            "~> 3.11"],
     ["json"],
   ]
 end

data/journey.gemspec

@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = "journey"
-  s.version = "1.0.0.20111022124133"
+  s.version = "1.0.0.rc2.20111221114756"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Aaron Patterson"]
-  s.date = "2011-10-22"
+  s.date = "2011-12-21"
   s.description = "Journey is a router.  It routes requests."
   s.email = ["aaron@tenderlovemaking.com"]
   s.extra_rdoc_files = ["Manifest.txt", "CHANGELOG.rdoc", "README.rdoc"]
-  s.files = [".autotest", "CHANGELOG.rdoc", "Gemfile", "Manifest.txt", "README.rdoc", "Rakefile", "journey.gemspec", "lib/journey.rb", "lib/journey/backwards.rb", "lib/journey/core-ext/hash.rb", "lib/journey/formatter.rb", "lib/journey/gtg/builder.rb", "lib/journey/gtg/simulator.rb", "lib/journey/gtg/transition_table.rb", "lib/journey/nfa/builder.rb", "lib/journey/nfa/dot.rb", "lib/journey/nfa/simulator.rb", "lib/journey/nfa/transition_table.rb", "lib/journey/nodes/node.rb", "lib/journey/parser.rb", "lib/journey/parser.y", "lib/journey/parser_extras.rb", "lib/journey/path/pattern.rb", "lib/journey/route.rb", "lib/journey/router.rb", "lib/journey/router/strexp.rb", "lib/journey/router/utils.rb", "lib/journey/routes.rb", "lib/journey/scanner.rb", "lib/journey/visitors.rb", "lib/journey/visualizer/d3.min.js", "lib/journey/visualizer/fsm.css", "lib/journey/visualizer/fsm.js", "lib/journey/visualizer/index.html.erb", "lib/journey/visualizer/reset.css", "test/gtg/test_builder.rb", "test/gtg/test_transition_table.rb", "test/helper.rb", "test/nfa/test_simulator.rb", "test/nfa/test_transition_table.rb", "test/nodes/test_symbol.rb", "test/path/test_pattern.rb", "test/route/definition/test_parser.rb", "test/route/definition/test_scanner.rb", "test/router/test_strexp.rb", "test/router/test_utils.rb", "test/test_route.rb", "test/test_router.rb", "test/test_routes.rb", ".gemtest"]
+  s.files = [".autotest", ".gemtest", ".travis.yml", "CHANGELOG.rdoc", "Gemfile", "Manifest.txt", "README.rdoc", "Rakefile", "journey.gemspec", "lib/journey.rb", "lib/journey/backwards.rb", "lib/journey/core-ext/hash.rb", "lib/journey/formatter.rb", "lib/journey/gtg/builder.rb", "lib/journey/gtg/simulator.rb", "lib/journey/gtg/transition_table.rb", "lib/journey/nfa/builder.rb", "lib/journey/nfa/dot.rb", "lib/journey/nfa/simulator.rb", "lib/journey/nfa/transition_table.rb", "lib/journey/nodes/node.rb", "lib/journey/parser.rb", "lib/journey/parser.y", "lib/journey/parser_extras.rb", "lib/journey/path/pattern.rb", "lib/journey/route.rb", "lib/journey/router.rb", "lib/journey/router/strexp.rb", "lib/journey/router/utils.rb", "lib/journey/routes.rb", "lib/journey/scanner.rb", "lib/journey/visitors.rb", "lib/journey/visualizer/d3.min.js", "lib/journey/visualizer/fsm.css", "lib/journey/visualizer/fsm.js", "lib/journey/visualizer/index.html.erb", "lib/journey/visualizer/reset.css", "test/gtg/test_builder.rb", "test/gtg/test_transition_table.rb", "test/helper.rb", "test/nfa/test_simulator.rb", "test/nfa/test_transition_table.rb", "test/nodes/test_symbol.rb", "test/path/test_pattern.rb", "test/route/definition/test_parser.rb", "test/route/definition/test_scanner.rb", "test/router/test_strexp.rb", "test/router/test_utils.rb", "test/test_route.rb", "test/test_router.rb", "test/test_routes.rb"]
   s.homepage = "http://github.com/tenderlove/journey"
   s.rdoc_options = ["--main", "README.rdoc"]
   s.require_paths = ["lib"]
@@ -23,20 +23,26 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<minitest>, ["~> 2.6"])
+      s.add_development_dependency(%q<minitest>, ["~> 2.9"])
       s.add_development_dependency(%q<racc>, [">= 1.4.6"])
+      s.add_development_dependency(%q<rdoc>, ["~> 3.11"])
       s.add_development_dependency(%q<json>, [">= 0"])
       s.add_development_dependency(%q<hoe>, ["~> 2.12"])
+      s.add_development_dependency(%q<rdoc>, ["~> 3.10"])
     else
-      s.add_dependency(%q<minitest>, ["~> 2.6"])
+      s.add_dependency(%q<minitest>, ["~> 2.9"])
       s.add_dependency(%q<racc>, [">= 1.4.6"])
+      s.add_dependency(%q<rdoc>, ["~> 3.11"])
       s.add_dependency(%q<json>, [">= 0"])
       s.add_dependency(%q<hoe>, ["~> 2.12"])
+      s.add_dependency(%q<rdoc>, ["~> 3.10"])
     end
   else
-    s.add_dependency(%q<minitest>, ["~> 2.6"])
+    s.add_dependency(%q<minitest>, ["~> 2.9"])
     s.add_dependency(%q<racc>, [">= 1.4.6"])
+    s.add_dependency(%q<rdoc>, ["~> 3.11"])
     s.add_dependency(%q<json>, [">= 0"])
     s.add_dependency(%q<hoe>, ["~> 2.12"])
+    s.add_dependency(%q<rdoc>, ["~> 3.10"])
   end
 end

data/lib/journey/nfa/transition_table.rb

@@ -109,7 +109,7 @@ module Journey
       end
 
       def alphabet
-        inverted.values.map(&:keys).flatten.compact.uniq
+        inverted.values.map(&:keys).flatten.compact.uniq.sort_by { |x| x.to_s }
       end
 
       ###

data/lib/journey/route.rb

@@ -5,6 +5,8 @@ module Journey
     attr_reader :constraints
     alias :conditions :constraints
 
+    attr_accessor :precidence
+
     ##
     # +path+ is a path constraint.
     # +constraints+ is a hash of constraints to be applied to this route.
@@ -23,6 +25,7 @@ module Journey
       @required_parts    = nil
       @parts             = nil
       @decorated_ast     = nil
+      @precidence        = 0
     end
 
     def ast

data/lib/journey/router.rb

@@ -17,7 +17,7 @@ module Journey
     class RoutingError < ::StandardError
     end
 
-    VERSION = '1.0.0.rc1'
+    VERSION = '1.0.0.rc2'
 
     class NullReq # :nodoc:
       attr_reader :env
@@ -122,7 +122,7 @@ module Journey
         r.path.match(env['PATH_INFO'])
       }
 
-      routes.find_all { |r|
+      routes.sort_by(&:precidence).find_all { |r|
         r.constraints.all? { |k,v| v === req.send(k) } &&
           r.verb === env['REQUEST_METHOD']
       }.reject { |r| addr && !(r.ip === addr) }.map { |r|

data/lib/journey/routes.rb

@@ -58,6 +58,7 @@ module Journey
     def add_route app, path, conditions, defaults, name = nil
       route = Route.new(name, app, path, conditions, defaults)
 
+      route.precidence = routes.length
       routes << route
       named_routes[name] = route if name && !named_routes[name]
       clear_cache!

data/test/nfa/test_transition_table.rb

@@ -53,7 +53,7 @@ module Journey
 
       def test_alphabet
         table  = tt 'a|:a'
-        assert_equal ['a', /[^\.\/\?]+/], table.alphabet
+        assert_equal [/[^\.\/\?]+/, 'a'], table.alphabet
 
         table  = tt 'a|a'
         assert_equal ['a'], table.alphabet

data/test/test_router.rb

@@ -85,6 +85,25 @@ module Journey
       assert_equal env.env, klass.env
     end
 
+    def test_regexp_first_precedence
+      add_routes @router, [
+        Router::Strexp.new("/whois/:domain", {:domain => /\w+\.[\w\.]+/}, ['/', '.', '?']),
+        Router::Strexp.new("/whois/:id(.:format)", {}, ['/', '.', '?'])
+      ]
+
+      env = rails_env 'PATH_INFO' => '/whois/example.com'
+
+      list = []
+      @router.recognize(env) do |r, _, params|
+        list << r
+      end
+      assert_equal 2, list.length
+
+      r = list.first
+
+      assert_equal '/whois/:domain', r.path.spec.to_s
+    end
+
     def test_required_parts_verified_are_anchored
       add_routes @router, [
         Router::Strexp.new("/foo/:id", { :id => /\d/ }, ['/', '.', '?'], false)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: journey
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc1
+  version: 1.0.0.rc2
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-14 00:00:00.000000000 Z
+date: 2011-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70241724096100 !ruby/object:Gem::Requirement
+  requirement: &70190462428740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '2.9'
   type: :development
   prerelease: false
-  version_requirements: *70241724096100
+  version_requirements: *70190462428740
 - !ruby/object:Gem::Dependency
   name: racc
-  requirement: &70241724104520 !ruby/object:Gem::Requirement
+  requirement: &70190462428320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,21 @@ dependencies:
         version: 1.4.6
   type: :development
   prerelease: false
-  version_requirements: *70241724104520
+  version_requirements: *70190462428320
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: &70190462427900 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.11'
+  type: :development
+  prerelease: false
+  version_requirements: *70190462427900
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70241724098840 !ruby/object:Gem::Requirement
+  requirement: &70190462427540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70241724098840
+  version_requirements: *70190462427540
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &70241724109020 !ruby/object:Gem::Requirement
+  requirement: &70190462427080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +65,10 @@ dependencies:
         version: '2.12'
   type: :development
   prerelease: false
-  version_requirements: *70241724109020
+  version_requirements: *70190462427080
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70241729404380 !ruby/object:Gem::Requirement
+  requirement: &70190462693860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +76,7 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *70241729404380
+  version_requirements: *70190462693860
 description: Journey is a router.  It routes requests.
 email:
 - aaron@tenderlovemaking.com
@@ -78,6 +89,7 @@ extra_rdoc_files:
 files:
 - .autotest
 - .gemtest
+- .travis.yml
 - CHANGELOG.rdoc
 - Gemfile
 - Manifest.txt