Skip to content

Commit

Permalink
Merge pull request #329 from ardumont/0.7.9
Browse files Browse the repository at this point in the history
0.7.9
  • Loading branch information
ardumont committed Jun 4, 2016
2 parents 49b65ea + 2f7e494 commit dfb9815
Show file tree
Hide file tree
Showing 7 changed files with 34 additions and 18 deletions.
7 changes: 7 additions & 0 deletions TODO.org
Expand Up @@ -32,6 +32,13 @@
- [ ] #245 - Trying to sync a card: orgtrello-buffer/compute-marker: Wrong type argument: numberp, nil
- [ ] #248 - Installing from melpa (unstable) works, but then it errs on an undefined variable "error-messages"
- [ ] #263 - Colors broken in org trello
* DONE 0.7.9 [100%]
CLOSED: [2016-06-04 Sat 14:42]
- [X] Fix problem with custom kill-whole-line properties - Close #270
- [X] Fix problem with scheduled deadline - Close #326
- [X] Upgrade version
- [X] Release notes

* DONE 0.7.8 [100%]
- [X] Fix cyrillic encoding problem - Close #318 #270
- [X] Update version
Expand Down
19 changes: 10 additions & 9 deletions org-trello-api.el
Expand Up @@ -179,15 +179,16 @@ Optional fields DUE, ID-MEMBERS, DESC, LABELS, POS query."
labels pos)
"Create an update a card CARD-ID to IDLIST.
Optional NAME, DUE date, ID-MEMBERS, DESC, LABELS, POS query."
(->> (orgtrello-api--deal-with-optional-values
`((,name . ("name" . ,name))
(,id-members . ("idMembers" . ,id-members))
(,due . ("due" . ,due))
(,desc . ("desc" . ,desc))
(,labels . ("labels" . ,labels))
(,pos . ("pos" . ,pos)))
`(("idList" . ,idList)))
(orgtrello-api-make-query "PUT" (format "/cards/%s" card-id))))
(let ((due (if due due "")))
(->> (orgtrello-api--deal-with-optional-values
`((,name . ("name" . ,name))
(,id-members . ("idMembers" . ,id-members))
(,due . ("due" . ,due))
(,desc . ("desc" . ,desc))
(,labels . ("labels" . ,labels))
(,pos . ("pos" . ,pos)))
`(("idList" . ,idList)))
(orgtrello-api-make-query "PUT" (format "/cards/%s" card-id)))))

