mhc 1.1.1 → 1.2.4

data/lib/mhc/occurrence_enumerator.rb

@@ -71,7 +71,7 @@ module Mhc
           first_date = date_or_range
           last_date  = date_or_range
         end
-        if last_date < @date_range.first or @date_range.last < first_date
+        if last_date.to_date < @date_range.first or @date_range.last < first_date.to_date
           next
         end
         next if @exceptions.include?(first_date)

data/lib/mhc/property_value.rb

@@ -15,12 +15,18 @@ module Mhc
         return @value.to_s
       end
 
+      def empty?
+        return true if @value.nil? || (@value.respond_to?(:empty?) && @value.empty?)
+        return false
+      end
+
       alias_method :to_s, :to_mhc_string
     end
 
     dir = File.dirname(__FILE__) + "/property_value"
 
     autoload :Date,                "#{dir}/date.rb"
+    autoload :DateTime,            "#{dir}/date_time.rb"
     autoload :Integer,             "#{dir}/integer.rb"
     autoload :List,                "#{dir}/list.rb"
     autoload :Period,              "#{dir}/period.rb"

data/lib/mhc/property_value/date.rb

@@ -8,12 +8,25 @@ module Mhc
 
       DAYS_OF_MONTH = [0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]
 
-      def self.parse(string)
-        if /^(\d{4})(\d{2})(\d{2})$/ =~ string
-          # don't use super(string) because it's slow.
-          new($1.to_i, $2.to_i, $3.to_i)
-        else
-          return nil # raise ParseError
+      def self.parse(string, default = nil)
+        begin
+          # YYYYMMDD/HH:MM => DateTime
+          if /^(\d{4})(\d{2})(\d{2})\/(\d{2}):(\d{2})$/ =~ string
+            DateTime.new($1.to_i, $2.to_i, $3.to_i, $4.to_i, $5.to_i, 0)
+
+          # YYYYMMDD => Date
+          elsif /^(\d{4})(\d{2})(\d{2})$/ =~ string
+            Date.new($1.to_i, $2.to_i, $3.to_i)
+
+          # YYYYMMDD/hh:mm-HH:MM => DateTime taking YYYYMMDD, HH:MM
+          elsif /^(\d+):(\d+)$/ =~ string && default
+            DateTime.new(default.year, default.month, default.day, $1.to_i, $2.to_i, 0)
+
+          else
+            fail ParseError
+          end
+        rescue
+          raise ParseError, "invalid date string \"#{string}\""
         end
       end
 
@@ -38,7 +51,7 @@ module Mhc
           return self.today.first_day_of_month.next_month
 
         else
-          raise ParseError, "invalid date string '#{date_string}'"
+          raise ParseError, "invalid date string \"#{date_string}\""
         end
       end
 
@@ -65,7 +78,7 @@ module Mhc
           date = parse_relative($1)
           return date..date
         else
-          raise ParseError, "invalid date range string '#{range_string}'"
+          raise ParseError, "invalid date range string \"#{range_string}\""
         end
       end
 
@@ -80,12 +93,8 @@ module Mhc
         end
       end
 
-      def parse(string)
-        if /^\d{8}$/ =~ string
-          self.class.parse(string)
-        else
-          return nil # raise ParseError
-        end
+      def parse(string, default = nil)
+        self.class.parse(string, default)
       end
 
       def add_time(time = nil)

data/lib/mhc/property_value/date_time.rb

@@ -0,0 +1,19 @@
+require "date"
+
+module Mhc
+  module PropertyValue
+    class DateTime < ::DateTime
+
+      def to_mhc_string
+        return strftime("%Y%m%d/%H:%M")
+      end
+
+      def absolute_from_epoch
+        return (self - Date.new(1970, 1, 1)).to_i
+      end
+
+      alias_method :to_s, :to_mhc_string
+
+    end # class DateTime
+  end # module PropertyValue
+end # module Mhc

data/lib/mhc/property_value/integer.rb

@@ -2,7 +2,11 @@ module Mhc
   module PropertyValue
     class Integer < Base
       def parse(string)
