mhc 1.2.4 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4522630272ecdc9d44c9b994b2b31f8e36278abb0004708ec0e39d63e5d16792
-  data.tar.gz: cbcd079db569d336eec4eb87f21e5598cd3735b04f0fef6ffbbc8b7fdb583067
+  metadata.gz: b0b65ae5e1dd5f504de2eeb59f280eff7ef0422133520006e9814ab52510e9ac
+  data.tar.gz: '0168de3d55867bf8356a02cf9be81d3ecd199b01f64d5c2cdc5f6835a0605fdd'
 SHA512:
-  metadata.gz: 1f052c78047e59e8638248ef56928f2ee3e85ae544b959d294c6900afb06868cb305a4a23b1ae85a35d963b870dbb0ec950c4c1d5cd9ea25d9ffe07334be5cd8
-  data.tar.gz: 874b007618cfd8be8a49ba0fab497ba38f6a36edfedbedf0ec72bb983c6c5ceff67a52c2b6138a62ced23fb0586e5f644eca018e2d9b963a8d79666100b94b9a
+  metadata.gz: d4533cef977bafd8491f1f3bbb709049dfa17b7ca70f0286381aaba60ffb51a096d34b28d6cb7239e1a5f932729237dce1d931332c1830983357ec99196f75e5
+  data.tar.gz: 40dbdfcdcacf2ac4f274db2897bfa91f25a58ebb0d80c4b705d9134efef3e2fafa7e1ec51a743817e075e7a0f015b53262a6c3c1f915400ce5e0dd5dad31727d

data/.rubocop.yml

@@ -0,0 +1,14 @@
+Style/RedundantReturn:
+  Enabled: false
+Style/CommentedKeyword:
+  Enabled: false
+Style/Documentation:
+  Enabled: false
+Style/RedundantSelf:
+  Enabled: false
+Style/StringLiterals:
+  Enabled: false
+Metrics/MethodLength:
+  Enabled: false
+Metrics/ClassLength:
+  Enabled: false

data/README.org

@@ -127,6 +127,7 @@
        | =M= | Open pointed article to edit                   |
        | =D= | Delete pointed article                         |
        | =C= | Copy article temporally as a reusable template |
+       | =R= | Copy article like =C= using completing-read    |
        | =Y= | Same as =E= but use the template stored by =C= |
 
     3) Draft Buffer
@@ -149,6 +150,7 @@
      X-SC-Time: 18:00-21:00
      X-SC-Category: Private Party
      X-SC-Cond:
+     X-SC-Recurrence-Tag: HomeParty
      X-SC-Duration:
      X-SC-Record-Id: C34D89F5-27FA-4243-AC6C-168D8D243D9A
      X-SC-Sequence: 0
@@ -241,6 +243,40 @@
       of 2015-07-15 (Wed) and inclusion of 2015-08-01 (Sat).
     #+END_EXAMPLE
 
