http_accept_language 1.0.1 → 1.0.2

data/.gitignore

@@ -1 +1,5 @@
-pkg
+*.gem
+.bundle
+Gemfile.lock
+pkg/*
+.rvmrc

data/Gemfile

@@ -0,0 +1,4 @@
+source "http://rubygems.org"
+
+# Specify your gem's dependencies in http_accept_language.gemspec
+gemspec

data/README.rdoc

@@ -16,14 +16,14 @@ See also: http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html
 
   class SomeController < ApplicationController
     def some_action
-      
+
       request.user_preferred_languages
       # => [ 'nl-NL', 'nl-BE', 'nl', 'en-US', 'en' ]
-      
+
       available = %w{en en-US nl-BE}
       request.preferred_language_from(available)
       # => 'nl-BE'
-      
+
       request.user_preferred_languages
       # => [ 'en-GB']
       available = %w{en-US}
@@ -34,11 +34,12 @@ See also: http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html
 
 == Installation
 
-Install the gem <tt>http_accept_language</tt>, require it in your Rails app.
+Install the gem +http_accept_language+, require it in your Rails app.
 
 == Changelog
 
+* 2011-09-11: 1.0.2 release, still works appearantly
 * 2010-01-05: Gem release
 * 2009-03-12: Rails 2.3 compatible
 
-Copyright (c) 2008-2010 Iain Hecker, released under the MIT license
+Copyright (c) 2008-2011 Iain Hecker, released under the MIT license

data/Rakefile

@@ -1,19 +1,4 @@
-require 'rake'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "http_accept_language"
-    gem.summary = %Q{Parse the HTTP Accept Language Header}
-    gem.description = %Q{Find out which locale the user preferes by reading the languages they specified in their browser}
-    gem.email = "iain@iain.nl"
-    gem.homepage = "http://github.com/iain/http_accept_language"
-    gem.authors = ["Iain Hecker"]
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
-end
+require "bundler/gem_tasks"
 
 require 'rake/testtask'
 desc 'Test the http_accept_language plugin.'
@@ -32,6 +17,6 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title    = 'HttpAcceptLanguage'
   rdoc.options << '--line-numbers' << '--inline-source'
-  rdoc.rdoc_files.include('README')
+  rdoc.rdoc_files.include('README.rdoc')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end

data/http_accept_language.gemspec

@@ -1,47 +1,17 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
-
 Gem::Specification.new do |s|
-  s.name = %q{http_accept_language}
-  s.version = "1.0.1"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Iain Hecker"]
-  s.date = %q{2010-02-25}
+  s.name        = "http_accept_language"
+  s.version     = '1.0.2'
+  s.authors     = ["iain"]
+  s.email       = ["iain@iain.nl"]
+  s.homepage    = "https://github.com/iain/http_accept_language"
+  s.summary     = %q{Find out which locale the user preferes by reading the languages they specified in their browser}
   s.description = %q{Find out which locale the user preferes by reading the languages they specified in their browser}
-  s.email = %q{iain@iain.nl}
-  s.extra_rdoc_files = [
-    "README.rdoc"
-  ]
-  s.files = [
-    ".gitignore",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "http_accept_language.gemspec",
-     "lib/http_accept_language.rb",
-     "rails/init.rb",
-     "test/http_accept_language_test.rb"
-  ]
-  s.homepage = %q{http://github.com/iain/http_accept_language}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
-  s.summary = %q{Parse the HTTP Accept Language Header}
-  s.test_files = [
-    "test/http_accept_language_test.rb"
-  ]
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  s.rubyforge_project = "http_accept_language"
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-    else
-    end
-  else
-  end
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
 end
-

data/lib/http_accept_language.rb

@@ -9,7 +9,7 @@ module HttpAcceptLanguage
   #   # => [ 'nl-NL', 'nl-BE', 'nl', 'en-US', 'en' ]
   #
   def user_preferred_languages
-    @user_preferred_languages ||= env['HTTP_ACCEPT_LANGUAGE'].split(',').collect do |l|
+    @user_preferred_languages ||= env['HTTP_ACCEPT_LANGUAGE'].split(/\s*,\s*/).collect do |l|
       l += ';q=1.0' unless l =~ /;q=\d+\.\d+$/
       l.split(';q=')
     end.sort do |x,y|
