Rename all the lambdas to private scopes

It's not meant for regular users to engage them directly.
master
Elis Axelsson 9 years ago
parent cc9ba3d929
commit 4b32baa166
No known key found for this signature in database
GPG Key ID: D57EFA625C9A925F
  1. 2
      tests/unit/test-webpaste-default-post-field-lambda.el
  2. 4
      tests/unit/test-webpaste-error-lambdas.el
  3. 6
      tests/unit/test-webpaste-success-lambdas.el
  4. 36
      webpaste.el

@ -10,7 +10,7 @@
(it (it
"can add language and text as post data" "can add language and text as post data"
(let ((post-lambda (webpaste-providers-default-post-field-lambda)) (let ((post-lambda (webpaste--providers-default-post-field-lambda))
(major-mode 'fundamental-mode) (major-mode 'fundamental-mode)
(webpaste--provider-lang-alists '(("https://example.com/" . ((fundamental-mode . "text")))))) (webpaste--provider-lang-alists '(("https://example.com/" . ((fundamental-mode . "text"))))))
(let ((post-data (funcall post-lambda (let ((post-data (funcall post-lambda

@ -16,7 +16,7 @@
(it (it
"with fallback" "with fallback"
(let ((error-lambda (webpaste-providers-error-lambda :text "my text"))) (let ((error-lambda (webpaste--providers-error-lambda :text "my text")))
(funcall error-lambda :error-thrown "my error") (funcall error-lambda :error-thrown "my error")
(expect 'message (expect 'message
@ -30,7 +30,7 @@
(it (it
"without fallback" "without fallback"
(let ((error-lambda (webpaste-providers-error-lambda-no-failover :text "my text"))) (let ((error-lambda (webpaste--providers-error-lambda-no-failover :text "my text")))
(funcall error-lambda :error-thrown "my error") (funcall error-lambda :error-thrown "my error")
(expect 'message (expect 'message

@ -17,7 +17,7 @@
(it (it
"using a response header" "using a response header"
(let ((success-lambda (webpaste-providers-success-location-header))) (let ((success-lambda (webpaste--providers-success-location-header)))
(funcall success-lambda :response "my fake response") (funcall success-lambda :response "my fake response")
(expect 'webpaste--return-url (expect 'webpaste--return-url
@ -27,7 +27,7 @@
(xit (xit
"when using some request.el response thingy" "when using some request.el response thingy"
(let ((success-lambda (webpaste-providers-success-response-url))) (let ((success-lambda (webpaste--providers-success-response-url)))
(funcall success-lambda :response "my fake response") (funcall success-lambda :response "my fake response")
(expect 'webpaste--return-url (expect 'webpaste--return-url
@ -38,7 +38,7 @@
(it (it
"when returning a string with an url" "when returning a string with an url"
(let ((success-lambda (webpaste-providers-success-returned-string))) (let ((success-lambda (webpaste--providers-success-returned-string)))
(funcall success-lambda :data "\"https://example.com/\" (funcall success-lambda :data "\"https://example.com/\"
") ")

@ -93,21 +93,21 @@ This uses `simpleclip-set-contents' to copy to clipboard."
:post-field "c" :post-field "c"
:lang-uri-separator "/" :lang-uri-separator "/"
:lang-overrides ((emacs-lisp-mode . "elisp")) :lang-overrides ((emacs-lisp-mode . "elisp"))
:success-lambda webpaste-providers-success-location-header) :success-lambda webpaste--providers-success-location-header)
("ix.io" ("ix.io"
:uri "http://ix.io/" :uri "http://ix.io/"
:post-field "f:1" :post-field "f:1"
:lang-uri-separator "/" :lang-uri-separator "/"
:lang-overrides ((emacs-lisp-mode . "elisp")) :lang-overrides ((emacs-lisp-mode . "elisp"))
:success-lambda webpaste-providers-success-returned-string) :success-lambda webpaste--providers-success-returned-string)
("sprunge.us" ("sprunge.us"
:uri "http://sprunge.us/" :uri "http://sprunge.us/"
:post-field "sprunge" :post-field "sprunge"
:lang-uri-separator "?" :lang-uri-separator "?"
:lang-overrides ((emacs-lisp-mode . "clojure")) :lang-overrides ((emacs-lisp-mode . "clojure"))
:success-lambda webpaste-providers-success-returned-string) :success-lambda webpaste--providers-success-returned-string)
("dpaste.com" ("dpaste.com"
:uri "http://dpaste.com/api/v2/" :uri "http://dpaste.com/api/v2/"
@ -117,7 +117,7 @@ This uses `simpleclip-set-contents' to copy to clipboard."
:post-field "content" :post-field "content"
:post-lang-field-name "syntax" :post-lang-field-name "syntax"
:lang-overrides ((emacs-lisp-mode . "clojure")) :lang-overrides ((emacs-lisp-mode . "clojure"))
:success-lambda webpaste-providers-success-location-header) :success-lambda webpaste--providers-success-location-header)
("dpaste.de" ("dpaste.de"
:uri "https://dpaste.de/api/" :uri "https://dpaste.de/api/"
@ -125,7 +125,7 @@ This uses `simpleclip-set-contents' to copy to clipboard."
:post-field "content" :post-field "content"
:post-lang-field-name "lexer" :post-lang-field-name "lexer"
:lang-overrides ((emacs-lisp-mode . "clojure")) :lang-overrides ((emacs-lisp-mode . "clojure"))
:success-lambda webpaste-providers-success-returned-string) :success-lambda webpaste--providers-success-returned-string)
("gist.github.com" ("gist.github.com"
:uri "https://api.github.com/gists" :uri "https://api.github.com/gists"
@ -148,7 +148,7 @@ This uses `simpleclip-set-contents' to copy to clipboard."
:post-field "code" :post-field "code"
:post-lang-field-name "language" :post-lang-field-name "language"
:lang-overrides ((emacs-lisp-mode . "clojure")) :lang-overrides ((emacs-lisp-mode . "clojure"))
:success-lambda webpaste-providers-success-response-url)) :success-lambda webpaste--providers-success-response-url))
"Define all webpaste.el providers. "Define all webpaste.el providers.
Consists of provider name and arguments to be sent to `webpaste--provider' when Consists of provider name and arguments to be sent to `webpaste--provider' when
@ -193,21 +193,21 @@ precalculated, and also available both for pre and post request access.")
;;; Predefined error lambda for providers ;;; Predefined error lambda for providers
(cl-defun webpaste-providers-error-lambda (&key text) (cl-defun webpaste--providers-error-lambda (&key text)
"Predefined error callback for providers that always does failover." "Predefined error callback for providers that always does failover."
(cl-function (lambda (&key error-thrown &allow-other-keys) (cl-function (lambda (&key error-thrown &allow-other-keys)
(message "Got error: %S" error-thrown) (message "Got error: %S" error-thrown)
(webpaste--paste-text text)))) (webpaste--paste-text text))))
(cl-defun webpaste-providers-error-lambda-no-failover (&key text) (cl-defun webpaste--providers-error-lambda-no-failover (&key text)
"Predefined error callback for providers that shouldn't do failover." "Predefined error callback for providers that shouldn't do failover."
(cl-function (lambda (&key error-thrown &allow-other-keys) (cl-function (lambda (&key error-thrown &allow-other-keys)
(message "Got error: %S" error-thrown)))) (message "Got error: %S" error-thrown))))
;;; Predefined success lambdas for providers ;;; Predefined success lambdas for providers
(cl-defun webpaste-providers-success-location-header () (cl-defun webpaste--providers-success-location-header ()
"Predefined success callback for providers returning a Location header." "Predefined success callback for providers returning a Location header."
(cl-function (lambda (&key response &allow-other-keys) (cl-function (lambda (&key response &allow-other-keys)
(when response (when response
@ -215,7 +215,7 @@ precalculated, and also available both for pre and post request access.")
(request-response-header response "Location")))))) (request-response-header response "Location"))))))
(cl-defun webpaste-providers-success-response-url () (cl-defun webpaste--providers-success-response-url ()
"Predefined success callback for providers that and up with an URL somehow." "Predefined success callback for providers that and up with an URL somehow."
(cl-function (lambda (&key response &allow-other-keys) (cl-function (lambda (&key response &allow-other-keys)
(when response (when response
@ -223,7 +223,7 @@ precalculated, and also available both for pre and post request access.")
(request-response-url response)))))) (request-response-url response))))))
(cl-defun webpaste-providers-success-returned-string () (cl-defun webpaste--providers-success-returned-string ()
"Predefined success callback for providers returning a string with URL." "Predefined success callback for providers returning a string with URL."
(cl-function (lambda (&key data &allow-other-keys) (cl-function (lambda (&key data &allow-other-keys)
(when data (when data
@ -233,7 +233,7 @@ precalculated, and also available both for pre and post request access.")
(webpaste--return-url data))))) (webpaste--return-url data)))))
(cl-defun webpaste-providers-default-post-field-lambda () (cl-defun webpaste--providers-default-post-field-lambda ()
"Predefined lambda for building post fields." "Predefined lambda for building post fields."
(cl-function (lambda (&key text (cl-function (lambda (&key text
post-field post-field
@ -275,8 +275,8 @@ precalculated, and also available both for pre and post request access.")
(parser 'buffer-string) (parser 'buffer-string)
(lang-overrides '()) (lang-overrides '())
(lang-uri-separator nil) (lang-uri-separator nil)
(error-lambda 'webpaste-providers-error-lambda) (error-lambda 'webpaste--providers-error-lambda)
(post-field-lambda 'webpaste-providers-default-post-field-lambda)) (post-field-lambda 'webpaste--providers-default-post-field-lambda))
"Function to create the lambda function for a provider. "Function to create the lambda function for a provider.
Usage: Usage:
@ -290,8 +290,8 @@ Required params:
:success-lambda Callback sent to `request', look up how to write these in the :success-lambda Callback sent to `request', look up how to write these in the
documentation for `request'. Two good examples are documentation for `request'. Two good examples are
`webpaste-providers-success-location-header' and `webpaste--providers-success-location-header' and
`webpaste-providers-success-returned-string' as well as the `webpaste--providers-success-returned-string' as well as the
custom one used for the gist.github.com provider. custom one used for the gist.github.com provider.
Optional params: Optional params:
@ -315,8 +315,8 @@ Optional params:
:error-lambda Callback sent to `request', look up how to write these in the :error-lambda Callback sent to `request', look up how to write these in the
documentation for `request'. The default value for this is documentation for `request'. The default value for this is
`webpaste-providers-error-lambda', but there's also `webpaste--providers-error-lambda', but there's also
`webpaste-providers-error-lambda-no-failover' available if `webpaste--providers-error-lambda-no-failover' available if
you need a provider that isn't allowed to failover. you need a provider that isn't allowed to failover.
:post-field-lambda Function that builds and returns the post data that should be :post-field-lambda Function that builds and returns the post data that should be

Loading…
Cancel
Save