when_exe 0.4.5 → 0.4.6

data/lib/when_exe/events.rb

@@ -37,6 +37,13 @@ module When
       #
       attr_reader :until
 
+      # オリジナル文字列
+      #
+      # @return [String]
+      #
+      attr_accessor :original
+      private :original=
+
       # オブジェクトを When::Events::Range 型に変換する
       #
       # @param [Object] source 変換元のオブジェクト
@@ -605,10 +612,9 @@ module When
       # 日時範囲化
       to_range     = proc {|event, date|
         target = When.when?(date, :parse=>When::Locale::EasternParser)
-        case target
-        when Array, Enumerator ; Range.convert_from(target)
-        else                   ; target
-        end
+        target = Range.convert_from(target) if target.kind_of?(Array) || target.kind_of?(Enumerator)
+        target.send(:original=, date) if target.kind_of?(Range)
+        target
       }
 
       # 日付化
@@ -1187,14 +1193,14 @@ module When
             event_range.overlaped(range).each do |focused_date|
               sort_required = true
               focused_event = event.deep_copy
-              focused_event.role[VALID] = focused_date
+              focused_event.send(:date=, focused_date)
               narrowed_events << focused_event
             end
           else
             narrowed_events << event
           end
         end
-        narrowed_events.sort_by! {|event| event.role[VALID]} if sort_required
+        narrowed_events.sort_by! {|event| event.date} if sort_required
         narrowed_events
       end
 
@@ -1325,37 +1331,42 @@ module When
         source    = yield(source) if block_given? && operation !~ /SPARQL|CalendarEra/i
         raise IOError, target + ': not ready' unless source
         for_each_record(source, operation) do |row|
-          event = Event.new(self, @events.size+1, row)
-          @events << event
-
-          @role.keys.each do |item|
-            case item
-            when LABEL, REFERENCE
-            when HAS_PART
-              if event.role[HAS_PART].kind_of?(Array)
-                event.role[HAS_PART].each do |word|
-                  @index[HAS_PART][word] << @events.size
+          begin
+            event = Event.new(self, @events.size+1, row)
+            @events << event
+  
+            @role.keys.each do |item|
+              case item
+              when LABEL, REFERENCE
+              when HAS_PART
+                if event.role[HAS_PART].kind_of?(Array)
+                  event.role[HAS_PART].each do |word|
+                    @index[HAS_PART][word] << @events.size
+                  end
+                else
+                  event.each_word do |word|
+                    @index[HAS_PART][word] << @events.size
+                  end
                 end
+              when WHAT_DAY
+                date = event.role[WHAT_DAY]
+                key = [date.class.to_s !~ /\AWhen/ ||
+                       date.frame.kind_of?(When::CalendarTypes::Christian),
+                       date.month * 1, date.day]
+                @index[WHAT_DAY][key] << @events.size
               else
-                event.each_word do |word|
-                  @index[HAS_PART][word] << @events.size
-                end
+                add_index(:role, item)
               end
-            when WHAT_DAY
-              date = event.role[WHAT_DAY]
-              key = [date.class.to_s !~ /\AWhen/ ||
-                     date.frame.kind_of?(When::CalendarTypes::Christian),
-                     date.month * 1, date.day]
-              @index[WHAT_DAY][key] << @events.size
-            else
-              add_index(:role, item)
             end
-          end
-
-          [:rdf, :csv].each do |method|
-            send(method).keys.each do |item|
-              add_index(method, item)
+  
+            [:rdf, :csv].each do |method|
+              send(method).keys.each do |item|
+                add_index(method, item)
+              end
             end
+          rescue => exception
+            puts "#{source}##{@events.size+1}: #{exception}"
+          # puts exception.backtrace
           end
         end
 
@@ -1660,6 +1671,22 @@ module When
       #
       attr_reader :order
 
