andyjeffries-journey 1.0.0 → 1.0.0.20111022124133

data/CHANGELOG.rdoc

@@ -1,6 +1,5 @@
-=== 1.0.0 / 2011-03-08
-
-* 1 major enhancement
-
-  * Birthday!
+Mon Jan 23 17:07:53 2012  Aaron Patterson <aaron@tenderlovemaking.com>
 
+	* Added symbol? and literal? predicate methods to the ast nodes for
+        easier AST traversal.
+        * Made the dummy node a real class.

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,4 +1,6 @@
 .autotest
+.gemtest
+.travis.yml
 CHANGELOG.rdoc
 Gemfile
 Manifest.txt

data/README.rdoc

@@ -1,6 +1,6 @@
 = Journey
 
-* http://github.com/tenderlove/journey
+* http://github.com/rails/journey
 
 == DESCRIPTION:
 

data/Rakefile

@@ -16,6 +16,7 @@ Hoe.spec 'andyjeffries-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 = "andyjeffries-journey"
-  s.version = "1.0.0.20111022124133"
+  s.version = "1.0.0.20120112115843"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Aaron Patterson", "Andy Jeffries"]
-  s.date = "2011-10-22"
+  s.date = "2012-01-24"
   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,23 @@ 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<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<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<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/gtg/builder.rb

@@ -3,7 +3,7 @@ require 'journey/gtg/transition_table'
 module Journey
   module GTG
     class Builder
-      DUMMY = Nodes::Literal.new Object.new # :nodoc:
+      DUMMY = Nodes::Dummy.new # :nodoc:
 
       attr_reader :root, :ast, :endpoints
 

data/lib/journey/gtg/transition_table.rb

@@ -10,8 +10,8 @@ module Journey
       def initialize
         @regexp_states = Hash.new { |h,k| h[k] = {} }
         @string_states = Hash.new { |h,k| h[k] = {} }
-        @accepting  = {}
-        @memos      = Hash.new { |h,k| h[k] = [] }
+        @accepting     = {}
+        @memos         = Hash.new { |h,k| h[k] = [] }
       end
 
       def add_accepting state

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/nodes/node.rb

@@ -35,13 +35,29 @@ module Journey
       def type
         raise NotImplementedError
       end
+
+      def symbol?; false; end
+      def literal?; false; end
     end
 
     class Terminal < Node
       alias :symbol :left
     end
 
