when_exe 0.3.5 → 0.3.6

data/lib/when_exe/coordinates.rb

@@ -112,10 +112,10 @@ module When::Coordinates
         return day if day.kind_of?(self)
 
         day ||= 0
-        week  = When.Resource('_co:CommonResidue::Week').child
+        week  = When.Resource('_co:Common::Week').child
         case day
         when Numeric ; return week[day]
-        when String  ;
+        when String  ; day = When::EncodingConversion.to_internal_encoding(day)
         else         ; return nil
         end
 
@@ -696,20 +696,14 @@ module When::Coordinates
     private
 
     def _normalize(args=[], options={})
-      label, unit, base, trunk, shift, branch = args
-      label ||= @label
-      unit  ||= @unit
-      base  ||= @base  || 1
-      shift ||= @shift || 0
-      @label  = m17n(label, nil, nil, @options) if label
-      @unit   = unit.to_i if unit
-      @base   = base.to_i
-      @trunk  = trunk  if trunk
-      @shift  = shift.to_i
-      @branch = branch if branch
+      @label  = m17n(@label, nil, nil, @options) if @label
+      @unit   = @unit.to_i if @unit
+      @base   = (@base  || 1).to_i
+      @trunk  = When::BasicTypes::M17n.labels(args[0]) unless args.empty?
+      @shift  = (@shift || 0).to_i
       @keys   = []
-      if (@trunk)
-        if (@trunk.kind_of?(Array))
+      if @trunk
+        if @trunk.kind_of?(Array)
           m17n = {}
           @trunk.length.times do |i|
             m17n[(i-@shift) % @trunk.length + @base] = @trunk[i]
@@ -718,11 +712,11 @@ module When::Coordinates
         end
         raise TypeError, "Trunk must be Hash" unless @trunk.kind_of?(Hash)
         @trunk.values.each do |v|
-          @keys |= v.keys if v.kind_of?(When::Parts::Locale)
+          @keys |= v.keys if v.kind_of?(When::Locale)
         end
       end
-      if (@branch)
-        if (@branch.kind_of?(Array))
+      if @branch
+        if @branch.kind_of?(Array)
           m17n = {}
           @branch.length.times do |i|
             m17n[i] = @branch[i]
@@ -730,8 +724,10 @@ module When::Coordinates
           @branch = m17n
         end
         raise TypeError, "Branch must be Hash" unless @branch.kind_of?(Hash)
-        @branch.values.each do |v|
-          @keys |= v.keys if v.kind_of?(When::Parts::Locale)
+        @branch.each_pair do |key, value|
+          value  = When::BasicTypes::M17n.label(value)
+          @keys |= value.keys if value.kind_of?(When::Locale)
+          @branch[key] = value
         end
       end
       @trunk_branch = {}
@@ -1585,7 +1581,7 @@ module When::Coordinates
         # Formula
         instance_eval('class << self; attr_reader :formula; end') if @location && @border
         if respond_to?(:formula)
-          instance_eval('class << self; include When::Ephemeris::Formula::ForwardedFormula; end')
+          extend When::Ephemeris::Formula::ForwardedFormula
           @formula ||= When::Ephemeris::Formula.new({:location=>@location})
           @formula   = When.Resource(Array(@formula), '_ep:')
         end
@@ -1680,7 +1676,10 @@ module When::Coordinates
     #   block  [Block] (デフォルト なし)
     #
     def note
-      @note = When.CalendarNote(@note) if @note.kind_of?(String)
+      case @note
+      when String ; @note = When.CalendarNote(@note)
+      when Array  ; @note = When::CalendarNote.new(*@note)
+      end
       @note
     end
 
@@ -1944,15 +1943,18 @@ module When::Coordinates
       # method cash
       @_m_cash_lock_ = Mutex.new if When.multi_thread
 
