Merge pull request #18 from mdorman/date

Fix date handling

Author: mdorman

TODO.org

@@ -55,3 +55,7 @@
   know about =xmlrpc.php=.
 
 
+* DONE Fix date issues once and for all
+  Added some tests to make the failure repeatable, then fixed the
+  issue.  The fix is admittedly a hack, but it would appear to be a
+  reliable one, at least until WP changes its output.

acceptance

@@ -1,3 +1,3 @@
 #!/bin/sh -e
 IFS= read -r -p 'Please enter blog password: ' PASSWORD
-exec emacs -nw -Q -L /usr/share/emacs/site-lisp/org-mode -L . -l ert -l org-blog --eval "(setq org-blog-test-password \"${PASSWORD}\")" --eval '(ert t)'
+exec emacs -nw -Q -L /usr/share/emacs/site-lisp/org-mode -L . -l ert -l org-blog --eval '(setq xml-rpc-debug 10)' --eval "(setq org-blog-test-password \"${PASSWORD}\")" --eval '(ert t)'

org-blog-wp.el

@@ -35,7 +35,7 @@
 (defconst org-blog-wp-alist
   (list (cons :category "category")
         (cons :content "post_content")
-        (cons :date "post_date")
+        (cons :date "post_date_gmt")
         (cons :description "post_excerpt")
         (cons :id "post_id")
         (cons :keywords "post_tag")
@@ -67,11 +67,8 @@ sorted."
                  (org-blog-post-to-wp-add-taxonomy wp "category" v))
                 ((eq :date k)
                  ;; Convert to GMT by adding seconds offset
-                 (cons
-                  (cons "post_date_gmt" (list :datetime
-                                              (time-add v
-                                                        (seconds-to-time (- (car (current-time-zone)))))))
-                  wp))
+                 (let ((gmt (time-add v (seconds-to-time (- (car (current-time-zone)))))))
+                   (cons (cons "post_date_gmt" (list :datetime gmt)) wp)))
                 ((eq :keywords k)
                  (org-blog-post-to-wp-add-taxonomy wp "post_tag" v))
                 ((eq :title k)
@@ -117,7 +114,7 @@ sorted."
                  post)
                 ((string= "terms" k)
                  (org-blog-wp-to-post-handle-taxonomy post v))
-                ((string= "post_date" k)
+                ((string= "post_date_gmt" k)
                  (cons (cons (car (rassoc k org-blog-wp-alist)) (plist-get v :datetime)) post))
                 ((rassoc k org-blog-wp-alist)
                  (cons (cons (car (rassoc k org-blog-wp-alist)) v) post))
@@ -260,13 +257,12 @@ call the specified function and return the results."
 
 ;;;; Define tests if ert is loaded
 (when (featurep 'ert)
-  (setq xml-rpc-debug 5)
   (ert-deftest ob-test-post-to-wp ()
     "Transfer from buffers to posts and back again"
     (let ((post1-struct '((:blog . "t1b")
                           (:category "t1c1" "t1c2")
                           (:content . "<p>\nTest 1 Content</p>\n")
-                          (:date 20738 4432 0 0)
+                          (:date 20738 4432)
                           (:description . "t1e")
                           (:id . "1")
                           (:keywords "t1k1" "t1k2" "t1k3")
@@ -310,7 +306,7 @@ call the specified function and return the results."
                              ("post_date" :datetime
                               (20738 4432))
                              ("post_date_gmt" :datetime
-                              (20738 18832 0 0))
+                              (20738 4432))
                              ("post_modified" :datetime
                               (20738 4432))
                              ("post_modified_gmt" :datetime

org-blog.el

@@ -188,8 +188,7 @@ available in org-blog-alist."
 (when (featurep 'ert)
   (require 'el-mock)
   (setq message-log-max t
-        test-time (current-time)
-        xml-rpc-debug 5)
+        test-time (current-time))
   (ert-deftest ob-test-enable-org-blog-mode ()
     "Test turning on the org-blog minor mode"
     (with-temp-buffer
@@ -308,4 +307,6 @@ works at all, not the content of the post."))
           (org-blog-save)
           (goto-char (point-max))
           (insert "\n\nThis is a little additional text")
-          (org-blog-save))))))
+          (let ((pre-save (buffer-string)))
+            (org-blog-save)
+            (should (equal pre-save (buffer-string)))))))))