fix Rails 5 rc1 warnings

svenfuchs · May 13, 2016 · a1816d4 · a1816d4
1 parent b12870d
commit a1816d4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/lib/routing_filter/adapters/rails.rb b/lib/routing_filter/adapters/rails.rb
@@ -42,7 +42,7 @@ def clear!
 
 ActionDispatch::Journey::Routes.class_eval do
   def filters
-    @filters || RoutingFilter::Chain.new.tap { |f| @filters = f unless frozen? }
+    @filters ||= RoutingFilter::Chain.new.tap { |f| @filters = f unless frozen? }
   end
 end
 

diff --git a/lib/routing_filter/adapters/routers/journey.rb b/lib/routing_filter/adapters/routers/journey.rb
@@ -1,9 +1,3 @@
-ActionDispatch::Journey::Routes.class_eval do
-  def filters
-    @filters || RoutingFilter::Chain.new.tap { |f| @filters = f unless frozen? }
-  end
-end
-
 module ActionDispatchJourneyRouterWithFiltering
   def find_routes(env)
     path = env.is_a?(Hash) ? env['PATH_INFO'] : env.path_info
@@ -27,4 +21,4 @@ def find_routes(env)
   end
 end
 
-ActionDispatch::Journey::Router.send(:prepend, ActionDispatchJourneyRouterWithFiltering)
+ActionDispatch::Journey::Router.send(:prepend, ActionDispatchJourneyRouterWithFiltering)