routing-filter 0.1.3 → 0.1.4

data/lib/routing_filter/adapters/rails_3.rb

@@ -21,8 +21,8 @@ ActionDispatch::Routing::RouteSet.class_eval do
   end
   alias_method_chain :recognize_path, :filtering
 
-  def generate_with_filtering(*args)
-    @set.filters.run(:around_generate, args.first, &lambda{ generate_without_filtering(*args) })
+  def generate_with_filtering(options, recall = {}, extras = false)
+    @set.filters.run(:around_generate, options, &lambda{ generate_without_filtering(options, recall, extras) })
   end
   alias_method_chain :generate, :filtering
 
@@ -38,7 +38,7 @@ require 'rack/mount/code_generation'
 
 Rack::Mount::RouteSet.class_eval do
   def filters
-    @filters ||= RoutingFilter::Chain.new
+    @filters || RoutingFilter::Chain.new.tap { |f| @filters = f unless frozen? }
   end
 end
 
@@ -56,12 +56,13 @@ Rack::Mount::CodeGeneration.class_eval do
   # note: if you overly and unnecessarily use blocks in your lowlevel libraries you make it fricking
   # hard for your users to hook in anywhere
   def recognize_with_filtering(request, &block)
-    route, matches, params = nil
-    filters.run(:around_recognize, request.env['PATH_INFO'], {}) do |path, env|
-      recognize_without_filtering(request) { |r, m, p| route, matches, params = r, m, p }
-      params
+    path, route, matches, params = request.env['PATH_INFO'], nil, nil, nil
+    filters.run(:around_recognize, path, {}) do
+      path.replace('/') if path.empty?
+      route, matches, params = recognize_without_filtering(request)
+      params || {}
     end
-    block.call(route, matches, params)
+    block.call(route, matches, params) if route
   end
 end
 

data/lib/routing_filter/chain.rb

@@ -6,11 +6,11 @@ module RoutingFilter
     end
     
     def run(method, *args, &final)
-      RoutingFilter.active? ? first.run(method, *args, &final) : final.call
+      active? ? first.run(method, *args, &final) : final.call
     end
     
     def active?
-      RoutingFilter.active && !empty?
+      RoutingFilter.active? && !empty?
     end
   end
 end

data/lib/routing_filter/filter.rb

@@ -1,7 +1,7 @@
 module RoutingFilter
   class Filter
     attr_accessor :next, :previous, :options
-    
+
     def initialize(options = {})
       @options = options
     end
@@ -15,5 +15,22 @@ module RoutingFilter
       _prev = previous ? lambda { previous.run_reverse(method, *args, &block) } : block
       RoutingFilter.active? ? send(method, *args, &_prev) : _prev.call(*args)
     end