+** Headers for Grouping
+*** X-SC-Category
+    =X-SC-Category:= is a space separated list of category
+    It is useful for selective display both in CLI:
+    : mhc scan today --category=Private
+    and Emacs UI:
+    : M-x mhc-set-default-category
+    : Default Category: Private && !Party
+
+    Also useful sync with Google Calendar. See [[https://github.com/yoshinari-nomura/mhc/blob/master/samples/DOT.mhc-config.yml][mhc-config.yml]] for
+    details.
+
+*** X-SC-Recurrence-Tag
+    =X-SC-Recurrence-Tag:= is a tag for bundling multiple event articles as one recurring group.
+
+    MHC allows flexible description of repeating events using
+    =X-SC-Cond:=, =X-SC-Duration:=, or =X-SC-Day:=. However, we know
+    this is not sufficient.
+
+    For example, in my experience, some monthly meetings do not have
+    distinct recurring patterns such like "Third Wednesday of each
+    month." Instead, the next date is fixed by coordination during the meeting.
+
+    In such cases, it is difficult to mark these events as a series of related events.
+    That's why we need =X-SC-Recurrence-Tag:=
+
+    Using =X-SC-Recurrence-Tag:=, MHC suggests what event should be arranged.
+    : mhc stuck_recurrences
+    will tell you to make the next appointment.
+
+    For example, if you have "X-SC-Recurrence-Tag: Dentist" in your
+    articles of past dentist events, mhc will point out that you
+    forgot to make your next dentist appointment.
+
 * INFORMATION FOR DEVELOPERS
 ** INSTALL for developers:
    1) Install rbenv + ruby-build
@@ -326,6 +362,7 @@
         (setq load-path
               (cons "~/src/mhc/emacs" load-path))
         (autoload 'mhc "mhc" "Message Harmonized Calendar system." t)
+        (autoload 'mhc-import "mhc" "Import a schedule." t)
 
         ;; M-x mhc
       #+END_SRC

data/bin/mhc

@@ -72,9 +72,10 @@ class MhcCLI < Thor
   register_option :repository, :desc => "Set MHC top directory", :banner => "DIRECTORY"
   register_option :calendar,   :desc => "Set source CALENDAR"
   register_option :category,   :desc => "Pick items only in CATEGORY"
-  register_option :format,     :desc => "Set printing format", :enum => %w(text mail orgtable emacs icalendar calfw howm json)
+  register_option :format,     :desc => "Set printing format", :enum => %w(text mail orgtable emacs icalendar calfw howm json html)
   register_option :search,     :desc => "Search items by complex expression"
   register_option :dry_run,    :desc => "Perform a trial run with no changes made", :type => :boolean
+  register_option :verbose,    :desc => "Show verbose message", :type => :boolean
 
   ################################################################
   # command name mappings
@@ -113,7 +114,9 @@ class MhcCLI < Thor
     Mhc::Command::Cache.new(builder.datastore)
   end
 
+  ################################################################
   # Command: todo
+  ################################################################
   desc "todo", "List Todo entries in MHC calendar"
 
   named_option :repository
@@ -131,7 +134,8 @@ class MhcCLI < Thor
         search_range = nil
       end
       next if task.in_category?("done") && !options[:show_all]
-      todos << task.occurrences(range: search_range).first
+      task_first = task.occurrences(range: search_range).first
+      todos << task_first if task_first
     end
     todos.each.sort{|a, b| a.dtstart <=> b.dtstart}.each do |t|
       deadline = t.dtstart
@@ -168,6 +172,38 @@ class MhcCLI < Thor
     Mhc::Command::Completions.new(help, global_options, command, config)
   end
 
+  ################################################################
+  # Command: compose
+  ################################################################
+  desc "compose", "Create new draft and open it in your editor"
+
+  long_desc <<-LONGDESC
+    Create a new draft and open it in your editor.
+    To select your favorite editor,
+    set environment variable MHC_EDITOR or EDITOR.
+  LONGDESC
+
+  def compose
+    require 'securerandom'
+    ev = Mhc::Event.new
+    ev.record_id = SecureRandom.uuid.upcase
+    path = builder.datastore.create(ev, true)
+    puts "Create draft #{path}"
+    editor = ENV["MHC_EDITOR"] || ENV["EDITOR"] || "vi"
+    system(editor, path)
+
+    while add(path) != 0
+      if ask("Retry?") =~ /^[Yy]/
+        system(editor, path)
+      else
+        puts "Abort..."
+        exit(1)
+      end
+    end
+    puts "Successfully registered."
+    exit(0)
+  end
+
   ################################################################
   # Command: config
   ################################################################
@@ -179,6 +215,40 @@ class MhcCLI < Thor
     puts Mhc::Converter::Emacs.new.to_emacs(config.get_value(name))
   end
 
+  ################################################################
+  # Command: add
+  ################################################################
+  desc "add FILE", "Add event FILE to repository"
+
+  named_option :repository
+
+  def add(file)
+    full_path = File.expand_path(file)
+
+    unless File.exist?(full_path)
+      puts Mhc::Converter::Emacs.new.to_emacs("No such file #{file}.")
+      return 1
+    end
+
+    event_string = File.open(full_path).read
+    errors = Mhc::Event.validate(event_string)
+
+    if errors.empty?
+      ev = Mhc::Event.parse(event_string)
+      calendar.add(ev)
+      return 0
+    else
+      string = ""
+      errors.each do |err, key|
+        string += "#{err.to_s.capitalize}"
+        string += " in X-SC-#{key.capitalize}" if key
+        string += ".\n"
+      end
+      puts string
+      return 1
+    end
+  end
+
   ################################################################
   # Command: init
   ################################################################
@@ -188,6 +258,55 @@ class MhcCLI < Thor
     Mhc::Command::Init.new(top_dir, options[:config] || DEFAULT_CONFIG_PATH, ENV["MHC_TZID"])
   end
 
+  ################################################################
+  # Command: stuck_recurrences
+  ################################################################
+  desc "stuck_recurrences", "List stuck recurrences in MHC calendar"
+
+  named_option :repository
+  named_option :verbose
+  named_option :format
+
+  # * stuck_recurrences
+  #
+  #  For all "living recurrences", if no next event has been set in
+  #  the "future", show the information on the last time.
+  #
+  #   + "living recurrences" ::
+  #     + There is a last-time evnet within a year and a half.
+  #   + "future" :: ten years from now.
+  #
+  def stuck_recurrences(format = options[:format])
+    today = Mhc::PropertyValue::Date.today
+
+    # Seek -1.5y to +10y
+    search_range = (today - ((365 *  5).to_i)) ..
+                   (today + ((365 * 10).to_i))
+
+    recurrences = {}
+
+    # Get all recurrences in search_range
+    calendar.occurrences(search_range).each do |oc|
+      rtag = oc.recurrence_tag.to_s
+      next if rtag.empty?
+      recurrences[rtag] ||= []
+      recurrences[rtag] << oc
+    end
+
+    formatter = Mhc::Formatter.build(formatter: format || :text, date_range: search_range)
+
+    recurrences.each do |rtag, recurrence|
+      if options[:verbose]
+        rec_put_debug(recurrence)
+      else
+        formatter << recurrence.last if rec_stuck?(recurrence)
+      end
+    end
+    str = formatter.to_s
+    return str if format == :json || options[:verbose]
+    puts str
+  end # stuck_recurrences
+
   ################################################################
   # Command: scan
   ################################################################
@@ -222,6 +341,9 @@ class MhcCLI < Thor
   named_option :calendar, :category, :format, :repository, :search
 
   def scan(range)
+    if options[:format].to_s == 'html'
+      $stuck_recurrences_json = stuck_recurrences(:json)
+    end
     begin
       Mhc::Command::Scan.new(calendar, range, **symbolize_keys(options))
     rescue Mhc::PropertyValue::ParseError, Mhc::Formatter::NameError, Mhc::Query::ParseError => e
@@ -326,6 +448,80 @@ class MhcCLI < Thor
 
   private
 
+  def rec_put_debug(recurrence)
+    ol = recurrence.last
+
+    today = Mhc::PropertyValue::Date.today
+    last_occurrence = recurrence.last
+    last_occurrence_date = last_occurrence.dtstart.to_date
+    # Ignore living recurrences
+    return false if last_occurrence_date > today
+
+    status = if rec_stuck?(recurrence) then " TODO" else "" end
+    print "*#{status} #{ol.recurrence_tag}#{status} "
+
+    print format("%s %s",
+                 ol.dtstart.strftime("%Y-%m-%d %a"),
+                 ol.subject)
+
+    print format(" (length: %d, max: %d, min: %d, avr: %d)\n",
+                 recurrence.length,
+                 *rec_stat(recurrence))
+
+    pr = recurrence.first
+    recurrence.each do |oc|
+      puts format("  %s %s (%d)",
+                  oc.dtstart.strftime("%Y-%m-%d %a"),
+                  oc.subject,
+                  (oc.dtstart.to_date - pr.dtstart.to_date).to_i
+                 )
+      pr = oc
+    end
+  end
+
+  # Judge if a recurrence is stuck or not. recurrence is a set of occurrences.
+  def rec_stuck?(recurrence, today = Mhc::PropertyValue::Date.today)
+    last_occurrence = recurrence.last
+    last_occurrence_date = last_occurrence.dtstart.to_date
+    max_interval, _min_interval, avr_interval = rec_stat(recurrence)
+
+    # Not stuck if scheduled in the future dates
+    return false if last_occurrence_date > today
+
+    # Stuck if last event occurred within 90 days, but average
+    # interval is less than 60 days.
+    if (today - last_occurrence_date).to_i < 90 && avr_interval < 60
+      return true
+    end
+
+    # Not stuck if the number of days between the last event and today
+    # does not reach 80% of the maximum interval.
+    return false if (today - last_occurrence_date).to_i < max_interval * 4 / 5
+
+    # Not stuck if the number of days between the last event and today
+    # is more than 30 days or 1.5 years beyond the maximum interval.
+    # It would be no more recurring.
+    return false if (today - last_occurrence_date).to_i > [max_interval + 30, 365*1.5].min
+
+    # Otherwise, stuck
+    return true
+  end
+
+  # Return statistics on recurrences: max/min/average interval.
+  def rec_stat(recurrence)
+    # Calcurate all intervals of the recurrence
+    intervals = recurrence.each_cons(2).map{|ocs|
+      (ocs[1].dtstart.to_date - ocs[0].dtstart.to_date).to_i
+    }.reject{|interval| interval < 1}
+
+    # Assume annual event if the recurrence is one-shot.
+    intervals = [365] if intervals.empty?
+
+    return [intervals.max,
+            intervals.min,
+            intervals.reduce(0, :+) / intervals.length]
+  end
+
   def exit_on_error(&block)
     begin
       yield if block_given?

data/emacs/Cask

@@ -5,7 +5,7 @@
 (source org)
 (source melpa)
 
-(package "mhc" "1.2.4" "Message Harmonized Calendaring system") ;; MHC_VERSION
+(package "mhc" "1.2.5" "Message Harmonized Calendaring system") ;; MHC_VERSION
 
 (files "mhc.el" "mhc-*.el")
 

data/emacs/mhc-db.el

@@ -34,6 +34,12 @@ If optional SEARCH is non-nil returned value is clipped by search string."
            (if category  (format " --category=%s" category) "")
            (if search  (format " --search='%s'" search) ""))))
 
