rails_locale_detection 1.3.2 → 2.0.0.pre2

data/spec/spec_helper.rb

@@ -1,17 +1,12 @@
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-
-require 'rspec'
-require 'i18n'
-require 'action_dispatch/middleware/cookies'
+require 'abstract_controller'
+require 'action_controller'
+require 'active_support'
+require 'rspec/rails'
 require 'timecop'
-
 require 'rails_locale_detection'
 
-# Requires supporting files with custom matchers and macros, etc,
-# in ./support/ and its subdirectories.
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
-RSpec.configure do |config|
-  
-end
+I18n.default_locale = :en
+I18n.available_locales = [:en, :fr]
+Timecop.freeze

data/spec/support/{mock.rb → mocks.rb}

@@ -1,34 +1,61 @@
 class MockRequest
   include HttpAcceptLanguage
-  
+
   attr_accessor :env
-  
+
   def initialize
     @env = {'HTTP_ACCEPT_LANGUAGE' => ''}
   end
+  
+  def host
+    "localhost"
+  end
+    
+  def ssl?
+    false
+  end
+    
+  def cookies
+    {}
+  end  
+end
+
+class MockUser
+  attr_accessor :locale
+
+  def initialize(locale)
+    @locale = locale
+  end
 end
 
 class MockController
-  include Rails::LocaleDetection
-  
+
   attr_accessor :request, :params, :cookies, :default_url_options, :user
-  
+
   def initialize(request)
     @request = request
-    @cookies = ActionDispatch::Cookies::CookieJar.new
+    @cookies = ActionDispatch::Cookies::CookieJar.build(request)
     @default_url_options = @params = {}
   end
-  
+
   def user_locale
     return user.locale if user
   end
-  
-end
 
-class MockUser
-  attr_accessor :locale
-  
-  def initialize(locale)
-    @locale = locale
+  class << self
+    attr_reader :before_filters
+  end
+
+  def self.before_filter(*args)
+    @before_filters ||= []
+    @before_filters << args
   end
+
+  def self.append_before_filter(*args)
+    @before_filters ||= []
+    @before_filters << args
+  end
+
+  include RailsLocaleDetection::ControllerMethods
+
 end

data/spec/support/rails.rb

@@ -0,0 +1,30 @@
+class MockApplication
+  def self.env_config
+    {}
+  end
+  
+  def self.routes
+    @routes ||= ActionDispatch::Routing::RouteSet.new
+  end
+end
+
+MockApplication.routes.draw do
+  resource :callback_tests
+end
+
+::Rails.application = MockApplication
+
+ActionController::Base.send :include, RailsLocaleDetection::ControllerMethods
+ActionController::Base.send :include, Rails.application.routes.url_helpers  
+
+class CallbackTestsController < ActionController::Base
+
+  def user_locale
+    :fr
+  end
+  
+  def show
+    render :text => current_locale
+  end
+  
+end

metadata

@@ -1,22 +1,22 @@
 --- !ruby/object:Gem::Specification
 name: rails_locale_detection
 version: !ruby/object:Gem::Version
-  version: 1.3.2
-  prerelease: 
+  version: 2.0.0.pre2
+  prerelease: 6
 platform: ruby
 authors:
 - Mateo Murphy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-19 00:00:00.000000000 Z
+date: 2013-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.2.13
   type: :runtime
@@ -24,7 +24,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.2.13
 - !ruby/object:Gem::Dependency
@@ -32,57 +32,57 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.2
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.1
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.1
 - !ruby/object:Gem::Dependency
-  name: actionpack
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.13
+        version: 2.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,15 +90,15 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.13
+        version: 2.13.0
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: 1.3.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,15 +106,15 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: 1.3.4
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: gem-release
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.4
+        version: 0.5.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,15 +122,15 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.4
+        version: 0.5.3
 - !ruby/object:Gem::Dependency
-  name: jeweler
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.8.4
+        version: 10.0.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -138,33 +138,42 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.8.4
+        version: 10.0.4
 description: Sets the current locale of a request using a combination of params, cookies,
   and http headers
-email: mateo.murphy@gmail.com
+email:
+- mateo.murphy@gmail.com
 executables: []
 extensions: []
