licensee 8.3.0 → 8.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 164aba2b0d79240f86c450f08efcad11696c1689
-  data.tar.gz: ba886506d15fde0a96c1ef386a9479c81dd19110
+  metadata.gz: 3b3f800aaf46c58f74814dc25a5f9121985b619c
+  data.tar.gz: fbe2299058f5b7108e1f05462ced09f24cd9c13e
 SHA512:
-  metadata.gz: 13be7b5f7eaa4f0bdba46022128506680a50dd340a17b13a0ad0ee0629bdc8953521e47686c3c74b9ac2cd14e135da91945dae447f9905579a1af6e5559f939a
-  data.tar.gz: 2bb3cadf3a5d0ce3b61d39d33e9faac916626eb1bb3da52c3649a90e574e9ab9dbf686071ddf64390b8605e845cc4ea0a660c71d3c4f7c6e7e420b2bf1194fca
+  metadata.gz: 841d87d6848ec806dd1ecf8d557c67f2e1f7cfbf76f9dbe5175cf2363efed2e1b6f373db9831990c0884d19bdea9e2bd826b4e493169c4b71bf66a3c137a85f5
+  data.tar.gz: 624464f0ccbd8bac06df571a31bdc8be1996a426b041ac1064f88d2aee3b57b52b9d6eb567bcce244a68bfa5c08a5f157c40360545e26c0916dcf55e1bab1a5e

data/lib/licensee/license.rb

@@ -76,9 +76,10 @@ module Licensee
       @path ||= File.expand_path "#{@key}.txt", Licensee::License.license_dir
     end
 
-    # License metadata from YAML front matter
+    # License metadata from YAML front matter with defaults merged in
     def meta
-      @meta ||= if parts && parts[1]
+      @meta ||= begin
+        return YAML_DEFAULTS unless parts && parts[1]
         meta = if YAML.respond_to? :safe_load
           YAML.safe_load(parts[1])
         else
@@ -90,11 +91,11 @@ module Licensee
 
     # Returns the human-readable license name
     def name
-      meta.nil? ? key.capitalize : meta['title']
+      meta['title'] ? meta['title'] : key.capitalize
     end
 
     def nickname
-      meta['nickname'] if meta
+      meta['nickname']
     end
 
     def name_without_version
@@ -102,14 +103,11 @@ module Licensee
     end
 
     def featured?
-      return YAML_DEFAULTS['featured'] unless meta
       meta['featured']
     end
     alias featured featured?
 
     def hidden?
-      return true if PSEUDO_LICENSES.include?(key)
-      return YAML_DEFAULTS['hidden'] unless meta
       meta['hidden']
     end
 

data/lib/licensee/version.rb

@@ -1,3 +1,3 @@
 module Licensee
-  VERSION = '8.3.0'.freeze
+  VERSION = '8.3.1'.freeze
 end

data/test/test_licensee_license.rb

@@ -106,7 +106,11 @@ class TestLicenseeLicense < Minitest::Test
     license = Licensee::License.new('other')
     assert_equal nil, license.content
     assert_equal 'Other', license.name
+    assert license.hidden?
     refute license.featured?
+    Licensee::License::YAML_DEFAULTS.each do |key, value|
+      assert_equal value, license.meta[key]
+    end
   end
 
   should 'know the license hash' do

data/test/test_licensee_project.rb

@@ -90,12 +90,14 @@ class TestLicenseeProject < Minitest::Test
 
     should 'detect the BSD 2-clause license without title' do
       verify_license_file fixture_path(
-        'bsd-2-clause-without-title/bsd-2-clause.txt')
+        'bsd-2-clause-without-title/bsd-2-clause.txt'
+      )
     end
 
     should 'detect the BSD 3-Clause license without title' do
       verify_license_file fixture_path(
-        'bsd-3-clause-without-title/bsd-3-clause.txt')
+        'bsd-3-clause-without-title/bsd-3-clause.txt'
+      )
     end
 
     should 'detect the ISC license without title' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: licensee
 version: !ruby/object:Gem::Version
-  version: 8.3.0
+  version: 8.3.1
 platform: ruby
 authors:
 - Ben Balter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-05 00:00:00.000000000 Z
+date: 2016-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rugged
@@ -255,7 +255,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: A Ruby Gem to detect open source project licenses