Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

Removed some deprecation warning from routing filter.

Browse source
This commit is contained in:
benni 2011-05-11 00:58:53 +02:00
parent bea145f33d
commit a689bdd5f5
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/foodcoop_filter.rb
View file

@ -4,7 +4,7 @@ module RoutingFilter
class Foodcoop < Base class Foodcoop < Base
def around_recognize(path, env, &block) def around_recognize(path, env, &block)
token = extract_token!(path) # remove the token from the beginning of the path token = extract_token!(path) # remove the token from the beginning of the path
returning yield do |params| # invoke the given block (calls more filters and finally routing) yield.tap do |params| # invoke the given block (calls more filters and finally routing)
params[:foodcoop] = token if token # set recognized token to the resulting params hash params[:foodcoop] = token if token # set recognized token to the resulting params hash
end end
end end
@ -13,7 +13,7 @@ module RoutingFilter
token = args.extract_options!.delete(:foodcoop) # extract the passed :token option token = args.extract_options!.delete(:foodcoop) # extract the passed :token option
token = Foodsoft.env if token.nil? # default to Foodsoft.env token = Foodsoft.env if token.nil? # default to Foodsoft.env
returning yield do |result| yield.tap do |result|
if token if token
url = result.is_a?(Array) ? result.first : result url = result.is_a?(Array) ? result.first : result
prepend_token!(url, token) prepend_token!(url, token)