[bug#39730] [PATCH 0/2] Add cl-lquery

[bug#39730] [PATCH 0/2] Add cl-lquery

[Dimakakos Dimos]

Hello Guix!

This patch series adds the cl-lquery library and its missing dependency
cl-clss.

Thanks!

[bug#39730] [PATCH 1/2] gnu: Add cl-clss.

[Dimakis Dimakakos]

From: Dimakakos Dimos <me@bendersteed.tech>

* gnu/packages/lisp-xyz.scm (cl-clss, sbcl-clss, ecl-clss): New variables.
---
 gnu/packages/lisp-xyz.scm | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm
index 0ed074b766..c6f64ae278 100644
--- a/gnu/packages/lisp-xyz.scm
+++ b/gnu/packages/lisp-xyz.scm
@@ -17,6 +17,7 @@
 ;;; Copyright © 2019, 2020 Guillaume Le Vaillant <glv@posteo.net>
 ;;; Copyright © 2019 Brett Gilio <brettg@gnu.org>
 ;;; Copyright © 2020 Konrad Hinsen <konrad.hinsen@fastmail.net>
+;;; Copyright © 2020 Dimakis Dimakakos <me@bendersteed.tech>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -10645,3 +10646,36 @@ lightweight messaging kernel.")
 
 (define-public ecl-pzmq
   (sbcl-package->ecl-package sbcl-pzmq))
+
+(define-public sbcl-clss
+  (let ((revision "1")
+	(commit "2a8e8615ab55870d4ca01928f3ed3bbeb4e75c8d"))
+    (package
+      (name "sbcl-clss")
+      (version (string-append "0.3.1-" revision "." (string-take commit 7)))
+      (source
+       (origin
+         (method git-fetch)
+         (uri
+          (git-reference
+           (url "https://github.com/Shinmera/clss.git")
+           (commit commit)))
+         (sha256
+          (base32 "0la4dbcda78x29szanylccrsljqrn9d1mhh569sqkyp44ni5fv91"))
+         (file-name
+          (string-append "clss" version "-checkout"))))
+      (inputs
+       `(("array-utils" ,sbcl-array-utils)
+         ("plump" ,sbcl-plump)))
+      (build-system asdf-build-system/sbcl)
+      (synopsis "A DOM tree searching engine based on CSS selectors")
+      (description "CLSS is a DOM traversal engine based on CSS
+selectors. It makes use of the Plump-DOM and is used by lQuery.")
+      (home-page "https://github.com/Shinmera/clss")
+      (license license:zlib))))
+
+(define-public cl-clss
+  (sbcl-package->cl-source-package sbcl-clss))
+
+(define-public ecl-clss
+  (sbcl-package->ecl-package sbcl-clss))
-- 
2.25.0

[bug#39730] [PATCH 2/2] gnu: Add cl-lquery.

[Dimakis Dimakakos]

From: Dimakakos Dimos <me@bendersteed.tech>

* gnu/packages/lisp-xyz.scm (sbcl-lquery, cl-lquery, ecl-lquery): New variables.
---
 gnu/packages/lisp-xyz.scm | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm
index c6f64ae278..8bdc7b8493 100644
--- a/gnu/packages/lisp-xyz.scm
+++ b/gnu/packages/lisp-xyz.scm
@@ -10679,3 +10679,42 @@ selectors. It makes use of the Plump-DOM and is used by lQuery.")
 
 (define-public ecl-clss
   (sbcl-package->ecl-package sbcl-clss))
+
+(define-public sbcl-lquery
+  (let ((revision "1")
+	(commit "8048111c6b83956daa632e7a3ffbd8c9c203bd8d"))
+    (package
+      (name "sbcl-lquery")
+      (version (string-append "3.2.1-" revision "." (string-take commit 7)))
+      (source
+       (origin
+         (method git-fetch)
+         (uri
+          (git-reference
+           (url "https://github.com/Shinmera/lquery.git")
+           (commit commit)))
+         (sha256
+          (base32 "0520mcpxc2d6fdm8z61arpgd2z38kan7cf06qs373n5r64rakz6w"))
+         (file-name
+          (string-append "lquery" version "-checkout"))))
+      (inputs `(("array-utils" ,sbcl-array-utils)
+		("form-fiddle" ,sbcl-form-fiddle)
+		("plump" ,sbcl-plump)
+		("clss" ,sbcl-clss)
+		("fiveam" ,sbcl-fiveam)))
+      (build-system asdf-build-system/sbcl)
+      (synopsis "A library to allow jQuery-like HTML/DOM manipulation")
+      (description "lQuery is a DOM manipulation library written in
+Common Lisp, inspired by and based on the jQuery syntax and
+functions. It uses Plump and CLSS as DOM and selector engines. The
+main idea behind lQuery is to provide a simple interface for crawling
+and modifying HTML sites, as well as to allow for an alternative
+approach to templating.")
+      (home-page "https://github.com/Shinmera/lquery")
+      (license license:zlib))))
+
+(define-public cl-lquery
+  (sbcl-package->cl-source-package sbcl-lquery))
+
+(define-public ecl-lquery
+  (sbcl-package->ecl-package sbcl-lquery))
-- 
2.25.0

bug#39730: [PATCH 0/2] Add cl-lquery

[Guillaume Le Vaillant]

[-- Attachment #1: Type: text/plain, Size: 546 bytes --]


Dimakakos Dimos <me@bendersteed.tech> skribis:

> Hello Guix!
>
> This patch series adds the cl-lquery library and its missing dependency
> cl-clss.
>
> Thanks!

Pushed with a few modifications as
cfc9004e3fa7128f0972aa2d4b6653b962771b4d and
eb85995738e4cf8098b9b16a0ddd84bdd02704cb.

Instead of building 'version' and 'file-name' using 'string-append', you
can use the 'git-version' and 'git-file-name' functions.
I also put the 'fiveam' dependency of sbcl-lquery in 'native-inputs'
instead of 'inputs' as it's only used in the tests.

Thanks.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 227 bytes --]

[bug#39730] [PATCH 0/2] Add cl-lquery

[Dimakakos Dimos]

Guillaume Le Vaillant writes:

> Instead of building 'version' and 'file-name' using 'string-append', you
> can use the 'git-version' and 'git-file-name' functions.
> I also put the 'fiveam' dependency of sbcl-lquery in 'native-inputs'
> instead of 'inputs' as it's only used in the tests.

Thanks for the corrections, I didn't know about git-version and
git-file-name. I was sure that fiveam was in native inputs, was
surprised to see it there, that's strange. Maybe an I sent an earlier
patch series? 

And thanks again for pushing the patch!