+      # label
+      @label = When::BasicTypes::M17n.label(@label)
+
       # Origin and Upper Digits
       @origin_of_MSC  ||= - +@border.behavior if @border
       @origin_of_MSC    = Pair._en_number(@origin_of_MSC)
       @origin_of_LSC    = Pair._en_number(@origin_of_LSC)
       @index_of_MSC     = Pair._en_number(@index_of_MSC)
-      if (@index_of_MSC != 0)
-        class << self; include OriginAndUpperDigits; end
-      elsif (@origin_of_MSC != 0)
-        class << self; include OriginOnly; end
+      if @index_of_MSC != 0
+        extend OriginAndUpperDigits
+      elsif @origin_of_MSC != 0
+        extend OriginOnly
       end
 
       # unit
@@ -1970,13 +1972,24 @@ module When::Coordinates
         @base <<  @indices[i].base
         @pair << (@indices[i].branch != nil)
       end
-      class << self; include IndexConversion; end unless @pair.uniq == [false]
+      extend IndexConversion unless @pair.uniq == [false]
 
       # note
-      @note ||= 'DefaultNotes'
+      @note ||= 'Default'
 
       # keys
-      @keys = @indices.inject(label.instance_of?(When::Parts::Locale) ? label.keys : []) {|key, index| key |= index.keys}
+      @keys = @indices.inject(label.instance_of?(When::Locale) ? label.keys : []) {|key, index| key |= index.keys}
+    end
+
+    def _default_index_of_MSC
+      unless @index_of_MSC
+        [:_coordinates_to_number, :_coordinates_to_number_].each do |to_n|
+          if respond_to?(to_n)
+            @index_of_MSC = @indices.length - method(to_n).arity + 1
+            break
+          end
+        end
+      end
     end
 
     # 何もしない
@@ -2047,12 +2060,21 @@ module When::Coordinates
     def method_missing(name, *args, &block)
       unless When::Parts::MethodCash::Escape.key?(name)
         if note.respond_to?(name)
-          instance_eval %Q{
-            def #{name}(*args, &block)
-              @note.send("#{name}", *(args + [self]), &block)
-            end
-          } unless When::Parts::MethodCash.escape(name)
-          return @note.send(name, *(args + [self]), &block)
+          if note.class::CalendarDepend
+            instance_eval %Q{
+              def #{name}(*args, &block)
+                @note.send("#{name}", *(args + [self]), &block)
+              end
+            } unless When::Parts::MethodCash.escape(name)
+            return @note.send(name, *(args + [self]), &block)
+          else
+            instance_eval %Q{
+              def #{name}(*args, &block)
+                @note.send("#{name}", *args, &block)
+              end
+            } unless When::Parts::MethodCash.escape(name)
+            return @note.send(name, *args, &block)
+          end
         end
         ['SolarTerms', 'LunarPhases'].each do |note|
           if When.CalendarNote(note).respond_to?(name)
@@ -2066,7 +2088,7 @@ module When::Coordinates
         end
         if When::Ephemeris::Formula.method_defined?(name)
           unless respond_to?(:forwarded_formula, true)
-            instance_eval('class << self; include When::Ephemeris::Formula::ForwardedFormula; end')
+            extend When::Ephemeris::Formula::ForwardedFormula
             @formula ||= When::Ephemeris::Formula.new({:location=>@location})
             @formula   = When.Resource(Array(@formula), '_ep:')
           end

data/lib/when_exe/core/compatibility.rb

@@ -6,12 +6,13 @@
 =end
 
 #
-# Ruby .8.x 系のためのための互換性確保用コード
+# Ruby 1.8.x 系のためのための互換性確保用コード
 #
 
 class String
-  unless "1".respond_to?(:encode)
+  unless method_defined?(:encode)
     require('iconv')
+    #
     # encode
     #
     # @param [String] code 文字コード
@@ -23,11 +24,11 @@ class String
     end
   end
 
-  unless "1".respond_to?(:to_r)
+  unless method_defined?(:to_r)
+    #
     # to_r(もどき)
     #
