when_exe 0.3.4 → 0.3.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/bin/locales.rb +2 -2
- data/bin/when.rb +2 -2
- data/lib/when_exe.rb +161 -55
- data/lib/when_exe/basictypes.rb +34 -26
- data/lib/when_exe/calendarnote.rb +654 -0
- data/lib/when_exe/calendartypes.rb +49 -474
- data/lib/when_exe/coordinates.rb +141 -34
- data/lib/when_exe/core/compatibility.rb +22 -2
- data/lib/when_exe/core/extension.rb +47 -3
- data/lib/when_exe/ephemeris.rb +82 -109
- data/lib/when_exe/googlecalendar.rb +1 -1
- data/lib/when_exe/icalendar.rb +26 -14
- data/lib/when_exe/inspect.rb +82 -68
- data/lib/when_exe/locales/af.rb +1 -1
- data/lib/when_exe/locales/ar.rb +1 -1
- data/lib/when_exe/locales/az.rb +1 -1
- data/lib/when_exe/locales/bg.rb +1 -1
- data/lib/when_exe/locales/bn.rb +1 -1
- data/lib/when_exe/locales/bs.rb +1 -1
- data/lib/when_exe/locales/ca.rb +1 -1
- data/lib/when_exe/locales/cs.rb +1 -1
- data/lib/when_exe/locales/cy.rb +1 -1
- data/lib/when_exe/locales/da.rb +1 -1
- data/lib/when_exe/locales/de.rb +1 -1
- data/lib/when_exe/locales/de_AT.rb +1 -1
- data/lib/when_exe/locales/de_CH.rb +1 -1
- data/lib/when_exe/locales/el.rb +1 -1
- data/lib/when_exe/locales/en.rb +1 -1
- data/lib/when_exe/locales/en_AU.rb +1 -1
- data/lib/when_exe/locales/en_CA.rb +1 -1
- data/lib/when_exe/locales/en_GB.rb +1 -1
- data/lib/when_exe/locales/en_IE.rb +1 -1
- data/lib/when_exe/locales/en_IN.rb +1 -1
- data/lib/when_exe/locales/en_NZ.rb +1 -1
- data/lib/when_exe/locales/en_US.rb +1 -1
- data/lib/when_exe/locales/eo.rb +1 -1
- data/lib/when_exe/locales/es.rb +1 -1
- data/lib/when_exe/locales/es_419.rb +1 -1
- data/lib/when_exe/locales/es_AR.rb +1 -1
- data/lib/when_exe/locales/es_CL.rb +1 -1
- data/lib/when_exe/locales/es_CO.rb +1 -1
- data/lib/when_exe/locales/es_CR.rb +1 -1
- data/lib/when_exe/locales/es_EC.rb +1 -1
- data/lib/when_exe/locales/es_MX.rb +1 -1
- data/lib/when_exe/locales/es_PA.rb +1 -1
- data/lib/when_exe/locales/es_PE.rb +1 -1
- data/lib/when_exe/locales/es_VE.rb +1 -1
- data/lib/when_exe/locales/et.rb +1 -1
- data/lib/when_exe/locales/eu.rb +1 -1
- data/lib/when_exe/locales/fa.rb +1 -1
- data/lib/when_exe/locales/fi.rb +1 -1
- data/lib/when_exe/locales/fr.rb +1 -1
- data/lib/when_exe/locales/fr_CA.rb +1 -1
- data/lib/when_exe/locales/fr_CH.rb +1 -1
- data/lib/when_exe/locales/gl.rb +1 -1
- data/lib/when_exe/locales/he.rb +1 -1
- data/lib/when_exe/locales/hi.rb +1 -1
- data/lib/when_exe/locales/hi_IN.rb +1 -1
- data/lib/when_exe/locales/hr.rb +1 -1
- data/lib/when_exe/locales/hu.rb +1 -1
- data/lib/when_exe/locales/id.rb +1 -1
- data/lib/when_exe/locales/is.rb +1 -1
- data/lib/when_exe/locales/it.rb +1 -1
- data/lib/when_exe/locales/it_CH.rb +1 -1
- data/lib/when_exe/locales/ja.rb +1 -1
- data/lib/when_exe/locales/kn.rb +1 -1
- data/lib/when_exe/locales/ko.rb +1 -1
- data/lib/when_exe/locales/lo.rb +1 -1
- data/lib/when_exe/locales/locales.rb +1 -1
- data/lib/when_exe/locales/lt.rb +1 -1
- data/lib/when_exe/locales/lv.rb +1 -1
- data/lib/when_exe/locales/mk.rb +1 -1
- data/lib/when_exe/locales/mn.rb +1 -1
- data/lib/when_exe/locales/ms.rb +1 -1
- data/lib/when_exe/locales/nb.rb +1 -1
- data/lib/when_exe/locales/ne.rb +1 -1
- data/lib/when_exe/locales/nl.rb +1 -1
- data/lib/when_exe/locales/nn.rb +1 -1
- data/lib/when_exe/locales/or.rb +1 -1
- data/lib/when_exe/locales/pl.rb +1 -1
- data/lib/when_exe/locales/pt.rb +1 -1
- data/lib/when_exe/locales/pt_BR.rb +1 -1
- data/lib/when_exe/locales/rm.rb +1 -1
- data/lib/when_exe/locales/ro.rb +1 -1
- data/lib/when_exe/locales/ru.rb +1 -1
- data/lib/when_exe/locales/sk.rb +1 -1
- data/lib/when_exe/locales/sl.rb +1 -1
- data/lib/when_exe/locales/sr.rb +1 -1
- data/lib/when_exe/locales/sv.rb +1 -1
- data/lib/when_exe/locales/sw.rb +1 -1
- data/lib/when_exe/locales/th.rb +1 -1
- data/lib/when_exe/locales/tl.rb +1 -1
- data/lib/when_exe/locales/tr.rb +1 -1
- data/lib/when_exe/locales/uk.rb +1 -1
- data/lib/when_exe/locales/ur.rb +1 -1
- data/lib/when_exe/locales/uz.rb +1 -1
- data/lib/when_exe/locales/vi.rb +1 -1
- data/lib/when_exe/locales/wo.rb +1 -1
- data/lib/when_exe/locales/zh_CN.rb +1 -1
- data/lib/when_exe/locales/zh_HK.rb +1 -1
- data/lib/when_exe/locales/zh_TW.rb +1 -1
- data/lib/when_exe/mini_application.rb +6 -2
- data/lib/when_exe/parts/enumerator.rb +13 -8
- data/lib/when_exe/parts/geometric_complex.rb +3 -5
- data/lib/when_exe/parts/locale.rb +185 -28
- data/lib/when_exe/parts/method_cash.rb +20 -10
- data/lib/when_exe/parts/resource.rb +154 -76
- data/lib/when_exe/parts/timezone.rb +11 -6
- data/lib/when_exe/region/bahai.rb +2 -2
- data/lib/when_exe/region/balinese.rb +296 -296
- data/lib/when_exe/region/chinese.rb +564 -564
- data/lib/when_exe/region/chinese_calendar.rb +5 -1
- data/lib/when_exe/region/chinese_epoch.rb +47 -102
- data/lib/when_exe/region/chinese_twin.rb +798 -0
- data/lib/when_exe/region/christian.rb +314 -338
- data/lib/when_exe/region/coptic.rb +88 -0
- data/lib/when_exe/region/ephemeric_notes.rb +322 -307
- data/lib/when_exe/region/french.rb +2 -2
- data/lib/when_exe/region/indian.rb +361 -272
- data/lib/when_exe/region/iranian.rb +2 -2
- data/lib/when_exe/region/islamic.rb +3 -3
- data/lib/when_exe/region/japanese.rb +1 -1
- data/lib/when_exe/region/japanese_notes.rb +165 -103
- data/lib/when_exe/region/japanese_residues.rb +56 -55
- data/lib/when_exe/region/japanese_twin.rb +228 -0
- data/lib/when_exe/region/javanese.rb +2 -2
- data/lib/when_exe/region/jewish.rb +2 -2
- data/lib/when_exe/region/korean.rb +4 -4
- data/lib/when_exe/region/m17n.rb +19 -19
- data/lib/when_exe/region/martian.rb +21 -9
- data/lib/when_exe/region/mayan.rb +19 -11
- data/lib/when_exe/region/moon.rb +7 -7
- data/lib/when_exe/region/nihon_shoki.rb +7 -7
- data/lib/when_exe/region/roman.rb +100 -100
- data/lib/when_exe/region/shire.rb +130 -147
- data/lib/when_exe/region/thai.rb +2 -2
- data/lib/when_exe/region/tibetan.rb +2 -2
- data/lib/when_exe/region/vietnamese.rb +383 -114
- data/lib/when_exe/region/world.rb +112 -129
- data/lib/when_exe/timestandard.rb +12 -1
- data/lib/when_exe/tmposition.rb +28 -14
- data/lib/when_exe/tmreference.rb +96 -93
- data/lib/when_exe/version.rb +1 -1
- data/test/examples/Terms.m17n +2 -2
- data/test/examples/sample.json +16 -0
- data/test/examples/sample.xml +1 -1
- data/test/test.rb +4 -0
- data/test/test/basictypes.rb +2 -2
- data/test/test/calendarnote.rb +69 -0
- data/test/test/calendartypes.rb +41 -1
- data/test/test/coordinates.rb +12 -1
- data/test/test/ephemeris.rb +13 -66
- data/test/test/icalendar.rb +3 -3
- data/test/test/inspect.rb +1 -1
- data/test/test/parts.rb +7 -4
- data/test/test/region/chinese.rb +45 -0
- data/test/test/region/coptic.rb +27 -0
- data/test/test/region/indian.rb +1 -1
- data/test/test/region/japanese.rb +4 -4
- data/test/test/region/jewish.rb +1 -1
- data/test/test/region/m17n.rb +7 -5
- data/test/test/region/residue.rb +2 -2
- data/test/test/region/vietnamese.rb +102 -0
- data/test/test/timestandard.rb +81 -0
- data/test/test/tmposition.rb +1 -1
- data/test/test/tmreference.rb +1 -1
- data/when_exe.gemspec +2 -2
- metadata +16 -7
data/lib/when_exe/locales/it.rb
CHANGED
data/lib/when_exe/locales/ja.rb
CHANGED
data/lib/when_exe/locales/kn.rb
CHANGED
data/lib/when_exe/locales/ko.rb
CHANGED
data/lib/when_exe/locales/lo.rb
CHANGED
data/lib/when_exe/locales/lt.rb
CHANGED
data/lib/when_exe/locales/lv.rb
CHANGED
data/lib/when_exe/locales/mk.rb
CHANGED
data/lib/when_exe/locales/mn.rb
CHANGED
data/lib/when_exe/locales/ms.rb
CHANGED
data/lib/when_exe/locales/nb.rb
CHANGED
data/lib/when_exe/locales/ne.rb
CHANGED
data/lib/when_exe/locales/nl.rb
CHANGED
data/lib/when_exe/locales/nn.rb
CHANGED
data/lib/when_exe/locales/or.rb
CHANGED
data/lib/when_exe/locales/pl.rb
CHANGED
data/lib/when_exe/locales/pt.rb
CHANGED
data/lib/when_exe/locales/rm.rb
CHANGED
data/lib/when_exe/locales/ro.rb
CHANGED
data/lib/when_exe/locales/ru.rb
CHANGED
data/lib/when_exe/locales/sk.rb
CHANGED
data/lib/when_exe/locales/sl.rb
CHANGED
data/lib/when_exe/locales/sr.rb
CHANGED
data/lib/when_exe/locales/sv.rb
CHANGED
data/lib/when_exe/locales/sw.rb
CHANGED
data/lib/when_exe/locales/th.rb
CHANGED
data/lib/when_exe/locales/tl.rb
CHANGED
data/lib/when_exe/locales/tr.rb
CHANGED
data/lib/when_exe/locales/uk.rb
CHANGED
data/lib/when_exe/locales/ur.rb
CHANGED
data/lib/when_exe/locales/uz.rb
CHANGED
data/lib/when_exe/locales/vi.rb
CHANGED
data/lib/when_exe/locales/wo.rb
CHANGED
|
@@ -141,6 +141,10 @@ module When
|
|
|
141
141
|
|
|
142
142
|
private
|
|
143
143
|
|
|
144
|
+
# to_h メソッドのオプション設定
|
|
145
|
+
HashMethod = {:iri => [:to_h, {:method=>:iri , :prefix=>true}],
|
|
146
|
+
:to_m17n => [:to_h, {:method=>:to_m17n, :prefix=>true}]}
|
|
147
|
+
|
|
144
148
|
# 引数読み込み
|
|
145
149
|
#
|
|
146
150
|
# args [String] コマンドライン入力
|
|
@@ -167,7 +171,7 @@ module When
|
|
|
167
171
|
when Numeric ; dates << arg ; numbers << arg
|
|
168
172
|
when Hash ; options.update(arg)
|
|
169
173
|
when Range ; arg.each {|d| dates << d}
|
|
170
|
-
when Symbol ; output = arg
|
|
174
|
+
when Symbol ; output = [arg]
|
|
171
175
|
when String
|
|
172
176
|
case arg
|
|
173
177
|
when /^:(.+?)(?:\[(..)\])?$/ ; output = [$1.to_sym, $2].compact
|
|
@@ -199,7 +203,7 @@ module When
|
|
|
199
203
|
dates << arg
|
|
200
204
|
end
|
|
201
205
|
end
|
|
202
|
-
[calendars, dates, numbers, methods, output, options]
|
|
206
|
+
[calendars, dates, numbers, methods, HashMethod[output[0]] || output, options]
|
|
203
207
|
end
|
|
204
208
|
|
|
205
209
|
# 変換処理(実行部)
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
# -*- coding: utf-8 -*-
|
|
2
2
|
=begin
|
|
3
|
-
Copyright (C) 2011-
|
|
3
|
+
Copyright (C) 2011-2014 Takashi SUGA
|
|
4
4
|
|
|
5
5
|
You may use and/or modify this file according to the license described in the LICENSE.txt file included in this archive.
|
|
6
6
|
=end
|
|
@@ -234,19 +234,20 @@ module When::Parts
|
|
|
234
234
|
|
|
235
235
|
# オブジェクトの生成
|
|
236
236
|
#
|
|
237
|
-
# @overload initialize(parent, range, count_limit=nil)
|
|
237
|
+
# @overload initialize(parent, range, count_limit=nil)
|
|
238
238
|
# @param [Comparable] parent 生成元
|
|
239
239
|
# @param [Range, When::Parts::GeometricComplex] range
|
|
240
240
|
# [ 始点 - range.first ]
|
|
241
241
|
# [ 終点 - range.last ]
|
|
242
242
|
# @param [Integer] count_limit 繰り返し回数(デフォルトは指定なし)
|
|
243
243
|
#
|
|
244
|
+
# @overload initialize(parent, first, direction, count_limit=nil)
|
|
244
245
|
# @param [Comparable] parent 生成元
|
|
245
246
|
# @param [When::TM::TemporalPosition] first 始点
|
|
246
|
-
# @param [Symbol] direction
|
|
247
|
+
# @param [Symbol] direction (options[:direction]で渡してもよい)
|
|
247
248
|
# [ :forward - 昇順 ]
|
|
248
249
|
# [ :reverse - 降順 ]
|
|
249
|
-
# @param [Integer] count_limit 繰り返し回数(
|
|
250
|
+
# @param [Integer] count_limit 繰り返し回数(デフォルトは指定なし, options[:count_limit]で渡してもよい)
|
|
250
251
|
#
|
|
251
252
|
def initialize(*args)
|
|
252
253
|
@options = self.class._options(args)
|
|
@@ -259,9 +260,9 @@ module When::Parts
|
|
|
259
260
|
|
|
260
261
|
private
|
|
261
262
|
|
|
262
|
-
def _range(
|
|
263
|
-
if (
|
|
264
|
-
range, @count_limit, others =
|
|
263
|
+
def _range(rest)
|
|
264
|
+
if (rest[0].instance_of?(Range))
|
|
265
|
+
range, @count_limit, others = rest
|
|
265
266
|
raise ArgumentError, "Too many arguments" if others
|
|
266
267
|
@first = When.when?(range.first)
|
|
267
268
|
@last = When.when?(range.last)
|
|
@@ -273,12 +274,16 @@ module When::Parts
|
|
|
273
274
|
@direction = :forward
|
|
274
275
|
end
|
|
275
276
|
else
|
|
276
|
-
@first, @direction, @count_limit, others =
|
|
277
|
+
@first, @direction, @count_limit, others = rest
|
|
277
278
|
raise ArgumentError, "Too many arguments" if others
|
|
278
279
|
raise ArgumentError, "Too few arguments" unless @first
|
|
279
280
|
@direction ||= :forward
|
|
280
281
|
@last = nil
|
|
281
282
|
end
|
|
283
|
+
@count_limit = @options[:count_limit] if @options[:count_limit] && (!@count_limit || @count_limit > @options[:count_limit])
|
|
284
|
+
@options.delete(:count_limit)
|
|
285
|
+
@direction = @options[:direction] if @options[:direction]
|
|
286
|
+
@options.delete(:direction)
|
|
282
287
|
end
|
|
283
288
|
|
|
284
289
|
def _exclude(value)
|