routing_filter_locale_unless_api 0.2.2 → 0.2.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 3e6ee61a8e181f5b9875a48198e9eb9c1b22617b
+  data.tar.gz: 921940fa6e4ded33872836228978d15e928d1b02
+SHA512:
+  metadata.gz: 2d690125fd63264396edab5c4c662051473ecd40d18c3bc6a3413b285cbf891bdd8545764542277b66ed52af883d6c3cbcefacfb3e28d52532b622d39817dd09
+  data.tar.gz: 9a74adef77f118e9b7b065b0f50139125460c1938a621bedbceaef187454dd9446144faa98c92645089e0e7a1e4ee6573042d0b42def574b05c681b5bceb0cdd

data/Changelog.md

@@ -6,6 +6,9 @@
 
 [full changelog](https://github.com/ZenCocoon/routing_filter_locale_unless_api/compare/v0.2.1...v0.2.2)
 
+* Fix
+  * Fix Gem dependencies.
+
 ### 0.2.1 / 2012-02-18
 
 [full changelog](https://github.com/ZenCocoon/routing_filter_locale_unless_api/compare/v0.2.0...v0.2.1)

data/README.md

@@ -1,5 +1,45 @@
 # Routing Filter, Locale Unless API [![build status](http://travis-ci.org/ZenCocoon/routing_filter_locale_unless_api.png)](http://travis-ci.org/ZenCocoon/routing_filter_locale_unless_api)
 
+## Deprecated with Rails 4+
+
+Since Rails 4+, the router changed and there's more flexible way to do this:
+
+In your `congfig/routes.rb`:
+
+* put all in the locale scope (except the root)
+* add route for locale's only path
+
+```ruby
+scope "(:locale)", locale: /([a-zA-Z]{2}[-_])?[a-zA-Z]{2}/ do
+end
+
+get '/en', to: redirect('/')
+get '/:locale' => 'home#index', locale: /([a-zA-Z]{2}[-_])?[a-zA-Z]{2}/
+root to: 'home#index'
+```
+
+In your `app/application_controller.rb`
+
+* Set the locale from the params
+* Add the locale as default URL option
+
+```ruby
+before_filter :set_locale
+
+def default_url_options(options={})
+  formats = %w( xml json )
+  { locale: formats.include?(params[:format].to_s) ? nil : I18n.locale }
+end
+
+private
+
+def set_locale
+  I18n.locale = params[:locale] || I18n.default_locale
+end
+```
+
+## For Rails 3.2 and under
+
 RoutingFilterLocaleUnlessAPI is a extension filter to Sven Fuchs’s routing-filter
 
 http://github.com/svenfuchs/routing-filter

data/lib/routing_filter_locale_unless_api/filter/locale_unless_api.rb

@@ -4,7 +4,7 @@ module RoutingFilterLocaleUnlessAPI
   module Filter
     class LocaleUnlessApi < RoutingFilter::Filter
       @@api_formats = %w( xml json )
-      cattr_writer :api_formats
+      cattr_writer :api_formats, :exclude
 
       # Class Methods
       class << self
@@ -118,9 +118,22 @@ module RoutingFilterLocaleUnlessAPI
         #
         # @return [Boolean]
         def prepend_locale?(path, locale, format)
-          locale && !self.class.api_format?(format) && !(root_path?(path) && default_locale?(locale))
+          locale && !self.class.api_format?(format) && !(root_path?(path) && default_locale?(locale)) && !excluded?(path)
         end
 
+        # Returns true if path should be excluded based on :exclude option
+        #
+        # @param [String|Array] path
+        # @return [Boolean]
+        def excluded?(path)
+          path = path.is_a?(Array) ? path.first : path
+          case @@exclude
+          when Regexp
+            path =~ @@exclude
+          when Proc
+            @@exclude.call(path)
+          end
+        end
     end
   end
 end

data/lib/routing_filter_locale_unless_api/version.rb

@@ -1,6 +1,6 @@
 module RoutingFilterLocaleUnlessAPI
   # @private
   module Version
-    STRING = "0.2.2"
+    STRING = "0.2.3"
   end
 end

data/spec/routing_filter_locale_unless_api/filter/locale_unless_api_spec.rb

@@ -73,6 +73,13 @@ module RoutingFilterLocaleUnlessAPI::Filter
           it 'if the format XLS is not considered as api' do
             generated_routes_with(params.merge(:format => 'xls')).should == '/fr/products/1.xls'
           end
+
+          context "when exclude is set" do
+            it "if a given path doesn't match exclude regexp" do
+              RoutingFilter::LocaleUnlessApi.exclude = %r(/clients)
+              generated_routes_with(params.merge(:format => 'xls')).should == '/fr/products/1.xls'
+            end
+          end
         end
 
         context "does not prepend the segments /:locale to the generated path" do
@@ -138,6 +145,11 @@ module RoutingFilterLocaleUnlessAPI::Filter
             RoutingFilter::LocaleUnlessApi.api_formats = %w( xml json xls )
             generated_routes_with(params.merge(:format => 'xls')).should == '/products/1.xls'
           end
+
+          it 'if a given path matches exclude regexp' do
+            RoutingFilter::LocaleUnlessApi.exclude = %r(/products)
+            generated_routes_with(params).should == '/products/1'
+          end
         end
       end
     end

metadata

@@ -1,137 +1,169 @@
 --- !ruby/object:Gem::Specification
 name: routing_filter_locale_unless_api
 version: !ruby/object:Gem::Version
-  version: 0.2.2
-  prerelease: 
+  version: 0.2.3
 platform: ruby
 authors:
 - Sébastien Grosjean
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-13 00:00:00.000000000Z
+date: 2014-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &70357855929220 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.9
   type: :runtime
   prerelease: false
-  version_requirements: *70357855929220
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.9
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70357855928720 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70357855928720
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: routing-filter
-  requirement: &70357855928260 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *70357855928260
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.2.3
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70357855927800 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *70357855927800
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70357855927340 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *70357855927340
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70357855926880 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.2'
   type: :development
   prerelease: false
-  version_requirements: *70357855926880
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70357855926420 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70357855926420
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: guard-cucumber
-  requirement: &70357855925960 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :development
   prerelease: false
-  version_requirements: *70357855925960
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: growl
-  requirement: &70357855925500 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70357855925500
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70357855925040 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
   type: :development
   prerelease: false
-  version_requirements: *70357855925040
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: appraisal
-  requirement: &70357855924580 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.4'
   type: :development
   prerelease: false
-  version_requirements: *70357855924580
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.4'
 description: A routing-filter additional filter that add locale unless XML or JSON,
   or root_url with default locale
 email: public@zencocoon.com
@@ -161,28 +193,27 @@ files:
 - spec/spec_helper.rb
 homepage: https://github.com/ZenCocoon/routing_filter_locale_unless_api
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --charset=UTF-8
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: routing filter that add locale unless XML or JSON, or root_url with default
   locale
 test_files: