import: gem: Factorize "bundler" special case for name mapping.

* guix/import/gem.scm (ruby-package-name): Add "bundler" special case.
(gem->guix-package): Adjust accordingly.
* tests/gem.scm ("gem-recursive-import")
("gem-recursive-import with a specific version"): Remove "ruby-bundler"
from the expected packages.

guix/import/gem.scm

@@ -93,9 +93,11 @@
 (define (ruby-package-name name)
   "Given the NAME of a package on RubyGems, return a Guix-compliant name for
 the package."
-  (if (string-prefix? "ruby-" name)
-      (snake-case name)
-      (string-append "ruby-" (snake-case name))))
+  (if (string=? name "bundler")
+      name                                        ;special case: no prefix
+      (if (string-prefix? "ruby-" name)
+          (snake-case name)
+          (string-append "ruby-" (snake-case name)))))
 
 (define (make-gem-sexp name version hash home-page synopsis description
                        dependencies licenses)
@@ -135,11 +137,7 @@ Optionally include a VERSION string to fetch a specific version gem."
         (let* ((dependencies-names (map gem-dependency-name
                                         (gem-dependencies-runtime
                                          (gem-dependencies gem))))
-               (dependencies (map (lambda (dep)
-                                    (if (string=? dep "bundler")
-                                        "bundler" ; special case, no prefix
-                                        (ruby-package-name dep)))
-                                  dependencies-names))
+               (dependencies (map ruby-package-name dependencies-names))
                (licenses     (map string->license (gem-licenses gem))))
           (values (make-gem-sexp (gem-name gem) (gem-version gem)
                                  (gem-sha256 gem) (gem-home-page gem)

tests/gem.scm

@@ -181,21 +181,6 @@
               ('description "Another cool gem")
               ('home-page "https://example.com")
               ('license #f))                      ;no licensing info
-            ('package
-              ('name "ruby-bundler")
-              ('version "1.14.2")
-              ('source
-               ('origin
-                 ('method 'url-fetch)
-                 ('uri ('rubygems-uri "bundler" 'version))
-                 ('sha256
-                  ('base32
-                   "1446xiz7zg0bz7kgx9jv84y0s4hpsg61dj5l3qb0i00avc1kxd9v"))))
-              ('build-system 'ruby-build-system)
-              ('synopsis "Ruby gem bundler")
-              ('description "Ruby gem bundler")
-              ('home-page "https://bundler.io/")
-              ('license 'license:expat))
             ('package
               ('name "ruby-foo")
               ('version "1.0.0")
@@ -248,21 +233,6 @@
               ('description "Another cool gem")
               ('home-page "https://example.com")
               ('license #f))                      ;no licensing info
-            ('package
-              ('name "ruby-bundler")
-              ('version "1.14.2")
-              ('source
-               ('origin
-                 ('method 'url-fetch)
-                 ('uri ('rubygems-uri "bundler" 'version))
-                 ('sha256
-                  ('base32
-                   "1446xiz7zg0bz7kgx9jv84y0s4hpsg61dj5l3qb0i00avc1kxd9v"))))
-              ('build-system 'ruby-build-system)
-              ('synopsis "Ruby gem bundler")
-              ('description "Ruby gem bundler")
-              ('home-page "https://bundler.io/")
-              ('license 'license:expat))
             ('package
               ('name "ruby-foo")
               ('version "2.0.0")