+
+    protected
+
+      def extract_segment!(pattern, path)
+        path.sub!(pattern, '')
+        $1
+      end
+
+      def prepend_segment!(result, segment)
+        url = result.is_a?(Array) ? result.first : result
+        url.sub!(%r(^(http.?://[^/]*)?(.*))) { "#{$1}/#{segment}#{$2 == '/' ? '' : $2}" }
+      end
+
+      def append_segment!(result, segment)
+        url = result.is_a?(Array) ? result.first : result
+        url.sub!(%r(/?($|\?))) { "/#{segment}#{$1}" }
+      end
   end
 end

data/lib/routing_filter/filters/locale.rb

@@ -1,12 +1,12 @@
-# The Locale filter extracts segments matching /:locale from the beginning of 
+# The Locale filter extracts segments matching /:locale from the beginning of
 # the recognized path and exposes the page parameter as params[:page]. When a
 # path is generated the filter adds the segments to the path accordingly if
 # the page parameter is passed to the url helper.
-# 
+#
 #   incoming url: /de/products/page/1
 #   filtered url: /de/products
 #   params:       params[:locale] = 'de'
-# 
+#
 # You can install the filter like this:
 #
 #   # in config/routes.rb
@@ -14,7 +14,7 @@
 #     filter :locale
 #   end
 #
-# To make your named_route helpers or url_for add the pagination segments you 
+# To make your named_route helpers or url_for add the pagination segments you
 # can use:
 #
 #   products_path(:locale => 'de')
@@ -46,29 +46,24 @@ module RoutingFilter
     end
 
     def around_recognize(path, env, &block)
-      locale = extract_locale!(path)                 # remove the locale from the beginning of the path
-      yield.tap do |params|                          # invoke the given block (calls more filters and finally routing)
-        params[:locale] = locale if locale           # set recognized locale to the resulting params hash
+      locale = extract_segment!(self.class.locales_pattern, path) # remove the locale from the beginning of the path
+      yield.tap do |params|                                       # invoke the given block (calls more filters and finally routing)
+        params[:locale] = locale if locale                        # set recognized locale to the resulting params hash
       end
     end
 
-    def around_generate(*args, &block)
-      locale = args.extract_options!.delete(:locale) # extract the passed :locale option
-      locale = I18n.locale if locale.nil?            # default to I18n.locale when locale is nil (could also be false)
-      locale = nil unless valid_locale?(locale)      # reset to no locale when locale is not valid
+    def around_generate(params, &block)
+      locale = params.delete(:locale)                             # extract the passed :locale option
+      locale = I18n.locale if locale.nil?                         # default to I18n.locale when locale is nil (could also be false)
+      locale = nil unless valid_locale?(locale)                   # reset to no locale when locale is not valid
 
       yield.tap do |result|
-        prepend_locale!(result, locale) if prepend_locale?(locale)
+        prepend_segment!(result, locale) if prepend_locale?(locale)
       end
     end
 
     protected
 
-      def extract_locale!(path)
-        path.sub!(self.class.locales_pattern, '')
-        $1
-      end
-
       def valid_locale?(locale)
         locale && self.class.locales.include?(locale.to_sym)
       end
@@ -80,10 +75,5 @@ module RoutingFilter
       def prepend_locale?(locale)
         locale && (self.class.include_default_locale? || !default_locale?(locale))
       end
-
-      def prepend_locale!(result, locale)
-        url = result.is_a?(Array) ? result.first : result
-        url.sub!(%r(^(http.?://[^/]*)?(.*))) { "#{$1}/#{locale}#{$2}" }
-      end
   end
 end

data/lib/routing_filter/filters/pagination.rb

@@ -1,12 +1,12 @@
-# The Pagination filter extracts segments matching /page/:page from the end of 
+# The Pagination filter extracts segments matching /page/:page from the end of
 # the recognized url and exposes the page parameter as params[:page]. When a
 # url is generated the filter adds the segments to the url accordingly if the
 # page parameter is passed to the url helper.
-# 
+#
 #   incoming url: /products/page/1
 #   filtered url: /products
 #   params:       params[:page] = 1
-# 
+#
 # You can install the filter like this:
 #
 #   # in config/routes.rb
@@ -14,7 +14,7 @@
 #     filter :pagination
 #   end
 #
-# To make your named_route helpers or url_for add the pagination segments you 
+# To make your named_route helpers or url_for add the pagination segments you
 # can use:
 #
 #   products_path(:page => 1)
@@ -22,30 +22,26 @@
 
 module RoutingFilter
   class Pagination < Filter
+    PAGINATION_SEGMENT = %r(/page/([\d]+)/?$)
+
     def around_recognize(path, env, &block)
-      page = extract_page!(path)
+      page = extract_segment!(PAGINATION_SEGMENT, path)
       yield(path, env).tap do |params|
         params[:page] = page.to_i if page
       end
     end
 
-    def around_generate(*args, &block)
-      page = args.extract_options!.delete(:page)
+    def around_generate(params, &block)
+      page = params.delete(:page)
       yield.tap do |result|
-        append_page!(result, page) if page && page.to_i != 1
+        append_segment!(result, "page/#{page}") if append_page?(page)
       end
     end
 
     protected
 
-      def extract_page!(path)
-        path.sub! %r(/page/([\d]+)/?$), ''
-        $1
-      end
-
-      def append_page!(result, page)
-        url = result.is_a?(Array) ? result.first : result
-        url.sub!(/($|\?)/) { "/page/#{page}#{$1}" }
+      def append_page?(page)
+        page && page.to_i != 1
       end
   end
 end

data/lib/routing_filter/filters/uuid.rb

@@ -21,32 +21,20 @@
 
 module RoutingFilter
   class Uuid < Filter
-    UUID_SEGMENT = %r(^/?([a-z\d]{8}\-[a-z\d]{4}\-[a-z\d]{4}\-[a-z\d]{4}\-[a-z\d]{12})/)
+    UUID_SEGMENT = %r(^/?([a-z\d]{8}\-[a-z\d]{4}\-[a-z\d]{4}\-[a-z\d]{4}\-[a-z\d]{12})/?)
     
     def around_recognize(path, env, &block)
-      uuid = extract_uuid!(path)
+      uuid = extract_segment!(UUID_SEGMENT, path)
       yield.tap do |params|
         params[:uuid] = uuid if uuid
       end
     end
 
-    def around_generate(*args, &block)
-      uuid = args.extract_options!.delete(:uuid)
+    def around_generate(params, &block)
+      uuid = params.delete(:uuid)
       yield.tap do |result|
-        prepend_uuid!(result, uuid) if uuid
+        prepend_segment!(result, uuid) if uuid
       end
     end
-
-    protected
-
-      def extract_uuid!(path)
-        path.sub!(UUID_SEGMENT, '/')
-        $1
-      end
-
-      def prepend_uuid!(result, uuid)
-        url = result.is_a?(Array) ? result.first : result
-        url.sub!(%r(^(http.?://[^/]*)?(.*))) { "#{$1}/#{uuid}#{$2}" }
-      end
   end
 end

data/lib/routing_filter/version.rb

@@ -1,3 +1,3 @@
 module RoutingFilter
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: routing-filter
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Sven Fuchs