-        @value = string.to_i if /^\d+$/ =~ string
+        if /^\d+$/ =~ string
+          @value = string.to_i
+        else
+          raise ParseError, "invalid integer format \"#{string}\""
+        end
         return self
       end
 

data/lib/mhc/property_value/list.rb

@@ -6,35 +6,36 @@ module Mhc
       ITEM_SEPARATOR = " "
 
       def initialize(item_class)
-        @list = []
+        @value = []
         @item_class = item_class
       end
 
       def each
-        @list.each do |value|
+        @value.each do |value|
           yield value
         end
       end
 
       def include?(o)
-        @list.include?(o)
+        @value.include?(o)
       end
 
       def empty?
-        @list.empty?
+        @value.empty?
       end
 
       def parse(string)
         string.strip.split(ITEM_SEPARATOR).each do |str|
           item = @item_class.parse(str)
-          @list << item if item
+          @value << item if item
         end
         return self
       end
 
       def to_mhc_string
-        @list.map{|item| item.to_mhc_string}.join(ITEM_SEPARATOR)
+        @value.map{|item| item.to_mhc_string}.join(ITEM_SEPARATOR)
       end
+      alias_method :to_s, :to_mhc_string
 
     end # class List
   end # module PropertyValue

data/lib/mhc/property_value/period.rb

@@ -4,7 +4,7 @@ module Mhc
 
       UNIT2MIN = {'minute' => 1, 'hour' => 60, 'day' => 60*24}
       UNITS    = UNIT2MIN.keys
