when_exe 0.3.3 → 0.3.4

data/lib/when_exe/coordinates.rb

@@ -1957,7 +1957,12 @@ module When::Coordinates
             end
           } unless When::Parts::MethodCash.escape(name)
           return @note.send(name, *(args + [self]), &block)
-        elsif respond_to?(:forwarded_formula, true)
+        elsif When::Ephemeris::Formula.method_defined?(name)
+          unless respond_to?(:forwarded_formula, true)
+            instance_eval('class << self; include When::Ephemeris::Formula::Methods; end')
+            @formula ||= When::Ephemeris::Formula.new({:location=>@location})
+            @formula   = When.Resource(Array(@formula), '_ep:')
+          end
           instance_eval %Q{
             def #{name}(*args, &block)
               forward = forwarded_formula("#{name}", args[0])

data/lib/when_exe/icalendar.rb

@@ -52,6 +52,7 @@
 # * NAMESPACE Property を追加
 # * LOCALE Property を追加
 # * SUMMARY Property で[...]表現を多言語対応文字列として解釈する
+# * RFC6350 ( http://tools.ietf.org/html/rfc6350 ) 方式にも対応
 # === Content Lines
 #   RFC 5545 3.1 Content Lines では、記述が75文字を超える場合、改行してインデントする。
 #   本ライブラリでは文字数によらず、BEGIN:の次の行を基準にして、より深いインデントがある場合は、

data/lib/when_exe/version.rb

@@ -6,5 +6,5 @@
 =end
 
 module When
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end

data/test/test.rb

@@ -40,7 +40,7 @@ require './test/tmreference'
 require './test/tmposition'
 require './test/calendartypes'
 require './test/inspect'
-#require './test/googlecalendar'
+require './test/googlecalendar'
 require './test/region/m17n'
 require './test/region/residue'
 require './test/region/civil'

data/test/test/googlecalendar.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 =begin
-  Copyright (C) 2012-2013 Takashi SUGA
+  Copyright (C) 2012-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.
@@ -51,22 +51,28 @@ END:VTIMEZONE
 RECURRENCE
 
     HOLIDAYS = [
-      ["元日",         "2012-01-01T00:00:00.00+09:00", "2012-01-02T00:00:00.00+09:00"],
-      ["成人の日",     "2012-01-09T00:00:00.00+09:00", "2012-01-10T00:00:00.00+09:00"],
-      ["建国記念の日", "2012-02-11T00:00:00.00+09:00", "2012-02-12T00:00:00.00+09:00"],
-      ["昭和の日",     "2012-04-29T00:00:00.00+09:00", "2012-04-30T00:00:00.00+09:00"],
-    # ["振替休日",     "2012-04-30T00:00:00.00+09:00", "2012-05-01T00:00:00.00+09:00"],
-      ["憲法記念日",   "2012-05-03T00:00:00.00+09:00", "2012-05-04T00:00:00.00+09:00"],
-      ["みどりの日",   "2012-05-04T00:00:00.00+09:00", "2012-05-05T00:00:00.00+09:00"],
-      ["こどもの日",   "2012-05-05T00:00:00.00+09:00", "2012-05-06T00:00:00.00+09:00"],
-      ["海の日",       "2012-07-16T00:00:00.00+09:00", "2012-07-17T00:00:00.00+09:00"],
-      ["敬老の日",     "2012-09-17T00:00:00.00+09:00", "2012-09-18T00:00:00.00+09:00"],
-    # ["秋分の日",     "2012-09-22T00:00:00.00+09:00", "2012-09-23T00:00:00.00+09:00"],
-      ["体育の日",     "2012-10-08T00:00:00.00+09:00", "2012-10-09T00:00:00.00+09:00"],
-      ["文化の日",     "2012-11-03T00:00:00.00+09:00", "2012-11-04T00:00:00.00+09:00"],
-      ["勤労感謝の日", "2012-11-23T00:00:00.00+09:00", "2012-11-24T00:00:00.00+09:00"],
-      ["天皇誕生日",   "2012-12-23T00:00:00.00+09:00", "2012-12-24T00:00:00.00+09:00"],
-    # ["振替休日",     "2012-12-24T00:00:00.00+09:00", "2012-12-25T00:00:00.00+09:00"]
+      ["元日",                "2012-01-01T00:00:00.00+09:00", "2012-01-02T00:00:00.00+09:00"],
+      ["元日 振替休日",       "2012-01-02T00:00:00.00+09:00", "2012-01-03T00:00:00.00+09:00"],
+      ["銀行休業日",          "2012-01-02T00:00:00.00+09:00", "2012-01-03T00:00:00.00+09:00"],
+      ["銀行休業日",          "2012-01-03T00:00:00.00+09:00", "2012-01-04T00:00:00.00+09:00"],
+      ["成人の日",            "2012-01-09T00:00:00.00+09:00", "2012-01-10T00:00:00.00+09:00"],
+      ["建国記念の日",        "2012-02-11T00:00:00.00+09:00", "2012-02-12T00:00:00.00+09:00"],
+      ["春分の日",            "2012-03-20T00:00:00.00+09:00", "2012-03-21T00:00:00.00+09:00"],
+      ["昭和の日",            "2012-04-29T00:00:00.00+09:00", "2012-04-30T00:00:00.00+09:00"],
+      ["昭和の日 振替休日",   "2012-04-30T00:00:00.00+09:00", "2012-05-01T00:00:00.00+09:00"],
+      ["憲法記念日",          "2012-05-03T00:00:00.00+09:00", "2012-05-04T00:00:00.00+09:00"],
+      ["みどりの日",          "2012-05-04T00:00:00.00+09:00", "2012-05-05T00:00:00.00+09:00"],
+      ["こどもの日",          "2012-05-05T00:00:00.00+09:00", "2012-05-06T00:00:00.00+09:00"],
+      ["海の日",              "2012-07-16T00:00:00.00+09:00", "2012-07-17T00:00:00.00+09:00"],
+      ["敬老の日",            "2012-09-17T00:00:00.00+09:00", "2012-09-18T00:00:00.00+09:00"],
+      ["秋分の日",            "2012-09-22T00:00:00.00+09:00", "2012-09-23T00:00:00.00+09:00"],
+      ["体育の日",            "2012-10-08T00:00:00.00+09:00", "2012-10-09T00:00:00.00+09:00"],
+      ["文化の日",            "2012-11-03T00:00:00.00+09:00", "2012-11-04T00:00:00.00+09:00"],
+      ["勤労感謝の日",        "2012-11-23T00:00:00.00+09:00", "2012-11-24T00:00:00.00+09:00"],
+      ["天皇誕生日",          "2012-12-23T00:00:00.00+09:00", "2012-12-24T00:00:00.00+09:00"],
+      ["天皇誕生日 振替休日", "2012-12-24T00:00:00.00+09:00", "2012-12-25T00:00:00.00+09:00"],
+      ["クリスマス",          "2012-12-25T00:00:00.00+09:00", "2012-12-26T00:00:00.00+09:00"],
+      ["大晦日",              "2012-12-31T00:00:00.00+09:00", "2013-01-01T00:00:00.00+09:00"]
     ]
 
     WEEKLY_EVENTS = [
@@ -84,6 +90,7 @@ RECURRENCE
     end
 
     if const_defined?(:PASSWORD) && Object.const_defined?(:GoogleCalendar)
+
       def test__to_vevent
         holidays = HOLIDAYS.dup
         gcal     = get_cal(PUBLIC_FEED % ['japanese', 'ja'])
@@ -105,19 +112,21 @@ RECURRENCE
         end
         event = When.Resource("examples/JapanHolidays.ics::Ganjitsu").to_gcalevent(gcal)
         event.save!
-        holidays = [RULE0]
+        holidays = [RULE0] * 2
         gcal.events(period).each do |event|
           assert_equal(holidays.shift, event.recurrence)
         end
-        assert_equal(0, holidays.size)
+        pp 'WARN: event is duplicated.' if holidays.size == 0
+        assert_equal(true, (0..1).include?(holidays.size))
       end
 
       def test__enum_for
         holidays = HOLIDAYS.dup
+        holidays.delete_at(2)
         gcal     = get_cal(PUBLIC_FEED % ['japanese', 'ja'])
         gcal.enum_for({'start-min'=>'2012-01-01', 'start-max'=>'2013-01-01'}).each do |date|
-          sample = holidays.shift
-          assert_equal(sample[1] + '...' + sample[2], date.to_s)
+         sample = holidays.shift
+         assert_equal(sample[1] + '...' + sample[2], date.to_s)
         end
         assert_equal(0, holidays.size)
       end

data/when_exe.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.email       = ["suchowan@box.email.ne.jp"]
   s.homepage    = "http://www.asahi-net.or.jp/~dd6t-sg/"
   s.summary     = %q{A multicultural and multilingualized calendar library based on ISO 8601, ISO 19108 and RFC 5545}
-  s.description = %q{This library supports ISO 8601, ISO 19108, RFC 5545 and RFC6350. This version is a beta version and in the evaluation stage. So, its APIs may be changed in future.}
+  s.description = %q{This library supports ISO 8601, ISO 19108, RFC 5545 and RFC6350. This version is a beta version and in the evaluation stage. So, its APIs may be changed in future. Please refer to http://suchowan.at.webry.info/theme/a543700674.html for the recent history (Sorry only in Japanese).}
 
   s.rubyforge_project = "when_exe"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: when_exe
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-06 00:00:00.000000000Z
+date: 2014-02-10 00:00:00.000000000Z
 dependencies: []
 description: This library supports ISO 8601, ISO 19108, RFC 5545 and RFC6350. This
   version is a beta version and in the evaluation stage. So, its APIs may be changed
-  in future.
+  in future. Please refer to http://suchowan.at.webry.info/theme/a543700674.html for
+  the recent history (Sorry only in Japanese).
 email:
 - suchowan@box.email.ne.jp
 executables: