when_exe 0.4.4 → 0.4.5

data/lib/when_exe/mini_application.rb

@@ -232,9 +232,6 @@ module When
       calendars[0] ||= When::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]
@@ -257,15 +254,13 @@ module When
 
         if methods.size == 0
           list.map {|calendar|
-             calendar.kind_of?(Class) ?
-             yield(calendar.new(date, opts.dup)) :
-             yield(calendar.^(calendar.rate_of_clock == date.time_standard.rate_of_clock ? date.to_i : date, opts))
+            yield(date_for_calendar(calendar, date, options))
           }
         else
           list.map {|calendar|
-            date_for_calendar = calendar.^(calendar.rate_of_clock == date.time_standard.rate_of_clock ? date.to_i : date, opts)
+            date_for_cal = date_for_calendar(calendar, date, options)
             methods.map {|method|
-              date_for_calendar.send(method[0].to_sym, method[1], &block)
+              date_for_cal.send(method[0].to_sym, method[1], &block)
             }
           }
         end
@@ -274,6 +269,17 @@ module When
       return result
     end
 
+    # 当該 Calendar or CalendarEra の TemporalPosition を生成
+    def date_for_calendar(calendar, date, options)
+      opts            = {}
+      opts[:location] = date.location if date.location
+      opts[:clock   ] = calendar.rate_of_clock == 1.0 ? options[:clock] :
+                                                        calendar.time_basis if date.respond_to?(:clock)
+      calendar.kind_of?(Class) ?
+        calendar.new(date, opts) :
+        calendar.^([calendar.rate_of_clock,date.time_standard.rate_of_clock].uniq == [1.0] ? date.to_i : date, opts)
+    end
+
     # JSONで通信するために Symbol を String に変換する
     def _to_string(source)
       case source

data/lib/when_exe/namespace.rb

@@ -0,0 +1,42 @@
+# -*- coding: utf-8 -*-
+=begin
+  Copyright (C) 2015 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
+  module Namespace
+
+    # XML Schema Definition
+    XSD  = 'http://www.w3.org/2001/XMLSchema'
+
+    # Resource Description Framework
+    RDF  = 'http://www.w3.org/1999/02/22-rdf-syntax-ns#'
+
+    # Resource Description Framework Schema
+    RDFS = 'http://www.w3.org/2000/01/rdf-schema#'
+
+    # RDF 1.1 Concepts and Abstract Syntax
+    RDFC = 'http://www.w3.org/TR/rdf11-concepts/#'
+
+    # Web Ontology Language
+    OWL  = 'http://www.w3.org/2002/07/owl#'
+
+    # Dublin Core
+    DC   = 'http://purl.org/dc/elements/1.1/'
+
+    # Dublin Core Terms
+    DCQ  = 'http://purl.org/dc/terms/'
+
+    # Dublin Core Types
+    DCT  = 'http://purl.org/dc/dcmitype/'
+
+    # Friend of a Friend
+    FOAF = 'http://xmlns.com/foaf/0.1/'
+
+    # RDF Site Summary
+    RSS  = 'http://purl.org/rss/1.0/'
+
+  end
+end

data/lib/when_exe/parts/enumerator.rb

@@ -188,7 +188,7 @@ module When::Parts
     #   [ false - ない ]
     #
     def has_next?
-      return (@count_limit != 0) && (@current != nil)
+      return (@count_limit != 0) && !@current.nil?
     end
 
     #
@@ -238,7 +238,17 @@ module When::Parts
         @count += 1
         _exclude(@current) if @current
       end
-      return value
+      @delayed && value.respond_to?(:apply_delayed_options) ?
+        value.apply_delayed_options(@delayed)               :
+        value
+    end
+
+    # 終端要素は含む
+    #
+    # @return [Boolean]
+    #
+    def exclude_end
+      false
     end
 
     # オブジェクトの生成
@@ -262,6 +272,7 @@ module When::Parts
       @options = self.class._options(args)
       @exdate  = @options.delete(:exdate)
       @exevent = @options.delete(:exevent)
+      @delayed = @options.delete(:delayed)
       @parent, *rest = args
       _range(rest)
       _rewind

data/lib/when_exe/parts/geometric_complex.rb

@@ -224,6 +224,56 @@ module When::Parts
       end
     end
 
