routing-filter 0.3.0 → 0.3.1

data/CHANGELOG.md

@@ -1,3 +1,6 @@
-## 0.3.0 (Not yet released)
+## 0.3.1
+* Filters support exclude option.
+
+## 0.3.0
 
 * Make `routing-filter` compatible with the new journey router in rails 3.2.

data/README.markdown

@@ -57,6 +57,7 @@ Filters can also accept options:
 
     Rails.application.routes.draw do
       filter :extension, :exclude => %r(^admin/)
+      filter :locale,    :exclude => /^\/admin/
     end
 
 ## Running the tests

data/lib/routing_filter/filters/locale.rb

@@ -43,6 +43,14 @@ module RoutingFilter
       end
     end
 
+
+    attr_reader :exclude
+    def initialize(*args)
+      super
+      @exclude = options[:exclude]
+    end
+
+
     def around_recognize(path, env, &block)
       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)
@@ -59,23 +67,32 @@ module RoutingFilter
 
       args << params
 
-      yield.tap do |result|
-        prepend_segment!(result, locale) if prepend_locale?(locale)
+      yield.tap do |result|        
+        url = result.is_a?(Array) ? result.first : result
+        prepend_segment!(result, locale) if prepend_locale?(locale) && !excluded?(url)
       end
     end
 
     protected
+    def valid_locale?(locale)
+      locale && self.class.locales.include?(locale.to_sym)
+    end
 
-      def valid_locale?(locale)
-        locale && self.class.locales.include?(locale.to_sym)
-      end
-
-      def default_locale?(locale)
-        locale && locale.to_sym == I18n.default_locale.to_sym
-      end
+    def default_locale?(locale)
+      locale && locale.to_sym == I18n.default_locale.to_sym
+    end
 
-      def prepend_locale?(locale)
-        locale && (self.class.include_default_locale? || !default_locale?(locale))
+    def prepend_locale?(locale)
+      locale && (self.class.include_default_locale? || !default_locale?(locale))
+    end
+    
+    def excluded?(url)
+      case exclude
+      when Regexp
+        url =~ exclude
+      when Proc
+        exclude.call(url)
       end
+    end
   end
 end

data/lib/routing_filter/version.rb

@@ -1,3 +1,3 @@
 module RoutingFilter
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: routing-filter
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-10 00:00:00.000000000 Z
+date: 2012-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &7231340 !ruby/object:Gem::Requirement
+  requirement: &2156259340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *7231340
+  version_requirements: *2156259340
 - !ruby/object:Gem::Dependency
   name: appraisal
-  requirement: &7229840 !ruby/object:Gem::Requirement
+  requirement: &2156258620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7229840
+  version_requirements: *2156258620
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &7225980 !ruby/object:Gem::Requirement
+  requirement: &2156257900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7225980
+  version_requirements: *2156257900
 - !ruby/object:Gem::Dependency
   name: test_declarative
-  requirement: &7311620 !ruby/object:Gem::Requirement
+  requirement: &2156273620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7311620
+  version_requirements: *2156273620
 description: Routing filters wraps around the complex beast that the Rails routing
   system is, allowing for unseen flexibility and power in Rails URL recognition and
   generation.
@@ -67,19 +67,19 @@ files:
 - README.markdown
 - MIT-LICENSE
 - lib/routing/filter.rb
+- lib/routing-filter.rb
+- lib/routing_filter/adapters/rails_2.rb
+- lib/routing_filter/adapters/rails_3.rb
+- lib/routing_filter/adapters/routers/journey.rb
+- lib/routing_filter/adapters/routers/rack_mount.rb
 - lib/routing_filter/chain.rb
+- lib/routing_filter/filter.rb
+- lib/routing_filter/filters/extension.rb
 - lib/routing_filter/filters/locale.rb
-- lib/routing_filter/filters/uuid.rb
 - lib/routing_filter/filters/pagination.rb
-- lib/routing_filter/filters/extension.rb
+- lib/routing_filter/filters/uuid.rb
 - lib/routing_filter/version.rb
-- lib/routing_filter/filter.rb
-- lib/routing_filter/adapters/rails_3.rb
-- lib/routing_filter/adapters/routers/journey.rb
-- lib/routing_filter/adapters/routers/rack_mount.rb
-- lib/routing_filter/adapters/rails_2.rb
 - lib/routing_filter.rb
-- lib/routing-filter.rb
 homepage: http://github.com/svenfuchs/routing-filter
 licenses: []
 post_install_message: 
@@ -100,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: ! '[none]'
-rubygems_version: 1.8.10
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Routing filters wraps around the complex beast that the Rails routing system