-      REGEXP   = /(\d+)\s*(#{UNITS.join("|")})s?/
+      REGEXP   = /(\d+)\s*(#{UNITS.join("|")})s?$/
 
       def self.parse(string)
         return new.parse(string)
@@ -13,6 +13,8 @@ module Mhc
       def parse(string)
         if REGEXP =~ string
           @minutes = (UNIT2MIN[$2] * $1.to_i)
+        else
+          raise ParseError, "invalid period string \"#{string}\""
         end
         return self
       end

data/lib/mhc/property_value/range.rb

@@ -25,7 +25,7 @@ module Mhc
         last = first if last.nil? # single "A" means "A-A"
 
         @first = @item_class.parse(first) unless first.to_s == ""
-        @last  = @item_class.parse(last)  unless last.to_s  == ""
+        @last  = @item_class.parse(last, @first)  unless last.to_s  == ""
         return self.class.new(@item_class, @prefix, @first, @last)
       end
 

data/lib/mhc/property_value/time.rb

@@ -7,13 +7,20 @@ module Mhc
     class Time < Base
       include Comparable
 
-      def parse(string)
+      def parse(string, default = nil)
+        # default is dummy for matching interface
         if /^(\d+):(\d+)$/ =~ string
           @sec = ($1.to_i) * 3600 + ($2.to_i) * 60
+        else
+          raise ParseError, "invalid time format \"#{string}\""
         end
         return self
       end
 
+      def self.parse(string, default = nil)
+        new.parse(string, default)
+      end
+
       def days;    (@sec        ) / 86400 ;end
       def hour;    (@sec % 86400) / 3600  ;end
       def minute;  (@sec % 3600)  / 60    ;end

data/lib/mhc/version.rb

@@ -1,4 +1,4 @@
 module Mhc
-  VERSION = "1.1.1"
+  VERSION = "1.2.4"
   PRODID = "-//Quickhack.net//MHC #{Mhc::VERSION}//EN"
 end

data/mhc.gemspec

@@ -28,7 +28,6 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "tzinfo",      ">= 1.2.2"
   spec.add_runtime_dependency "tzinfo-data", ">= 1.2015.4"
 
-  spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
 end

data/samples/japanese-holidays.mhcc

@@ -72,12 +72,14 @@ X-SC-Record-Id: 5E03776A-4280-4337-85C0-F1322A3AAE6E
 
 X-SC-Subject: 海の日
 X-SC-Category: Holiday Japanese
+X-SC-Day: !20200720 20200723 !20210719 20210722
 X-SC-Cond: 3rd Mon Jul
 X-SC-Duration: 20030701-
 X-SC-Record-Id: BD4156C2-5546-4146-8297-09CF4210A346
 
 X-SC-Subject: 山の日
 X-SC-Category: Holiday Japanese
+X-SC-Day: 20200810 !20200811 20210808 !20210811
 X-SC-Cond: 11 Aug
 X-SC-Duration: 20160811-
 X-SC-Record-Id: FC7C481B-7BF5-4639-B700-3B60CB99E05D
@@ -103,9 +105,16 @@ X-SC-Record-Id: AFABC42C-2E9D-4093-A4AF-DA12D4D4B9D7
 X-SC-Subject: 体育の日
 X-SC-Category: Holiday Japanese
 X-SC-Cond: 2nd Mon Oct
-X-SC-Duration: 20001009-
+X-SC-Duration: 20001009-20191231
 X-SC-Record-Id: C17D9CA5-28AF-4826-AD33-8B75473E5B52
 
+X-SC-Subject: スポーツの日
+X-SC-Category: Holiday Japanese
+X-SC-Day: 20200724 !20201012 20210723 !20211011
+X-SC-Cond: 2nd Mon Oct
+X-SC-Duration: 20200101-
+X-SC-Record-Id: F10B2B18-B0FB-477E-A7D3-A067B31F4736
+
 X-SC-Subject: 文化の日
 X-SC-Category: Holiday Japanese
 X-SC-Cond: 3 Nov
@@ -121,11 +130,27 @@ X-SC-Record-Id: 97E6F125-2625-44A9-8D43-A6FCA9670D8D
 X-SC-Subject: 天皇誕生日
 X-SC-Category: Holiday Japanese
 X-SC-Cond: 23 Dec
-X-SC-Duration: 19891223-
+X-SC-Duration: 19891223-20190430
 X-SC-Record-Id: 51D42B0D-EF46-4D65-B62A-6ED2F0D1F0B5
 
+X-SC-Subject: 天皇誕生日
+X-SC-Category: Holiday Japanese
+X-SC-Cond: 23 Feb
+X-SC-Duration: 20190501-
+X-SC-Record-Id: 59B83B1E-6161-45F5-9DEC-95E3C1CCA4EE
+
 ## 毎年変わる祝日と振替休日
 
+X-SC-Subject: 即位の日
+X-SC-Day: 20190501
+X-SC-Category: Holiday Japanese
+X-SC-Record-Id: 25C73788-1104-42BE-85F6-570861B0020B
+
+X-SC-Subject: 即位礼正殿の儀
+X-SC-Category: Holiday Japanese
+X-SC-Day: 20191022
+X-SC-Record-Id: 76F9756D-C00F-47D0-9592-67E21909C39D
+
 X-SC-Subject: 春分の日
 X-SC-Day: 19960320 19970320 19980321 19990321 20000320 20010320 20020321
   20030321 20040320 20050320 20060321 20070321 20080320 20090320
@@ -158,14 +183,15 @@ X-SC-Day: 19730430 19730924 19740506 19740916 19741104 19751124
   20050321 20060102 20070212 20070430 20070924 20071224 20080506
   20081124 20090506 20100322 20120102 20120430 20121224 20130506
   20131104 20140506 20141124 20150506 20160321 20170102 20180212
-  20180430 20180924 20181224 20190506 20190812 20191104 20200506
-  20230102 20240212 20240506 20240812 20240923 20241104 20250506
+  20180430 20180924 20181224 20190506 20190812 20191104 20200224 20200506
+  20210809
+  20230102 20240212 20240506 20240812 20240923 20241104 20250224 20250506
   20251124 20260506 20270322 20290212 20290430 20290924 20291224
-  20300506 20300812 20301104 20310506 20311124 20330321 20340102
+  20300506 20300812 20301104 20310224 20310506 20311124 20330321 20340102
   20350212 20350430 20350924 20351224 20360506 20361124 20370506
-  20400102 20400430 20401224 20410506 20410812 20411104 20420506
+  20400102 20400430 20401224 20410506 20410812 20411104 20420224 20420506
   20421124 20430506 20440321 20450102 20460212 20460430 20460924
-  20461224 20470506 20470812 20471104 20480506 20500321
+  20461224 20470506 20470812 20471104 20480224 20480506 20500321
 X-SC-Category: Holiday Japanese
 X-SC-Record-Id: E2D696DF-EB49-44D7-B06C-812B10BD99A2
 
@@ -173,8 +199,9 @@ X-SC-Subject: 国民の休日
 X-SC-Category: Holiday Japanese
 X-SC-Day: 19880504 19890504 19900504 19910504 19930504 19940504 19950504
   19960504 19990504 20000504 20010504 20020504 20040504 20050504 20060504
-  20090922 20150922 20260922 20320921 20370922 20430922 20490921 20540922
-  20600921 20650922 20710922 20770921 20880921 20940921 20990922
+  20090922 20150922 20190430 20190502 20260922 20320921 20370922 20430922
+  20490921 20540922 20600921 20650922 20710922 20770921 20880921 20940921
+  20990922
 X-SC-Record-Id: 46953810-BD72-45DE-BC11-104CBE970CFF
 
 ## Make sure you have at least one blank line for each entry (改行で終わる)

data/spec/mhc_spec.rb

@@ -125,6 +125,20 @@ describe Mhc::Event do
   end
 
 
+  it "should emit an error on parsing invalid time format." do
+    str = <<-EOF.strip_heredoc
+      X-SC-Subject: Invalid Date format
+      X-SC-Location: Room1
+      X-SC-Day: 19960930
+      X-SC-Duration: 19960930-
+      X-SC-Time: 19:30-2030
+      X-SC-Record-Id: 54A339AD-F7FD-4E56-9B70-2D09F840E94D
+      X-SC-Sequence: 0
+    EOF
+    errors = Mhc::Event.validate(str)
+    expect(errors.length).to eq 1
+    expect(errors.first.first.message).to match /invalid time format/
+  end
 
   it "should occur weekly on Monday and Thursday from 2014-04-01 to 2014-04-30 with exception of 2014-04-10 (Thu)" do
     ev = Mhc::Event.parse <<-EOF.strip_heredoc
@@ -204,6 +218,53 @@ describe Mhc::Event do
       ["20140203 10:00-12:00 TEST", "20140509 10:00-12:00 TEST", "20140831 10:00-12:00 TEST"]
   end
 
+  it "should produce a list of occurrences, and one occurrence has different Time" do
+    ev = Mhc::Event.parse <<-EOF.strip_heredoc
+      X-SC-Subject: X-Project
+      X-SC-Location: 101
+      X-SC-Day: 20160601 20160602/16:00-18:00 20160616 20160617 20160623 20160624
+      X-SC-Time: 09:00-11:00
+      X-SC-Category: Conference
+      X-SC-Record-Id: FEDA4C97-21C2-46AA-A395-075856FBD5C3
+    EOF
+    expect(ev.occurrences.take(30).map{|o| "#{o.dtstart.strftime("%Y%m%d/%H:%M")}-#{o.dtend.strftime("%Y%m%d/%H:%M")} #{o.subject}"}).to eq \
+      ["20160601/09:00-20160601/11:00 X-Project",
+       "20160602/16:00-20160602/18:00 X-Project",
+       "20160616/09:00-20160616/11:00 X-Project",
+       "20160617/09:00-20160617/11:00 X-Project",
+       "20160623/09:00-20160623/11:00 X-Project",
+       "20160624/09:00-20160624/11:00 X-Project"]
+  end
+
+  it "should produce a list of occurrences, and one occurrence has different Time crossing days" do
+    ev = Mhc::Event.parse <<-EOF.strip_heredoc
+      X-SC-Subject: TEST
+      X-SC-Time: 10:00-12:00
+      X-SC-Day: 20150203/10:30-20150205/12:30 20150509 20150831
+      X-SC-Record-Id: FEDA4C97-21C2-46AA-A395-075856FBD5C3
+    EOF
+
+    expect(ev.occurrences.take(30).map{|o| "#{o.dtstart.strftime("%Y%m%d/%H:%M")}-#{o.dtend.strftime("%Y%m%d/%H:%M")} #{o.subject}"}).to eq \
+      ["20150203/10:30-20150205/12:30 TEST",
+       "20150509/10:00-20150509/12:00 TEST",
+       "20150831/10:00-20150831/12:00 TEST"]
+
+    expect(ev.to_ics).to eq <<-'EOF'.strip_heredoc
+      BEGIN:VEVENT
+      RDATE;VALUE=PERIOD:20150509T100000Z/20150509T120000Z,20150831T100000Z/20150831T120000Z
+      CREATED;VALUE=DATE-TIME:20140101T000000Z
+      DTEND;VALUE=DATE-TIME:20150205T123000Z
+      DTSTART;VALUE=DATE-TIME:20150203T103000Z
+      DTSTAMP;VALUE=DATE-TIME:20140101T000000Z
+      LAST-MODIFIED;VALUE=DATE-TIME:20140101T000000Z
+      UID:FEDA4C97-21C2-46AA-A395-075856FBD5C3
+      DESCRIPTION:
+      SUMMARY:TEST
+      SEQUENCE:0
+      END:VEVENT
+    EOF
+  end
+
   it "should return true when #allday? is called if X-SC-Time: is blank" do
     ev = Mhc::Event.parse <<-EOF.strip_heredoc
       X-SC-Subject: TEST
@@ -397,6 +458,28 @@ describe Mhc::Event do
     EOF
   end
 
+  it "should return icalendar VEVENT over 24h event" do
+    ev = Mhc::Event.parse <<-EOF.strip_heredoc
+      X-SC-Subject: CS1
+      X-SC-Time: 12:00-13:00
+      X-SC-Day: 20140508/12:00-20140509/10:10
+      X-SC-Record-Id: 69CFD0DF-4058-425B-8C2B-40D81E6A2392
+    EOF
+    expect(ev.to_ics).to eq <<-'EOF'.strip_heredoc
+      BEGIN:VEVENT
+      CREATED;VALUE=DATE-TIME:20140101T000000Z
+      DTEND;VALUE=DATE-TIME:20140509T101000Z
+      DTSTART;VALUE=DATE-TIME:20140508T120000Z
+      DTSTAMP;VALUE=DATE-TIME:20140101T000000Z
+      LAST-MODIFIED;VALUE=DATE-TIME:20140101T000000Z
+      UID:69CFD0DF-4058-425B-8C2B-40D81E6A2392
+      DESCRIPTION:
+      SUMMARY:CS1
+      SEQUENCE:0
+      END:VEVENT
+    EOF
+  end
+
   it "should return icalendar VEVENT two day's allday event" do
     ev = Mhc::Event.parse <<-EOF.strip_heredoc
       X-SC-Subject: CS1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mhc
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.4
 platform: ruby
 authors:
 - Yoshinari Nomura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-26 00:00:00.000000000 Z
+date: 2020-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -66,20 +66,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.2015.4
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -198,12 +184,22 @@ files:
 - lib/mhc/etag.rb
 - lib/mhc/event.rb
 - lib/mhc/formatter.rb
+- lib/mhc/formatter/base.rb
+- lib/mhc/formatter/emacs.rb
+- lib/mhc/formatter/howm.rb
+- lib/mhc/formatter/icalendar.rb
+- lib/mhc/formatter/json.rb
+- lib/mhc/formatter/mail.rb
+- lib/mhc/formatter/org_table.rb
+- lib/mhc/formatter/symbolic_expression.rb
+- lib/mhc/formatter/text.rb
 - lib/mhc/logger.rb
 - lib/mhc/modifier.rb
 - lib/mhc/occurrence.rb
 - lib/mhc/occurrence_enumerator.rb
 - lib/mhc/property_value.rb
 - lib/mhc/property_value/date.rb
+- lib/mhc/property_value/date_time.rb
 - lib/mhc/property_value/integer.rb
 - lib/mhc/property_value/list.rb
 - lib/mhc/property_value/period.rb
@@ -259,8 +255,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Message Harmonized Calendaring