Merge branch 'gh-pages' into patch-1

Author: mlinksva

Gemfile

@@ -17,7 +17,6 @@ end
 group :test do
   gem 'html-proofer', '~> 3.0'
   gem 'licensee'
-  gem 'nokogiri'
   gem 'rake'
   gem 'rspec'
   gem 'rubocop'

README.md

@@ -69,7 +69,7 @@ The licenses on choosealicense.com are regularly imported to GitHub.com to be us
 * `project` - The repository name
 * `description` - The description of the repository
 * `year` - The current year
-* `project_url` - The repository URL or other project website
+* `projecturl` - The repository URL or other project website
 
 ## License properties
 

_data/fields.yml

@@ -22,5 +22,5 @@
 - name: year
   description: The current year
 
-- name: project_url
+- name: projecturl
   description: The repository URL or other project website

_licenses/ncsa.txt

@@ -34,7 +34,7 @@ Copyright (c) [year] [fullname]. All rights reserved.
 
 Developed by: [project] 
               [fullname] 
-              [project_url]
+              [projecturl]
 
 Permission is hereby granted, free of charge, to any person 
 obtaining a copy of this software and associated documentation files 

script/check-approval

@@ -52,6 +52,7 @@ approvals.each do |approver, licenses|
   rows << ["#{approver} approved", licenses.include?(license)]
 end
 
+license_ids = licenses.map { |l| l['id'] }
 current = license_ids.include?(license)
 rows << ['Current license', current]
 

spec/spec_helper.rb

@@ -4,7 +4,6 @@
 require 'json'
 require 'licensee'
 require 'open-uri'
-require 'nokogiri'
 
 module SpecHelper
   class << self
@@ -86,7 +85,7 @@ def spdx_ids
 end
 
 def find_spdx(license)
-  spdx_list.find { |name, _properties| name == license }
+  spdx_list.find { |name, _properties| name.casecmp(license).zero? }
 end
 
 def osi_approved_licenses
@@ -102,23 +101,15 @@ def osi_approved_licenses
 
 def fsf_approved_licenses
   SpecHelper.fsf_approved_licenses ||= begin
-    url = 'https://www.gnu.org/licenses/license-list.en.html'
-    doc = Nokogiri::HTML(open(url).read)
-    list = doc.css('.green dt')
+    url = 'https://wking.github.io/fsf-api/licenses-full.json'
+    object = JSON.parse(open(url).read)
     licenses = {}
-    list.each do |license|
-      a = license.css('a').find { |link| !link.text.nil? && !link.text.empty? && link.attr('id') }
-      next if a.nil?
-      id = a.attr('id').downcase
-      name = a.text.strip
-      licenses[id] = name
-    end
-
-    # FSF approved the Clear BSD, but doesn't use its SPDX ID or Name
-    if licenses.keys.include? 'clearbsd'
-      licenses['bsd-3-clause-clear'] = licenses['clearbsd']
+    object.each_value do |meta|
+      next unless (meta.include? 'identifiers') && (meta['identifiers'].include? 'spdx') && (meta.include? 'tags') && (meta['tags'].include? 'libre')
+      meta['identifiers']['spdx'].each do |identifier|
+        licenses[identifier.downcase] = meta['name']
+      end
     end
-
     licenses
   end
 end