+      #
+      # deep copy 時の元イベント
+      #
+      # @return [When::Events::Event]
+      #
+      attr_accessor :original
+      protected :original=
+
+      #
+      # 日付または日付範囲
+      #
+      # @return [When::TM::TemporalPosition or When::Events::Range]
+      #
+      attr_accessor :date
+      private :date=
+
       #
       # HAS_PART対象の文字列中の{}で囲まれた語に対して yield で指定された処理を行う
       #
@@ -1742,6 +1769,13 @@ module When
               words.each do |word|
                 @statements << ::RDF::Statement(subject, @dataset.resource[predicate], word)
               end
+            when VALID
+              if object.kind_of?(Range)
+                object = object.original
+              elsif object.respond_to?(:to_uri)
+                object = object.to_uri
+              end
+              @statements << ::RDF::Statement(subject, @dataset.resource[predicate], object)
           # when ABSTRACT
           #   @statements << ::RDF::Statement(subject, @dataset.resource[predicate], abstract)
             else
@@ -1765,10 +1799,11 @@ module When
       # @return [When::Events::Event] コピー結果
       #
       def deep_copy
-        result = self.dup
-        result.csv  = @csv.dup
-        result.rdf  = @rdf.dup
-        result.role = @role.dup
+        result          = self.dup
+        result.csv      = @csv.dup
+        result.rdf      = @rdf.dup
+        result.role     = @role.dup
+        result.original = self
         result
       end
 
@@ -1831,6 +1866,8 @@ module When
               definition[:operation].call(self, format == '%s' ? fields.first : format % fields)
             end
         end
+
+        @date = @role[VALID]
       end
 
       private

data/lib/when_exe/icalendar.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 =begin
-  Copyright (C) 2011-2015 Takashi SUGA
+  Copyright (C) 2011-2016 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
@@ -595,9 +595,10 @@ module When::V
           end
         }
         residue_options = delayed_options[:residue]
+        frame_len       = base.frame.indices.length
         if residue_options
-          event_options['rrule'].update(_byyear(residue_options)) if residue_options[0]
-          event_options['rrule'].update(_byday(residue_options )) if residue_options[2]
+          event_options['rrule'].update(_byyear(residue_options.delete(frame_len-2))) if residue_options[frame_len-2]
+          event_options['rrule'].update(_byday(residue_options.delete(frame_len) )) if residue_options[frame_len]
           delayed_options.delete(:residue)
         end
         if base.precision == When::MONTH && event_options['rrule']['FREQ'] == 'YEARLY'
@@ -620,14 +621,13 @@ module When::V
 
       # オブジェクト変換オプションの遅延適用のBYYEAR要素
       #
-      def _byyear(options)
-        {'BYYEAR'=>_to_ical_hash(When.Residue(options.delete(0)), 'year', 4)}
+      def _byyear(operation)
+        {'BYYEAR'=>_to_ical_hash(When.Residue(operation), 'year', 4)}
       end
 
       # オブジェクト変換オプションの遅延適用のBYDAY要素
       #
-      def _byday(options)
-        operation = options.delete(2)
+      def _byday(operation)
         return {'BYDAY'=>_to_ical_hash(operation, 'day', 11)} if operation.kind_of?(When::Coordinates::Residue)
 
         residues = []

data/lib/when_exe/inspect.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 =begin
-  Copyright (C) 2011-2015 Takashi SUGA
+  Copyright (C) 2011-2016 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
@@ -773,7 +773,7 @@ module When
       # @return [String]
       #
       def _to_uri(date)
-        (date.gsub(/\./, '-').gsub(/%/, '@') + caret_frame).
+        (date.gsub(/%/, '@').sub(/(\d{2}:\d{2}:\d{2})\.(\d+)/, '\1%2E\2').gsub(/\./, '-') + caret_frame).
           gsub(When::Parts::Resource::IRIEncode) {|c| When::Parts::Resource::IRIEncodeTable[c]}
       end
 
