Merge pull request #59 from librariesio/mellisio/spdx/add-plus-expres…

…sions
librariesio · May 13, 2020 · 613958f · 613958f
2 parents 037a403 + 38e32fe
commit 613958f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/lib/spdx/version.rb b/lib/spdx/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Spdx
-  VERSION = "2.0.5"
+  VERSION = "2.0.6"
 end
diff --git a/lib/spdx_parser.rb b/lib/spdx_parser.rb
@@ -8,7 +8,7 @@
 class SpdxParser
   Treetop.load(File.expand_path(File.join(File.dirname(__FILE__), "spdx_parser.treetop")))
 
-  SKIP_PARENS = ["NONE", "NOASSERTION", ""]
+  SKIP_PARENS = ["NONE", "NOASSERTION", ""].freeze
   @parser = SpdxGrammarParser.new
 
   def self.parse(data)

diff --git a/lib/spdx_parser.treetop b/lib/spdx_parser.treetop
@@ -25,7 +25,7 @@ grammar SpdxGrammar
   end
 
   rule license
-    [a-zA-Z0-9\-\+:\.]+ &{|seq| Spdx.license_exists?(seq.first.text_value) }  <License>
+    [a-zA-Z0-9\-\+:\.]+ &{|seq| Spdx.license_exists?(seq.first.text_value) || Spdx.license_exists?(seq.first.text_value.delete_suffix('+')) }  <License>
   end
 
   rule license_exception

diff --git a/spec/spdx_spec.rb b/spec/spdx_spec.rb
@@ -201,6 +201,9 @@
         expect(Spdx.valid_spdx?("NOASSERTION")).to be true
         expect(Spdx.valid_spdx?("MIT OR NONE")).to be false
       end
+      it "returns true for + expression" do
+        expect(Spdx.valid_spdx?("AGPL-1.0+"))
+      end
     end
   end
   context "alias lookup" do