diff options
| author | Steve Klabnik <steve@steveklabnik.com> | 2013-01-07 06:40:16 -0800 |
|---|---|---|
| committer | Steve Klabnik <steve@steveklabnik.com> | 2013-01-07 06:40:16 -0800 |
| commit | e274db9edc31536510eef42ad61f170bd2787e13 (patch) | |
| tree | 275fff453e0f837faef55ad865492162135c482c /actionpack/lib/action_dispatch | |
| parent | 411de5ae379190613d86032d7bad53ec0191653a (diff) | |
| parent | ae1f86fab5f80d00dc75541aef04eea8a349fb97 (diff) | |
| download | rails-e274db9edc31536510eef42ad61f170bd2787e13.tar.gz rails-e274db9edc31536510eef42ad61f170bd2787e13.tar.bz2 rails-e274db9edc31536510eef42ad61f170bd2787e13.zip | |
Merge pull request #8799 from goshakkk/ivar-readers
Access ivars via instance reader methods for consistency
Diffstat (limited to 'actionpack/lib/action_dispatch')
| -rw-r--r-- | actionpack/lib/action_dispatch/journey/route.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_dispatch/journey/routes.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/action_dispatch/journey/route.rb b/actionpack/lib/action_dispatch/journey/route.rb index f8a53227f3..d3988cf31e 100644 --- a/actionpack/lib/action_dispatch/journey/route.rb +++ b/actionpack/lib/action_dispatch/journey/route.rb @@ -45,7 +45,7 @@ module ActionDispatch end def segments - @path.names + path.names end def required_keys diff --git a/actionpack/lib/action_dispatch/journey/routes.rb b/actionpack/lib/action_dispatch/journey/routes.rb index 9d59c9265e..a99d6d0d6a 100644 --- a/actionpack/lib/action_dispatch/journey/routes.rb +++ b/actionpack/lib/action_dispatch/journey/routes.rb @@ -16,12 +16,12 @@ module ActionDispatch end def length - @routes.length + routes.length end alias :size :length def last - @routes.last + routes.last end def each(&block) |