mhc 1.0.0 → 1.0.1

data/lib/mhc/formatter.rb

@@ -20,6 +20,8 @@ module Mhc
         SymbolicExpression.new(date_range: date_range, options:options)
       when :howm
         Howm.new(date_range: date_range, options:options)
+      when :json
+        FullCalendar.new(date_range: date_range, options:options)
       else
         raise FormatterNameError.new("Unknown format: #{formatter} (#{formatter.class})")
       end
@@ -308,5 +310,31 @@ module Mhc
       end
     end # class Howm
 
+    class FullCalendar < Base
+      require "json"
+
+      def format_body(context)
+        events = []
+        @occurrences.each do |oc|
+          if oc.categories.map{|c| c.to_s.downcase}.include?('holiday')
+            color = "red"
+          elsif oc.allday?
+            color = "green"
+          else
+            color = ""
+          end
+          events << {
+            id:    oc.record_id,
+            allDay: oc.allday?,
+            title: oc.subject,
+            start: oc.dtstart.iso8601,
+            end:   oc.dtend.iso8601,
+            color: color
+          }
+        end
+        return events.to_json
+      end
+    end # class FullCalendar
+
   end # module Formatter
 end # module Mhc

data/lib/mhc/version.rb

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

data/mhc.gemspec

@@ -18,6 +18,11 @@ 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 "ri_cal",      ">= 0.8.8"
+  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"

metadata

@@ -1,15 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: mhc
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Yoshinari Nomura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-16 00:00:00.000000000 Z
+date: 2015-05-29 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.19.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.19.1
+- !ruby/object:Gem::Dependency
+  name: ri_cal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.8
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.8
+- !ruby/object:Gem::Dependency
+  name: tzinfo
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.2
+- !ruby/object:Gem::Dependency
+  name: tzinfo-data
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2015.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2015.4
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -86,7 +142,6 @@ files:
 - emacs/mhc-message.el
 - emacs/mhc-minibuf.el
 - emacs/mhc-misc.el
-- emacs/mhc-mua.el
 - emacs/mhc-parse.el
 - emacs/mhc-process.el
 - emacs/mhc-ps.el

data/emacs/mhc-mua.el