@@ -22,6 +22,12 @@ module HttpAcceptLanguage
     []
   end
 
+  # Sets the user languages preference, overiding the browser
+  #
+  def user_preferred_languages=(languages)
+    @user_preferred_languages = languages
+  end
+
   # Finds the locale specifically requested by the browser.
   #
   # Example:
@@ -40,20 +46,20 @@ module HttpAcceptLanguage
   #
   #   request.compatible_language_from I18n.available_locales
   #
-  def compatible_language_from(array)
-    user_preferred_languages.map do |x|
-      x = x.to_s.split("-")[0]
-      array.find do |y|
-        y.to_s.split("-")[0] == x
+  def compatible_language_from(available_languages)
+    user_preferred_languages.map do |x| #en-US
+      available_languages.find do |y| # en
+        y = y.to_s
+        x == y || x.split('-', 2).first == y.split('-', 2).first
       end
     end.compact.first
   end
 
 end
-if defined?(ActionController::Request)
-  ActionController::Request.send :include, HttpAcceptLanguage
-elsif defined?(ActionController::AbstractRequest)
-  ActionController::AbstractRequest.send :include, HttpAcceptLanguage
-elsif defined?(ActionController::CgiRequest)
-  ActionController::CgiRequest.send :include, HttpAcceptLanguage
+if defined?(ActionDispatch::Request)
+  ActionDispatch::Request.send :include, HttpAcceptLanguage
+elsif defined?(ActionDispatch::AbstractRequest)
+  ActionDispatch::AbstractRequest.send :include, HttpAcceptLanguage
+elsif defined?(ActionDispatch::CgiRequest)
+  ActionDispatch::CgiRequest.send :include, HttpAcceptLanguage
 end

data/test/http_accept_language_test.rb

@@ -37,6 +37,11 @@ class HttpAcceptLanguageTest < Test::Unit::TestCase
     request.env['HTTP_ACCEPT_LANGUAGE'] = 'en-us,de-de'
     assert_equal 'en', request.compatible_language_from(%w{de en})
   end
+  
+  def test_should_accept_symbols_as_available_languages
+    request.env['HTTP_ACCEPT_LANGUAGE'] = 'en-us'
+    assert_equal :"en-HK", request.compatible_language_from([:"en-HK"])
+  end
 
   private
   def request

metadata

@@ -1,69 +1,56 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: http_accept_language
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 0
-  - 1
-  version: 1.0.1
+version: !ruby/object:Gem::Version
+  version: 1.0.2
+  prerelease: 
 platform: ruby
-authors: 
-- Iain Hecker
+authors:
+- iain
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-02-25 00:00:00 +01:00
-default_executable: 
+date: 2011-09-11 00:00:00.000000000Z
 dependencies: []
-
-description: Find out which locale the user preferes by reading the languages they specified in their browser
-email: iain@iain.nl
+description: Find out which locale the user preferes by reading the languages they
+  specified in their browser
+email:
+- iain@iain.nl
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
-- README.rdoc
-files: 
+extra_rdoc_files: []
+files:
 - .gitignore
+- Gemfile
 - README.rdoc
 - Rakefile
-- VERSION
 - http_accept_language.gemspec
 - lib/http_accept_language.rb
 - rails/init.rb
 - test/http_accept_language_test.rb
-has_rdoc: true
-homepage: http://github.com/iain/http_accept_language
+homepage: https://github.com/iain/http_accept_language
 licenses: []
-
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
-require_paths: 
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+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.3.6
+rubyforge_project: http_accept_language
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
-summary: Parse the HTTP Accept Language Header
-test_files: 
+summary: Find out which locale the user preferes by reading the languages they specified
+  in their browser
+test_files:
 - test/http_accept_language_test.rb

data/VERSION

@@ -1 +0,0 @@
-1.0.1