(defun orgtrello-api-add-checklist (card-id name pos)
"Create an add a checklist to a card CARD-ID, checklist with NAME, POS query."
Expand Down
2 changes: 1 addition & 1 deletion org-trello-pkg.el
@@ -1,4 +1,4 @@
(define-package "org-trello" "0.7.8" "Minor mode to synchronize org-mode buffer and trello board"
(define-package "org-trello" "0.7.9" "Minor mode to synchronize org-mode buffer and trello board"
'((request-deferred "0.2.0")
(deferred "0.4.0")
(s "1.11.0")
Expand Down
4 changes: 2 additions & 2 deletions org-trello.el
Expand Up @@ -4,7 +4,7 @@

;; Author: Antoine R. Dumont <eniotna.t AT gmail.com>
;; Maintainer: Antoine R. Dumont <eniotna.t AT gmail.com>
;; Version: 0.7.8
;; Version: 0.7.9
;; Package-Requires: ((emacs "24") (dash "2.12.1") (dash-functional "2.12.1") (s "1.11.0") (deferred "0.4.0") (request-deferred "0.2.0"))
;; Keywords: org-mode trello sync org-trello
;; URL: https://github.com/org-trello/org-trello
Expand Down Expand Up @@ -112,7 +112,7 @@ Please consider upgrading Emacs." emacs-version)
(require 'json)
(require 'parse-time)

(defconst org-trello--version "0.7.8" "Current org-trello version installed.")
(defconst org-trello--version "0.7.9" "Current org-trello version installed.")



Expand Down
7 changes: 7 additions & 0 deletions release-notes.md
@@ -1,3 +1,10 @@
# 0.7.9

- [X] Fix problem with custom kill-whole-line properties - Close #270
- [X] Fix problem with scheduled deadline - Close #326
- [X] Upgrade version
- [X] Release notes

# 0.7.8

- [X] Fix cyrillic encoding problem - Close #318 #270
Expand Down
10 changes: 5 additions & 5 deletions test/org-trello-api-test.el
Expand Up @@ -111,15 +111,15 @@
(ert-deftest test-orgtrello-api-move-card ()
(should (equal "PUT" (gethash :method (orgtrello-api-move-card :id-card :id-list "name-card"))))
(should (equal "/cards/:id-card" (gethash :uri (orgtrello-api-move-card :id-card :id-list "name-card"))))
(should (equal '(("name" . "name-card") ("idList" . :id-list)) (gethash :params (orgtrello-api-move-card :id-card :id-list "name-card"))))
(should (equal '(("due". "") ("name" . "name-card") ("idList" . :id-list)) (gethash :params (orgtrello-api-move-card :id-card :id-list "name-card"))))

(should (equal "PUT" (gethash :method (orgtrello-api-move-card :id-card :id-list :name))))
(should (equal "/cards/:id-card" (gethash :uri (orgtrello-api-move-card :id-card :id-list :name))))
(should (equal '(("name" . :name) ("idList" . :id-list)) (gethash :params (orgtrello-api-move-card :id-card :id-list :name))))
(should (equal '(("due". "") ("name" . :name) ("idList" . :id-list)) (gethash :params (orgtrello-api-move-card :id-card :id-list :name))))

(should (equal "PUT" (gethash :method (orgtrello-api-move-card :id-card :id-list))))
(should (equal "/cards/:id-card" (gethash :uri (orgtrello-api-move-card :id-card :id-list))))
(should (equal '(("idList" . :id-list)) (gethash :params (orgtrello-api-move-card :id-card :id-list))))
(should (equal '(("due" . "") ("idList" . :id-list)) (gethash :params (orgtrello-api-move-card :id-card :id-list))))

(should (equal "PUT" (gethash :method (orgtrello-api-move-card :id-card :id-list nil :due-date))))
(should (equal "/cards/:id-card" (gethash :uri (orgtrello-api-move-card :id-card :id-list nil :due-date))))
Expand All @@ -131,11 +131,11 @@

(should (equal "PUT" (gethash :method (orgtrello-api-move-card :id-card :id-list "name-card" nil "idmember0,idmember1"))))
(should (equal "/cards/:id-card" (gethash :uri (orgtrello-api-move-card :id-card :id-list "name-card" nil "idmember0,idmember1"))))
(should (equal '(("idMembers" . "idmember0,idmember1") ("name" . "name-card") ("idList" . :id-list)) (gethash :params (orgtrello-api-move-card :id-card :id-list "name-card" nil "idmember0,idmember1"))))
(should (equal '(("due". "") ("idMembers" . "idmember0,idmember1") ("name" . "name-card") ("idList" . :id-list)) (gethash :params (orgtrello-api-move-card :id-card :id-list "name-card" nil "idmember0,idmember1"))))

(should (equal "PUT" (gethash :method (orgtrello-api-move-card :id-card :id-list nil nil nil :description nil))))
(should (equal "/cards/:id-card" (gethash :uri (orgtrello-api-move-card :id-card :id-list nil nil nil :description nil))))
(should (equal '(("desc" . :description) ("idList" . :id-list)) (gethash :params (orgtrello-api-move-card :id-card :id-list nil nil nil :description nil)))))
(should (equal '(("desc" . :description) ("due" . "") ("idList" . :id-list)) (gethash :params (orgtrello-api-move-card :id-card :id-list nil nil nil :description nil)))))

(ert-deftest test-orgtrello-api-add-checklist ()
(should (equal "POST" (gethash :method (orgtrello-api-add-checklist "id-card" "name-checklist" "pos"))))
Expand Down
3 changes: 2 additions & 1 deletion test/org-trello-tests.el
Expand Up @@ -38,7 +38,8 @@ Deal with nested hash map."
org-trello-mode-off-hook nil
orgtrello-setup-use-position-in-checksum-computation 'please-do-use-position-in-checksum-computation
orgtrello-log-level orgtrello-log-no-log
org-trello--mode-activated-p t)
org-trello--mode-activated-p t
kill-whole-line t)
(call-interactively 'org-trello-mode))

(defmacro orgtrello-tests-with-temp-buffer (text body-test
Expand Down

0 comments on commit dfb9815

Please sign in to comment.