mhc 1.2.4 → 1.2.6

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/etag.rb

@@ -52,7 +52,7 @@ module Mhc
     end
 
     def unlink(key)
-      if File.exists?(path = make_path(key))
+      if File.exist?(path = make_path(key))
         File.unlink(path)
       end
     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.6"
   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