+(defun mhc-db-stuck-recurrences ()
+  "List stuck recurrences in MHC calendar."
+  (mhc-db-flatten
+   (mhc-process-send-command
+    (format "stuck_recurrences --format=emacs"))))
+
 (defun mhc-db-scan-flat (begin-date end-date &optional nosort category search)
   "Scan MHC database from BEGIN-DATE to END-DATE.
 Unlike `mhc-db-scan`, returned value is not grouped by date.
@@ -42,19 +48,48 @@ For example:
 If optional NOSORT is non-nil, returned value is not sort.
 If optional CATEGORY is non-nil, returned value is clipped by category.
 If optional SEARCH is non-nil returned value is clipped by search string."
-  (let ((dayinfo-list (mhc-db-scan begin-date end-date nosort category search)))
-    (apply 'append
-           (mapcar (lambda (dayinfo)
-                     (let ((date (mhc-day-date dayinfo))
-                           (schedules (mhc-day-schedules dayinfo)))
-                       (mapcar (lambda (sch) (cons date sch)) schedules)))
-                   dayinfo-list))))
+  (mhc-db-flatten (mhc-db-scan begin-date end-date nosort category search)))
+
+(defun mhc-db-flatten (dayinfo-list)
+  "Flatten DAYINFO-LIST scanned from `mhc-db-scan`.
+Unlike `mhc-db-scan`, returned value is not grouped by date."
+  (apply 'append
+         (mapcar (lambda (dayinfo)
+                   (let ((date (mhc-day-date dayinfo))
+                         (schedules (mhc-day-schedules dayinfo)))
+                     (mapcar (lambda (sch) (cons date sch)) schedules)))
+                 dayinfo-list)))
 
 (defun mhc-db-search (&rest query)
   (let ((b (mhc-date-new 1970 1 1))
         (e (mhc-date-yy+ (mhc-date-now) 10)))
     (mhc-db-scan b e nil nil (mhc-db/query-to-search-string query))))
 
+(defun mhc-db-past-occurrences (&optional days)
+  (let ((now (mhc-date-now)))
+    (nreverse
+     (mhc-db-scan-flat (mhc-date- now (or days 732)) now))))
+
+(defun mhc-db-make-completion-list (occurrences)
+  (delq nil
+        (mapcar
+         (lambda (occurrence)
+           (let ((sch (cdr occurrence)))
+             (if  (not (string= (mhc-record-name (mhc-schedule-record sch)) ""))
+                 (cons (mhc-db-real-to-display occurrence) occurrence))))
+         occurrences)))
+
+(defun mhc-db-real-to-display (occurrence)
+  (let* ((date (car occurrence))
+         (sch (cdr occurrence))
+         (location (mhc-schedule-location sch)))
+    (concat
+     (mhc-date-format date "%04d/%02d/%02d" yy mm dd)
+     (format " %11s " (mhc-schedule-time-as-string sch))
+     (mhc-schedule-subject sch)
+     (if (and location (not (string= location "")))
+         (format " [%s]" location)))))
+
 (defun mhc-db/quote-string (string)
   (format "\"%s\"" string))
 

data/emacs/mhc-summary.el

