locale 2.1.2 → 2.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 530d2db4f5bc7f68d06654f0a8ec730479e79860
-  data.tar.gz: 72a52587e7410335944d6ac1ab1a769633598c58
+SHA256:
+  metadata.gz: '0566995735dba653591ecc129791317aaccb9e04910bdf530a968eda9bc3d3b8'
+  data.tar.gz: 9352a3d86cb0d62bbb5d65aedeab76e20ec2a5ee9773ec51fec0409a04449fc1
 SHA512:
-  metadata.gz: 1f3cf2b1775cd5245c7e72ac837e2ec81af7db1b89abeb6771d74393bddde9d28ca4c1d0f73d2a615a474325c726ba37edebcce9551ba84d08b1c97941b244c2
-  data.tar.gz: c2c19cd4920438188f0f9cb7dff4cff07e1e87b8a15c3feb07bd49e9e3c7a4badfc6e950d5477f85e75a8a4134dc24a929782b4a2449d1f7b174dde471b8aef8
+  metadata.gz: 5de200054cccf923c4d542175d792dddb28a3ec59887e9a97c6aec55a59d588c1690527540a83affee5fe1843b01bd4bcef6bc02310b91da98b9c107c015cff0
+  data.tar.gz: 9e846daf080367701b615377af1d07ef1428b70bc779a664ea08ae8e061c8f26b13ac5229fdc1b95cd71966c7ae07c0d8db272a42d30da9481ca2a24bb2461dd

data/Gemfile

@@ -17,6 +17,6 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-source :rubygems
+source 'https://rubygems.org'
 
 gemspec

data/README.rdoc

@@ -28,8 +28,8 @@ other i18n/l10n libs/apps to handle major locale ID standards.
 * https://github.com/ruby-gettext/locale
 
 == Requirements
-* Ruby-1.8.7 or later <http://www.ruby-lang.org/ja/>
-* JRuby-1.1.4 or later <http://jruby.codehaus.org/>
+* Ruby-1.8.7 or later <https://www.ruby-lang.org/>
+* JRuby-1.1.4 or later <https://www.jruby.org/>
 
 == Install
 

data/Rakefile

@@ -35,7 +35,6 @@ end
 
 helper = Bundler::GemHelper.new(base_dir)
 helper.install
-spec = helper.gemspec
 
 desc "Run tests"
 task :test do

data/doc/text/news.md

@@ -1,5 +1,25 @@
 # News
 
+## 2.1.4: 2024-03-18
+
+### Fixes
+
+  * `Locale::Middleware`: Fixed a bug that `lang` cookie and
+    `Accept-Language`/`Accept-Charset` HTTP headers never used.
+    * GH-15
+    * GH-16
+    * Patch by OZAWA Sakuro
+
+### Thanks
+
+  * OZAWA Sakuro
+
+## <a id="2-1-3">2.1.3</a>: 2020-02-12
+
+### Improvements
+
+  * Suppressed warnings.
+
 ## <a id="2-1-2">2.1.2</a>: 2015-09-15
 
 ### Improvements

data/lib/locale/driver/cgi.rb

@@ -95,8 +95,8 @@ module Locale
       def set_request(query_langs, cookie_langs, accept_language, accept_charset)
         Locale.clear
         Thread.current[:current_request] = {
-          :query_langs => query_langs, 
-          :cookie_langs => cookie_langs, 
+          :query_langs => query_langs.compact,
+          :cookie_langs => cookie_langs.compact,
           :accept_language => accept_language,
           :accept_charset => accept_charset
         }

data/lib/locale/tag/cldr.rb

@@ -2,6 +2,7 @@
   locale/tag/cldr.rb - Locale::Tag::CLDR
 
   Copyright (C) 2008,2009  Masao Mutoh
+  Copyright (C) 2018  Kouhei Sutou <kou@clear-code.com>
 
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
@@ -28,9 +29,10 @@ module Locale
       class << self
         # Parse the language tag and return the new Locale::Tag::CLDR. 
         def parse(tag)