-    # 文字列を numeric に変換する
-    # (できるだけ情報が落ちない型を選択)
+    # 文字列を Rational or Integer に変換する
     #
     # @return [Numeric]
     def to_r
@@ -43,7 +44,8 @@ class String
     end
   end
 
-  unless "1".respond_to?(:ord)
+  unless method_defined?(:ord)
+    #
     # 文字列の先頭文字のコードを取得する
     # (多バイト文字非対応)
     #

data/lib/when_exe/core/extension.rb

@@ -44,10 +44,10 @@ class Time
   #
   # @note core/extension
   #
-  def tm_position(options={})
+  def tm_pos(options={})
     When.at(self, options)
   end
-  alias :to_tm_position :tm_position
+  alias :to_tm_pos :tm_pos
 end
 
 #
@@ -70,11 +70,11 @@ class Date
     # @note 暦法の指定がない場合、start メソッドの値によって
     #       Julian / Gregorian / Civil 暦法を選択する
     #
-    def tm_position(options={})
+    def tm_pos(options={})
       options[:frame] ||= When::CalendarTypes::Christian._default_start(self)
       super(options)
     end
-    alias :to_tm_position :tm_position
+    alias :to_tm_pos :tm_pos
   end
 
   alias :__method_missing :method_missing
@@ -83,13 +83,13 @@ class Date
   #
   # @note
   #   self で定義されていないメソッドは
-  #   tm_position で変換して処理する
+  #   tm_pos で変換して処理する
   #
   def method_missing(name, *args, &block)
     return __method_missing(name, *args, &block) if When::Parts::MethodCash::Escape.key?(name)
     self.class.module_eval %Q{
       def #{name}(*args, &block)
-        result = tm_position.send("#{name}", *args, &block)
+        result = tm_pos.send("#{name}", *args, &block)
         case result
         when When::TM::DateAndTime ; result.to_date_time
         when When::TM::CalDate     ; result.to_date
@@ -97,7 +97,7 @@ class Date
         end
       end
     } unless When::Parts::MethodCash.escape(name)
-    result = tm_position.send(name, *args, &block)
+    result = tm_pos.send(name, *args, &block)
     case result
     when When::TM::DateAndTime ; result.to_date_time
     when When::TM::CalDate     ; result.to_date
@@ -204,6 +204,8 @@ end
 #
 class String
 
+  include When::EncodingConversion
+
   #
   # self を When::BasicTypes::M17n に変換する
   #
@@ -235,8 +237,8 @@ class String
   #
   # @return [String] 包摂結果
   #
-  def ideographic_unification(pattern=When::Parts::Locale._unification)
-    When::Parts::Locale.ideographic_unification(self, pattern)
+  def ideographic_unification(pattern=When::Locale._unification)
+    When::Locale.ideographic_unification(self, pattern)
   end
 
   #
@@ -357,8 +359,8 @@ class String
   def when?(options={})
     When.when?(self, options)
   end
-  alias :tm_position    :when?
-  alias :to_tm_position :when?
+  alias :tm_pos    :when?
+  alias :to_tm_pos :when?
 
   #
   # 曜日(剰余類)
@@ -410,6 +412,9 @@ end
 # Extensions to Regexp class
 #
 class Regexp
+
+  include When::EncodingConversion
+
   #
   # self を検索する暦年代にマッチする正規表現とみなして登録された When::TM::CalendarEraを検索
   #
@@ -436,8 +441,8 @@ class Regexp
   #
   # @return [Regexp] 包摂結果
   #
-  def ideographic_unification(pattern=When::Parts::Locale._unification)
-    When::Parts::Locale.ideographic_unification(self, pattern)
+  def ideographic_unification(pattern=When::Locale._unification)
+    When::Locale.ideographic_unification(self, pattern)
   end
 end
 
@@ -461,10 +466,10 @@ class Array
   #
   # @note core/extension
   #
-  def tm_position(options={})
+  def tm_pos(options={})
     When.TemporalPosition(*(self.dup << options))
   end
