when_exe 0.3.5 → 0.3.6

data/lib/when_exe/locales/id.rb

@@ -5,8 +5,8 @@
   You may use and/or modify this file according to the license described in the LICENSE.txt file included in this archive.
 =end
 
-module When::BasicTypes
-  class M17n
+module When
+  module Locale
 
     # from https://raw.github.com/svenfuchs/rails-i18n/master/rails/locale/id.yml
 

data/lib/when_exe/locales/is.rb

@@ -5,8 +5,8 @@
   You may use and/or modify this file according to the license described in the LICENSE.txt file included in this archive.
 =end
 
-module When::BasicTypes
-  class M17n
+module When
+  module Locale
 
     # from https://raw.github.com/svenfuchs/rails-i18n/master/rails/locale/is.yml
 

data/lib/when_exe/locales/it.rb

@@ -5,8 +5,8 @@
   You may use and/or modify this file according to the license described in the LICENSE.txt file included in this archive.
 =end
 
-module When::BasicTypes
-  class M17n
+module When
+  module Locale
 
     # from https://raw.github.com/svenfuchs/rails-i18n/master/rails/locale/it.yml
 

data/lib/when_exe/locales/it_CH.rb

@@ -5,8 +5,8 @@
   You may use and/or modify this file according to the license described in the LICENSE.txt file included in this archive.
 =end
 
-module When::BasicTypes
-  class M17n
+module When
+  module Locale
 
     # from https://raw.github.com/svenfuchs/rails-i18n/master/rails/locale/it-CH.yml
 

data/lib/when_exe/locales/ja.rb

@@ -5,8 +5,8 @@
   You may use and/or modify this file according to the license described in the LICENSE.txt file included in this archive.
 =end
 
-module When::BasicTypes
-  class M17n
+module When
+  module Locale
 
     # from https://raw.github.com/svenfuchs/rails-i18n/master/rails/locale/ja.yml
 

data/lib/when_exe/locales/kn.rb

@@ -5,8 +5,8 @@
   You may use and/or modify this file according to the license described in the LICENSE.txt file included in this archive.
 =end
 
-module When::BasicTypes
-  class M17n
+module When
+  module Locale
 
     # from https://raw.github.com/svenfuchs/rails-i18n/master/rails/locale/kn.yml
 

data/lib/when_exe/locales/ko.rb

@@ -5,8 +5,8 @@
   You may use and/or modify this file according to the license described in the LICENSE.txt file included in this archive.
 =end
 
-module When::BasicTypes
-  class M17n
+module When
+  module Locale
 
     # from https://raw.github.com/svenfuchs/rails-i18n/master/rails/locale/ko.yml
 

data/lib/when_exe/locales/links.rb

@@ -1,12 +1,12 @@
 # -*- coding: utf-8 -*-
 =begin
-  Copyright (C) 2013 Takashi SUGA
+  Copyright (C) 2013-2014 Takashi SUGA
 
   You may use and/or modify this file according to the license described in the LICENSE.txt file included in this archive.
 =end
 