+    # オブジェクト変換オプションの遅延適用
+    #
+    # @param [Hash] options 以下の通り
+    # @option options [Hash<Integrt=>When::Coordinates::Residue>] :residue
+    # @option options [When::TM::Clock]                           :clock
+    # @option options [Array <When::TM::Calendar>]                :frame
+    #
+    # @return [When::Parts::GeometricComplex]
+    #
+    def apply_delayed_options(options)
+      last_node = nil
+      self.class.new(@node.map {|node|
+        point, flag, range = node
+        if range && last_node
+          [last_node + range, flag, range]
+        else
+           last_node = point.apply_delayed_options(options)
+          [last_node, flag]
+        end
+      }, @reverse)
+    end
+
+    # 平行移動(加算)
+    #
+    # @param [When::TM::Duration] duration
+    #
+    # @return [When::Parts::GeometricComplex]
+    #
+    def +(duration)
+      self.class.new(@node.map {|node|
+        new_node     = node.dup
+        new_node[0] += duration
+        new_node
+      }, @reverse)
+    end
+
+    # 平行移動(減算)
+    #
+    # @param [When::TM::Duration] duration
+    #
+    # @return [When::Parts::GeometricComplex]
+    #
+    def +(duration)
+      self.class.new(@node.map {|node|
+        new_node     = node.dup
+        new_node[0] -= duration
+        new_node
+      }, @reverse)
+    end
+
     # オブジェクトの生成
     #
     # @overload initialize(range, reverse=false)
@@ -288,7 +338,7 @@ module When::Parts
         first = [first, true]
         case last
         when Comparable         ; last = [last, false]
-        when When::TM::Duration ; last = [first[0] + last, false]
+        when When::TM::Duration ; last = [first[0] + last, false, last]
         when nil                ; last = first
         else ; raise TypeError, "Irregal GeometricComplex Type for last element: #{last.class}"
         end

data/lib/when_exe/parts/method_cash.rb

@@ -141,7 +141,7 @@ module When
         if ((name.to_s =~ /\A(_*)(.+?)_to_(.+)\z/) && respond_to?("#{$1}#{$3}_to_#{$2}_", true))
           prefix, from, to = $~[1..3]
           begin
-            if (@_m_cash_lock_)
+            if @_m_cash_lock_
               return send("#{prefix}#{from}_to_#{to}_", *args, &block) unless @_m_cash_lock_.try_lock
               unlock = "ensure ; @_m_cash_lock_.locked? && @_m_cash_lock_.unlock"
             end
@@ -161,19 +161,21 @@ module When
                     return inv
                   #{unlock}
                   end
+                rescue ThreadError
                 end
               }
             end
             key = _key_simplefy(args)
             inv = send("#{prefix}#{from}_to_#{to}_", *args)
-            @_m_cash_ ||= {}
-            @_m_cash_["#{prefix}#{to}_to_#{from}"]    ||= {}
-            @_m_cash_["#{prefix}#{from}_to_#{to}"]    ||= {}
+            @_m_cash_ ||= Hash.new {|hash,key| hash[key]={}}
             @_m_cash_["#{prefix}#{to}_to_#{from}"][_key_simplefy(inv)] = args
             @_m_cash_["#{prefix}#{from}_to_#{to}"][key] = inv
             return inv
           ensure
-            @_m_cash_lock_ && @_m_cash_lock_.locked? && @_m_cash_lock_.unlock
+            begin
+              @_m_cash_lock_ && @_m_cash_lock_.locked? && @_m_cash_lock_.unlock
+            rescue ThreadError
+            end
           end
 
         else
@@ -181,7 +183,7 @@ module When
             respond = respond_to?("#{name}_setup", true)
             setup   = respond ? "#{name}_setup(key, *args)" :
                                 "(@_m_cash_[\"#{name}\"][key] = #{name}_(*args))"
-            if (@_m_cash_lock_)
+            if @_m_cash_lock_
               return send("#{name}_", *args, &block) unless @_m_cash_lock_.try_lock
               lock   = "  return #{name}_(*args) unless @_m_cash_lock_.try_lock"
               unlock = "ensure ; @_m_cash_lock_.locked? && @_m_cash_lock_.unlock"
@@ -196,18 +198,21 @@ module When
                   return #{setup}
                 #{unlock}
                 end
+              rescue ThreadError
               end
             }
             key = _key_simplefy(args)
-            @_m_cash_ ||= {}
-            @_m_cash_["#{name}"] ||= {}
-            if (respond)
+            @_m_cash_ ||= Hash.new {|hash,key| hash[key]={}}
+            if respond
               return send("#{name}_setup", key, *args)
             else
               return(@_m_cash_["#{name}"][key] ||= send("#{name}_", *args))
             end
           ensure