@@ -294,9 +294,10 @@ If optional argument FOR-DRAFT is non-nil, Hilight message as draft message."
       (set-visited-file-name nil)
       ;; (rename-buffer (file-name-nondirectory file) 'unique)
       ;; (run-hooks 'mhc-calendar-view-file-hook)
+      (let ((buffer-read-only nil))
+        (mhc-message-mode))
       (set-buffer-modified-p nil)
       (setq buffer-read-only t)
-      (mhc-message-mode)
       (mhc-message-set-file-name file)
       )))
 
@@ -633,6 +634,7 @@ If BANNER is set, it is printed on the horizontal line."
   (define-key mhc-summary-mode-map "E" 'mhc-edit)
   (define-key mhc-summary-mode-map "M" 'mhc-modify)
   (define-key mhc-summary-mode-map "C" 'mhc-reuse-copy)
+  (define-key mhc-summary-mode-map "R" 'mhc-reuse-past-event)
   (define-key mhc-summary-mode-map "Y" 'mhc-reuse-create)
 
   (define-key mhc-summary-mode-map "n" 'mhc-summary-display-next)

data/emacs/mhc-vars.el

@@ -18,7 +18,7 @@
 
 
 ;;; Constants:
-(defconst mhc-version "mhc 1.2.4") ;; MHC_VERSION
+(defconst mhc-version "mhc 1.2.5") ;; MHC_VERSION
 
 
 ;;; Configration Variables:

data/emacs/mhc.el

@@ -3,7 +3,7 @@
 ;; Description: Message Harmonized Calendaring system.
 ;; Author:  Yoshinari Nomura <nom@quickhack.net>
 ;; Created: 1994-07-04
-;; Version: 1.2.4
+;; Version: 1.2.5
 ;; Keywords: calendar
 ;; URL: http://www.quickhack.net/mhc
 ;; Package-Requires: ((calfw "20150703"))
@@ -19,7 +19,8 @@
 ;;
 ;;  (setq load-path
 ;;        (cons "~/src/mhc/emacs" load-path))
-;;  (autoload 'mhc "mhc")
+;;  (autoload 'mhc "mhc" nil t)
+;;  (autoload 'mhc-import "mhc" nil t)
 ;;
 ;; and M-x mhc
 
@@ -325,10 +326,11 @@
         ret))))
 
 (defun mhc-expr-compile (string)
-  (byte-compile
-   `(lambda (schedule)
-      ,(mhc-expr-parse string)
-      )))
+  (let ((lexical-binding nil))
+    (byte-compile
+     `(lambda (schedule)
+	,(mhc-expr-parse string)
+	))))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
@@ -796,6 +798,7 @@ Returns t if the importation was succeeded."
   :group 'mhc
   :type 'boolean)
 
+;;;###autoload
 (defun mhc-import (&optional get-original)
   "Import a schedule from the current article.
 The default action of this command is to import a schedule from the
@@ -912,6 +915,27 @@ the default action of this command is changed to the latter."
           (message "%s is copied." (mhc-record-subject-as-string record)))
       (message "No file here."))))
 
+(defun mhc-reuse-past-event ()
+  "Select past schedule and copy to template."
+  (interactive)
+  (let* ((completion-ignore-case t)
+         (read-file-name-completion-ignore-case t)
+         (read-buffer-completion-ignore-case t)
+         (case-fold-search t)
+         (collection
+          (mhc-db-make-completion-list
+           (mhc-db-past-occurrences)))
+         (completion-table
+          (lambda (string pred action)
+            (if (eq action 'metadata)
+                '(metadata (display-sort-function . identity)
+                           (cycle-sort-function . identity))
+              (complete-with-action action collection string pred))))
+         (key (completing-read "Select occurrence: " completion-table nil t))
+         (sch (cdr (cdr (assoc key collection)))))
+    (mhc-reuse-copy
+     (mhc-record-name (mhc-schedule-record sch)))))
+
 (defun mhc-modify ()
   "Modify the current schedule."
   (interactive)

data/lib/mhc/calendar.rb

@@ -23,6 +23,22 @@ module Mhc
       @datastore.entries(category: "todo")
     end
 
+    def recurrences(rec, &scope_block)
+      @datastore.entries(recurrence: rec)
+    end
+
+    def recurrence_tags
+      hash = {}
+      @datastore.entries.each do |ev|
+        tag = ev.recurrence_tag.to_s
+        next if tag == ""
+        next if hash[tag]
+
+        yield tag
+        hash[tag] = ev
+      end
+    end
+
     def occurrences(date_range, &scope_block)
       ocs = []
       @datastore.entries(range: date_range).each do |event|
@@ -34,6 +50,10 @@ module Mhc
       return ocs.sort
     end
 
+    def add(event)
+      @datastore.update(event)
+    end
+
     ################################################################
     ## for sync manager
 

data/lib/mhc/config.rb

@@ -52,7 +52,11 @@ module Mhc
       end
 
       def self.create_from_yaml_string(yaml_string, filename = nil)
-        hash = YAML.load(yaml_string, filename) || {}
+        hash = if YAML.respond_to?(:unsafe_load)
+                 YAML.unsafe_load(yaml_string, filename: filename)
+               else
+                 YAML.load(yaml_string, filename)
+               end || {}
         return new(hash)
       end
 

data/lib/mhc/converter.rb

@@ -131,15 +131,86 @@ module Mhc
         end
       end
 
+      # https://github.com/rubyredrick/ri_cal
+      def value_part(unit, diff) # :nodoc:
+        (diff == 0) ? nil : "#{diff}#{unit}"
+      end
+
+      # https://github.com/rubyredrick/ri_cal
+      def from_datetimes(start, finish, sign = '')  # :nodoc:
+        if start > finish
+          from_datetimes(finish, start, '-')
+        else
+          diff = finish - start
+          days_diff = diff.to_i
+          hours = (diff - days_diff) * 24
+          hour_diff = hours.to_i
+          minutes = (hours - hour_diff) * 60
+          min_diff = minutes.to_i
+          seconds = (minutes - min_diff) * 60
+          sec_diff = seconds.to_i
+
+          day_part = value_part('D',days_diff)
+          hour_part = value_part('H', hour_diff)
+          min_part = value_part('M', min_diff)
+          sec_part = value_part('S', sec_diff)
+          t_part = (hour_diff.abs + min_diff.abs + sec_diff.abs) == 0 ? "" : "T"
+          "P#{day_part}#{t_part}#{hour_part}#{min_part}#{sec_part}"
+        end
+      end
+
+      # Convert ~X-SC-Days:~ to RFC5545 3.8.2 ~RDATE~
+      #
+      # RDATE allows three types of format: PERIOD, DATE, DATE-TIME.
+      # + DATE :: 20140301
+      # + DATE-TIME :: 20140301T123000
+      # + PERIOD :: 20140301T123000/20140301T143000 or 20140301T123000/PT2H
+      #
+      # NOTE: *Google calenadr does not accept PERIOD*
+      #   That's why we cannot make X-SC-Day: have different duration-period for each occurrence.
+      #
       def rdates(event)
         return nil if event.dates.empty?
-        ocs = Mhc::OccurrenceEnumerator.new(event, event.dates, empty_dates, empty_condition, empty_duration).map {|oc| oc.dtstart}
+        # Get all RDATE candidates from X-SC-Date
+        ocs = Mhc::OccurrenceEnumerator.new(event, event.dates, empty_dates, empty_condition, empty_duration).map do |oc|
+          if oc.dtstart.respond_to?(:hour)
+            # duration = from_datetimes(oc.dtstart, oc.dtend)
+
+            # 20140301T123000/20140301T143000
+            dtstart  = IcalendarImporter.tz_convert(oc.dtstart, dst_tzid: 'UTC').strftime("%Y%m%dT%H%M00Z")
+            dtend    = IcalendarImporter.tz_convert(oc.dtend, dst_tzid: 'UTC').strftime("%Y%m%dT%H%M00Z")
+
+            dtstart + "/" + dtend
+            # dtstart + "/" + duration
+          else
+            oc.dtstart
+          end
+        end
+
+        # Check if all in X-SC-Date should be converted into RDATE,
+        # because the first occurrence of X-SC-Date might be dedicated
+        # to DTSTART in some particular case.
+        #
         if event.recurring?
+          # Use all values of X-SC-Date as RDATE, because DTSTART
+          # should be calculated from recurrence-rule (X-SC-Cond and
+          # X-SC-Duration).
           ocs
         else
-          ocs = ocs[1..-1]
-          return nil if ocs.empty?
+          # This is Workaround for avoiding the serious bug in Android.
+          # Android badly ignores DTSTART-DTEND if RDATE is set.
+          # As a result, the first occurence is vanished.
+          # So, I set the first occurence twice; in RDATE and DTSTART.
+          return nil if ocs[1..-1].empty?
           return ocs
+
+          # This is what I wanted to do:
+          # Remove the first occurence of X-SC-Date, because the first
+          # value should be dedicated to DTSTART.
+          #
+          # ocs = ocs[1..-1]
+          # return nil if ocs.empty?
+          # return ocs
         end
       end
 

data/lib/mhc/datastore.rb

@@ -25,7 +25,7 @@ module Mhc
             Dir.foreach(".") do |ent|
               parse_mhcc(ent).each {|ev|
                 next if category   && !ev.in_category?(category)
-                next if recurrence && !ev.in_recurrence?(recurrence)
+                next if recurrence && !(ev.recurrence_tag.to_s == recurrence)
                 yielder << ev
               } if /\.mhcc$/ =~ ent
               next unless /\.mhc$/ =~ ent
@@ -52,22 +52,25 @@ module Mhc
       return Event.parse_file(path)
     end
 
-    def create(event)
+    def create(event, draft = false)
       if find_by_uid(event.uid)
         raise "Already exist uid:#{uid} in #{@basedir}"
       end
+      path = uid_to_path(event.uid, draft)
       File.open(path, "w") do |f|
         f.write(event.dump)
       end
+      return path.to_s
     end
 
-    def update(event)
-      unless path = uid_to_path(event.uid)
+    def update(event, draft = false)
+      unless path = uid_to_path(event.uid, draft)
         raise "Not found uid:#{uid} in #{@basedir}"
       end
       File.open(path, "w") do |f|
         f.write(event.dump)
       end
+      return path.to_s
     end
 
     def delete(uid_or_event)
@@ -105,7 +108,8 @@ module Mhc
       return Dir.glob(glob).first
     end
 
-    def uid_to_path(uid)
+    def uid_to_path(uid, draft = false)
+      return @basedir + ('draft/' + uid + '.mhc') if draft
       return @basedir + ('spool/' + uid + '.mhc')
     end
 

data/lib/mhc/formatter/html.rb

@@ -0,0 +1,32 @@
+module Mhc
+  class Formatter
+    class Html < Base
+      TEMPLATE_DIR = File.expand_path("../../templates", __FILE__)
+
+      def initialize(date_range:, options:)
+        super(date_range: date_range, options: options)
+        @json_formatter = Json.new(date_range: date_range, options: options)
+      end
+
+      def <<(occurrence)
+        @json_formatter << occurrence
+      end
+
+      private
+
+      def format_header(context)
+        require "erb"
+        template_path = File.expand_path("full-calendar.html.erb", TEMPLATE_DIR)
+        @template = ERB.new(File.open(template_path).read, nil, "-")
+        return ""
+      end
+
+      def format_body(context)
+        env = Struct.new(:json_event_array, :tzid)
+        mhc = env.new(@json_formatter.to_s, Mhc.default_tzid) # used in ERB template
+        @template.result(binding)
+      end
+
+    end # class Html
+  end # class Formatter
+end # module Mhc

data/lib/mhc/formatter.rb

@@ -21,6 +21,8 @@ module Mhc
         Howm.new(date_range: date_range, options:options)
       when :json
         Json.new(date_range: date_range, options:options)
+      when :html
+        Html.new(date_range: date_range, options:options)
       else
         raise Formatter::NameError.new("Unknown format: #{formatter} (#{formatter.class})")
       end
@@ -37,6 +39,7 @@ module Mhc
     autoload :OrgTable,           "#{dir}/org_table.rb"
     autoload :SymbolicExpression, "#{dir}/symbolic_expression.rb"
     autoload :Text,               "#{dir}/text.rb"
+    autoload :Html,               "#{dir}/html.rb"
 
   end # class Formatter
 end # module Mhc

data/lib/mhc/templates/full-calendar.html.erb

@@ -0,0 +1,417 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+
+    <title>Calendar</title>
+
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/fullcalendar/3.9.0/fullcalendar.min.css" />
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.4/css/bootstrap.min.css" />
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.4/css/bootstrap-theme.min.css" />
+
+    <style media="screen" type="text/css">
+      .container {
+          // max-width: 100%;
+        width: auto;
+      }
+
+      .ui-draggable {
+        cursor: grab;
+      }
+
+      a {
+        cursor: pointer;
+      }
+
+      .fc-sun {
+        color:#gray;
+        background-color: #fff0f0;
+      }
+
+      .fc-sat {
+        color:#gray;
+        background-color: #f0f0ff;
+      }
+
+
+
+      #calendar .mhc-allday {
+        background-color: lightblue;
+        border-color: lightblue;
+        color: black;
+      }
+
+      #calendar .mhc-time-range {
+        background-color: #f7f7ff;
+        border-color: #f7f7ff;
+        color: black;
+      }
+
+      #calendar .mhc-time-range:hover {
+        background-color: aliceblue;
+        border-color: lavender;
+        color: black;
+      }
+
+      #calendar .mhc-category-holiday {
+        background-color: orangered;
+        border-color: orangered;
+        color: white;
+      }
+
+      #calendar .mhc-category-birthday {
+        background-color: #ffffe8;
+        border-color: #ffffe8;
+        color: black;
+      }
+
+
+
+
+      #side-calendar .mhc-category-birthday {
+        display: none;
+      }
+
+
+
+
+      #stuck-events .fc-list-heading {
+        display: none;
+      }
+
+    </style>
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.js"></script>
+    <script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.12.1/jquery-ui.js"></script>
+    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.4/js/bootstrap.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.22.1/moment.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/fullcalendar/3.9.0/fullcalendar.js"></script>
+
+  </head>
+  <body>
+<!--
+    <div class="navmenu navmenu-default navmenu-fixed-left offcanvas">
+      <a class="navmenu-brand" href="#">brand</a>
+      <ul class="nav navmenu-nav">
+        <li><a href="#">Menu text 1</a></li>
+        <li><a href="#">Menu text 2</a></li>
+        <li><a href="#">Menu text 3</a></li>
+      </ul>
+    </div>
+    <div class="navbar navbar-default navbar-fixed-top">
+      <button type="button" class="navbar-toggle" data-toggle="offcanvas" data-target=".navmenu" data-canvas="body">
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+      </button>
+    </div>
+-->
+
+    <div class="container">
+      <div class="row">
+
+        <div class="col-xs-3">
+          <ul class="nav nav-tabs">
+            <li class="active"><a data-toggle="tab" href="#side-calendar">Past Events</a></li>
+            <li><a data-toggle="tab" href="#stuck-events">Stuck Events</a></li>
+          </ul>
+          <div class="tab-content">
+              <div id="side-calendar" class="tab-pane fade in active"></div>
+              <div id="stuck-events"  class="tab-pane fade"></div>
+          </div>
+        </div><!-- col-xs-3 -->
+
+        <div class="col-xs-9" id="calendar"></div> <!-- col-xs-9 -->
+      </div><!-- row -->
+    </div><!-- /.container -->
+
+    <script>
+        function create_uuid() {
+          var d = +new Date();
+          return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'
+            .replace(/[xy]/g, function(c) {
+              var r = (d + Math.random() * 16) % 16 | 0;
+              return (c == 'x' ? r : (r & 0x3 | 0x8)).toString(16).toUpperCase();
+            });
+        }
+
+        function max_height_for(element) {
+          var top = $(element).position().top;
+          return $(window).height() - top - 7;
+        }
+
+        function adjust_height(element) {
+          var height = max_height_for(element);
+          $(element).fullCalendar('option', 'height', height);
+        }
+
+        var json_event_array = [<%= mhc.json_event_array %>];
+
+        $(document).ready(function() {
+
+          $('#side-calendar').fullCalendar({
+            defaultView: 'listMonth',
+            header: {
+              left: '',
+              center: 'title',
+              right: ''
+            },
+            height: max_height_for('#side-calendar'),
+            editable: true,
+            eventResourceEditable: true,
+            eventLimit: true,
+            selectable: true,
+            droppable: true,
+            timezone: '<%= mhc.tzid %>',
+            timeFormat: "HH:mm",
+            displayEventEnd: false,
+            allDayText: "",
+            month: 'HH:mm',
+            week: 'HH:mm',
+            day: 'HH:mm',
+            // eventSources: [<%= $stuck_recurrences_json %>],
+            eventSources: json_event_array,
+            XeventDragStart: function(calEvent, jsEvent, ui, view) {
+              alert('Drag Event: ' + calEvent.title);
+              alert('Event ID: ' + calEvent.id);
+              alert('Coordinates: ' + jsEvent.pageX + ',' + jsEvent.pageY);
+              alert('View: ' + view.name);
+              // change the border color just for fun
+              $(this).css('border-color', 'red');
+            },
+            viewRender: function(view, element) {
+              $('tr.fc-list-item').each(function() {
+                var duration;
+                var seg = $(this).data('fc-seg');
+                var myevent = seg.footprint.getEventLegacy();
+                if (myevent.end) {
+                  var minutes = moment.duration(myevent.end.diff(myevent.start)).asMinutes();
+                  var days  = Math.floor(minutes/(24*60));
+                  minutes -= days * 24 * 60;
+                  var hours = Math.floor(minutes/60);
+                  minutes -= hours * 60;
+                  duration = days + "." + hours + ":" + minutes;
+                } else {
+                  duration = "0.00:00";
+                }
+                if (myevent.title == "母の日") {
+                  // alert('My Event: ' + myevent.title);
+                  // alert('Duration: ' + duration);
+                }
+                var uuid = create_uuid();
+                // alert('Seg: ' + seg);
+                $(this).data('event', {
+                  title: myevent.title,
+                  allDay: myevent.allDay,
+                  start: myevent.start.format("HH:mm"),
+                  duration: duration,
+                  stick: true,
+                  className: myevent.className
+                });
+              });
+
+              $('tr.fc-list-item').draggable({
+                appendTo: "#calendar",
+                cursorAt: {top: 5, left: 5},
+                iframeFix: true,
+                refreshPositions: true,
+                scroll: false,
+                cursor: "move",
+                revert: true,       // will cause the event to go back to its
+                revertDuration: 0,  //  original position after the drag
+                helper: "clone",
+                zIndex: 100,
+                opacity: 0.35,
+
+                start: function(event, ui) {
+                }
+              });
+              if(view.name == 'listMonth') {
+                adjust_height('#side-calendar');
+              }
+            },
+            windowResize: function(view) {
+              if(view.name == 'listMonth') {
+                adjust_height('#side-calendar');
+              }
+            }
+          });
+
+          $('#stuck-events').fullCalendar({
+            defaultView: 'listall',
+            Xheader: {
+              left: '',
+              center: '',
+              right: ''
+            },
+            header: false,
+            views: {
+              listall: {
+                type: 'list',
+                duration: { days: 3650},
+                dayCount: 30
+              }
+            },
+            height: max_height_for('#side-calendar'), // XXX
+            editable: true,
+            eventResourceEditable: true,
+            eventLimit: true,
+            selectable: true,
+            droppable: true,
+            timezone: '<%= mhc.tzid %>',
+            timeFormat: " ",
+            allDayText: "",
+            month: 'HH:mm',
+            week: 'HH:mm',
+            day: 'HH:mm',
+            eventSources: [<%= $stuck_recurrences_json %>],
+            XeventDragStart: function(calEvent, jsEvent, ui, view) {
+              alert('Drag Event: ' + calEvent.title);
+              alert('Event ID: ' + calEvent.id);
+              alert('Coordinates: ' + jsEvent.pageX + ',' + jsEvent.pageY);
+              alert('View: ' + view.name);
+              // change the border color just for fun
+              $(this).css('border-color', 'red');
+            },
+            viewRender: function(view, element) {
+              $('tr.fc-list-item').each(function() {
+                var duration;
+                var seg = $(this).data('fc-seg');
+                var myevent = seg.footprint.getEventLegacy();
+                if (myevent.end) {
+                  var minutes = moment.duration(myevent.end.diff(myevent.start)).asMinutes();
+                  var days  = Math.floor(minutes/(24*60));
+                  minutes -= days * 24 * 60;
+                  var hours = Math.floor(minutes/60);
+                  minutes -= hours * 60;
+                  duration = days + "." + hours + ":" + minutes;
+                } else {
+                  duration = "0.00:00";
+                }
+                if (myevent.title == "母の日") {
+                  // alert('My Event: ' + myevent.title);
+                  // alert('Duration: ' + duration);
+                }
+                var uuid = create_uuid();
+                // alert('Seg: ' + seg);
+                $(this).data('event', {
+                  title: myevent.title,
+                  allDay: myevent.allDay,
+                  start: myevent.start.format("HH:mm"),
+                  duration: duration,
+                  stick: true,
+                  className: myevent.className
+                });
+              });
+
+              $('tr.fc-list-item').draggable({
+                appendTo: "#calendar",
+                cursorAt: {top: 5, left: 5},
+                iframeFix: true,
+                refreshPositions: true,
+                scroll: false,
+                cursor: "move",
+                revert: true,       // will cause the event to go back to its
+                revertDuration: 0,  //  original position after the drag
+                helper: "clone",
+                zIndex: 100,
+                opacity: 0.35,
+
+                start: function(event, ui) {
+                }
+              });
+              if(view.name == 'listMonth') {
+                adjust_height('#stuck-events');
+              }
+            },
+            windowResize: function(view) {
+              if(view.name == 'listMonth') {
+                adjust_height('#stuck-events');
+              }
+            }
+          });
+
+          $('#calendar').fullCalendar({
+            header: {
+              left: 'prev,next today',
+              center: 'title',
+              right: 'month,agendaWeek,agendaDay,listMonth'
+            },
+            firstDay: 1,
+            height: max_height_for('#calendar'),
+            editable: true,
+            eventResourceEditable: true,
+            eventLimit: true,
+            selectable: true,
+            droppable: true,
+
+            // drop: Event ではない draggable からドロップされたとき．
+            // draggable が event として認識できないようなときでも発火する
+            drop: function(date) {
+              // alert("Dropped on " + date.format());
+            },
+
+            // eventReceive: Event ではない draggable からドロップされたとき
+            // draggable が event として認識可能な property を持っている場合だけ発火する
+            eventReceive: function(event) {
+              event.id = create_uuid(); // XXX! これがうまくいかない
+              $('#calendar').fullCalendar('updateEvent', event);
+              // alert("Drop event from ourter world! ID: " + event.id);
+            },
+
+            // eventDrop:  既に登録されている event を変更したとき
+            eventDrop: function(event, delta, revertFunc, jsEvent, ui, view) {
+              // alert("eventDrop:" + event.title);
+              // alert("eventDrop:" + event.id);
+            },
+
+            //  return (this.eventInstance || this.eventDef).toLegacy()
+            eventClick: function(calEvent, jsEvent, view) {
+              var yesno = prompt('Do you delete ' + calEvent.title + '?');
+              // alert('Event ID: ' + calEvent.id);
+              if (yesno == "yes"){
+                $('#calendar').fullCalendar('removeEvents', [calEvent.id]);
+              }
+              // alert('This Event: ' + $(this).getEventLegacy().title);
+              //alert('Coordinates: ' + jsEvent.pageX + ',' + jsEvent.pageY);
+              //alert('View: ' + view.name);
+              // change the border color just for fun
+              // $(this).css('border-color', 'red');
+            },
+
+            timezone: '<%= mhc.tzid %>',
+            timeFormat: "HH:mm",
+            allDayText: "",
+            month: 'HH:mm',
+            week: 'HH:mm',
+            day: 'HH:mm',
+            eventSources: json_event_array,
+            // eventSources: [<%= mhc.json_event_array %>],
+            viewRender: function(view, element) {
+              if(view.name == 'month') {
+                adjust_height('#calendar');
+                adjust_height('#stuck-events');
+              }
+              var currentDate = $('#calendar').fullCalendar('getDate');
+              // alert("The current date of the calendar is " + currentDate.format());
+              $('#side-calendar').fullCalendar('gotoDate', currentDate.subtract(1, 'y'));
+              $('#stuck-events').fullCalendar('gotoDate', currentDate.subtract(5, 'y'));
+            },
+            windowResize: function(view) {
+              if(view.name == 'month') {
+                adjust_height('#calendar');
+                adjust_height('#stuck-events');
+              }
+            }
+          }) // $('#calendar')
+
+          $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) {
+             var target = $(e.target).attr("href") // activated tab
+             adjust_height(target);
+          });
+
+        });
+    </script>
+  </body>
+</html>

