when_exe 0.3.2 → 0.3.3

data/lib/when_exe/locales/nl.rb

@@ -12,7 +12,7 @@ module When::BasicTypes
 
     Locale_nl =
 {"date"=>
-  {"abbr_day_names"=>["zon", "maa", "din", "woe", "don", "vri", "zat"],
+  {"abbr_day_names"=>["zo", "ma", "di", "wo", "do", "vr", "za"],
    "abbr_month_names"=>
     [nil,
      "jan",
@@ -35,7 +35,7 @@ module When::BasicTypes
      "donderdag",
      "vrijdag",
      "zaterdag"],
-   "formats"=>{"default"=>"%d/%m/%Y", "long"=>"%e %B %Y", "short"=>"%e %b"},
+   "formats"=>{"default"=>"%d-%m-%Y", "long"=>"%e %B %Y", "short"=>"%e %b"},
    "month_names"=>
     [nil,
      "januari",

data/lib/when_exe/locales/ru.rb

@@ -35,7 +35,7 @@ module When::BasicTypes
      "четверг",
      "пятница",
      "суббота"],
-   "formats"=>{"default"=>"%d.%m.%Y", "long"=>"%d %B %Y", "short"=>"%d %b"},
+   "formats"=>{"default"=>"%d.%m.%Y", "long"=>"%-d %B %Y", "short"=>"%-d %b"},
    "month_names"=>
     [nil,
      "января",

data/lib/when_exe/locales/uk.rb

@@ -35,7 +35,7 @@ module When::BasicTypes
      "четвер",
      "п'ятниця",
      "субота"],
-   "formats"=>{"default"=>"%d.%m.%Y", "long"=>"%d %B %Y", "short"=>"%d %b"},
+   "formats"=>{"default"=>"%d.%m.%Y", "long"=>"%-d %B %Y", "short"=>"%-d %b"},
    "month_names"=>
     [nil,
      "Січень",

data/lib/when_exe/locales/ur.rb

@@ -0,0 +1,84 @@
+# -*- coding: utf-8 -*-
+=begin
+  Copyright (C) 2012-2013 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
+
+    # from https://raw.github.com/svenfuchs/rails-i18n/master/rails/locale/ur.yml
+
+    Locale_ur =
+{"date"=>
+  {"abbr_day_names"=>
+    ["اتوار", "سوموار", "منگل", "ندھ", "جمعرات", "جمعہ", "ہفتہ"],
+   "abbr_month_names"=>
+    [nil,
+     "جنوری",
+     "فروری",
+     "مارچ",
+     "اپریل",
+     "مئی",
+     "جون",
+     "جولائی",
+     "اگست",
+     "ستمبر",
+     "اکتوبر",
+     "نومبر",
+     "دسمبر"],
+   "day_names"=>["اتوار", "سوموار", "منگل", "ندھ", "جمعرات", "جمعہ", "ہفتہ"],
+   "formats"=>{"default"=>"%d %B %Y", "long"=>"%B %d، %Y", "short"=>"%d %b"},
+   "month_names"=>
+    [nil,
+     "جنوری",
+     "فروری",
+     "مارچ",
+     "اپریل",
+     "مئی",
+     "جون",
+     "جولائی",
+     "اگست",
+     "ستمبر",
+     "اکتوبر",
+     "نومبر",
+     "دسمبر"],
+   "order"=>[:day, :month, :year]},
+ "time"=>
+  {"am"=>"صبح",
+   "pm"=>"شام",
+   "formats"=>
+    {"default"=>"%a، %d %b %Y، %p %l:%M %Z",
+     "long"=>"%B %d، %Y %p %H:%M",
+     "short"=>"%d %b، %H:%M"}},
+ "datetime"=>
+  {"distance_in_words"=>
+    {"about_x_hours"=>
+      {"one"=>"تقریبا ایک گھنٹہ", "other"=>"تقریبا %{count} گھنٹے"},
+     "about_x_months"=>
+      {"one"=>"تقریبا ایک مہینہ", "other"=>"تقریبا %{count} مہینہ"},
+     "about_x_years"=>
+      {"one"=>"تقریبا ایک سال", "other"=>"تقریبا %{count} سال"},
+     "almost_x_years"=>
+      {"one"=>"تقریبا ایک سال", "other"=>"تقریبا %{count} سال"},
+     "half_a_minute"=>"آدھا منٹ",
+     "less_than_x_minutes"=>
+      {"one"=>"ایک مںٹ سے کم", "other"=>"%{count} مںٹوں سے کم"},
+     "less_than_x_seconds"=>
+      {"one"=>"ایک سیکنڈ سے کم", "other"=>"%{count} سیکنڈوں سے کم"},
+     "over_x_years"=>
+      {"one"=>"ایک سال سے زیادہ", "other"=>"%{count} سالوں سے زیادہ"},
+     "x_days"=>{"one"=>"ایک دن", "other"=>"%{count} دن"},
+     "x_minutes"=>{"one"=>"ایک منٹ", "other"=>"%{count} منٹ"},
+     "x_months"=>{"one"=>"ایک ماہ", "other"=>"%{count} ماہ"},
+     "x_seconds"=>{"one"=>"ایک سیکنڈ", "other"=>"%{count} سیکنڈ"}},
+   "prompts"=>
+    {"day"=>"دن",
+     "hour"=>"گہنٹہ",
+     "minute"=>"منٹ",
+     "month"=>"ماہ",
+     "second"=>"سیکنڈ",
+     "year"=>"سال"}}}
+  end
+end

data/lib/when_exe/mini_application.rb

@@ -1,6 +1,6 @@
 # -*- 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
@@ -102,40 +102,6 @@ module When
       end
     end
 
-    # JSONで通信するために Symbol を String に変換する
-    def _to_string(source)
-      case source
-      when Array
-        source.map {|e| _to_string(e)}
-      when Hash
-        result = {}
-        source.each_pair {|k,v|
-          result[k.kind_of?(Symbol) ? '_sym_' + k.to_s : k] = _to_string(v)
-        }
-        result
-      else
-        source
-      end
-    end
-    private :_to_string
-
-    # JSONで通信するために String を Symbol に変換する
-    def _to_symbol(source)
-      case source
-      when Array
-        source.map {|e| _to_symbol(e)}
-      when Hash
-        result = {}
-        source.each_pair {|k,v|
-          result[k =~ /^_sym_(.+)$/ ? $1.to_sym : k] = _to_symbol(v)
-        }
-        result
-      else
-        source
-      end
-    end
-    private :_to_symbol
-
     # 日付の自由変換
     #
     # @param [Array<String>] args コマンドライン入力
@@ -148,7 +114,7 @@ module When
     # @note mini_application
     #
     def free_conv(*args, &block)
-      calendars, dates, numbers, methods, output, options = _parse(args)
+      calendars, dates, numbers, methods, output, options = _parse_command(args)
 
       if numbers.size >= 2 && calendars.size == 0
         result = []
@@ -173,6 +139,8 @@ module When
       _free_conv(calendars, dates, methods, output, options, &block)
     end
 
+    private
+
     # 引数読み込み
     #
     # args [String] コマンドライン入力
@@ -185,8 +153,7 @@ module When
     #   [ output    [Array<Symbol, String>] 出力処理に使うメソッドのシンボルと引数  ]
     #   [ options   [Hash{ :extent=>Boolean, :go_back=><:All || :Before(nil) || :After> }]
     #
-    # @private
-    def _parse(args)
+    def _parse_command(args)
       calendars = []
       dates     = []
       numbers   = []
@@ -244,16 +211,18 @@ module When
     #
     # @return [Array] 変換結果
     #
-    # @private
     def _free_conv(calendars, dates, methods, output, options, &block)
       dates[0]     ||= When.now
       calendars[0] ||= When.Calendar('Gregorian')
       result = dates.map {|date|
         date = When.when?(date)
+        opts = {}
+        opts[:location] = date.location if date.location
+        opts[:clock   ] = date.clock    if date.respond_to?(:clock) && date.clock
         list = calendars.dup
         (0...calendars.size).to_a.reverse.each do |i|
           case list[i]
-          when When::TM::Calendar ; list.slice!(i) if options[:extent] && !list[i].domain.include?(date)
+          when When::TM::Calendar ; list.slice!(i) if options[:extent] && !list[i].domain[''].include?(date)
           when Class              ; 
           else
              eras = (date ^ list[i]).delete_if {|e| !e.leaf?}
@@ -271,12 +240,12 @@ module When
         if methods.size == 0
           list.map {|calendar|
              calendar.kind_of?(Class) ?
-             yield(calendar.new(date)) :
-             yield(calendar ^ (calendar.rate_of_clock == date.time_standard.rate_of_clock ? date.to_i : date))
+             yield(calendar.new(date, opts.dup)) :
+             yield(calendar.^(calendar.rate_of_clock == date.time_standard.rate_of_clock ? date.to_i : date, opts))
           }
         else
           list.map {|calendar|
-            date_for_calendar = calendar ^ (calendar.rate_of_clock == date.time_standard.rate_of_clock ? date.to_i : date)
+            date_for_calendar = calendar.^(calendar.rate_of_clock == date.time_standard.rate_of_clock ? date.to_i : date, opts)
             methods.map {|method|
               date_for_calendar.send(method[0].to_sym, method[1], &block)
             }
@@ -286,5 +255,37 @@ module When
       result = result[0] while result.kind_of?(Array) && result.size == 1
       return result
     end
+
+    # JSONで通信するために Symbol を String に変換する
+    def _to_string(source)
+      case source
+      when Array
+        source.map {|e| _to_string(e)}
+      when Hash
+        result = {}
+        source.each_pair {|k,v|
+          result[k.kind_of?(Symbol) ? '_sym_' + k.to_s : k] = _to_string(v)
+        }
+        result
+      else
+        source
+      end
+    end
+
+    # JSONで通信するために String を Symbol に変換する
+    def _to_symbol(source)
+      case source
+      when Array
+        source.map {|e| _to_symbol(e)}
+      when Hash
+        result = {}
+        source.each_pair {|k,v|
+          result[k =~ /^_sym_(.+)$/ ? $1.to_sym : k] = _to_symbol(v)
+        }
+        result
+      else
+        source
+      end
+    end
   end
 end

data/lib/when_exe/parts/enumerator.rb

@@ -262,7 +262,7 @@ module When::Parts
     def _range(args)
       if (args[0].instance_of?(Range))
         range, @count_limit, others = args
-        raise ArgumentError, "Too many arguments" if (others)
+        raise ArgumentError, "Too many arguments" if others
         @first   = When.when?(range.first)
         @last    = When.when?(range.last)
         @exdate |= @last if (range.exclude_end?)
@@ -274,8 +274,8 @@ module When::Parts
         end
       else
         @first, @direction, @count_limit, others = args
-        raise ArgumentError, "Too many arguments" if (others)
-        raise ArgumentError, "Too few arguments"  unless (@first)
+        raise ArgumentError, "Too many arguments" if others
+        raise ArgumentError, "Too few arguments"  unless @first
         @direction ||= :forward
         @last        = nil
       end

data/lib/when_exe/parts/geometric_complex.rb

@@ -373,7 +373,12 @@ module When::Parts
     #   処理を first (type: When::TM::(Temporal)Position) に委譲する
     #
     def method_missing(name, *args, &block)
-      first.send(name.to_sym, *args, &block)
+      self.class.module_eval %Q{
+        def #{name}(*args, &block)
+          first.send("#{name}", *args, &block)
+        end
+      } unless When::Parts::MethodCash.escape(name)
+      first.send(name, *args, &block)
     end
   end
 end

data/lib/when_exe/parts/locale.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 =begin
-  Copyright (C) 2011-2012 Takashi SUGA
+  Copyright (C) 2011-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
@@ -45,8 +45,14 @@ module When::Parts
       '竜' => '龍',
     }
 
+    # Escape
     # @private
-    Escape = '__!_ESCAPE_%2C_!__'
+    Escape = {
+      "\\\\" => "\\",
+      "\\n"  => "\n",
+      "\\r"  => "\r",
+      "\\,"  => ","
+    }
 
     class << self
 
@@ -128,8 +134,8 @@ module When::Parts
       # @private
       def _namespace(source=nil)
         case source
-        when Hash ; return source
-        when nil  ; return {}
+        when Hash ; source
+        when nil  ; {}
         when String
           namespace = {}
           source = $1 if (source=~/\A\s*\[?(.+?)\]?\s*\z/m)
@@ -139,8 +145,10 @@ module When::Parts
             pair = [''] + v.split(/\s*=\s*/, 2)
             namespace[pair[-2]] = pair[-1]
           end
-          return namespace
-        else ; raise TypeError, "Irregal Namespace Type"
+          namespace
+        when When::Parts::Resource::ContentLine
+          source.object.names
+        else ; raise TypeError, "Irregal Namespace Type: #{source.class}"
         end
       end
 
@@ -153,7 +161,9 @@ module When::Parts
         # source の配列化
         if source.kind_of?(String)
           source = $1 if (source=~/\A\s*\[?(.+?)\]?\s*\z/m)
-          source = source.split(/[\n\r,]+/)
+          source = source.scan(/((?:[^\\\n\r,]|\\.)+)(?:[\n\r,]+(?!\z))?|[\n\r,]+/m).flatten.map {|token|
+            (token||'').gsub(/\\./) {|escape| Escape[escape] || escape}
+          }
         end
 
         # 各Localeの展開
@@ -170,10 +180,12 @@ module When::Parts
 
       # 文字列 [.., .., ..] を分割する
       # @private
-      def _split(line)
-        line  = line.dup
+      def _split(source)
+        line  = source.dup
+        return [line] unless line =~ /,/
+        list  = []
         b = d = s = 0
-        (line.length-1).downto(0) do |i|
+        (source.length-1).downto(0) do |i|
           bs = 0
           (i-1).downto(0) do |k|
             break unless (line[k,1] == '\\')
@@ -181,14 +193,18 @@ module When::Parts
           end
           next if (bs[0] == 1)
           case line[i,1]
-          when "'" ; s  = 1-s  if (d == 0)
-          when '"' ; d  = 1-d  if (s == 0)
-          when ']' ; b += 1 if  (d+s == 0)
-          when '[' ; b -= 1 if  (d+s == 0 && b > 0)
-          when ',' ; line[i,1] = Escape if (b+d+s == 0)
+          when "'"         ; s  = 1-s  if (d == 0)
+          when '"'         ; d  = 1-d  if (s == 0)
+          when ']','}',')' ; b += 1 if  (d+s == 0)
+          when '[','{','(' ; b -= 1 if  (d+s == 0 && b > 0)
+          when ','
+            if (b+d+s == 0)
+              list.unshift(line[i+1..-1])
+              line = i > 0 ? line[0..i-1] : ''
+            end
           end
         end
-        return (line =='') ? [''] : line.split(Escape, -1)
+        list.unshift(line)
       end
 
       # locale 指定を解析して Hash の値を取り出す
@@ -299,6 +315,21 @@ module When::Parts
       return nil
     end
 
+    # 部分文字列の位置
+    #
+    # @param [String] other 部分文字列
+    #
+    # @return [Integer] 部分文字列の先頭のindex(いずれかの locale で部分文字列を含んだ場合)
+    # @return [nil]     すべての locale で部分文字列を含まない場合
+    #
+    def index(other)
+      @keys.each do |key|
+        index = @names[key].index(Locale.translate(other, key))
+        return index if index
+      end
+      return nil
+    end
+
     # 文字列の連結
     #
     # @param [String, When::Toos::Locale] other 連結する文字列
@@ -493,7 +524,7 @@ module When::Parts
         case v
         when '', /^#/ ;
         when /^\/(.+)/; @access_key = $1
-        when /^(\*)?(?:([^=%]*?)\s*:)?\s*(.+?)\s*(=\s*(.+?)?)?$/
+        when /^(\*)?(?:([^=%]*?)\s*:)?\s*(.+?)\s*(=\s*([^=]+?)?)?$/
           asterisk[0], locale, name, assignment, ref = $~[1..5]
           asterisk[1], locale, default_ref = default_locale.shift unless locale
           locale ||= ''
@@ -523,7 +554,7 @@ module When::Parts
     # encode URI from patterns %%(...) or %.(...)
     def _encode(source)
       source.gsub(/%.<.+?>/) do |match|
-        URI.encode(match[3..-2].gsub(match[1], '%'))
+        URI.encode(match[3..-2]).gsub('%', match[1..1])
       end
     end
   end

data/lib/when_exe/parts/method_cash.rb

@@ -51,6 +51,66 @@ module When::Parts
   #
   module MethodCash
 
+    # @private
+    Escape = {:to_str  => true,
+              :to_ary  => true,
+              :to_hash => true}
+
+    class << self
+
+      # '_' で終わるメソッドをキャッシュせずに毎回計算するか否か
+      #
+      # @return [Boolean] キャッシュしない true, キャッシュする false/nil
+      #
+      attr_accessor :direct
+
+      # When::Parts::MethodCash のグローバルな設定を行う
+      #
+      # @param [Boolean] direct '_' で終わるメソッドをキャッシュせずに毎回計算する場合 true, キャッシュする場合 false/nil
+      # @param [Hash{Symbol=>boolean}] escape 毎回 method_missing を発生させるメソッドを true にして指定
+      # @param [false, nil] escape to_str, to_ary, to_hash のみ毎回 method_missing を発生させる
+      # @param [true] escape すべて毎回 method_missing を発生させる
+      #
+      # @return [void]
+      #
+      # @note When::TM::Calendar クラスの一部はキャッシュ使用を前提としているため direct=true では動作しません
+      #
+      def _setup_(direct=false, escape=false)
+        @direct = direct
+        case escape
+        when true
+          instance_eval %Q{
+            def escape(method)
+              true
+            end
+          }
+        when Hash
+          @escape = Escape.merge(escape)
+          instance_eval %Q{
+            def escape(method)
+              @escape[method]
+            end
+          }
+        else
+          instance_eval %Q{
+            def escape(method)
+              Escape.key?(method)
+            end
+          }
+        end
+      end
+
+      # method_missing メソッドを forward するか否か
+      #
+      # @param [Symbol] method メソッドシンボル
+      #
+      # @return [boolean] true - しない, false/nil - する
+      #
+      def escape(method)
+        Escape.key?(method)
+      end
+    end
+
     alias :method_missing_ :method_missing
 
     #
@@ -65,6 +125,7 @@ module When::Parts
     def method_missing(name, *args, &block)
 
       return method_missing_(name, *args, &block) unless respond_to?("#{name}_", true)
+      return send("#{name}_",  *args, &block) if MethodCash.direct
 
       if ((name.to_s =~ /^(_*)(.+?)_to_(.+)$/) && respond_to?("#{$1}#{$3}_to_#{$2}_", true))
         prefix, from, to = $~[1..3]