jekyll-spdx_licenses 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e542725bfb96976b7d4ce7402ea2adcdf79d68939d85e77c4cb138a97a7a0f2e
-  data.tar.gz: e20fc9c3eaaec6aa69014a81cea742628859dfc5fa13bee3566533644d943289
+  metadata.gz: adc19ad5992f4bbf911b42daf5e92d78bc5bd5d8b4eab31bb599fb448856c376
+  data.tar.gz: 69514878274391a5097782515225537f177085a4271a7169656521397b223086
 SHA512:
-  metadata.gz: 485da0d12aedf2d2b43d058dd084045b9162eedaca910f814387f5877b58235abc64b0f169ad76ae15549f0aa7669a487e26bf0d88d913c7b1d7ff40024421ab
-  data.tar.gz: 1cea463ea4c2b968a5a1a688f93db6f9663afa3e1c8a3a420a609212322ba95e8e75a93ac975cc058ee99259cf05dbd7b99c8c82c5be9ac626231e23c2122126
+  metadata.gz: e682bf03b18f3889855312706dcb616793504df41093a12f15603a649fcabff0195b4003904d6add1035f0aad1a4975d92c84549cbe9431ac29eaa71685beef5
+  data.tar.gz: 3949765722f6a44089c90fdfec16e38855581d90c9556d039ded56674ffd6138f001ac3353b5a1468c3d01ff0122cc8039c393a6cf3b00ba9a84ae8fbcba018d

data/README.md

@@ -25,17 +25,24 @@ Or install it yourself as:
 To convert a SPDX license ID to its full name:
 
 ```
-{% spdx_name Apache-2.0 %}
+{{ Apache-2.0 | spdx_name }}
 => Apache License 2.0
 ```
 
 To convert the SPDX license ID to a link:
 
 ```
-{% spdx_link Apache-2.0 %}
+{{ Apache-2.0 | spdx_link_name }}
 => <a href="https://spdx.org/licenses/Apache-2.0">Apache License 2.0</a>
 ```
 
+To convert the SPDX license ID to a link, with just the ID:
+
+```
+{{ Apache-2.0 | spdx_link_id }}
+=> <a href="https://spdx.org/licenses/Apache-2.0">Apache-2.0</a>
+```
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/jekyll/spdx_licenses.rb

@@ -10,6 +10,4 @@ module Jekyll
   end
 end
 
-Liquid::Template.register_tag('spdx_link', Jekyll::SpdxLicenses::SpdxLinkTag)
-Liquid::Template.register_tag('spdx_link_id', Jekyll::SpdxLicenses::SpdxLinkIdTag)
-Liquid::Template.register_tag('spdx_name', Jekyll::SpdxLicenses::SpdxNameTag)
+Liquid::Template.register_filter(Jekyll::SpdxLicenses::SpdxFilter)

data/lib/jekyll/spdx_licenses/spdx_filter.rb

@@ -0,0 +1,23 @@
+module Jekyll
+  module SpdxLicenses
+    class SpdxFilter
+      def spdx_link_id(license_id)
+        license = ::SpdxLicenses.lookup(license_id)
+        raise 'License ID not valid according to SPDX licenses' unless license
+        "<a href=\"https://spdx.org/licenses/#{license.id}.html\">#{license.id}</a>"
+      end
+
+      def spdx_link_name(license_id)
+        license = ::SpdxLicenses.lookup(license_id)
+        raise 'License ID not valid according to SPDX licenses' unless license
+        "<a href=\"https://spdx.org/licenses/#{license.id}.html\">#{license.name}</a>"
+      end
+
+      def spdx_name(license_id)
+        license = ::SpdxLicenses.lookup(license_id)
+        raise 'License ID not valid according to SPDX licenses' unless license
+        license.name
+      end
+    end
+  end
+end

data/lib/jekyll/spdx_licenses/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module SpdxLicenses
-    VERSION = "0.3.1"
+    VERSION = "0.4.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-spdx_licenses
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Jamie Tanna
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-02 00:00:00.000000000 Z
+date: 2018-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -99,6 +99,7 @@ files:
 - jekyll-spdx_licenses.gemspec
 - lib/jekyll-spdx_licenses.rb
 - lib/jekyll/spdx_licenses.rb
+- lib/jekyll/spdx_licenses/spdx_filter.rb
 - lib/jekyll/spdx_licenses/spdx_link_id_tag.rb
 - lib/jekyll/spdx_licenses/spdx_link_tag.rb
 - lib/jekyll/spdx_licenses/spdx_name_tag.rb