@@ -1460,7 +1460,7 @@ module When
       # 出力に使用する clk_time の作成
       def _clk_time_for_inspect(precision)
         return @clk_time unless precision && precision > When::DAY
-        base = self + When::TM::Duration.new(@clk_time.frame._round_value(precision))
+        base = self + When::TM::PeriodDuration.new(0.5, precision)
         base.clk_time.clk_time[When::HOUR] = @clk_time.clk_time[When::HOUR] + 1 unless self.to_i == base.to_i
         return base.clk_time
       end

data/lib/when_exe/linkeddata.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 =begin
-  Copyright (C) 2014-2015 Takashi SUGA
+  Copyright (C) 2014-2016 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

data/lib/when_exe/parts/resource.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 =begin
-  Copyright (C) 2011-2015 Takashi SUGA
+  Copyright (C) 2011-2016 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
@@ -373,9 +373,21 @@ module When::Parts
             end
           end
           case @_pool[iri]
-          when my_mutex; my_mutex.synchronize    {@_pool[iri] = _create_object(iri, path, query, &block) }
-          when Mutex   ; @_pool[iri].synchronize {@_pool[iri]}
-          else         ; @_pool[iri]
+          when my_mutex
+            my_mutex.synchronize do
+              begin
+                @_pool[iri] = _create_object(iri, path, query, &block)
+              rescue => exception
+                @_pool[iri] = nil
+                raise exception
+              end
+            end
+          when Mutex
+            @_pool[iri].synchronize do
+              @_pool[iri]
+            end
+          else
+            @_pool[iri]
           end
         else
           @_pool      ||= {}

data/lib/when_exe/parts/timezone.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 =begin
-  Copyright (C) 2011-2015 Takashi SUGA
+  Copyright (C) 2011-2016 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
@@ -16,7 +16,7 @@ module When::Parts
   class Timezone
 
     #
-    # When::V::Timezone と Qhwn::Parts::Timezone の抽象基底
+    # When::TM::Clock, When::V::Timezone と Qhwn::Parts::Timezone の抽象基底
     # 
     module Base
       # 標準時間帯の時計
@@ -39,10 +39,13 @@ module When::Parts
       # @return [When::TM::DateAndTime, When::TM::JulianDate]
       #
       def ^(date, options={})
-        date    = When::TM::Position.any_other(date, options)
-        options = date._attr.merge({:clock=>self}).merge(options)
-        return When::TM::JulianDate.dynamical_time(date.dynamical_time, options) unless date.frame.kind_of?(When::TM::Calendar)
-        date.frame.jul_trans(When::TM::JulianDate.dynamical_time(date.dynamical_time), options)
+        date   = When::TM::Position.any_other(date, options)
+        my_opt = date._attr
+        my_opt[:clock]         = self
+        my_opt[:time_standard] = time_standard if respond_to?(:time_standard)
+        my_opt.merge(options)
+        return When::TM::JulianDate.dynamical_time(date.dynamical_time, my_opt) unless date.frame.kind_of?(When::TM::Calendar)
+        date.frame.jul_trans(When::TM::JulianDate.dynamical_time(date.dynamical_time, {:time_standard=>my_opt[:time_standard]}), my_opt)
       end
     end
 

data/lib/when_exe/region/chinese.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 =begin
-  Copyright (C) 2011-2015 Takashi SUGA
+  Copyright (C) 2011-2016 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
@@ -820,7 +820,8 @@ module When
       #
       def _normalize(args=[], options={})
         @label            ||= 'Chinese::ChineseSolar'
-        @formula          ||= ['Formula']
+        @formula          ||= (When::CalendarNote::LuniSolarPositions.table_off ? ['Formula'] :
+                                 [When.Resource('_ep:SolarFormulaWithTable'), When.Resource('_ep:LunarFormulaWithTable')])
         @formula            = Array(@formula)
         @formula           *= 2 if @formula.length == 1
         @formula[0]        += (@formula[0] =~ /\?/ ? '&' : '?') + 'formula=12S' if @formula[0].kind_of?(String)
