Merge pull request KSP-CKAN#62 from KSP-CKAN/cc-by-nd

Add CC-BY-ND licenses
techman83 · May 6, 2018 · 1742c70 · 1742c70
2 parents eab96a9 + a76ce59
commit 1742c70
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/lib/App/KSP_CKAN/Roles/Licenses.pm b/lib/App/KSP_CKAN/Roles/Licenses.pm
@@ -58,7 +58,7 @@ method _build__license_urls {
     "CC-BY-NC-2.5"      => 'https://creativecommons.org/licenses/by-nc/2.5/',
     "CC-BY-NC-3.0"      => 'https://creativecommons.org/licenses/by-nc/3.0/',
     "CC-BY-NC-4.0"      => 'https://creativecommons.org/licenses/by-nc/4.0/',
-    "CC-BY-NC-SA"       => 'http://creativecommons.org/licenses/by-nc-sa/1.0/', 
+    "CC-BY-NC-SA"       => 'http://creativecommons.org/licenses/by-nc-sa/1.0/',
     "CC-BY-NC-SA-1.0"   => 'http://creativecommons.org/licenses/by-nc-sa/1.0',
     "CC-BY-NC-SA-2.0"   => 'http://creativecommons.org/licenses/by-nc-sa/2.0',
     "CC-BY-NC-SA-2.5"   => 'http://creativecommons.org/licenses/by-nc-sa/2.5',
@@ -70,6 +70,12 @@ method _build__license_urls {
     "CC-BY-NC-ND-2.5"   => 'https://creativecommons.org/licenses/by-nd-nc/2.5/',
     "CC-BY-NC-ND-3.0"   => 'https://creativecommons.org/licenses/by-nd-nc/3.0/',
     "CC-BY-NC-ND-4.0"   => 'https://creativecommons.org/licenses/by-nd-nc/4.0/',
+    "CC-BY-ND"          => 'https://creativecommons.org/licenses/by-nd/1.0/',
+    "CC-BY-ND-1.0"      => 'https://creativecommons.org/licenses/by-nd/1.0/',
+    "CC-BY-ND-2.0"      => 'https://creativecommons.org/licenses/by-nd/2.0/',
+    "CC-BY-ND-2.5"      => 'https://creativecommons.org/licenses/by-nd/2.5/',
+    "CC-BY-ND-3.0"      => 'https://creativecommons.org/licenses/by-nd/3.0/',
+    "CC-BY-ND-4.0"      => 'https://creativecommons.org/licenses/by-nd/4.0/',
     "CC0"               => 'https://creativecommons.org/publicdomain/zero/1.0/',
     "CDDL"              => 'https://opensource.org/licenses/CDDL-1.0',
     "CPL"               => 'https://opensource.org/licenses/cpl1.0.php',
@@ -128,6 +134,7 @@ method redistributable_licenses {
     "CC-BY-NC", "CC-BY-NC-1.0", "CC-BY-NC-2.0", "CC-BY-NC-2.5", "CC-BY-NC-3.0", "CC-BY-NC-4.0",
     "CC-BY-NC-SA", "CC-BY-NC-SA-1.0", "CC-BY-NC-SA-2.0", "CC-BY-NC-SA-2.5", "CC-BY-NC-SA-3.0", "CC-BY-NC-SA-4.0",
     "CC-BY-NC-ND", "CC-BY-NC-ND-1.0", "CC-BY-NC-ND-2.0", "CC-BY-NC-ND-2.5", "CC-BY-NC-ND-3.0", "CC-BY-NC-ND-4.0",
+    "CC-BY-ND", "CC-BY-ND-1.0", "CC-BY-ND-2.0", "CC-BY-ND-2.5", "CC-BY-ND-3.0", "CC-BY-ND-4.0",
     "CC0",
     "CDDL", "CPL",
     "EFL-1.0", "EFL-2.0",

diff --git a/t/App/KSP_CKAN/Roles/Licenses.t b/t/App/KSP_CKAN/Roles/Licenses.t
@@ -23,6 +23,7 @@ subtest 'licenses' => sub {
       "CC-BY-NC", "CC-BY-NC-1.0", "CC-BY-NC-2.0", "CC-BY-NC-2.5", "CC-BY-NC-3.0", "CC-BY-NC-4.0",
       "CC-BY-NC-SA", "CC-BY-NC-SA-1.0", "CC-BY-NC-SA-2.0", "CC-BY-NC-SA-2.5", "CC-BY-NC-SA-3.0", "CC-BY-NC-SA-4.0",
       "CC-BY-NC-ND", "CC-BY-NC-ND-1.0", "CC-BY-NC-ND-2.0", "CC-BY-NC-ND-2.5", "CC-BY-NC-ND-3.0", "CC-BY-NC-ND-4.0",
+      "CC-BY-ND", "CC-BY-ND-1.0", "CC-BY-ND-2.0", "CC-BY-ND-2.5", "CC-BY-ND-3.0", "CC-BY-ND-4.0",
       "CC0",
       "CDDL", "CPL",
       "EFL-1.0", "EFL-2.0",
@@ -42,9 +43,9 @@ subtest 'licenses' => sub {
       "WTFPL",
       "Unlicense",
       "open-source", "unrestricted" ];
-  
+
   my @test = $licenses->redistributable_licenses;
-  
+
   is_deeply(
     @test,
     @licenses,
@@ -54,7 +55,7 @@ subtest 'licenses' => sub {
 
 subtest 'license urls' => sub {
   is(
-    $licenses->license_url("GPL-2.0"), 
+    $licenses->license_url("GPL-2.0"),
     "http://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html",
     "GPL-2.0 license url returned successfully",
   );