spdx 1.2.6 → 1.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bbd6e0e8044c6218a6bcaa3a79b33912995ad86f
-  data.tar.gz: db525a0b0e0c2dd9d38800a135f2ada37e72a216
+  metadata.gz: ab443ec15cd26651f98c53f1b6cdfc8c59711936
+  data.tar.gz: 06b2126b9e7d71f6c5fdfaa2b74a6032a7caac26
 SHA512:
-  metadata.gz: 44978203081580ed55d20e14573d53d92d08420e967749ffe9519b51ad756ed180d8504eb06ab9886adabc3f01bd5729888e7a31a7154816a95779188d09c363
-  data.tar.gz: e8f6381e24382ba3da855d9bb5419adb79834cf1521cdd2cb9250159597fe2c237df296ff196b07681467950e8e1f8a2d42387f3a52c6a3576a9c9c15dead34f
+  metadata.gz: 84188b5e576e014bb51822b0b32c07a847eba6a731377ea77420fb42ee36e8bbfd44047d4950cf68da1c38dbd44a01f64ccb1dc3ba8ec8e6823e215eae705f53
+  data.tar.gz: 3e1c6e18907bf3f0f9387df523da8041975977f5480b8031a027929e3dd863736325a8d6cf5593e75e5b17fed527ea85b3f233a19f5e20125e474fa48b3d2e96

data/lib/spdx.rb

@@ -34,7 +34,7 @@ module Spdx
   end
 
   def self.stop_words
-    %w(version software the right)
+    %w(version software the or right)
   end
 
   def self.find_by_name(name)
@@ -43,7 +43,7 @@ module Spdx
   end
 
   def self.find_by_special_case(name)
-    lookup(special_cases[name.downcase])
+    lookup(special_cases[name.downcase.strip])
   end
 
   def self.special_cases
@@ -139,6 +139,7 @@ module Spdx
       'cddl 1.1' => 'CDDL-1.1',
       'epl' => 'EPL-1.0',
       'mit-license' => 'MIT',
+      '(mit or x11)' => 'MIT',
       'iscl' => 'ISC',
       'wtf' => 'WTFPL',
       '2-clause bsdl' => 'BSD-2-clause',

data/lib/spdx/version.rb

@@ -1,3 +1,3 @@
 module Spdx
-  VERSION = "1.2.6"
+  VERSION = "1.2.7"
 end

data/spec/spdx_spec.rb

@@ -68,6 +68,7 @@ describe Spdx do
       expect(Spdx.find('GPL').name).to eq('GNU General Public License v2.0 or later')
       expect(Spdx.find('GNU LESSER GENERAL PUBLIC LICENSE').name).to eq('GNU Lesser General Public License v2.1 or later')
       expect(Spdx.find('New BSD License').name).to eq('BSD 3-clause "New" or "Revised" License')
+      expect(Spdx.find('(MIT OR X11) ').name).to eq('MIT License')
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spdx
 version: !ruby/object:Gem::Version
-  version: 1.2.6
+  version: 1.2.7
 platform: ruby
 authors:
 - Andrew Nesbitt