journey 1.0.0 → 1.0.1

data/CHANGELOG.rdoc

@@ -1,6 +1,5 @@
-=== 1.0.0 / (not released)
-
-* 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/journey.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "journey"
-  s.version = "1.0.0.20120112111444"
+  s.version = "1.0.1.20120126101943"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Aaron Patterson"]
-  s.date = "2012-01-12"
+  s.date = "2012-01-26"
   s.description = "Journey is a router.  It routes requests."
   s.email = ["aaron@tenderlovemaking.com"]
   s.extra_rdoc_files = ["Manifest.txt", "CHANGELOG.rdoc", "README.rdoc"]
@@ -23,23 +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.10"])
       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"])
+      s.add_development_dependency(%q<hoe>, ["~> 2.12"])
     else
+      s.add_dependency(%q<minitest>, ["~> 2.10"])
       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"])
+      s.add_dependency(%q<hoe>, ["~> 2.12"])
     end
   else
+    s.add_dependency(%q<minitest>, ["~> 2.10"])
     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"])
+    s.add_dependency(%q<hoe>, ["~> 2.12"])
   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/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/router.rb

@@ -17,7 +17,7 @@ module Journey
     class RoutingError < ::StandardError
     end
 
-    VERSION = '1.0.0'
+    VERSION = '1.0.1'
 
     class NullReq # :nodoc:
       attr_reader :env
@@ -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.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/scanner.rb

@@ -47,7 +47,7 @@ module Journey
         [:DOT, text]
       when text = @ss.scan(/:\w+/)
         [:SYMBOL, text]
-      when text = @ss.scan(/[\w-]+/)
+      when text = @ss.scan(/[\w%-]+/)
         [:LITERAL, text]
         # any char
       when text = @ss.scan(/./)

data/test/test_router.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 require 'helper'
 
 module Journey
@@ -26,6 +27,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
@@ -45,6 +50,24 @@ module Journey
       assert called
     end
 
+    def test_unicode
+      klass  = FakeRequestFeeler.new nil
+      router = Router.new(routes, {})
+      
+      #match the escaped version of /ほげ
+      exp = Router::Strexp.new '/%E3%81%BB%E3%81%92', {}, ['/.?'] 
+      path  = Path::Pattern.new exp
+
+      routes.add_route nil, path, {}, {:id => nil}, {}
+
+      env = rails_env 'PATH_INFO' => '/%E3%81%BB%E3%81%92'
+      called = false
+      router.recognize(env) do |r, _, params|
+        called = true
+      end
+      assert called
+    end
+
     def test_request_class_and_requirements_success
       klass  = FakeRequestFeeler.new nil
       router = Router.new(routes, {:request_class => klass })
@@ -85,6 +108,30 @@ 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\.]+/}, ['/', '.', '?']),

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: journey
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-12 00:00:00.000000000 Z
+date: 2012-01-26 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: &70096229172640 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.10'
+  type: :development
+  prerelease: false
+  version_requirements: *70096229172640
 - !ruby/object:Gem::Dependency
   name: racc
-  requirement: &70268988140640 !ruby/object:Gem::Requirement
+  requirement: &70096229172040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +32,10 @@ dependencies:
         version: 1.4.6
   type: :development
   prerelease: false
-  version_requirements: *70268988140640
+  version_requirements: *70096229172040
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70268988140040 !ruby/object:Gem::Requirement
+  requirement: &70096229171400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +43,10 @@ dependencies:
         version: '3.11'
   type: :development
   prerelease: false
-  version_requirements: *70268988140040
+  version_requirements: *70096229171400
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70268988139560 !ruby/object:Gem::Requirement
+  requirement: &70096229162660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,29 +54,29 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70268988139560
+  version_requirements: *70096229162660
 - !ruby/object:Gem::Dependency
-  name: hoe
-  requirement: &70268988138820 !ruby/object:Gem::Requirement
+  name: rdoc
+  requirement: &70096229161760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.12'
+        version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *70268988138820
+  version_requirements: *70096229161760
 - !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: &70268988435100 !ruby/object:Gem::Requirement
+  name: hoe
+  requirement: &70096229161220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '2.12'
   type: :development
   prerelease: false
-  version_requirements: *70268988435100
+  version_requirements: *70096229161220
 description: Journey is a router.  It routes requests.
 email:
 - aaron@tenderlovemaking.com