routing_filter_locale_unless_api 0.1.0 → 0.2.0

data/.gitignore

@@ -9,7 +9,8 @@ Gemfile.lock
 bin
 coverage*
 doc
-gemfiles
+gemfiles/*.gemfile
+gemfiles/*.gemfile.lock
 pkg
 rdoc
 rerun.txt

data/.travis.yml

@@ -1,6 +1,10 @@
 rvm:
-  - 1.8.7
+  - 1.8.7-p334
   - 1.9.1
   - 1.9.2
   - ruby-head
   - ree
+gemfile:
+  - gemfiles/Gemfile.actionpack-3.0.x
+  - gemfiles/Gemfile.actionpack-3.1.x
+script: "bundle exec rake spec"

data/Appraisals

@@ -3,8 +3,7 @@ appraise "3.0" do
   gem "actionpack", "~> 3.0"
 end
 
-# Not yet supported
-# appraise "3.1.0.rc4" do
-#   gem "i18n", "~> 0.6.0"
-#   gem "actionpack", "~> 3.1.0.rc4"
-# end
+appraise "3.1.0" do
+  gem "i18n", "~> 0.6.0"
+  gem "actionpack", "~> 3.1.0"
+end

data/Changelog.md

@@ -1,6 +1,13 @@
 ### Dev
 
-[full changelog](https://github.com/ZenCocoon/routing_filter_locale_unless_api/compare/v0.1.0...master)
+[full changelog](https://github.com/ZenCocoon/routing_filter_locale_unless_api/compare/v0.2.0...master)
+
+### 0.2.0 / 2011-09-13
+
+[full changelog](https://github.com/ZenCocoon/routing_filter_locale_unless_api/compare/v0.1.0...v0.2.0)
+
+* Enhancements
+  * Add support for actionpack 3.1.*
 
 ### 0.1.0 / 2011-07-04
 

data/README.md

@@ -16,7 +16,7 @@ It will not add the locale parameter as a url fragment if:
 
 ## Documentation
 
-The [RDoc](http://rubydoc.info/gems/routing_filter_locale_unless_api/0.1.0/frames) provides
+The [RDoc](http://rubydoc.info/gems/routing_filter_locale_unless_api/0.2.0/frames) provides
 additional information for contributors and/or extenders.
 
 All of the documentation is open source and a work in progress. If you find it
@@ -26,7 +26,9 @@ tracker](https://github.com/ZenCocoon/routing_filter_locale_unless_api/issues).
 
 ## Requirements
 
-    actionpack ~> 3.0.9
+Notice: Tests currently failing under Ruby 1.8.7-p352, Ruby 1.8.7-p334 works properly so as Ruby 1.9.1, 1.9.2
+
+    actionpack >= 3.0.9
     i18n >= 0.5.0
     routing-filter ~> 0.2.3
 

data/gemfiles/Gemfile.actionpack-3.0.x

@@ -0,0 +1,10 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "ruby-prof", "~> 0.9.2", :platforms=>[:mri_18, :mri_19]
+gem "rb-fsevent", "~> 0.3.9", :platforms=>[:mri_18, :mri_19]
+gem "actionpack", "~> 3.0"
+gem "i18n", "~> 0.5.0"
+
+gemspec :path=>"../"

data/gemfiles/Gemfile.actionpack-3.1.x

@@ -0,0 +1,10 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "ruby-prof", "~> 0.9.2", :platforms=>[:mri_18, :mri_19]
+gem "rb-fsevent", "~> 0.3.9", :platforms=>[:mri_18, :mri_19]
+gem "actionpack", "~> 3.1.0"
+gem "i18n", "~> 0.6.0"
+
+gemspec :path=>"../"

data/lib/routing_filter_locale_unless_api/filter/locale_unless_api.rb

@@ -71,8 +71,8 @@ module RoutingFilterLocaleUnlessAPI
 
         format = params[:format]                                    # save the current format
         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
+        locale = I18n.locale if locale.nil?                         # default to I18n.locale when locale is nil (could also be false)
 
         args << params
 
@@ -107,7 +107,7 @@ module RoutingFilterLocaleUnlessAPI
         #
         # @return [Boolean]
         def root_path?(path)
-          path == '/'
+          (path.is_a?(Array) ? path.first : path) == '/'
         end
 
         # Returns true if it should prepend the locale

data/lib/routing_filter_locale_unless_api/version.rb

@@ -1,6 +1,6 @@
 module RoutingFilterLocaleUnlessAPI
   # @private
   module Version
-    STRING = "0.1.0"
+    STRING = "0.2.0"
   end
 end

data/routing_filter_locale_unless_api.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.rdoc_options      = "--charset=UTF-8"
   s.require_path      = "lib"
 
-  s.add_dependency "actionpack", "~> 3.0.9"
+  s.add_dependency "actionpack", ">= 3.0.9"
   s.add_dependency "i18n", ">= 0.5.0"
   s.add_dependency "routing-filter", "~> 0.2.3"
 

data/spec/routing_filter_locale_unless_api/filter/locale_unless_api_spec.rb

@@ -58,45 +58,45 @@ module RoutingFilterLocaleUnlessAPI::Filter
 
         context "prepends the segments /:locale to the generated path" do
           it 'if the current locale is not the default locale' do
-            routes.generate(params).should == '/fr/products/1'
+            generated_routes_with(params).should == '/fr/products/1'
           end
 
           it 'if the current locale is the default locale' do
             I18n.locale = 'en'
-            routes.generate(params).should == '/en/products/1'
+            generated_routes_with(params).should == '/en/products/1'
           end
 
           it 'if the current locale is not the default locale and with root url' do
-            routes.generate(root).should == '/fr'
+            generated_routes_with(root).should == '/fr'
           end
 
           it 'if the format XLS is not considered as api' do
-            routes.generate(params.merge(:format => 'xls')).should == '/fr/products/1.xls'
+            generated_routes_with(params.merge(:format => 'xls')).should == '/fr/products/1.xls'
           end
         end
 
         context "does not prepend the segments /:locale to the generated path" do
           it 'if the current locale is the default locale and with root url' do
             I18n.locale = 'en'
-            routes.generate(root).should == '/'
+            generated_routes_with(root).should == '/'
           end
 
           it 'if the format XML is considered as api' do
-            routes.generate(params.merge(:format => 'xml')).should == '/products/1.xml'
+            generated_routes_with(params.merge(:format => 'xml')).should == '/products/1.xml'
           end
 
           it 'if the format JSON is considered as api' do
-            routes.generate(params.merge(:format => 'json')).should == '/products/1.json'
+            generated_routes_with(params.merge(:format => 'json')).should == '/products/1.json'
           end
 
           it 'if the format XLS is considered as api' do
             RoutingFilter::LocaleUnlessApi.api_formats = %w( xml json xls )
-            routes.generate(params.merge(:format => 'xls')).should == '/products/1.xls'
+            generated_routes_with(params.merge(:format => 'xls')).should == '/products/1.xls'
           end
         end
 
         it 'should work with format as symbol' do
-          routes.generate(params.merge(:format => :xml)).should == '/products/1.xml'
+          generated_routes_with(params.merge(:format => :xml)).should == '/products/1.xml'
         end
       end
 
@@ -105,41 +105,48 @@ module RoutingFilterLocaleUnlessAPI::Filter
 
         context "prepends the segments /:locale to the generated path" do
           it 'if the given locale is not the default locale' do
-            routes.generate(params).should == '/fr/products/1'
+            generated_routes_with(params).should == '/fr/products/1'
           end
 
           it 'if the given locale is the default locale' do
-            routes.generate(params.merge(:locale => 'en')).should == '/en/products/1'
+            generated_routes_with(params.merge(:locale => 'en')).should == '/en/products/1'
           end
 
           it 'if the given locale is not the default locale and with root url' do
-            routes.generate(root.merge(:locale => 'fr')).should == '/fr'
+            generated_routes_with(root.merge(:locale => 'fr')).should == '/fr'
           end
 
           it 'if a given locale and the format XLS is not considered as api' do
-            routes.generate(params.merge(:format => 'xls')).should == '/fr/products/1.xls'
+            generated_routes_with(params.merge(:format => 'xls')).should == '/fr/products/1.xls'
           end
         end
 
         context "does not prepend the segments /:locale to the generated path" do
           it 'if a given locale is the default locale and with the root url' do
-            routes.generate(root.merge(:locale => 'en')).should == '/'
+            generated_routes_with(root.merge(:locale => 'en')).should == '/'
           end
 
           it 'if a given locale and the format XML is considered as api' do
-            routes.generate(params.merge(:format => 'xml')).should == '/products/1.xml'
+            generated_routes_with(params.merge(:format => 'xml')).should == '/products/1.xml'
           end
 
           it 'if a given locale and the format JSON is considered as api' do
-            routes.generate(params.merge(:format => 'json')).should == '/products/1.json'
+            generated_routes_with(params.merge(:format => 'json')).should == '/products/1.json'
           end
 
           it 'if a given locale and the format XLS is considered as api' do
             RoutingFilter::LocaleUnlessApi.api_formats = %w( xml json xls )
-            routes.generate(params.merge(:format => 'xls')).should == '/products/1.xls'
+            generated_routes_with(params.merge(:format => 'xls')).should == '/products/1.xls'
           end
         end
       end
     end
+
+    private
+
+      def generated_routes_with(params)
+        url = routes.generate(params)
+        url.is_a?(Array) ? url.first : url
+      end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: routing_filter_locale_unless_api
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - "S\xC3\xA9bastien Grosjean"
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-04 00:00:00 +03:00
-default_executable: 
+date: 2011-09-14 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: actionpack
@@ -24,7 +23,7 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         hash: 21
         segments: 
@@ -212,13 +211,14 @@ files:
 - License.txt
 - README.md
 - Rakefile
+- gemfiles/Gemfile.actionpack-3.0.x
+- gemfiles/Gemfile.actionpack-3.1.x
 - lib/routing_filter_locale_unless_api.rb
 - lib/routing_filter_locale_unless_api/filter/locale_unless_api.rb
 - lib/routing_filter_locale_unless_api/version.rb
 - routing_filter_locale_unless_api.gemspec
 - spec/routing_filter_locale_unless_api/filter/locale_unless_api_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: https://github.com/ZenCocoon/routing_filter_locale_unless_api
 licenses: []
 
@@ -248,7 +248,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: routing filter that add locale unless XML or JSON, or root_url with default locale