-  alias :to_tm_position :tm_position
+  alias :to_tm_pos :tm_pos
 
   # self を[幹,枝]と解釈してWhen::Coordinates::Pair を生成
   #
@@ -477,3 +482,23 @@ class Array
   end
   alias :pair :to_pair
 end
+
+#
+# Extensions to Module class
+#
+class Module
+  unless method_defined?(:_const_missing)
+    alias :_const_missing :const_missing
+
+    #
+    # When 直下に定数として定義する時法・暦法(暗黙的追加)
+    #
+    def const_missing(name)
+      if When.const_defined?(name)
+        _const_missing(name)
+      else
+        When.const_missing(name)
+      end
+    end
+  end
+end

data/lib/when_exe/ephemeris.rb

@@ -10,20 +10,20 @@
 #
 module When::Ephemeris
 
-  autoload :Sun,     'when_exe/region/sun'
-  autoload :Mercury, 'when_exe/region/planets'
-  autoload :Venus,   'when_exe/region/planets'
-  autoload :Earth,   'when_exe/region/sun'
-  autoload :JGD2000, 'when_exe/region/sun'
-  autoload :Mars,    'when_exe/region/planets'
-  autoload :Jupiter, 'when_exe/region/planets'
-  autoload :Saturn,  'when_exe/region/planets'
-  autoload :Uranus,  'when_exe/region/planets'
-  autoload :Neptune, 'when_exe/region/planets'
-  autoload :Pluto,   'when_exe/region/planets'
-  autoload :Moon,    'when_exe/region/moon'
-  autoload :Shadow,  'when_exe/region/moon'
-  autoload :V50,     'when_exe/region/v50'
+  autoload :Sun,     'when_exe/ephemeris/sun'
+  autoload :Mercury, 'when_exe/ephemeris/planets'
+  autoload :Venus,   'when_exe/ephemeris/planets'
+  autoload :Earth,   'when_exe/ephemeris/sun'
+  autoload :JGD2000, 'when_exe/ephemeris/sun'
+  autoload :Mars,    'when_exe/ephemeris/planets'
+  autoload :Jupiter, 'when_exe/ephemeris/planets'
+  autoload :Saturn,  'when_exe/ephemeris/planets'
+  autoload :Uranus,  'when_exe/ephemeris/planets'
+  autoload :Neptune, 'when_exe/ephemeris/planets'
+  autoload :Pluto,   'when_exe/ephemeris/planets'
+  autoload :Moon,    'when_exe/ephemeris/moon'
+  autoload :Shadow,  'when_exe/ephemeris/moon'
+  autoload :V50,     'when_exe/ephemeris/v50'
   autoload :Hindu,   'when_exe/region/indian'
 
   include Math
@@ -336,8 +336,9 @@ module When::Ephemeris
       y.shift
       i -= 1
     end
-    raise RangeError, "The result does not converge." if i<=0
-    return t[2]
+    return t[2] if i > 0
+    return t[1] + (t[0]-t[1]) / (y[0]-y[1]) * (y0-y[1]) if y0 && count < 6
+    raise RangeError, "The result does not converge - #{t}->#{y}."
   end
 
   # y が周期量である場合の周期の補正
@@ -1118,7 +1119,7 @@ module When::Ephemeris
     #
     def eclipse(t, target, base=Earth)
       t = +t
-      distance      = self.coords(t, base).spherical_law_of_cosines(target.coords(t, base)) / CIRCLE
+      distance      = acos(self.coords(t, base).spherical_law_of_cosines(target.coords(t, base))) / CIRCLE
       self_radius   = self.apparent_radius(t, base)
       target_radius = target.apparent_radius(t, base)
       return (self_radius + target_radius - distance) / (2.0 * target_radius)
@@ -1900,11 +1901,11 @@ module When::Ephemeris
           @month_epoch   = 0
           @month_epoch   = @longitude_shift -_mean_moon_(@epoch_shift).to_i
         end
-        class << self; include LunarMethod; end
+        extend LunarMethod
       else
         # 太陽黄経の計算
         @solar_degree    = @year_length / 360