data/lib/mhc/version.rb

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

data/mhc.gemspec

@@ -23,7 +23,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "thor",        ">= 0.19.1"
+  spec.add_runtime_dependency "thor",        ">= 1.2.0"
+  spec.add_runtime_dependency "rexml",       ">= 3.2.4"
   spec.add_runtime_dependency "ri_cal",      ">= 0.8.8"
   spec.add_runtime_dependency "tzinfo",      ">= 1.2.2"
   spec.add_runtime_dependency "tzinfo-data", ">= 1.2015.4"

data/samples/japanese-holidays.mhcc

@@ -31,14 +31,14 @@ X-SC-Record-Id: AC1B378C-BAFE-4B6E-AF9C-78C2377E8AA4
 X-SC-Subject: 天皇誕生日
 X-SC-Category: Holiday Japanese
 X-SC-Cond: 29 Apr
-X-SC-Duration: 19480429-19980429
+X-SC-Duration: 19490429-19880429
 X-SC-Record-Id: B78EAAEE-9963-4573-9EC7-0879F8940AEE
 
 X-SC-Subject: みどりの日
 X-SC-Category: Holiday Japanese
 X-SC-Cond: 29 Apr
 X-SC-Duration: 19890429-20060429
-X-SC-Record-Id: B78EAAEE-9963-4573-9EC7-0879F8940AEE
+X-SC-Record-Id: 8C05BF80-006C-4FA7-8CF1-5F1C18CB8641
 
 X-SC-Subject: 昭和の日
 X-SC-Category: Holiday Japanese