@@ -1,260 +0,0 @@
-;;; mhc-mua.el --- MUA backend for MHC
-
-;; Author:  Yoshinari Nomura <nom@quickhack.net>
-;; Created: 2014-09-20
-
-;;; Commentary:
-
-;; This file is a part of MHC, backend methods for Generic MUA.
-
-;;; Code:
-
-(defconst mhc-mua/summary-filename-regex
-  ".*\r *\\+\\([^ \t]+\\)[ \t]+\\([^ \t\n]+\\)")
-
-;; Setup function:
-
-(eval-and-compile
-  (autoload 'rfc2047-decode-region "rfc2047")
-  (autoload 'rfc2047-decode-string "rfc2047")
-  ;; (autoload 'eword-encode-string "eword-encode")
-  ;; (autoload 'rfc2047-encode-message-header "rfc2047")
-  ;; (autoload 'rfc2047-encode-string "rfc2047")
-  )
-
-;;;###autoload
-(defun mhc-mua-setup ()
-  (require 'mhc)
-  (setq mhc-mailer-package 'mua)
-  (mhc-setup)
-  (add-hook 'mhc-summary-mode-hook 'mhc-mode))
-
-;;; Backend methods:
-
-;;; for mhc-summary
-
-(defun mhc-mua-summary-filename ()
-  (let (folder number)
-    (save-excursion
-      (beginning-of-line)
-      (if (not (looking-at mhc-mua/summary-filename-regex))
-          ()
-        (buffer-substring (match-beginning 2) (match-end 2))))))
-
-(defun mhc-mua-summary-display-article ()
-  "Display the current article pointed in summary."
-  (let ((file (mhc-mua-summary-filename)))
-    (if (not (and (stringp file) (file-exists-p file)))
-        (message "File does not exist.")
-      (mhc-window-push)
-      ;; (view-file-other-window file)
-      (pop-to-buffer (get-buffer-create "*MHC message*"))
-      ;; eword decode
-      (let ((buffer-read-only nil))
-        (goto-char (point-min))
-        (erase-buffer)
-        (insert-file-contents file)
-        (mhc-header-narrowing
-          (mhc-header-delete-header
-           "^\\(Content-.*\\|Mime-Version\\|User-Agent\\):" 'regexp))
-        (mhc-header-delete-empty-header
-         "^X-SC-.*:" 'regexp)
-        (mhc-message-mode)
-        (mhc-message-set-file-name file))
-      ;; (setq view-exit-action 'mhc-calendar-view-exit-action)
-      (set-visited-file-name nil)
-      ;; (rename-buffer (file-name-nondirectory file) 'unique)
-      ;; (run-hooks 'mhc-calendar-view-file-hook)
-      (set-buffer-modified-p nil)
-      (setq buffer-read-only t)
-      )))
-
-(defun mhc-mua-get-import-buffer (&optional get-raw)
-  "Return a buffer visiting import article.
-If GET-RAW is non-nil, return a cons of buffer: car keeps a raw
-message and cdr keeps a visible message."
-  (let ((buffer
-         (or
-          (save-window-excursion
-            (let ((mode (progn (other-window 1) major-mode)))
-              (if (or
-                   (eq mode 'mew-message-mode)
-                   (eq mode 'mhc-message-mode))
-                  (current-buffer))))
-          (current-buffer))))
-    ;; XXX get-raw is gone soon
-    (if get-raw
-        (cons buffer buffer)
-      buffer)))
-
-(defun mhc-mua-generate-summary-buffer (name-or-date)
-  "Generate a summary buffer for DATE-OR-DATE, and change current buffer to it."
-  (switch-to-buffer
-   (set-buffer
-    (mhc-get-buffer-create
-     (if (stringp name-or-date)
-         name-or-date
-       (mhc-date-format name-or-date "%04d-%02d" yy mm)))))
-  (setq inhibit-read-only t
-        buffer-read-only nil
-        selective-display t
-        selective-display-ellipses nil
-        indent-tabs-mode nil)
-  (widen)
-  (delete-region (point-min) (point-max)))
-
-(defun mhc-mua/schedule-foldermsg (schedule)
-  (concat "\r +MHC " (mhc-record-name (mhc-schedule-record schedule))))
-
-(defun mhc-mua-insert-summary-contents (inserter)
-  (funcall inserter)
-  (insert (mhc-mua/schedule-foldermsg mhc-tmp-schedule) "\n"))
-
-(defun mhc-mua-summary-mode-setup (date)
-  (mhc-summary-mode))
-
-
-(defvar mhc-message-eof-marker-face 'mhc-message-eof-marker-face)
-(defvar mhc-message-subject-face 'mhc-message-subject-face)
-
-(defface mhc-message-eof-marker-face
-  '((((class color)
-      (background dark))
-     (:background "aquamarine2"))
-    (((class color)
-      (background light))
-     (:background "aquamarine2"))
-    (t
-     ()))
-  "*Face used by mhc-message-eof-marker."
-  :group 'mhc-faces)
-
-(defface mhc-message-subject-face
-  '((((class color)
-      (background dark))
-     (:foreground "OrangeRed" :bold t))
-    (((class color)
-      (background light))
-     (:foreground "Firebrick" :bold t))
-    (t
-     ()))
-  "*Face used by mhc-message-subject."
-  :group 'mhc-faces)
-
-(defvar mhc-message-font-lock-keywords
-  '(("\\([12][0-9][0-9][0-9]\\)\\([0-1][0-9]\\)\\([0-3][0-9]\\)"
-     (1 font-lock-type-face)
-     (2 font-lock-comment-face)
-     (3 font-lock-builtin-face))
-    ("\\(X-SC-\\(Subject\\|Location\\|Day\\|Time\\|Category\\|Priority\\|Recurrence-Tag\\|Mission-Tag:\\|Cond\\|Duration\\|Alarm\\|Record-Id\\|Sequence\\):\\)"
-     (1 font-lock-keyword-face))
-    ("\\(\\[End of message\\]\\)"
-     (1 mhc-message-eof-marker-face))
-    ("\\(X-SC-Subject:\\) *\\(.*\\)"
-     (1 font-lock-keyword-face)
-     (2 mhc-message-subject-face))
-    ))
-
-(defun mhc-mua-highlight-message (&optional for-draft)
-  "Hilight message in the current buffer.
-If FOR-DRAFT is non-nil, Hilight message as draft message."
-  (set (make-local-variable 'font-lock-defaults)
-       '(mhc-message-font-lock-keywords t)))
-
-(defalias 'mhc-mua-eword-decode-string 'rfc2047-decode-string)
-
-(defun mhc-mua-decode-header ()
-  (save-restriction
-    (mhc-header-narrowing
-      (rfc2047-decode-region (point-min) (point-max)))))
-
-;;; for mhc-draft
-
-(defun mhc-mua-draft-setup-new ()
-  (insert mail-header-separator "\n"))
-
-(defun mhc-mua-draft-reedit-buffer (buffer original)
-  ;; If current buffer is specified as buffer, no need to replace.
-  (unless (eq (current-buffer) buffer)
-    (erase-buffer)
-    (insert-buffer-substring buffer))
-  (mhc-header-narrowing
-    (mhc-header-delete-header
-     "^\\(Content-.*\\|Mime-Version\\|User-Agent\\):" 'regexp)
-    (rfc2047-decode-region (point-min) (point-max)))
-  (goto-char (point-min))
-  (when (re-search-forward "^\r?$" nil t)
-    (insert mail-header-separator)))
-
-(defun mhc-mua-draft-reedit-file (file)
-  (erase-buffer)
-  (insert-file-contents file)
-  (mhc-mua-draft-reedit-buffer (current-buffer) 'original))
-
-(defun mhc-mua-draft-translate ()
-  "Convert an article in the current buffer to an ENCODED one.
-ENCODED article should be valid for storeing to a mhc file.
-This function can be empty for the current mhc, whereas
-the old mhc was supposed to encode the article into MIME message."
-  (save-excursion
-    (goto-char (point-min))
-    (when (search-forward (concat "\n" mail-header-separator "\n") nil t)
-      (replace-match "\n\n"))))
-
-;;; for mhc-calendar
-
-(defun mhc-mua-goto-message (&optional view)
-  "Go to a view position on summary buffer."
-  (when view
-    (mhc-summary-display)))
-
-(provide 'mhc-mua)
-(put 'mhc-mua 'summary-filename        'mhc-mua-summary-filename)
-(put 'mhc-mua 'summary-display-article 'mhc-mua-summary-display-article)
-(put 'mhc-mua 'get-import-buffer       'mhc-mua-get-import-buffer)
-(put 'mhc-mua 'highlight-message       'mhc-mua-highlight-message)
-(put 'mhc-mua 'draft-mode              'mhc-mua-draft-mode)
-(put 'mhc-mua 'generate-summary-buffer 'mhc-mua-generate-summary-buffer)
-(put 'mhc-mua 'insert-summary-contents 'mhc-mua-insert-summary-contents)
-(put 'mhc-mua 'summary-search-date     'mhc-mua-summary-search-date)
-(put 'mhc-mua 'summary-mode-setup      'mhc-mua-summary-mode-setup)
-(put 'mhc-mua 'draft-setup-new         'mhc-mua-draft-setup-new)
-(put 'mhc-mua 'draft-reedit-buffer     'mhc-mua-draft-reedit-buffer)
-(put 'mhc-mua 'draft-reedit-file       'mhc-mua-draft-reedit-file)
-(put 'mhc-mua 'draft-translate         'mhc-mua-draft-translate)
-(put 'mhc-mua 'eword-decode-string     'mhc-mua-eword-decode-string)
-(put 'mhc-mua 'decode-header           'mhc-mua-decode-header)
-(put 'mhc-mua 'goto-message            'mhc-mua-goto-message)
-
-;;; Copyright Notice:
-
-;; Copyright (C) 1999, 2000 Yoshinari Nomura. All rights reserved.
-;; Copyright (C) 2000 MHC developing team. All rights reserved.
-
-;; Redistribution and use in source and binary forms, with or without
-;; modification, are permitted provided that the following conditions
-;; are met:
-;;
-;; 1. Redistributions of source code must retain the above copyright
-;;    notice, this list of conditions and the following disclaimer.
-;; 2. Redistributions in binary form must reproduce the above copyright
-;;    notice, this list of conditions and the following disclaimer in the
-;;    documentation and/or other materials provided with the distribution.
-;; 3. Neither the name of the team nor the names of its contributors
-;;    may be used to endorse or promote products derived from this software
-;;    without specific prior written permission.
-;;
-;; THIS SOFTWARE IS PROVIDED BY THE TEAM AND CONTRIBUTORS ``AS IS''
-;; AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-;; LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-;; FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
-;; THE TEAM OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-;; INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-;; (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-;; SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-;; HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-;; STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-;; ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-;; OF THE POSSIBILITY OF SUCH DAMAGE.
-
-;;; mhc-mua.el ends here