@@ -873,7 +874,8 @@ module When
       #
       def _normalize(args=[], options={})
         @label            ||= 'Chinese::ChineseLuniSolar'
-        @formula          ||= ['Formula']
+        @formula          ||= (When::CalendarNote::LuniSolarPositions.table_off ? ['Formula'] :
+                                 [When.Resource('_ep:SolarFormulaWithTable'), When.Resource('_ep:LunarFormulaWithTable')])
         @formula            = Array(@formula)
         @formula           *= 2 if @formula.length == 1
         @formula[0]        += (@formula[0] =~ /\?/ ? '&' : '?') + 'formula=12S' if @formula[0].kind_of?(String)

data/lib/when_exe/region/indian.rb

@@ -635,8 +635,8 @@ module When
       def _new_month_(m)
         new_month_time = @formula[0].cn_to_time(m + @cycle_offset)
         new_month_date = (new_month_time + 0.5 + @formula[0].long/360.0).floor
-        sunrise_time = @formula[0].sunrise(new_month_date)
-        (sunrise_time <= new_month_time) ? new_month_date : new_month_date-1
+      # sunrise_time = @formula[0].sunrise(new_month_date)
+      # (sunrise_time <= new_month_time) ? new_month_date : new_month_date-1
       end
 
       private

data/lib/when_exe/region/japanese/notes.rb

@@ -1271,7 +1271,10 @@ class When::CalendarNote
       2396063 => [315.0, 1], # 弘化05(1848).01.01 [315.0, 0] 没
 
       2397583 => [ 15.0, 1], # 嘉永05(1852).02=15 [ 14.0, 0] 没
-      2397584 => [ 16.0, 0]  # 嘉永05(1852).02=16 [ 15.0, 1] 清明 (計算誤差の補正)
+      2397584 => [ 16.0, 0], # 嘉永05(1852).02=16 [ 15.0, 1] 清明 (計算誤差の補正)
+
+      2451110 => [210.0, 1], # 平成10(1998).10.23 [209.0, 0] 没
+      2451111 => [211.0, 0]  # 平成10(1998).10.24 [210.0, 1] 霜降 (計算誤差の補正)
     }
 
     class << self

data/lib/when_exe/timestandard.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 =begin
-  Copyright (C) 2011-2015 Takashi SUGA
+  Copyright (C) 2011-2016 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

data/lib/when_exe/tmposition.rb

@@ -372,9 +372,14 @@ module When::TM
           d
         }
 
+        # 繰り返しの起点と間隔
+        base      = element[0].kind_of?(Duration) ? element[1] : element[0]
+        frame_len = (base.respond_to?(:frame) ? base.frame : When::Gregorian).indices.length
+        duration  = _duration_for_repeat(element)
+
         # 意味のある繰り返しのない場合
-        has_residue_options = delayed_options[:residue] && (delayed_options[:residue][0].kind_of?(String) ||
-                                                            delayed_options[:residue][2].kind_of?(String))
+        has_residue_options = delayed_options[:residue] && (delayed_options[:residue][frame_len-2].kind_of?(String) ||
+                                                            delayed_options[:residue][frame_len].kind_of?(String))
         case repeat
         when nil ; return _instance_without_repeat(element).apply_delayed_options(delayed_options) unless has_residue_options
         when 0   ; return []
@@ -383,10 +388,6 @@ module When::TM
           raise ArgumentError, "Duration or TemporalPosition missing" unless element[1] || has_residue_options
         end
 
-        # 繰り返しの起点と間隔
-        base     = element[0].kind_of?(Duration) ? element[1] : element[0]
-        duration = _duration_for_repeat(element)
-
         # 繰り返しのある場合
         if repeat.kind_of?(Integer) && !has_residue_options
 
@@ -408,7 +409,8 @@ module When::TM
           return duration.set_repeat(true) unless base
 
           # iCalendar の機能を使用する
