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

@@ -1,36 +1,27 @@
 module LicenseFinder
   class License
     class << self
       def all
-        @all ||= Definitions.all(LicenseFinder.config.whitelist)
+        @all ||= Definitions.all
       end
 
       def find_by_name(name)
-        name ||= "other"
-        all.detect { |l| l.matches_name? name } || Definitions.build_unrecognized(name, LicenseFinder.config.whitelist)
+        name ||= "unknown"
+        all.detect { |l| l.matches_name? name } || Definitions.build_unrecognized(name)
       end
 
       def find_by_text(text)
         all.detect { |l| l.matches_text? text }
       end
     end
 
-    autoload :Definitions,   "license_finder/license/definitions"
-    autoload :Text,          "license_finder/license/text"
-    autoload :Template,      "license_finder/license/template"
-    autoload :Matcher,       "license_finder/license/matcher"
-    autoload :HeaderMatcher, "license_finder/license/header_matcher"
-    autoload :AnyMatcher,    "license_finder/license/any_matcher"
-    autoload :NoneMatcher,   "license_finder/license/none_matcher"
-
     def initialize(settings)
       @short_name  = settings.fetch(:short_name)
       @pretty_name = settings.fetch(:pretty_name, short_name)
       @other_names = settings.fetch(:other_names, [])
       @url         = settings.fetch(:url)
-      @whitelisted = settings.fetch(:whitelisted, false)
       @matcher     = settings.fetch(:matcher) { Matcher.from_template(Template.named(short_name)) }
     end
 
     attr_reader :url
 
@@ -44,18 +35,10 @@
 
     def matches_text?(text)
       matcher.matches_text?(text)
     end
 
-    def whitelisted?
-      @whitelisted
-    end
-
-    def whitelist
-      copy(whitelisted: true)
-    end
-
     def eql?(other)
       name == other.name
     end
 
     def hash
@@ -68,19 +51,17 @@
     attr_reader :matcher
 
     def names
       ([short_name, pretty_name] + other_names).uniq
     end
-
-    def copy(overrides)
-      settings = {
-        short_name:  short_name,
-        pretty_name: pretty_name,
-        other_names: other_names,
-        url:         url,
-        whitelisted: whitelisted?,
-        matcher:     matcher
-      }
-      self.class.new(settings.merge(overrides))
-    end
   end
 end
+
+require "license_finder/license/text"
+require "license_finder/license/template"
+
+require "license_finder/license/matcher"
+require "license_finder/license/header_matcher"
+require "license_finder/license/any_matcher"
+require "license_finder/license/none_matcher"
+
+require "license_finder/license/definitions"