Add NONE and NOASSERTION as valid spdx, also make empty string invalid

Author: Matt Ellis

lib/spdx/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Spdx
-  VERSION = "2.0.2"
+  VERSION = "2.0.3"
 end

lib/spdx_grammar.rb

@@ -16,6 +16,12 @@ class LogicalAnd < Treetop::Runtime::SyntaxNode
   class With < Treetop::Runtime::SyntaxNode
   end
 
+  class None < Treetop::Runtime::SyntaxNode
+  end
+
+  class NoAssertion < Treetop::Runtime::SyntaxNode
+  end
+
   class License < Treetop::Runtime::SyntaxNode
     def licenses
       text_value

lib/spdx_parser.rb

@@ -8,6 +8,7 @@
 class SpdxParser
   Treetop.load(File.expand_path(File.join(File.dirname(__FILE__), "spdx_parser.treetop")))
 
+  SKIP_PARENS = ["NONE", "NOASSERTION", ""]
   @parser = SpdxGrammarParser.new
 
   def self.parse(data)
@@ -21,8 +22,7 @@ def self.parse_licenses(data)
 
   private_class_method def self.parse_tree(data)
     # Couldn't figure out treetop to make parens optional
-    data = "(#{data})" unless data.start_with?("(") || data == "NONE" || data == "NOASSERTION"
-
+    data = "(#{data})" unless data.start_with?("(") || SKIP_PARENS.include?(data)
     tree = @parser.parse(data)
 
     raise SpdxGrammar::SpdxParseError, "Parse error at offset: #{@parser.index}" if tree.nil?

lib/spdx_parser.treetop

@@ -1,7 +1,7 @@
 grammar SpdxGrammar
 
-  rule top_level_spdx
-    "NONE" / "NOASSERTION" / compound_expression
+  rule spdx_expression
+    compound_expression / none / no_assertion
   end
 
   rule compound_expression
@@ -36,6 +36,14 @@ grammar SpdxGrammar
     "AND" / "OR" / "WITH"
   end
 
+  rule none
+    "NONE" <None>
+  end
+
+  rule no_assertion
+    "NOASSERTION" <NoAssertion>
+  end
+
   rule space
     [\s]+
   end

spec/spdx_spec.rb

@@ -188,12 +188,19 @@
         expect(Spdx.valid_spdx?("MIT OR MIT AND OR")).to be false
         expect(Spdx.valid_spdx?("MIT OR FAKEYLICENSE")).to be false
         expect(Spdx.valid_spdx?(nil)).to be false
+        expect(Spdx.valid_spdx?("")).to be false
       end
       it "returns true for valid spdx" do
         expect(Spdx.valid_spdx?("(MIT OR MPL-2.0)")).to be true
         expect(Spdx.valid_spdx?("MIT")).to be true
         expect(Spdx.valid_spdx?("((MIT OR AGPL-1.0) AND (MIT OR MPL-2.0))")).to be true
       end
+      it "returns true for NONE and NOASSERTION" do
+        expect(Spdx.valid_spdx?("NONE")).to be true
+        expect(Spdx.valid_spdx?("(NONE)")).to be false
+        expect(Spdx.valid_spdx?("NOASSERTION")).to be true
+        expect(Spdx.valid_spdx?("MIT OR NONE")).to be false
+      end
     end
   end
   context "alias lookup" do