coconductor 0.6.2 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9b4cc3e36b81bf54501ef0faecde56bc6d9d56301bf329cb3d606145f5312b2
-  data.tar.gz: ff6ded1918af2d981cc367cae83aa41c9dbe403c087ded3d33572ece20e76d05
+  metadata.gz: c5c5ff9d7faba7e4fdad45cacddaffcfee361aaa1382f2d607b846959d1547a0
+  data.tar.gz: a453031ce32a2926e4695b03611b4a538bc23009f06f6ca7183367abb0c3a468
 SHA512:
-  metadata.gz: 85aab5538e5f66c2b25e6d9aa08112851334502e1888a6bbf8d7e1d9e6327345bd1b1f5646d68ecce8b066f842e456e4d037ff4954a13cf1e14c55abe1e7f691
-  data.tar.gz: 2275c2792b3e9c012ac34ebb34daa4068aba46921fa86e2ba70fbb970b93dec488063a3b771cd2ce997a844950c353df12b2995c6370eb09b29373288f9a3466
+  metadata.gz: c59d42852ddfb4c84fba34b895e0bcb691f14833d15447c5b189d6a9485876ce338f7359e1bce8b9047ccd33f3a1b3464413fc3f25dd77a2334ef90aaea8af83
+  data.tar.gz: ccc6b1b5b353e6c9601d4dcc85ead0826c83494dbc8c683e37562bf0c4603b8d1a261bc5ec0f2465b03a9b64555e748fc7b602411d920f6052e8b07f00774091

data/lib/coconductor/code_of_conduct.rb

@@ -15,7 +15,7 @@ module Coconductor
       # Returns the code of conduct specified by the key with version,
       # or the latest in the family if only the family is specified
       def find(key_or_family)
-        return new('other') if key_or_family == 'other'
+        return new(key_or_family) if new(key_or_family).pseudo?
         match = all.find { |coc| coc.key == key_or_family }
         match || latest_in_family(key_or_family)
       end
@@ -32,7 +32,7 @@ module Coconductor
           key = path.relative_path_from(vendor_dir)
           matches = KEY_REGEX.match(key.to_path)
           matches.to_a.compact[1..-1].insert(1, 'version').join('/') if matches
-        end
+        end.compact
       end
 
       def latest_in_family(family, language: DEFAULT_LANGUAGE)
@@ -82,7 +82,7 @@ module Coconductor
     def language
       @language ||= begin
         parts = key.split('/')
-        if other?
+        if pseudo?
           nil
         elsif parts.last =~ /^[a-z-]{2,5}$/
           parts.last
@@ -124,7 +124,7 @@ module Coconductor
     end
 
     def family
-      @family ||= key.split('/').first
+      @family ||= key.split('/').first unless none?
     end
 
     def contributor_covenant?
@@ -139,10 +139,21 @@ module Coconductor
       family == 'no-code-of-conduct'
     end
 
+    # The "other" code of conduct represents an unidentifiable code of conduct
     def other?
       key == 'other'
     end
 
+    # The "none" code of conduct represents the lack of a code of conduct
+    def none?
+      key == 'none'
+    end
+
+    # Code of conduct is an pseudo code of conduct (e.g., none, other)
+    def pseudo?
+      other? || none?
+    end
+
     def fields
       @fields ||= Field.from_code_of_conduct(self)
     end
@@ -178,7 +189,7 @@ module Coconductor
 
     # Raw content of code of conduct file, including TOML front matter
     def raw_content
-      return if other?
+      return if pseudo?
       unless File.exist?(filepath)
         msg = "'#{key}' is not a valid code of conduct key"
         raise Coconductor::InvalidCodeOfConduct, msg
@@ -201,7 +212,7 @@ module Coconductor
     end
 
     def default_language?
-      other? || language == DEFAULT_LANGUAGE
+      pseudo? || language == DEFAULT_LANGUAGE
     end
   end
 end

data/lib/coconductor/version.rb

@@ -1,3 +1,3 @@
 module Coconductor
-  VERSION = '0.6.2'.freeze
+  VERSION = '0.7.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coconductor
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.0
 platform: ruby
 authors:
 - Ben Balter