-            @_m_cash_lock_ && @_m_cash_lock_.locked? && @_m_cash_lock_.unlock
+            begin
+              @_m_cash_lock_ && @_m_cash_lock_.locked? && @_m_cash_lock_.unlock
+            rescue ThreadError
+            end
           end
         end
       end

data/lib/when_exe/parts/resource.rb

@@ -15,6 +15,8 @@ module When::Parts
   #
   module Resource
 
+    include When::Namespace
+
     # @private
     LabelProperty = nil
 
@@ -47,7 +49,7 @@ module When::Parts
     IRIEncode = /[#{IRIEncodeTable.keys.join('')}]/
 
     # @private
-    IRIDecode = /#{IRIDecodeTable.keys.join('|')}/
+    IRIDecode = /#{IRIDecodeTable.keys.join('|')}/i
 
     # @private
     class ContentLine
@@ -198,6 +200,31 @@ module When::Parts
       end
     end
 
+    module Navigation
+      # 前のオブジェクト
+      #
+      # @return [When::Parts::Resource]
+      #
+      def prev
+        c = self
+        c = c.child[0] while c.child && c.child.size > 0
+        c = c._pool['.<-']
+        c = c.child[-1] while c && c.child && c.child.size > 0
+        c
+      end
+
+      # 次のオブジェクト
+      #
+      # @return [When::Parts::Resource]
+      #
+      def next
+        c = self
+        c = c.child[0] while c.child && c.child.size > 0
+        c._pool['.->']
+      end
+      alias :succ :next
+    end
+
     class << self
 
       include Pool
@@ -307,7 +334,7 @@ module When::Parts
       #
       # @param [String] iri International Resource Identifier
       # @param [String] namespace (デフォルトの名前空間, 指定がないときは名前空間を省略しない)
-      # @param [Block] block オブジェクトが見つからない場合の代替処理
+      # @param [Block] block オブジェクトやパスが見つからない場合の代替処理
       #
       # @return [When::Parts::Resource]
       #
@@ -457,7 +484,7 @@ module When::Parts
 
       # @private
       def _decode(iri)
-        iri = iri.gsub(When::Parts::Resource::IRIDecode) {|c| When::Parts::Resource::IRIDecodeTable[c]}
+        iri = iri.gsub(When::Parts::Resource::IRIDecode) {|c| When::Parts::Resource::IRIDecodeTable[c.upcase]}
         return iri unless iri =~ /%28/
 
         begin
@@ -515,7 +542,10 @@ module When::Parts
           return object if object
           OpenURI
           args  = [path, "1".respond_to?(:force_encoding) ? 'r:utf-8' : 'r']
-          args << {:ssl_verify_mode=>OpenSSL::SSL::VERIFY_NONE} if path =~ /\Ahttps:/
+          real_path = block_given? ? yield(path) : path
+          raise IOError, path + ': not ready' unless real_path
+          args  = [real_path, "1".respond_to?(:force_encoding) ? 'r:utf-8' : 'r']
+          args << {:ssl_verify_mode=>OpenSSL::SSL::VERIFY_NONE} if real_path =~ /\Ahttps:/
           open(*args) do |file|
             resource = file.read
             case resource[0..5].upcase
@@ -525,6 +555,9 @@ module When::Parts
             when '<?XML '
               options['.'] = _xml(REXML::Document.new(_replace_tags(resource, replace)).root)
               options['.'][0].new(options)
+            when '# WHEN'
+              klass, rows = _csv(resource)
+              klass.new(path, rows, &block)
             else
               raise NoMethodError, 'JSON not supported' unless Object.const_defined?(:JSON)
               _internal(_json([JSON.parse(resource)]), replace, options)
@@ -683,6 +716,13 @@ module When::Parts
           json
         end
       end
+
+      # .csv フォーマットの読み込み
+      def _csv(csv)
+        rows  = CSV.parse(csv)
+        klass = rows.shift.first[2..-1].strip.split('::').inject(Object) {|ns, sym| ns.const_get(sym)}
+        [klass, rows]
+      end
     end
 
     include Synchronize
@@ -731,12 +771,13 @@ module When::Parts
     # @return [Sring]
     #
     def iri(prefix=false)
+      return nil unless @_pool
       unless @iri
         root = @_pool['..']
         path = root.instance_of?(String) ? root : label.to_s
         if root.respond_to?(:iri)
           root_iri = root.iri
-          path = root_iri + '::' + path if root_iri
+          path = root_iri + '::' + path.gsub(/[<>]/) {|char|'%' + char.ord.to_s(16)} if root_iri
         end
         @iri = path
       end
@@ -825,29 +866,6 @@ module When::Parts
       other.include?(self)
     end
 
-    # 前のオブジェクト
-    #
-    # @return [When::Parts::Resource]
-    #
-    def prev
-      c = self
-      c = c.child[0] while c.child && c.child.size > 0
-      c = c._pool['.<-']
-      c = c.child[-1] while c && c.child && c.child.size > 0
-      c
-    end
-
-    # 次のオブジェクト
-    #
-    # @return [When::Parts::Resource]
-    #
-    def next
-      c = self
-      c = c.child[0] while c.child && c.child.size > 0
-      c._pool['.->']
-    end
-    alias :succ :next
-
     # オブジェクト包含階層の末端か?
     #
     # @return [Boolean]
@@ -871,7 +889,7 @@ module When::Parts
         return false unless leaf.equal?(root._pool[leaf.label])
         leaf = root
       end
-      Resource._pool.value?(leaf)
+      Resource._pool.values.map {|resource| resource.object_id}.include?(leaf.object_id)
     end
 
     # When::BasicTypes::M17n の生成/参照

data/lib/when_exe/region/chinese.rb

@@ -156,9 +156,9 @@ module When
           @repeat_count   = @repeat_count.to_i
 
           # 太陽の盈縮表の生成
-          #   [先後數, 朓朒数, (立成b, 立成c)]
+          #   [先後數, 朓朒数, (初率b, 別差c)]
           #      ↓
-          #   [区間の始めの冬至からの経過日数, 朓朒数, 立成b, 立成c]
+          #   [区間の始めの冬至からの経過日数, 朓朒数, 初率b, 別差c]
           @s = @s.map {|item| item.dup}
           if @rissei # 立成の計算・比較
             puts "\n  ["+ @denominator.to_s + "]" if @rissei == @rissei.upcase
@@ -218,6 +218,7 @@ module When
               t02 / 2.0
             end
           r = v < 0 ? 12.0/(17*11) : 12.0/(16*11)
+         # 初率b, 別差c
           [v * r, (t12-t01) * r * r]
         end
 
@@ -660,7 +661,7 @@ module When
           @anomalistic_month_shift  =  @anomalistic_month_shift.to_f      # 転應(暦元前近/遠地点通過から暦元天正冬至までの日数)
           @anomaly_method           =  @anomaly_method || 'a'             # (経朔-定朔)の計算方法
           @anomaly_precision        = (@anomaly_precision || 1.0E-5).to_f # c 方式 での収束判定誤差 / 日
-          @solar_weight             =  @solar_weight   || 0               # (経朔-定朔)の計算で用いる実行差での太陽盈縮の重み(0:非考慮,1:考慮)
+          @solar_weight             = (@solar_weight      || 0     ).to_i # (経朔-定朔)の計算で用いる実行差での太陽盈縮の重み(0:非考慮,1:考慮)
           @lunar_unit               =  @lunar_unit.to_f                   # 太陰遅速計算用招差法定数の時間の単位(限)
           @m                        =  _rissei_j(@m)                      # 太陰遅速計算用招差法定数
           @s                        =  _rissei_j(@s)                      # 太陽盈縮計算用招差法定数

data/lib/when_exe/region/chinese/calendars.rb

@@ -386,8 +386,8 @@ module When
     # 北周・隋::     大象暦    579 -  583
     # 隋::           開皇暦    584 -  596
     # 隋・唐::       大業暦    597 -  618
-    # 唐::           戊寅元暦  619 -  664
-    # 唐・周::       麟徳暦    665 -  728 総法 1340(小余の分母)
+    # 唐::           戊寅元暦  619 -  665
+    # 唐・周::       麟徳暦    666 -  728 総法 1340(小余の分母)
     # 唐::           大衍暦    729 -  761 通法 3040(    〃    )
     # 唐::           五紀暦    762 -  783 通法 1340(    〃    )
     # 唐::           正元暦    784 -  806
@@ -530,8 +530,8 @@ module When
     # 『唐・日本における進朔に関する研究』(2013-10版)を使用する場合の朔閏表(一部修正あり)
     #
     # 隋・唐::       大業暦    618
-    # 唐::           戊寅元暦  619 -  664
-    # 唐・周::       麟徳暦    665 -  728 総法 1340(小余の分母)
+    # 唐::           戊寅元暦  619 -  665
+    # 唐・周::       麟徳暦    666 -  728 総法 1340(小余の分母)
     # 唐::           大衍暦    729 -  761 通法 3040(    〃    )
     # 唐::           五紀暦    762 -  783 通法 1340(    〃    )
     # 唐::           正元暦    784 -  806