-module When::BasicTypes
-  class M17n
+module When
+  module Locale
 
     WikipediaLinks =
 {"ja"=>

data/lib/when_exe/locales/lo.rb

@@ -5,8 +5,8 @@
   You may use and/or modify this file according to the license described in the LICENSE.txt file included in this archive.
 =end
 
-module When::BasicTypes
-  class M17n
+module When
+  module Locale
 
     # from https://raw.github.com/svenfuchs/rails-i18n/master/rails/locale/lo.yml
 

data/lib/when_exe/{parts → locales}/locale.rb

@@ -5,10 +5,9 @@
   You may use and/or modify this file according to the license described in the LICENSE.txt file included in this archive.
 =end
 
-#
-# 本ライブラリのための諸々の部品
-#
-module When::Parts
+require 'when_exe/locales/encoding_conversion'
+
+module When
 
   #
   # Multilingualization(M17n) 対応モジュール
@@ -21,28 +20,23 @@ module When::Parts
     # Locale 読み替えの初期設定
     DefaultAlias = {'alias'=>'ja', '日本語'=>'ja', '英語'=>'en'}
 
+    # 省略時 Namespace
+    DefaultNamespaces = Hash.new {|hash, key|
+      hash[key] = "http://#{key}.wikipedia.org/wiki/"
+      }.update({
+      'mailto' => false,
+      'https'  => false,
+      'http'   => false,
+      'ftp'    => false
+    })
+
     # 漢字の包摂
     DefaultUnification = {
-      '煕' => '熙',
-      '廣' => '広',
-      '寶' => '宝',
-      '國' => '国',
-      '應' => '応',
-      '觀' => '観',
-      '龜' => '亀',
-      '齊' => '斉',
-      '靈' => '霊',
-      '攝' => '摂',
-      '壽' => '寿',
-      '萬' => '万',
-      '廢' => '廃',
-      '顯' => '顕',
-      '會' => '会',
-      '聰' => '聡',
-      '總' => '総',
-      '證' => '証',
-      '禮' => '礼',
-      '竜' => '龍',
+      '煕'=>'熙', '廣'=>'広', '寶'=>'宝', '國'=>'国',
+      '應'=>'応', '觀'=>'観', '龜'=>'亀', '齊'=>'斉',
+      '靈'=>'霊', '攝'=>'摂', '壽'=>'寿', '萬'=>'万',
+      '廢'=>'廃', '顯'=>'顕', '會'=>'会', '聰'=>'聡',
+      '總'=>'総', '證'=>'証', '禮'=>'礼', '竜'=>'龍'
     }
 
     # Escape
@@ -70,10 +64,11 @@ module When::Parts
       #
       attr_accessor :wikipedia_interval
 
-      # When::Parts::Locale Module のグローバルな設定を行う
+      # When::Locale Module のグローバルな設定を行う
       #
       # @param [Hash] options 下記の通り
       # @option options [Hash]    :alias              Locale の読み替えパターンを Hash で指定する。
+      # @option options [String]  :namespaces         名前空間定義の省略時に名前空間生成に用いる書式
       # @option options [Hash]    :unification        漢字の包摂パターンを Hash で指定する。
       # @option options [Numeric] :wikipedia_interval Wikipedia の連続的な参照を抑制するための遅延時間/秒
       #
@@ -83,6 +78,7 @@ module When::Parts
       #
       def _setup_(options={})
         @aliases            = options[:alias]       || DefaultAlias
+        @namespaces         = options[:namespaces]  || DefaultNamespaces
         @unifications       = options[:unification] || DefaultUnification
         @wikipedia_interval = options[:wikipedia_interval]
       end
@@ -93,6 +89,7 @@ module When::Parts
       #
       def _setup_info
         {:alias              => _alias,
+         :namespaces         => _namespaces,
          :unification        => _unification,
          :wikipedia_interval => @wikipedia_interval}
       end
@@ -132,18 +129,18 @@ module When::Parts
 
       # 包摂リストに登録されている文字を包摂する
       #
-      # @param [When::Parts::Locale] source 文字を包摂しようとする国際化文字列
+      # @param [When::Locale] source 文字を包摂しようとする国際化文字列
       # @param [String] source 文字を包摂しようとする文字列
       # @param [Regexp] source 文字を包摂しようとする正規表現
       # @param [Hash] pattern 包摂ルール
       #
-      # @return [When::Parts::Locale] 文字を包摂した国際化文字列
+      # @return [When::Locale] 文字を包摂した国際化文字列
       # @return [String] 文字を包摂した文字列
       # @return [Regexp] 文字を包摂した正規表現
       #
       def ideographic_unification(source, pattern=_unification)
         case source
-        when When::Parts::Locale
+        when When::Locale
           source.ideographic_unification(pattern)
         when Regexp
           Regexp.compile(ideographic_unification(source.source.encode('UTF-8'), pattern), source.options)
@@ -235,13 +232,16 @@ module When::Parts
 
       # locale 指定を解析して Hash の値を取り出す
       # @private
-      def _hash_value(hash, locale, default='')
-        locale = locale.sub(/\..*/, '').sub(/-/,'_')
-        return hash[locale] if (hash[locale])
-        return _hash_value(hash, _alias[locale], default) if _alias[locale]
-        language = locale.sub(/_.*/, '')
-        return hash[language] if (hash[language])
-        return hash[default]
+      def _hash_value(hash, locale, defaults=['', 'en'])
+        locale = locale.sub(/\..*/, '')
+        return hash[locale] if hash[locale]
+        return _hash_value(hash, _alias[locale], defaults) if _alias[locale]
+        language = locale.sub(/-.*/, '')
+        return hash[language] if hash[language]
+        defaults.each do |default|
+          return hash[default] if hash[default]
+        end
+        return nil
       end
 
       # 漢字の包摂パターン
@@ -250,11 +250,28 @@ module When::Parts
         @unifications ||= DefaultUnification
       end
 
+      # @private
+      def _get_locale(locale, access_key)
+        return nil unless access_key
+        access_key = access_key.split(/\//).map {|key| key =~ /^[0-9]+$/ ? key.to_i : key}
+        locale = locale.sub(/\..*/, '')
+        [locale, locale.sub(/-.*/, '')].each do |loc|
+          symbol = ('Locale_' + loc.sub(/-/,'_')).to_sym
+          return {loc=>access_key.inject(const_get(symbol)) {|hash, key| hash = hash[key]}} if const_defined?(symbol)
+        end
+        return nil
+      end
+
       private
 
       # Locale の読み替えパターン
       def _alias
-        @aliases ||= DefaultAlias
+        @aliases    ||= DefaultAlias
+      end
+
+      # 名前空間定義の省略時に名前空間生成に用いる書式
+      def _namespaces
+        @namespaces ||= DefaultNamespaces
       end
 
       # wikipedia オブジェクトの生成・参照
@@ -270,7 +287,7 @@ module When::Parts
         # 採取済みデータ
         title = URI.decode(file.gsub('_', ' '))
         mode  = "".respond_to?(:force_encoding) ? ':utf-8' : ''
-        dir   = Resource.root_dir + '/data/wikipedia/' + locale
+        dir   = When::Parts::Resource.root_dir + '/data/wikipedia/' + locale
         FileUtils.mkdir_p(dir) unless FileTest.exist?(dir)
 
         open("#{dir}/#{file}.json", 'r'+mode) do |source|
@@ -389,6 +406,7 @@ module When::Parts
     #
     def translate(loc='')
       return to_s unless loc
+      loc = loc.sub('_', '-')
       lang, code = loc.split(/\./)
       result = _label_value(loc)
       return result if !code || @names.member?(loc)
@@ -404,14 +422,14 @@ module When::Parts
     #
     def reference(loc='')
       loc ||= ''
-      return Locale._hash_value(@link, loc)
+      return Locale._hash_value(@link, loc.sub('_', '-'))
     end
 
     # 部分文字列
     #
     # @param [Range] range String#[] と同様の指定方法で範囲を指定する
     #
-    # @return [When::Parts::Locale] 指定範囲に対応した部分文字列
+    # @return [When::Locale] 指定範囲に対応した部分文字列
     #
     def [](range)
       dup._copy({
@@ -555,7 +573,7 @@ module When::Parts
     #
     # @param [Hash] pattern 包摂ルール
     #
-    # @return [When::Parts::Locale] self
+    # @return [When::Locale] self
     # @private
     def ideographic_unification!(pattern=_unification)
       names = {}
@@ -573,7 +591,7 @@ module When::Parts
     #
     # @param [Hash] pattern 包摂ルール
     #
-    # @return [When::Parts::Locale] 包摂結果
+    # @return [When::Locale] 包摂結果
     #
     def ideographic_unification(pattern=_unification)
       dup.ideographic_unification!(pattern)
@@ -630,12 +648,12 @@ module When::Parts
     # locale 指定を解析して @names の値を取り出す
     # @private
     def _label_value(locale)
-      label = Locale._hash_value(@names, locale, nil)
+      label = Locale._hash_value(@names, locale, [])
       return label if label
-      foreign  = When::BasicTypes::M17n._get_locale(locale, @access_key)
+      foreign  = Locale._get_locale(locale, @access_key)
       return @names[''] unless foreign
       english  = @names['en'] || @names['']
-      addition = english.dup.sub!(/^#{When::BasicTypes::M17n._get_locale('en', @access_key)['en']}/, '')
+      addition = english.dup.sub!(/^#{Locale._get_locale('en', @access_key)['en']}/, '')
       foreign[locale] += addition if addition
       update(foreign)
       return Locale._hash_value(@names, locale)
@@ -677,13 +695,14 @@ module When::Parts
           mark[0]  = locale if asterisk[0]
           mark[1]  = locale if asterisk[1]
           mark[2]  = locale unless mark[2]
+          name = _replacement($1, locale, ($3 || @names['en'] || @names[''])) if name =~ /^_([A-Z_]+)_(\((.+)\))?$/
           @names[locale] = name
-          if (ref =~ /^(.+):/)
-            prefix = namespace[$1]
-            ref.sub!(/^.+:/, prefix) if (prefix)
+          if ref =~ /^(.+):/
+            prefix = namespace[$1] || Locale.send(:_namespaces)[$1]
+            ref.sub!(/^.+:/, prefix) if prefix
           end
-          ref += '%%<' + name + '>' if (ref =~ /[\/#:]$/)
-          @link[locale] = _encode(ref)
+          ref += '%%<' + name + '>' if ref =~ /[\/#:]$/
+          @link[locale] = _encode(ref) unless ref == ''
         else ; raise ArgumentError, "Irregal locale format: " + v
         end
       end
@@ -708,6 +727,15 @@ module When::Parts
       @names[mark[0] || mark[1] || mark[2]]
     end
 
+    #
+    # 英語表記を現地表記に置き換える
+    #
+    def _replacement(table, locale, name)
+      Locale.const_get(table.split('_')[-1])[locale] ?
+        Locale.send(table.downcase, name, locale) :
+        name
+    end
+
     # encode URI from patterns %%(...) or %.(...)
     def _encode(source)
       source.gsub(/%.<.+?>/) do |match|

data/lib/when_exe/locales/lt.rb

@@ -5,8 +5,8 @@
   You may use and/or modify this file according to the license described in the LICENSE.txt file included in this archive.
 =end
 
-module When::BasicTypes
-  class M17n
+module When
+  module Locale
 
     # from https://raw.github.com/svenfuchs/rails-i18n/master/rails/locale/lt.yml
 
@@ -73,6 +73,10 @@ module When::BasicTypes
       {"one"=>"apie %{count} metus",
        "few"=>"apie %{count} metus",
        "other"=>"apie %{count} metų"},
+     "almost_x_years"=>
+      {"one"=>"beveik 1 metai",
+       "few"=>"beveik %{count} metai",
+       "other"=>"beveik %{count} metų"},
      "half_a_minute"=>"pusė minutės",
      "less_than_x_minutes"=>
       {"one"=>"mažiau nei %{count} minutė",

data/lib/when_exe/locales/lv.rb

@@ -5,8 +5,8 @@
   You may use and/or modify this file according to the license described in the LICENSE.txt file included in this archive.
 =end
 
-module When::BasicTypes
-  class M17n
+module When
+  module Locale
 
     # from https://raw.github.com/svenfuchs/rails-i18n/master/rails/locale/lv.yml
 

data/lib/when_exe/locales/mk.rb

@@ -5,8 +5,8 @@
   You may use and/or modify this file according to the license described in the LICENSE.txt file included in this archive.
 =end
 
-module When::BasicTypes
-  class M17n
+module When
+  module Locale
 
     # from https://raw.github.com/svenfuchs/rails-i18n/master/rails/locale/mk.yml
 

data/lib/when_exe/locales/mn.rb

@@ -5,8 +5,8 @@
   You may use and/or modify this file according to the license described in the LICENSE.txt file included in this archive.
 =end
 
-module When::BasicTypes
-  class M17n
+module When
+  module Locale
 
     # from https://raw.github.com/svenfuchs/rails-i18n/master/rails/locale/mn.yml
 

data/lib/when_exe/locales/ms.rb

@@ -5,8 +5,8 @@
   You may use and/or modify this file according to the license described in the LICENSE.txt file included in this archive.
 =end
 
-module When::BasicTypes
-  class M17n
+module When
+  module Locale
 
     # from https://raw.github.com/svenfuchs/rails-i18n/master/rails/locale/ms.yml
 

data/lib/when_exe/locales/nb.rb

@@ -5,8 +5,8 @@
   You may use and/or modify this file according to the license described in the LICENSE.txt file included in this archive.
 =end
 
-module When::BasicTypes
-  class M17n
+module When
+  module Locale
 
     # from https://raw.github.com/svenfuchs/rails-i18n/master/rails/locale/nb.yml