-        class << self; include SolarMethod;    end
+        extend SolarMethod
       end
       super
     end

data/lib/when_exe/{region → ephemeris}/moon.rb

@@ -5,7 +5,7 @@
   You may use and/or modify this file according to the license described in the LICENSE.txt file included in this archive.
 =end
 
-require 'when_exe/region/sun'
+require 'when_exe/ephemeris/sun'
 module When
   module Ephemeris
 
@@ -324,9 +324,9 @@ module When
       def apparent_radius(t, base=nil)
         t  = +t
         radius = Sun.pi(t) * AU
-        (asin(Ephemeris::Shadow.surface_radius/AU/Moon.pi(t)) -
-         asin(Ephemeris::Sun.surface_radius/radius)               +
-         asin(Ephemeris::Shadow.surface_radius/radius)) * 1.02 / CIRCLE
+        (asin(surface_radius/Moon.pi(t)) -
+         asin(Ephemeris::Sun::Radius/radius) +
+         asin(surface_radius/radius)) * 1.02 / CIRCLE
       end
     end
   end

data/lib/when_exe/{region/ephemeric_notes.rb → ephemeris/notes.rb}

@@ -99,11 +99,31 @@ class When::CalendarNote
     # @param [String] parameter 座標の分子と分母("#{ num }/#{ den }" の形式)
     #
     # @return [When::TM::IntervalLength]
+    #
+    # @private
     def event_delta(parameter=nil)
       return @delta unless parameter
       num, den = parameter.split(/\//, 2)
       When::TM::IntervalLength.new([(den || @den).to_f,1].max*0.9, 'day')
     end
+
+    #
+    # イベント日付(時刻付)
+    #
+    # @private
+    def event_time(date, event_name, event)
+      etime = term(date - When.Duration('P3D'), event, When::SYSTEM)
+      if formula.respond_to?(:year_length) && formula.denominator && formula.denominator < 100000
+        fraction  =  etime.clk_time.universal_time
+        fraction +=  When::TM::Duration::DAY * (etime.to_i - date.to_i)
+        fraction  = (fraction  / When::TM::Duration::DAY * formula.denominator * 1000 + 0.5).floor / 1000.0
+        fraction  =  fraction.to_i if fraction == fraction.to_i
+        event_name + "(#{fraction}/#{formula.denominator})"
+      else
+        etime.events = [event_name]
+        etime
+      end
+    end
   end
 
   #
@@ -173,12 +193,11 @@ class When::CalendarNote
   #
   # 天体暦の暦注
   #
-  class EphemericNote < self
+  class Ephemeris < self
 
-    NoteObjects = [When::BasicTypes::M17n, [
-      "namespace:[en=http://en.wikipedia.org/wiki/, ja=http://ja.wikipedia.org/wiki/]",
+    Notes = [When::BasicTypes::M17n, [
       "locale:[=en:, ja=ja:, alias=ja:]",
-      "names:[Ephemeric]",
+      "names:[Ephemeris]",
 
       # 年の暦注 ----------------------------
       [When::BasicTypes::M17n,
@@ -201,7 +220,7 @@ class When::CalendarNote
           [When::Coordinates::Residue,
             "label:[Moon_Age=, 正午月齢=ja:%%<月齢>]",
             "divisor:60",
-            "format:[%s(%4.1f)]"
+            "format:[%s(%4.1f)=]"
           ],
           "[Moonrise,  月の出          ]", # 月の出
           "[Moonset=,  月の入り        ]", # 月の入り
@@ -354,7 +373,7 @@ class When::CalendarNote
         @formula  = {}
       end
       @interval  = @interval.sub('@','.').to_f / 24 if @interval
-      @root      = When.CalendarNote('EphemericNote/NoteObjects::day')
+      @root      = When.CalendarNote('Ephemeris/Notes::day')
       @prime   ||= [%w(Month), %w(Sunrise Sunset Moon_Age)]
       super
     end