commit 78ca7bf09b26818c35b5715645899aa31b35610b
parent 5400d1812b14618fbfe2458ec5a789370509627f
Author: Lukas Henkel <lh@entf.net>
Date: Sat, 26 Mar 2022 21:01:58 +0100
Add ob-http
Diffstat:
7 files changed, 399 insertions(+), 2 deletions(-)
diff --git a/elpa/ob-http-20180707.1448/ob-http-autoloads.el b/elpa/ob-http-20180707.1448/ob-http-autoloads.el
@@ -0,0 +1,33 @@
+;;; ob-http-autoloads.el --- automatically extracted autoloads
+;;
+;;; Code:
+
+(add-to-list 'load-path (directory-file-name
+ (or (file-name-directory #$) (car load-path))))
+
+
+;;;### (autoloads nil "ob-http" "ob-http.el" (0 0 0 0))
+;;; Generated autoloads from ob-http.el
+
+(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-http" '("ob-http" "org-babel-")))
+
+;;;***
+
+;;;### (autoloads nil "ob-http-mode" "ob-http-mode.el" (0 0 0 0))
+;;; Generated autoloads from ob-http-mode.el
+
+(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-http-mode" '("ob-http-mode")))
+
+;;;***
+
+;;;### (autoloads nil nil ("ob-http-pkg.el") (0 0 0 0))
+
+;;;***
+
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; coding: utf-8
+;; End:
+;;; ob-http-autoloads.el ends here
diff --git a/elpa/ob-http-20180707.1448/ob-http-mode.el b/elpa/ob-http-20180707.1448/ob-http-mode.el
@@ -0,0 +1,66 @@
+;;; ob-http-mode.el --- syntax highlight for ob-http
+
+;; Copyright (C) 2015 Feng Zhou
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+(require 's)
+
+(setq ob-http-mode-keywords
+ (let* ((ob-http-methods
+ '(GET POST PUT PATCH DELETE OPTIONS HEAD TRACE CONNECT))
+ (ob-http-headers
+ '(Accept Accept-Charset Accept-Encoding Accept-Language
+ Accept-Datetime Authorization Cache-Control
+ Connection Cookie Content-Length Content-MD5
+ Content-Type Date Expect From Host If-Match
+ If-Modified-Since If-None-Match If-Range
+ If-Unmodified-Since Max-Forwards Origin Pragma
+ Proxy-Authorization Range Referer TE User-Agent
+ Upgrade Via Warning))
+ (ob-http-methods-regexp
+ (rx-to-string
+ `(seq
+ bol
+ (? (1+ space))
+ (group-n 1 (or ,@(mapcar 'symbol-name ob-http-methods)))
+ space
+ (group-n 2 (1+ any))
+ eol)))
+ (ob-http-headers-regexp
+ (rx-to-string
+ `(seq
+ bol
+ (? (1+ space))
+ (group-n 1 (or ,@(mapcar 'symbol-name ob-http-headers)))
+ ": "
+ (group-n 2 (1+ any))
+ eol)))
+ (ob-http-custom-headers-regexp
+ "\\(^X-[^ :]+\\): \\(.*\\)$")
+ (ob-http-variable-regexp
+ "\\([^ ?&=\n]+\\)=\\([^&\n]*\\)")
+ (ob-http-misc-regexp
+ "\\(&\\|=\\|?\\|{\\|}\\|\\[\\|\\]\\|\\,\\|:\\)"))
+ `((,ob-http-headers-regexp (1 font-lock-variable-name-face) (2 font-lock-string-face))
+ (,ob-http-custom-headers-regexp (1 font-lock-variable-name-face) (2 font-lock-string-face))
+ (,ob-http-variable-regexp (1 font-lock-variable-name-face) (2 font-lock-string-face))
+ (,ob-http-methods-regexp (1 font-lock-constant-face) (2 font-lock-function-name-face))
+ (,ob-http-misc-regexp (1 font-lock-comment-face)))))
+
+(define-derived-mode ob-http-mode fundamental-mode "ob http"
+ (set (make-local-variable 'font-lock-defaults) '(ob-http-mode-keywords)))
+
+(provide 'ob-http-mode)
+;;; ob-http-mode.el ends here
diff --git a/elpa/ob-http-20180707.1448/ob-http-mode.elc b/elpa/ob-http-20180707.1448/ob-http-mode.elc
Binary files differ.
diff --git a/elpa/ob-http-20180707.1448/ob-http-pkg.el b/elpa/ob-http-20180707.1448/ob-http-pkg.el
@@ -0,0 +1,11 @@
+(define-package "ob-http" "20180707.1448" "http request in org-mode babel"
+ '((s "1.9.0")
+ (cl-lib "0.5"))
+ :commit "b1428ea2a63bcb510e7382a1bf5fe82b19c104a7" :authors
+ '(("ZHOU Feng" . "zf.pascal@gmail.com"))
+ :maintainer
+ '("ZHOU Feng" . "zf.pascal@gmail.com")
+ :url "http://github.com/zweifisch/ob-http")
+;; Local Variables:
+;; no-byte-compile: t
+;; End:
diff --git a/elpa/ob-http-20180707.1448/ob-http.el b/elpa/ob-http-20180707.1448/ob-http.el
@@ -0,0 +1,287 @@
+;;; ob-http.el --- http request in org-mode babel
+
+;; Copyright (C) 2015 Feng Zhou
+
+;; Author: ZHOU Feng <zf.pascal@gmail.com>
+;; URL: http://github.com/zweifisch/ob-http
+;; Version: 0.0.1
+;; Package-Requires: ((s "1.9.0") (cl-lib "0.5"))
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+;;
+;; http request in org-mode babel
+;;
+
+;;; Code:
+(require 'ob)
+(require 's)
+(require 'subr-x)
+(require 'json)
+(require 'ob-http-mode)
+(require 'cl-lib)
+
+(defconst org-babel-header-args:http
+ '((pretty . :any)
+ (proxy . :any)
+ (noproxy . :any)
+ (curl . :any)
+ (cookie . :any)
+ (schema . :any)
+ (host . :any)
+ (port . :any)
+ (user . :any)
+ (username . :any) ;; deprecated, use user instead
+ (password . :any) ;; deprecated
+ (follow-redirect . :any)
+ (path-prefix . :any)
+ (resolve . :any)
+ (max-time . :any))
+ "http header arguments")
+
+(defgroup ob-http nil
+ "org-mode blocks for http request"
+ :group 'org)
+
+(defcustom ob-http:max-time 10
+ "maximum time in seconds that you allow the whole operation to take"
+ :group 'ob-http
+ :type 'integer)
+
+(defcustom ob-http:remove-cr nil
+ "remove carriage return from header"
+ :group 'ob-http
+ :type 'boolean)
+
+(defcustom ob-http:curl-custom-arguments nil
+ "List of custom headers that shall be added to each curl request"
+ :group 'ob-http
+ :type '(repeat (string :format "%v")))
+
+(cl-defstruct ob-http-request method url headers body)
+(cl-defstruct ob-http-response headers body headers-map)
+
+(defun ob-http-parse-request (input)
+ (let* ((headers-body (ob-http-split-header-body input))
+ (headers (s-split-up-to "\\(\r\n\\|[\n\r]\\)" (car headers-body) 1))
+ (method-url (split-string (car headers) " ")))
+ (make-ob-http-request
+ :method (car method-url)
+ :url (cadr method-url)
+ :headers (if (cadr headers) (s-lines (cadr headers)))
+ :body (cadr headers-body))))
+
+(defun ob-http-parse-response (response)
+ (let* ((headers-body (ob-http-split-header-body response))
+ (headers-map (mapcar 'ob-http-parse-header (s-lines (car headers-body)))))
+ (make-ob-http-response
+ :headers (car headers-body)
+ :body (cadr headers-body)
+ :headers-map headers-map)))
+
+(defun ob-http-split-header-body (input)
+ (let ((splited (s-split-up-to "\\(\r\n\\|[\n\r]\\)[ \t]*\\1" input 1)))
+ (if (and (string-match "^HTTP/\\(1.[0-1]\\|2\\) \\(30\\|100\\)" (car splited))
+ (string-match "^HTTP/\\(1.[0-1]\\|2\\)" (cadr splited)))
+ (ob-http-split-header-body (cadr splited))
+ splited)))
+
+(defun ob-http-parse-header (line)
+ (let ((key-value (s-split-up-to ": " line 1)))
+ `(,(s-downcase (car key-value)) . ,(cadr key-value))))
+
+(defun ob-http-parse-content-type (content-type)
+ (when content-type
+ (cond
+ ((string-match "json" content-type) 'json)
+ ((string-match "html" content-type) 'html)
+ ((string-match "xml" content-type) 'xml))))
+
+(defun ob-http-shell-command-to-string (command input)
+ (with-temp-buffer
+ (insert input)
+ (shell-command-on-region (point-min) (point-max) command nil 't)
+ (buffer-string)))
+
+(defun ob-http-pretty-json (str)
+ (if (executable-find "jq")
+ (ob-http-shell-command-to-string "jq -r ." str)
+ (with-temp-buffer
+ (insert str)
+ (json-pretty-print-buffer)
+ (buffer-string))))
+
+(defun ob-http-pretty-xml (str)
+ (cond
+ ((executable-find "xml_pp") (ob-http-shell-command-to-string "xml_pp" str))
+ ((executable-find "xmlstarlet") (ob-http-shell-command-to-string "xmlstarlet fo" str))
+ (t str)))
+
+(defun ob-http-pretty-html (str)
+ (cond
+ ((executable-find "elinks") (ob-http-shell-command-to-string "elinks -dump" str))
+ ((executable-find "tidy") (ob-http-shell-command-to-string "tidy -i -raw -q 2> /dev/null" str))
+ ((executable-find "pup") (ob-http-shell-command-to-string "pup -p" str))
+ (t str)))
+
+(defun ob-http-pretty (body content-type)
+ (if (string= "" body)
+ body
+ (cl-case (ob-http-parse-content-type content-type)
+ (json (ob-http-pretty-json body))
+ (xml (ob-http-pretty-xml body))
+ (html (ob-http-pretty-html body))
+ (otherwise body))))
+
+(defun ob-http-pretty-response (response content-type)
+ (setf (ob-http-response-body response)
+ (ob-http-pretty (ob-http-response-body response)
+ (if (member content-type '("yes" nil))
+ (ob-http-get-response-header response "content-type")
+ content-type))))
+
+(defun ob-http-select (response path)
+ (let ((content-type (ob-http-parse-content-type
+ (ob-http-get-response-header response "content-type")))
+ (body (ob-http-response-body response)))
+ (cond
+ ((and (eq 'json content-type) (executable-find "jq"))
+ (ob-http-shell-command-to-string (format "jq -r \"%s\"" path) body))
+ ((and (eq 'html content-type) (executable-find "pup"))
+ (ob-http-shell-command-to-string (format "pup -p \"%s\"" path) body))
+ ((and (eq 'xml content-type) (executable-find "xmlstarlet"))
+ (ob-http-shell-command-to-string (format "xmlstarlet sel -t -c '%s' | xmlstarlet fo -o" path) body))
+ (t body))))
+
+(defun org-babel-expand-body:http (body params)
+ (s-format body 'ob-http-aget
+ (mapcar (lambda (x) (when (eq (car x) :var) (cdr x))) params)))
+
+(defun ob-http-get-response-header (response header)
+ (cdr (assoc (s-downcase header) (ob-http-response-headers-map response))))
+
+(defun ob-http-remove-carriage-return (response)
+ (setf (ob-http-response-headers response)
+ (s-join "\n" (s-lines (ob-http-response-headers response))))
+ response)
+
+(defun ob-http-flatten (l)
+ (cond
+ ((null l) nil)
+ ((atom l) (list l))
+ (t
+ (append (ob-http-flatten (car l)) (ob-http-flatten (cdr l))))))
+
+(defun ob-http-aget (key alist)
+ (assoc-default (intern key) alist))
+
+(defun ob-http-construct-url (path params)
+ (if (s-starts-with? "/" path)
+ (s-concat
+ (format "%s://" (or (assoc-default :schema params) "http"))
+ (assoc-default :host params)
+ (when (assoc :port params)
+ (format ":%s" (assoc-default :port params)))
+ (assoc-default :path-prefix params)
+ path)
+ path))
+
+(defun ob-http-file (response filename)
+ (let ((body (ob-http-response-body response)))
+ (with-temp-file filename
+ (insert body))))
+
+(defun org-babel-execute:http (body params)
+ (let* ((request (ob-http-parse-request (org-babel-expand-body:http body params)))
+ (proxy (cdr (assoc :proxy params)))
+ (noproxy (assoc :noproxy params))
+ (follow-redirect (and (assoc :follow-redirect params) (not (string= "no" (cdr (assoc :follow-redirect params))))))
+ (pretty (assoc :pretty params))
+ (prettify (and pretty (not (string= (cdr pretty) "no"))))
+ (file (assoc :file params))
+ (get-header (cdr (assoc :get-header params)))
+ (cookie-jar (cdr (assoc :cookie-jar params)))
+ (cookie (cdr (assoc :cookie params)))
+ (curl (cdr (assoc :curl params)))
+ (select (cdr (assoc :select params)))
+ (resolve (cdr (assoc :resolve params)))
+ (request-body (ob-http-request-body request))
+ (error-output (org-babel-temp-file "curl-error"))
+ (args (append ob-http:curl-custom-arguments (list "-i"
+ (when (and proxy (not noproxy)) `("-x" ,proxy))
+ (when noproxy '("--noproxy" "*"))
+ (let ((method (ob-http-request-method request)))
+ (if (string= "HEAD" method) "-I" `("-X" ,method)))
+ (when follow-redirect "-L")
+ (when (and (assoc :username params) (assoc :password params))
+ `("--user" ,(s-format "${:username}:${:password}" 'ob-http-aget params)))
+ (when (assoc :user params) `("--user" ,(cdr (assoc :user params))))
+ (mapcar (lambda (x) `("-H" ,x)) (ob-http-request-headers request))
+ (when (s-present? request-body)
+ (let ((tmp (org-babel-temp-file "http-")))
+ (with-temp-file tmp (insert request-body))
+ `("-d" ,(format "@%s" tmp))))
+ (when cookie-jar `("--cookie-jar" ,cookie-jar))
+ (when cookie `("--cookie" ,cookie))
+ (when resolve (mapcar (lambda (x) `("--resolve" ,x)) (split-string resolve ",")))
+ (when curl (split-string-and-unquote curl))
+ "--max-time"
+ (int-to-string (or (cdr (assoc :max-time params))
+ ob-http:max-time))
+ "--globoff"
+ (ob-http-construct-url (ob-http-request-url request) params)))))
+ (with-current-buffer (get-buffer-create "*curl commands history*")
+ (goto-char (point-max))
+ (insert "curl "
+ (string-join (mapcar 'shell-quote-argument (ob-http-flatten args)) " ")
+ "\n"))
+ (with-current-buffer (get-buffer-create "*curl output*")
+ (erase-buffer)
+ (if (= 0 (apply 'call-process "curl" nil `(t ,error-output) nil (ob-http-flatten args)))
+ (let ((response (ob-http-parse-response (buffer-string))))
+ (when prettify (ob-http-pretty-response response (cdr pretty)))
+ (when ob-http:remove-cr (ob-http-remove-carriage-return response))
+ (cond (get-header (ob-http-get-response-header response get-header))
+ (select (ob-http-select response select))
+ (prettify (ob-http-response-body response))
+ (file (ob-http-file response (cdr file)))
+ (t (s-join "\n\n" (list (ob-http-response-headers response) (ob-http-response-body response))))))
+ (with-output-to-temp-buffer "*curl error*"
+ (princ (with-temp-buffer
+ (insert-file-contents-literally error-output)
+ (s-join "\n" (s-lines (buffer-string)))))
+ "")))))
+
+(defun ob-http-export-expand-variables (&optional backend)
+ "Scan current buffer for all HTTP source code blocks and expand variables.
+
+Add this function to `org-export-before-processing-hook' to
+enable variable expansion before source block is exported."
+ (let ((case-fold-search t) elt replacement)
+ (save-excursion
+ (goto-char (point-min))
+ (while (search-forward-regexp "^[ \t]*#\\+begin_src[ \t]+http" nil 'noerror)
+ (setq elt (org-element-at-point))
+ (when (eq 'src-block (car elt))
+ (setq replacement (org-babel-expand-src-block))
+ (goto-char (org-element-property :begin elt))
+ (delete-region (org-element-property :begin elt) (org-element-property :end elt))
+ (insert (org-element-interpret-data (org-element-put-property elt :value replacement))))))))
+
+(eval-after-load "org"
+ '(add-to-list 'org-src-lang-modes '("http" . "ob-http")))
+
+(provide 'ob-http)
+;;; ob-http.el ends here
diff --git a/elpa/ob-http-20180707.1448/ob-http.elc b/elpa/ob-http-20180707.1448/ob-http.elc
Binary files differ.
diff --git a/init.el b/init.el
@@ -173,7 +173,7 @@
'(kept-new-versions 10)
'(kept-old-versions 5)
'(mouse-wheel-progressive-speed nil)
- '(org-babel-load-languages '((awk . t) (lisp . t) (shell . t) (emacs-lisp . t)))
+ '(org-babel-load-languages '((awk . t) (lisp . t) (shell . t) (emacs-lisp . t) (http . t)))
'(org-log-done 'time)
'(org-log-done-with-time t)
'(org-src-window-setup 'other-window)
@@ -185,7 +185,7 @@
("melpa-stable" . "https://stable.melpa.org/packages/")
("melpa" . "https://melpa.org/packages/")))
'(package-selected-packages
- '(pdf-tools paredit-menu paredit vertico-posframe vertico corfu sly eglot aggressive-indent project nov nhexl-mode elfeed magit yaml-mode json-mode lua-mode go-mode geiser-guile geiser org-roam org-contrib org ace-window expand-region consult marginalia uuidgen request diminish which-key))
+ '(ob-http pdf-tools paredit-menu paredit vertico-posframe vertico corfu sly eglot aggressive-indent project nov nhexl-mode elfeed magit yaml-mode json-mode lua-mode go-mode geiser-guile geiser org-roam org-contrib org ace-window expand-region consult marginalia uuidgen request diminish which-key))
'(pcomplete-ignore-case t)
'(read-buffer-completion-ignore-case t)
'(read-file-name-completion-ignore-case t)