-          if tag =~ /\APOSIX\Z/  # This is the special case of POSIX locale but match this regexp.
+          case tag
+          when /\APOSIX\Z/  # This is the special case of POSIX locale but match this regexp.
             nil
-          elsif tag =~ TAG_RE
+          when TAG_RE
             lang, script, region, subtag = $1, $2, $3, $4
             
             extensions = {}

data/lib/locale/tag/common.rb

@@ -2,6 +2,7 @@
   locale/tag/common.rb - Locale::Tag::Common
 
   Copyright (C) 2008,2009  Masao Mutoh
+  Copyright (C) 2018  Kouhei Sutou <kou@clear-code.com>
 
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
@@ -35,9 +36,10 @@ module Locale
       class << self
         # Parse the language tag and return the new Locale::Tag::Common. 
         def parse(tag)
-          if tag =~ /\APOSIX\Z/  # This is the special case of POSIX locale but match this regexp.
+          case tag
+          when /\APOSIX\Z/  # This is the special case of POSIX locale but match this regexp.
             nil
-          elsif tag =~ TAG_RE
+          when TAG_RE
             lang, script, region, subtag = $1, $2, $3, $4
             variants = subtag.scan(/(^|[-_])#{VARIANT}(?=([-_]|$))/i).collect{|v| v[1]}
             

data/lib/locale/tag/posix.rb

@@ -2,6 +2,7 @@
   locale/tag/posix.rb - Locale::Tag::Posix
 
   Copyright (C) 2008  Masao Mutoh
+  Copyright (C) 2018  Kouhei Sutou <kou@clear-code.com>
 
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
@@ -30,11 +31,12 @@ module Locale
       end
 
       def self.parse(tag)
-        if tag =~ /^(C|POSIX)$/
+        case tag
+        when /^(C|POSIX)$/
           ret = self.new("en", "US")
           ret.tag = tag
           ret
-        elsif tag =~ TAG_RE
+        when TAG_RE
           ret = self.new($1, $2, $3, $4)
           ret.tag = tag
           ret

data/lib/locale/tag/rfc.rb

@@ -2,6 +2,7 @@
   locale/tag/rfc.rb - Locale::Tag::Rfc
 
   Copyright (C) 2008,2009  Masao Mutoh
+  Copyright (C) 2018  Kouhei Sutou <kou@clear-code.com>
 
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
@@ -29,9 +30,10 @@ module Locale
       class << self
         # Parse the language tag and return the new Locale::Tag::Rfc. 
         def parse(tag)
-          if tag =~ /\APOSIX\Z/  # This is the special case of POSIX locale but match this regexp.
+          case tag
+          when /\APOSIX\Z/  # This is the special case of POSIX locale but match this regexp.
             nil
-          elsif tag =~ TAG_RE
+          when TAG_RE
             lang, script, region, subtag = $1, $2, $3, $4
             extensions = []
             variants = []

data/lib/locale/tag/simple.rb

@@ -2,6 +2,7 @@
   locale/tag/simple.rb - Locale::Tag::Simple
 
   Copyright (C) 2008,2009  Masao Mutoh
+  Copyright (C) 2018  Kouhei Sutou <kou@clear-code.com>
 
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
@@ -52,7 +53,8 @@ module Locale
       class << self
         # Parse the language tag and return the new Locale::Tag::Simple. 
         def parse(tag)
-          if tag =~ TAG_RE
+          case tag
+          when TAG_RE
             ret = self.new($1, $2)
             ret.tag = tag
             ret

data/lib/locale/version.rb

@@ -2,12 +2,12 @@
   version - version information of Ruby-Locale
 
   Copyright (C) 2008 Masao Mutoh
-  Copyright (C) 2013-2015 Kouhei Sutou <kou@clear-code.com>
+  Copyright (C) 2013-2020  Sutou Kouhei <kou@clear-code.com>
 
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 =end
 module Locale
-  VERSION = "2.1.2"
+  VERSION = "2.1.4"
 end
 

data/locale.gemspec

@@ -44,11 +44,10 @@ Ruby-Locale is the pure ruby library which provides basic APIs for localization.
     s.test_files = Dir.glob("test/test_*.rb")
   end
 
-  s.add_development_dependency("rake")
   s.add_development_dependency("bundler")
-  s.add_development_dependency("yard")
-  s.add_development_dependency("redcarpet")
+  s.add_development_dependency("kramdown")
+  s.add_development_dependency("rake")
   s.add_development_dependency("test-unit")
-  s.add_development_dependency("test-unit-notify")
   s.add_development_dependency("test-unit-rr")
+  s.add_development_dependency("yard")
 end

data/test/test_detect_general.rb

@@ -27,6 +27,12 @@ class TestDetectGeneral < Test::Unit::TestCase
   def setup
     Locale.init
     Locale.clear_all
+    @have_win32_driver =
+      (Locale::Driver.const_defined?(:Win32) and
+       Locale::Driver::Win32.respond_to?(:set_thread_locale_id))
+    if @have_win32_driver
+      Locale::Driver::Win32.set_thread_locale_id(0xffff) # invalid
+    end
     ENV["LC_ALL"] = nil
     ENV["LC_CTYPE"] = nil
     ENV["LC_MESSAGES"] = nil
@@ -34,6 +40,12 @@ class TestDetectGeneral < Test::Unit::TestCase
     ENV["LANGUAGE"] = nil
   end
 
+  def teardown
+    if @have_win32_driver
+      Locale::Driver::Win32.set_thread_locale_id(nil)
+    end
+  end
+
   def test_lc_all
     ENV["LC_ALL"] = "ja_JP.eucJP"
     ENV["LC_CTYPE"] = "fr_FR.ISO-8859-1"  #Ignored.
@@ -165,6 +177,8 @@ class TestDetectGeneral < Test::Unit::TestCase
     end
 
     test "LC_ALL=C" do
+      omit("Can't disable the JRuby's default") if jruby?
+
       ENV["LC_ALL"] = "C"
       ENV["LANGUAGE"] = "zh_CN.UTF-8:ja_JP" # ignored
 
@@ -173,6 +187,8 @@ class TestDetectGeneral < Test::Unit::TestCase
     end
 
     test "LC_MESSAGES=C" do
+      omit("Can't disable the JRuby's default") if jruby?
+
       ENV["LC_MESSAGES"] = "C"
       ENV["LANGUAGE"] = "zh_CN.UTF-8:ja_JP" # ignored
 
@@ -181,6 +197,8 @@ class TestDetectGeneral < Test::Unit::TestCase
     end
 
     test "LANG=C" do
+      omit("Can't disable the JRuby's default") if jruby?
+
       ENV["LANG"] = "C"
       ENV["LANGUAGE"] = "zh_CN.UTF-8:ja_JP" # ignored
 
@@ -213,6 +231,8 @@ class TestDetectGeneral < Test::Unit::TestCase
     end
 
     test "LC_ALL=C and LC_MESSAGES" do
+      omit("Can't disable the JRuby's default") if jruby?
+
       ENV["LC_ALL"] = "C"
       ENV["LC_MESSAGES"] = "ja_JP.Shift_JIS"
       ENV["LANGUAGE"] = "zh_CN.UTF-8:ja_JP" # ignored
@@ -222,6 +242,8 @@ class TestDetectGeneral < Test::Unit::TestCase
     end
 
     test "LC_ALL=C and LANG" do
+      omit("Can't disable the JRuby's default") if jruby?
+
       ENV["LC_ALL"] = "C"
       ENV["LANG"] = "ja_JP.Shift_JIS"
       ENV["LANGUAGE"] = "zh_CN.UTF-8:ja_JP" # ignored
@@ -231,6 +253,8 @@ class TestDetectGeneral < Test::Unit::TestCase
     end
 
     test "LC_MESSAGES=C and LANG" do
+      omit("Can't disable the JRuby's default") if jruby?
+
       ENV["LC_MESSAGES"] = "C"
       ENV["LANG"] = "ja_JP.Shift_JIS"
       ENV["LANGUAGE"] = "zh_CN.UTF-8:ja_JP" # ignored

data/test/test_driver_jruby.rb

@@ -25,10 +25,14 @@ begin
   class TestDiverJRuby < Test::Unit::TestCase
 
     def setup
+      Locale.init
+      Locale.clear_all
       ENV["LC_ALL"] = nil
       ENV["LC_CTYPE"] = nil
+      ENV["LC_MESSAGES"] = nil
       ENV["LANG"] = nil
       ENV["LANGUAGE"] = nil
+      set_locale(Locale::Tag::Common.parse("en-US"))
     end
 
     def set_locale(tag)
@@ -56,7 +60,7 @@ begin
       assert_equal Locale::Tag::Posix.parse("ja_JP"), Locale::Driver::JRuby.locales[0]
   
       ENV["LC_ALL"] = "C"
-      assert_equal Locale::Tag::Posix.parse("C"), Locale::Driver::JRuby.locales[0]
+      assert_equal Locale::Tag::Common.parse("en-US"), Locale::Driver::JRuby.locales[0]
     end
   end
 

data/test/test_driver_win32.rb

@@ -5,8 +5,11 @@ begin
   class TestDiverWin32 < Test::Unit::TestCase
 
     def setup
+      Locale.init
+      Locale.clear_all
       ENV["LC_ALL"] = nil
       ENV["LC_CTYPE"] = nil
+      ENV["LC_MESSAGES"] = nil
       ENV["LANG"] = nil
       ENV["LANGUAGE"] = nil
       Locale::Driver::Win32.set_thread_locale_id(nil)
@@ -56,7 +59,8 @@ begin
       assert_equal "CP932", Locale::Driver::Win32.charset
 
       ENV["LC_ALL"] = "C"
-      assert_equal Locale::Tag::Posix.parse("C"), Locale::Driver::Win32.locales[0]
+      Locale::Driver::Win32.set_thread_locale_id(0x0409)
+      assert_equal Locale::Tag::Common.parse("en_US"), Locale::Driver::Win32.locales[0]
       assert_equal "CP1252", Locale::Driver::Win32.charset
     end
   end

metadata

@@ -1,30 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: locale
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.4
 platform: ruby
 authors:
 - Kouhei Sutou
 - Masao Mutoh
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-15 00:00:00.000000000 Z
+date: 2024-03-18 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -40,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: kramdown
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -54,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: redcarpet
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -82,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: test-unit-notify
+  name: test-unit-rr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -96,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: test-unit-rr
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,8 +94,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: |
-  Ruby-Locale is the pure ruby library which provides basic APIs for localization.
+description: 'Ruby-Locale is the pure ruby library which provides basic APIs for localization.
+
+  '
 email:
 - kou@clear-code.com
 - mutomasa at gmail.com
@@ -174,7 +160,6 @@ licenses:
 - Ruby
 - LGPLv3+
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -189,19 +174,16 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
-signing_key: 
+rubygems_version: 3.6.0.dev
 specification_version: 4
 summary: Ruby-Locale is the pure ruby library which provides basic APIs for localization.
 test_files:
-- test/test_tag.rb
 - test/test_detect_cgi.rb
-- test/test_info.rb
-- test/test_thread.rb
+- test/test_detect_general.rb
 - test/test_driver_jruby.rb
-- test/test_taglist.rb
 - test/test_driver_win32.rb
-- test/test_detect_general.rb
+- test/test_info.rb
 - test/test_locale.rb
-has_rdoc: 
+- test/test_tag.rb
+- test/test_taglist.rb
+- test/test_thread.rb