@@ -186,12 +186,12 @@ X-SC-Day: 19730430 19730924 19740506 19740916 19741104 19751124
   20180430 20180924 20181224 20190506 20190812 20191104 20200224 20200506
   20210809
   20230102 20240212 20240506 20240812 20240923 20241104 20250224 20250506
-  20251124 20260506 20270322 20290212 20290430 20290924 20291224
+  20251124 20260506 20270322 20290212 20290430 20290924
   20300506 20300812 20301104 20310224 20310506 20311124 20330321 20340102
-  20350212 20350430 20350924 20351224 20360506 20361124 20370506
-  20400102 20400430 20401224 20410506 20410812 20411104 20420224 20420506
+  20350212 20350430 20350924 20360506 20361124 20370506
+  20400102 20400430 20410506 20410812 20411104 20420224 20420506
   20421124 20430506 20440321 20450102 20460212 20460430 20460924
-  20461224 20470506 20470812 20471104 20480224 20480506 20500321
+  20470506 20470812 20471104 20480224 20480506 20500321
 X-SC-Category: Holiday Japanese
 X-SC-Record-Id: E2D696DF-EB49-44D7-B06C-812B10BD99A2
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mhc
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.5
 platform: ruby
 authors:
 - Yoshinari Nomura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-13 00:00:00.000000000 Z
+date: 2024-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -16,14 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 1.2.0
+- !ruby/object:Gem::Dependency
+  name: rexml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.4
 - !ruby/object:Gem::Dependency
   name: ri_cal
   requirement: !ruby/object:Gem::Requirement
@@ -104,6 +118,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - ".travis.yml"
 - COPYRIGHT
 - Gemfile
@@ -187,6 +202,7 @@ files:
 - lib/mhc/formatter/base.rb
 - lib/mhc/formatter/emacs.rb
 - lib/mhc/formatter/howm.rb
+- lib/mhc/formatter/html.rb
 - lib/mhc/formatter/icalendar.rb
 - lib/mhc/formatter/json.rb
 - lib/mhc/formatter/mail.rb
@@ -215,6 +231,7 @@ files:
 - lib/mhc/sync/strategy.rb
 - lib/mhc/sync/syncinfo.rb
 - lib/mhc/templates/config.yml.erb
+- lib/mhc/templates/full-calendar.html.erb
 - lib/mhc/version.rb
 - lib/mhc/webdav.rb
 - mhc.gemspec
@@ -255,7 +272,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: Message Harmonized Calendaring