-          should_limit = base.precision == When::MONTH && !(delayed_options[:residue] && delayed_options[:residue][0])
+          should_limit = base.precision == When::MONTH &&
+                       !(delayed_options[:residue] && delayed_options[:residue][frame_len-2])
           iterator = When::V::Event.iterator_for_ISO8601(base, duration, delayed_options)
           case repeat
           when nil     ; (result=iterator.succ).precision > base.precision && should_limit && base != result ? nil : result
@@ -430,6 +432,7 @@ module When::TM
         options  = TemporalPosition._options(options)
         options[:frame]  ||= 'Gregorian'
         options[:frame]    = When.Resource(options[:frame], '_c:') if options[:frame].kind_of?(String)
+        frame_len = options[:frame].indices.length
         case args[0]
         when String
           options[:era_name]    = When::EncodingConversion.to_internal_encoding(args.shift)
@@ -441,7 +444,7 @@ module When::TM
         # 時間位置の生成
         res   = []
         abbrs = Array(options[:abbr])
-        date  = Array.new(options[:frame].indices.length-1) {
+        date  = Array.new(frame_len-1) {
           element = args.shift
           abbr    = abbrs.shift
           res    << element.to('year') if element.kind_of?(When::Coordinates::Residue)
@@ -458,8 +461,8 @@ module When::TM
           end
         }
         parse = options.delete(:parse)
-        if parse && parse[:residue] && parse[:residue][2]
-          res << parse[:residue][2]
+        if parse && parse[:residue] && parse[:residue][frame_len]
+          res << parse[:residue][frame_len]
         end
         if args.length > 0
           options[:clock] ||= Clock.local_time
@@ -838,8 +841,10 @@ module When::TM
       else          ; raise TypeError, "The right operand should be Numeric or Duration"
       end
       return _plus(other) if other.kind_of?(PeriodDuration)
-      @frame.kind_of?(Calendar) ? @frame.jul_trans(JulianDate.dynamical_time(dynamical_time + other.duration), self._attr) :
-                                                   JulianDate.dynamical_time(dynamical_time + other.duration,  self._attr)
+      options = self._attr
+      time    = dynamical_time + other.duration
+      @frame.kind_of?(Calendar) ? @frame.jul_trans(JulianDate.dynamical_time(time, {:time_standard=>options[:time_standard]}), options) :
+                                                   JulianDate.dynamical_time(time,  options)
     rescue RangeError
       (@frame ^ self) + other
     end
@@ -863,8 +868,10 @@ module When::TM
       else          ; raise TypeError, "The right operand should be Numeric, Duration or TemporalPosition"
       end
       return _plus(-other) if other.kind_of?(PeriodDuration)
-      @frame.kind_of?(Calendar) ? @frame.jul_trans(JulianDate.dynamical_time(dynamical_time - other.duration), self._attr) :
-                                                   JulianDate.dynamical_time(dynamical_time - other.duration,  self._attr)
+      options = self._attr
+      time    = dynamical_time - other.duration
+      @frame.kind_of?(Calendar) ? @frame.jul_trans(JulianDate.dynamical_time(time, {:time_standard=>options[:time_standard]}), options) :
+                                                   JulianDate.dynamical_time(time,  options)
     rescue RangeError
       (@frame ^ self) - other
     end
@@ -1065,12 +1072,13 @@ module When::TM
     # @return [When::TM::TemporalPosition]
     #
     def apply_delayed_options(options)
-      position = self
+      position  = self
+      frame_len = frame.indices.length
       if options[:residue]
         options[:residue].keys.sort.each do |count|
           options[:residue][count] = When.Residue(options[:residue][count]) unless options[:residue][count].kind_of?(When::Coordinates::Residue)
           residue = options[:residue][count]
-          if count == 0
+          if count == frame_len - 2
             residue   = residue.to('year')
             position &= residue
           else