-extra_rdoc_files:
-- LICENSE.txt
-- README.md
+extra_rdoc_files: []
 files:
 - .document
+- .gitignore
 - .rspec
+- .rvmrc
 - Gemfile
 - Gemfile.lock
-- LICENSE.txt
+- LICENSE
 - README.md
 - Rakefile
-- VERSION
-- lib/rails/locale_detection.rb
 - lib/rails_locale_detection.rb
+- lib/rails_locale_detection/controller_methods.rb
+- lib/rails_locale_detection/detection_methods.rb
+- lib/rails_locale_detection/locale_accessors.rb
+- lib/rails_locale_detection/locale_detector.rb
+- lib/rails_locale_detection/railtie.rb
+- lib/rails_locale_detection/version.rb
 - rails_locale_detection.gemspec
-- spec/rails_locale_detection_spec.rb
+- spec/controllers/callback_tests_controller_spec.rb
+- spec/rails_locale_detection/config_spec.rb
+- spec/rails_locale_detection/controller_methods_spec.rb
+- spec/rails_locale_detection/locale_accessors_spec.rb
+- spec/rails_locale_detection/locale_detector_spec.rb
 - spec/spec_helper.rb
-- spec/support/mock.rb
-homepage: http://github.com/mateomurphy/rails_locale_detection
-licenses:
-- MIT
+- spec/support/mocks.rb
+- spec/support/rails.rb
+homepage: https://github.com/mateomurphy/rails_locale_detection
+licenses: []
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -175,19 +184,24 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3187113159151487164
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
-summary: locale setting for rails project
-test_files: []
+summary: Locale setting for rails project
+test_files:
+- spec/controllers/callback_tests_controller_spec.rb
+- spec/rails_locale_detection/config_spec.rb
+- spec/rails_locale_detection/controller_methods_spec.rb
+- spec/rails_locale_detection/locale_accessors_spec.rb
+- spec/rails_locale_detection/locale_detector_spec.rb
+- spec/spec_helper.rb
+- spec/support/mocks.rb
+- spec/support/rails.rb

data/LICENSE.txt

@@ -1,20 +0,0 @@
-Copyright (c) 2011 Mateo Murphy
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/VERSION

@@ -1 +0,0 @@
-1.3.2

data/lib/rails/locale_detection.rb

@@ -1,74 +0,0 @@
-module Rails
-  module LocaleDetection
-    mattr_accessor :locale_expiry
-    @@locale_expiry = 3.months
-    
-    mattr_accessor :set_default_url_option
-    @@set_default_url_option = :always
-    
-    mattr_accessor :detection_order
-    @@detection_order = [:user, :param, :cookie, :request]
-    
-    def self.config
-      yield self
-    end
-    
-    def available_locales
-      I18n.available_locales
-    end
-  
-    def default_locale
-      I18n.default_locale
-    end
-  
-    def user_locale
-      nil
-    end
-  
-    # returns the (symbolized) value passed if it's in the available_locales
-    def validate_locale(locale)
-      locale.to_sym if locale && available_locales.include?(locale.to_sym)
-    end
-  
-    def locale_from_param
-      validate_locale(params[:locale])
-    end
-  
-    def locale_from_cookie
-      validate_locale(cookies[:locale])
-    end  
-  
-    def locale_from_request
-      validate_locale(request.preferred_language_from(available_locales))
-    end
-  
-    def locale_from_user
-      validate_locale(user_locale)
-    end
-  
-    def locale_from(key)
-      send("locale_from_#{key}")
-    end
-  
-    def get_locale
-      detection_order.inject(nil) { |result, source| result || locale_from(source) } || default_locale
-    end
-    
-    # returns true if the default url option should be set for this request
-    def set_default_url_option_for_request?
-      set_default_url_option === true || set_default_url_option == :always || set_default_url_option == :explicitly && params[:locale].present?
-    end
-    
-    # set I18n.locale, default_url_options[:locale] and cookies[:locale] to the value returned by
-    # get_locale
-    def set_locale
-      I18n.locale = get_locale
-      
-      default_url_options[:locale] = I18n.locale if set_default_url_option_for_request?
-      
-      cookies[:locale] = { :value => I18n.locale, :expires => locale_expiry.from_now }
-      
-      I18n.locale
-    end  
-  end
-end