emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals/plz-event-source 9654a785ef 11/22: Call handler functio


From: ELPA Syncer
Subject: [elpa] externals/plz-event-source 9654a785ef 11/22: Call handler functions only with the event object
Date: Wed, 1 May 2024 09:58:49 -0400 (EDT)

branch: externals/plz-event-source
commit 9654a785eff348041915e8d14fc55a87d88a71ee
Author: Roman Scherer <roman@burningswell.com>
Commit: Roman Scherer <roman@burningswell.com>

    Call handler functions only with the event object
---
 plz-event-source.el            | 14 +++++++-------
 tests/test-plz-event-source.el | 40 ++++++++++++++++------------------------
 2 files changed, 23 insertions(+), 31 deletions(-)

diff --git a/plz-event-source.el b/plz-event-source.el
index 942661f1a5..d9a71a34e1 100644
--- a/plz-event-source.el
+++ b/plz-event-source.el
@@ -293,10 +293,10 @@
         (let ((timer (timer-create)))
           (timer-set-time timer (current-time))
           (timer-set-function timer
-                              (lambda (handler source event)
+                              (lambda (handler event)
                                 (with-temp-buffer
-                                  (funcall handler source event)))
-                              (list (cdr pair) source event))
+                                  (funcall handler event)))
+                              (list (cdr pair) event))
           (timer-activate timer))))))
 
 (defun plz-event-source-dispatch-events (source events)
@@ -454,13 +454,13 @@ ELSE callbacks will always be set to nil.")
                                         (handler (cdr pair)))
                                     (cond
                                      ((equal 'open type)
-                                      (cons type (lambda (source event)
+                                      (cons type (lambda (event)
                                                    (setf (oref event data) 
response)
-                                                   (funcall handler source 
event))))
+                                                   (funcall handler event))))
                                      ((equal 'close type)
-                                      (cons type (lambda (source event)
+                                      (cons type (lambda (event)
                                                    (setf (oref event data) 
response)
-                                                   (funcall handler source 
event))))
+                                                   (funcall handler event))))
                                      (t pair))))
                                 (oref media-type events))))))
       (setq-local plz-event-source--current source)))
diff --git a/tests/test-plz-event-source.el b/tests/test-plz-event-source.el
index eb470636cd..27b9b4d593 100644
--- a/tests/test-plz-event-source.el
+++ b/tests/test-plz-event-source.el
@@ -189,25 +189,21 @@
            (all-events) (close-events) (error-events) (message-events) 
(open-events)
            (source (plz-event-source-buffer
                     :buffer (buffer-name)
-                    :handlers `((open . ,(lambda (source event)
+                    :handlers `((open . ,(lambda (event)
                                            (push event open-events)
-                                           (should (cl-typep source 
'plz-event-source))
                                            (should (cl-typep event 
'plz-event-source-event))
                                            (should (equal 'open 
(plz-event-source-event-type event)))))
-                                (error . ,(lambda (source event)
+                                (error . ,(lambda (event)
                                             (push event all-events)
                                             (push event error-events)
-                                            (should (cl-typep source 
'plz-event-source))
                                             (should (cl-typep event 
'plz-event-source-event))
                                             (should (equal "error" 
(plz-event-source-event-type event)))))
-                                (message . ,(lambda (source event)
+                                (message . ,(lambda (event)
                                               (push event message-events)
-                                              (should (cl-typep source 
'plz-event-source))
                                               (should (cl-typep event 
'plz-event-source-event))
                                               (should (equal 'message 
(plz-event-source-event-type event)))))
-                                (close . ,(lambda (source event)
+                                (close . ,(lambda (event)
                                             (push event close-events)
-                                            (should (cl-typep source 
'plz-event-source))
                                             (should (cl-typep event 
'plz-event-source-event))
                                             (should (equal 'close 
(plz-event-source-event-type event)))))))))
       (with-slots (parser) source
@@ -255,28 +251,24 @@
                                (headers . (("Authorization" . ,(format "Bearer 
%s" "MOCK-KEY"))
                                            ("Content-Type" . 
"application/json")))
                                (method . post))
-                    :handlers `((open . ,(lambda (source event)
+                    :handlers `((open . ,(lambda (event)
                                            (push event all-events)
                                            (push event open-events)
-                                           (should (cl-typep source 
'plz-event-source))
                                            (should (cl-typep event 
'plz-event-source-event))
                                            (should (equal 'open 
(plz-event-source-event-type event)))))
-                                (error . ,(lambda (source event)
+                                (error . ,(lambda (event)
                                             (push event all-events)
                                             (push event error-events)
-                                            (should (cl-typep source 
'plz-event-source))
                                             (should (cl-typep event 
'plz-event-source-event))
                                             (should (equal 'error 
(plz-event-source-event-type event)))))
-                                (message . ,(lambda (source event)
+                                (message . ,(lambda (event)
                                               (push event all-events)
                                               (push event message-events)
-                                              (should (cl-typep source 
'plz-event-source))
                                               (should (cl-typep event 
'plz-event-source-event))
                                               (should (equal 'message 
(plz-event-source-event-type event)))))
-                                (close . ,(lambda (source event)
+                                (close . ,(lambda (event)
                                             (push event all-events)
                                             (push event close-events)
-                                            (should (cl-typep source 
'plz-event-source))
                                             (should (cl-typep event 
'plz-event-source-event))
                                             (should (equal 'close 
(plz-event-source-event-type event)))))))))
       (with-slots (ready-state url) source
@@ -314,13 +306,13 @@
                       :as `(media-types
                             ,(cons (cons 'text/event-stream
                                          (plz-event-source:text/event-stream
-                                          :events `((open . ,(lambda (_ event)
+                                          :events `((open . ,(lambda (event)
                                                                (push event 
open-events)))
-                                                    (message . ,(lambda (_ 
event)
+                                                    (message . ,(lambda (event)
                                                                   (push event 
message-events)))
-                                                    (error . ,(lambda (_ event)
+                                                    (error . ,(lambda (event)
                                                                 (push event 
error-events)))
-                                                    (close . ,(lambda (_ event)
+                                                    (close . ,(lambda (event)
                                                                 (push event 
close-events))))))
                                    plz-media-types))
                       :else (lambda (object) (push object else))
@@ -356,13 +348,13 @@
                       :as `(media-types
                             ,(cons (cons 'text/event-stream
                                          (plz-event-source:text/event-stream
-                                          :events `((open . ,(lambda (_ event)
+                                          :events `((open . ,(lambda (event)
                                                                (push event 
open-events)))
-                                                    (message . ,(lambda (_ 
event)
+                                                    (message . ,(lambda (event)
                                                                   (push event 
message-events)))
-                                                    (error . ,(lambda (_ event)
+                                                    (error . ,(lambda (event)
                                                                 (push event 
error-events)))
-                                                    (close . ,(lambda (_ event)
+                                                    (close . ,(lambda (event)
                                                                 (push event 
close-events))))))
                                    plz-media-types))
                       :else (lambda (object) (push object else))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]