lib/license_finder/license/definitions.rb in license_finder-1.2-java vs lib/license_finder/license/definitions.rb in license_finder-2.0.0.rc2

@@ -1,11 +1,11 @@
 module LicenseFinder
   class License
     module Definitions
       extend self
 
-      def all(whitelist)
+      def all
         [
           apache2,
           bsd,
           gplv2,
           isc,
@@ -13,35 +13,37 @@
           mit,
           newbsd,
           python,
           ruby,
           simplifiedbsd
-        ].map { |license|
-          whitelist_if_necessary(license, whitelist)
-        }
+        ]
       end
 
-      def build_unrecognized(name, whitelist)
-        result = License.new(
+      def build_unrecognized(name)
+        License.new(
           short_name: name,
           url: nil,
           matcher: NoneMatcher.new
         )
-        whitelist_if_necessary(result, whitelist)
       end
 
       private
 
-      def whitelist_if_necessary(license, whitelist)
-        whitelisted = whitelist.any? { |name| license.matches_name? name }
-        whitelisted ? license.whitelist : license
-      end
-
       def apache2
         License.new(
           short_name:  "Apache2",
           pretty_name: "Apache 2.0",
-          other_names: ["Apache-2.0", "Apache Software License", "Apache License 2.0", "Apache License Version 2.0", "Apache Public License 2.0"],
+          other_names: [
+            "Apache-2.0",
+            "Apache Software License",
+            "Apache License 2.0",
+            "Apache License Version 2.0",
+            "Apache Public License 2.0",
+            "The Apache Software License, Version 2.0",
+            "Apache 2",
+            "Apache License",
+            "Apache License, Version 2.0"
+          ],
           url:         "http://www.apache.org/licenses/LICENSE-2.0.txt"
         )
       end
 
       def bsd