-    %w{ Symbol Slash Literal Dot }.each do |t|
+    class Literal < Terminal
+      def literal?; true; end
+      def type; :LITERAL; end
+    end
+
+    class Dummy < Literal
+      def initialize x = Object.new
+        super
+      end
+
+      def literal?; false; end
+    end
+
+    %w{ Symbol Slash Dot }.each do |t|
       class_eval %{
         class #{t} < Terminal
           def type; :#{t.upcase}; end
@@ -62,6 +78,8 @@ module Journey
       def default_regexp?
         regexp == DEFAULT_EXP
       end
+
+      def symbol?; true; end
     end
 
     class Unary < Node

data/lib/journey/path/pattern.rb

@@ -103,8 +103,7 @@ module Journey
           return @separator_re unless @matchers.key? node
 
           re = @matchers[node]
-          # FIXME: is the question mark needed?
-          "(#{re}?)"
+          "(#{re})"
         end
 
         def visit_GROUP node
@@ -121,7 +120,8 @@ module Journey
         end
 
         def visit_STAR node
-          "(.+)"
+          re = @matchers[node.left.to_sym] || '.+'
+          "(#{re})"
         end
       end
 
@@ -172,11 +172,11 @@ module Journey
         to_regexp.source
       end
 
-      private
       def to_regexp
         @re ||= regexp_visitor.new(@separators, @requirements).accept spec
       end
 
+      private
       def regexp_visitor
         @anchored ? AnchoredRegexp : UnanchoredRegexp
       end

data/lib/journey/route.rb

@@ -5,6 +5,8 @@ module Journey
     attr_reader :constraints
     alias :conditions :constraints
 
+    attr_accessor :precedence
+
     ##
     # +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
+      @precedence        = 0
     end
 
     def ast

data/lib/journey/router.rb

@@ -29,6 +29,14 @@ module Journey
         env['REQUEST_METHOD']
       end
 
+      def path_info
+        env['PATH_INFO']
+      end
+
+      def ip
+        env['REMOTE_ADDR']
+      end
+
       def [](k); env[k]; end
     end
 
@@ -115,18 +123,17 @@ module Journey
     end
 
     def find_routes env
-      addr       = env['REMOTE_ADDR']
-      req        = request_class.new env
+      req = request_class.new env
 
-      routes = filter_routes(env['PATH_INFO']) + custom_routes.find_all { |r|
-        r.path.match(env['PATH_INFO'])
+      routes = filter_routes(req.path_info) + custom_routes.find_all { |r|
+        r.path.match(req.path_info)
       }
 
-      routes.find_all { |r|
+      routes.sort_by(&:precedence).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|
-        match_data  = r.path.match(env['PATH_INFO'])
+          r.verb === req.request_method
+      }.reject { |r| req.ip && !(r.ip === req.ip) }.map { |r|
+        match_data  = r.path.match(req.path_info)
         match_names = match_data.names.map { |n| n.to_sym }
         match_values = match_data.captures.map { |v| v && Utils.unescape_uri(v) }
         info = Hash[match_names.zip(match_values).find_all { |_,y| y }]

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.precedence = routes.length
       routes << route
       named_routes[name] = route if name && !named_routes[name]
       clear_cache!

data/lib/journey/visitors.rb

@@ -88,7 +88,8 @@ module Journey
         if consumed == options
           nil
         else
-          visit node.left
+          route = visit node.left
+          route.include?("\0") ? nil : route
         end
       end
 
@@ -107,8 +108,7 @@ module Journey
       def visit_SYMBOL node
         key = node.to_sym
 
-        if options.key? key
-          value = options[key]
+        if value = options[key]
           consumed[key] = value
           Router::Utils.escape_path(value)
         else

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/path/test_pattern.rb

@@ -5,16 +5,16 @@ module Journey
     class TestPattern < MiniTest::Unit::TestCase
       x = /.+/
       {
-        '/:controller(/:action)'       => %r{\A/(#{x}?)(?:/([^/.?]+))?\Z},
-        '/:controller/foo'             => %r{\A/(#{x}?)/foo\Z},
-        '/:controller/:action'         => %r{\A/(#{x}?)/([^/.?]+)\Z},
-        '/:controller'                 => %r{\A/(#{x}?)\Z},
-        '/:controller(/:action(/:id))' => %r{\A/(#{x}?)(?:/([^/.?]+)(?:/([^/.?]+))?)?\Z},
-        '/:controller/:action.xml'     => %r{\A/(#{x}?)/([^/.?]+)\.xml\Z},
-        '/:controller.:format'         => %r{\A/(#{x}?)\.([^/.?]+)\Z},
-        '/:controller(.:format)'       => %r{\A/(#{x}?)(?:\.([^/.?]+))?\Z},
-        '/:controller/*foo'            => %r{\A/(#{x}?)/(.+)\Z},
-        '/:controller/*foo/bar'        => %r{\A/(#{x}?)/(.+)/bar\Z},
+        '/:controller(/:action)'       => %r{\A/(#{x})(?:/([^/.?]+))?\Z},
+        '/:controller/foo'             => %r{\A/(#{x})/foo\Z},
+        '/:controller/:action'         => %r{\A/(#{x})/([^/.?]+)\Z},
+        '/:controller'                 => %r{\A/(#{x})\Z},
+        '/:controller(/:action(/:id))' => %r{\A/(#{x})(?:/([^/.?]+)(?:/([^/.?]+))?)?\Z},
+        '/:controller/:action.xml'     => %r{\A/(#{x})/([^/.?]+)\.xml\Z},
+        '/:controller.:format'         => %r{\A/(#{x})\.([^/.?]+)\Z},
+        '/:controller(.:format)'       => %r{\A/(#{x})(?:\.([^/.?]+))?\Z},
+        '/:controller/*foo'            => %r{\A/(#{x})/(.+)\Z},
+        '/:controller/*foo/bar'        => %r{\A/(#{x})/(.+)/bar\Z},
       }.each do |path, expected|
         define_method(:"test_to_regexp_#{path}") do
           strexp = Router::Strexp.new(
@@ -23,21 +23,21 @@ module Journey
             ["/", ".", "?"]
           )
           path = Pattern.new strexp
-          assert_equal(expected, path.send(:to_regexp))
+          assert_equal(expected, path.to_regexp)
         end
       end
 
       {
-        '/:controller(/:action)'       => %r{\A/(#{x}?)(?:/([^/.?]+))?},
-        '/:controller/foo'             => %r{\A/(#{x}?)/foo},
-        '/:controller/:action'         => %r{\A/(#{x}?)/([^/.?]+)},
-        '/:controller'                 => %r{\A/(#{x}?)},
-        '/:controller(/:action(/:id))' => %r{\A/(#{x}?)(?:/([^/.?]+)(?:/([^/.?]+))?)?},
-        '/:controller/:action.xml'     => %r{\A/(#{x}?)/([^/.?]+)\.xml},
-        '/:controller.:format'         => %r{\A/(#{x}?)\.([^/.?]+)},
-        '/:controller(.:format)'       => %r{\A/(#{x}?)(?:\.([^/.?]+))?},
-        '/:controller/*foo'            => %r{\A/(#{x}?)/(.+)},
-        '/:controller/*foo/bar'        => %r{\A/(#{x}?)/(.+)/bar},
+        '/:controller(/:action)'       => %r{\A/(#{x})(?:/([^/.?]+))?},
+        '/:controller/foo'             => %r{\A/(#{x})/foo},
+        '/:controller/:action'         => %r{\A/(#{x})/([^/.?]+)},
+        '/:controller'                 => %r{\A/(#{x})},
+        '/:controller(/:action(/:id))' => %r{\A/(#{x})(?:/([^/.?]+)(?:/([^/.?]+))?)?},
+        '/:controller/:action.xml'     => %r{\A/(#{x})/([^/.?]+)\.xml},
+        '/:controller.:format'         => %r{\A/(#{x})\.([^/.?]+)},
+        '/:controller(.:format)'       => %r{\A/(#{x})(?:\.([^/.?]+))?},
+        '/:controller/*foo'            => %r{\A/(#{x})/(.+)},
+        '/:controller/*foo/bar'        => %r{\A/(#{x})/(.+)/bar},
       }.each do |path, expected|
         define_method(:"test_to_non_anchored_regexp_#{path}") do
           strexp = Router::Strexp.new(
@@ -47,7 +47,7 @@ module Journey
             false
           )
           path = Pattern.new strexp
-          assert_equal(expected, path.send(:to_regexp))
+          assert_equal(expected, path.to_regexp)
         end
       end
 
@@ -101,6 +101,17 @@ module Journey
         end
       end
 
+      def test_to_regexp_match_non_optional
+        strexp = Router::Strexp.new(
+          '/:name',
+          { :name => /\d+/ },
+          ["/", ".", "?"]
+        )
+        path = Pattern.new strexp
+        assert_match('/123', path)
+        refute_match('/', path)
+      end
+
       def test_to_regexp_with_group
         strexp = Router::Strexp.new(
           '/page/:name',
@@ -157,6 +168,17 @@ module Journey
         assert_equal %w{ tender 10 }, match.captures
       end
 
+      def test_star_with_custom_re
+        z = /\d+/
+        strexp = Router::Strexp.new(
+          '/page/*foo',
+          { :foo => z },
+          ["/", ".", "?"]
+        )
+        path = Pattern.new strexp
+        assert_equal(%r{\A/page/(#{z})\Z}, path.to_regexp)
+      end
+
       def test_insensitive_regexp_with_group
         strexp = Router::Strexp.new(
           '/page/:name/aaron',
@@ -180,7 +202,7 @@ module Journey
       def test_to_regexp_defaults
         path = Pattern.new '/:controller(/:action(/:id))'
         expected = %r{\A/([^/.?]+)(?:/([^/.?]+)(?:/([^/.?]+))?)?\Z}
-        assert_equal expected, path.send(:to_regexp)
+        assert_equal expected, path.to_regexp
       end
 
       def test_failed_match

data/test/test_route.rb

@@ -74,6 +74,20 @@ module Journey
       assert_equal '/page/10', route.format({ :id => 10 })
     end
 
+    def test_extras_are_not_included_if_optional_with_parameter
+      path  = Path::Pattern.new '(/sections/:section)/pages/:id'
+      route = Route.new("name", nil, path, { }, { :action => 'show' })
+
+      assert_equal '/pages/10', route.format({:id => 10})
+    end
+
+    def test_extras_are_not_included_if_optional_parameter_is_nil
+      path  = Path::Pattern.new '(/sections/:section)/pages/:id'
+      route = Route.new("name", nil, path, { }, { :action => 'show' })
+
+      assert_equal '/pages/10', route.format({:id => 10, :section => nil})
+    end
+
     def test_score
       path = Path::Pattern.new "/page/:id(/:action)(.:format)"
       specific = Route.new "name", nil, path, {}, {:controller=>"pages", :action=>"show"}

data/test/test_router.rb

@@ -26,6 +26,10 @@ module Journey
         self.called = true
         'world'
       end
+
+      def path_info; env['PATH_INFO']; end
+      def request_method; env['REQUEST_METHOD']; end
+      def ip; env['REMOTE_ADDR']; end
     end
 
     def test_dashes
@@ -85,6 +89,49 @@ module Journey
       assert_equal env.env, klass.env
     end
 
+    class CustomPathRequest < Router::NullReq
+      def path_info
+        env['custom.path_info']
+      end
+    end
+
+    def test_request_class_overrides_path_info
+      router = Router.new(routes, {:request_class => CustomPathRequest })
+
+      exp = Router::Strexp.new '/bar', {}, ['/.?']
+      path = Path::Pattern.new exp
+
+      routes.add_route nil, path, {}, {}, {}
+
+      env = rails_env 'PATH_INFO' => '/foo', 'custom.path_info' => '/bar'
+
+      recognized = false
+      router.recognize(env) do |r, _, params|
+        recognized = true
+      end
+
+      assert recognized, "route should have been recognized"
+    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)

data/test/test_routes.rb

@@ -34,5 +34,18 @@ module Journey
       routes.add_route nil, path, {}, {}, {}
       refute_equal sim, routes.simulator
     end
+
+    def test_first_name_wins
+      #def add_route app, path, conditions, defaults, name = nil
+      routes = Routes.new
+
+      one   = Path::Pattern.new '/hello'
+      two   = Path::Pattern.new '/aaron'
+
+      routes.add_route nil, one, {}, {}, 'aaron'
+      routes.add_route nil, two, {}, {}, 'aaron'
+
+      assert_equal '/hello', routes.named_routes['aaron'].path.spec.to_s
+    end
   end
 end

metadata

@@ -1,30 +1,31 @@
 --- !ruby/object:Gem::Specification
 name: andyjeffries-journey
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.0.20111022124133
   prerelease: 
 platform: ruby
 authors:
 - Aaron Patterson
+- Andy Jeffries
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-23 00:00:00.000000000Z
+date: 2011-10-22 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70141541897200 !ruby/object:Gem::Requirement
+  requirement: &70099054425280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.10'
+        version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *70141541897200
+  version_requirements: *70099054425280
 - !ruby/object:Gem::Dependency
   name: racc
-  requirement: &70141541896340 !ruby/object:Gem::Requirement
+  requirement: &70099054424560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +33,10 @@ dependencies:
         version: 1.4.6
   type: :development
   prerelease: false
-  version_requirements: *70141541896340
+  version_requirements: *70099054424560
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70141541895820 !ruby/object:Gem::Requirement
+  requirement: &70099054423700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,21 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70141541895820
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: &70141541895120 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.10'
-  type: :development
-  prerelease: false
-  version_requirements: *70141541895120
+  version_requirements: *70099054423700
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &70141541894340 !ruby/object:Gem::Requirement
+  requirement: &70099054423180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +55,7 @@ dependencies:
         version: '2.12'
   type: :development
   prerelease: false
-  version_requirements: *70141541894340
+  version_requirements: *70099054423180
 description: Journey is a router.  It routes requests.
 email:
 - aaron@tenderlovemaking.com
@@ -140,9 +130,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3858943851392941251
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -150,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: andyjeffries-journey
+rubyforge_project: journey
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
@@ -169,3 +156,4 @@ test_files:
 - test/test_route.rb
 - test/test_router.rb
 - test/test_routes.rb
+has_rdoc: