coconductor 0.5.6 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49f40e4ec5de8c38e94731f1c5a01c2f9419fe209eaa078a8b81a10afc4c2de2
-  data.tar.gz: cc3c83a43583cb3b2efdf96d031c0412b150637aedf2ca475717e4e7a5dab5b8
+  metadata.gz: b1be21e8deb74888989e29a404c993dc58fc5c51a4bf9fbb1ae5e7e254653cbc
+  data.tar.gz: a7b3d870c12b0e7967ecddd7148076f4a25e795f48ed983028b40ec87aae0776
 SHA512:
-  metadata.gz: b5ee4e36e33a52b2bdaeaeb5455fd3c90cf9ea951c8f46be51526204589615cdc39bf913faf2d0a5b6da3b6eadc5fdb4c46e6bb16ffbc134c72e6cda81a080aa
-  data.tar.gz: 0231a718556b2e366ad06fffd06f7b31efd21c46b2b0a1a14222d1b6b7209f7dc80fcd8947ea0095cb146c05cc6c07a7714c11c81a52498235b5b3ed5865e73f
+  metadata.gz: df79aab295420223f9465e148a591e0f309b20f7dbc39b2244d19d9cee1880328c8aa21d3942c079162d5bbba8c6dd4fa8fb83e3f6eb8f529be5daf3e963de65
+  data.tar.gz: cf2ae15c68c899420be508a6235e237a0b2e9fab32c3fc793840bc827b981f93a25a4996bead5452e81af155f827f01db4b9fa935871dbb49b27908307a67f56

data/lib/coconductor/code_of_conduct.rb

@@ -81,7 +81,9 @@ module Coconductor
     def language
       @language ||= begin
         parts = key.split('/')
-        if parts.last =~ /^[a-z-]{2,5}$/
+        if other?
+          nil
+        elsif parts.last =~ /^[a-z-]{2,5}$/
           parts.last
         else
           DEFAULT_LANGUAGE
@@ -105,7 +107,9 @@ module Coconductor
 
     def content
       # See https://github.com/stumpsyn/policies/pull/21
-      @content ||= if citizen_code_of_conduct?
+      @content ||= if parts.nil?
+                     nil
+                   elsif citizen_code_of_conduct?
                      fields = %w[COMMUNITY_NAME GOVERNING_BODY]
                      parts.last.gsub(/ (#{Regexp.union(fields)}) /, ' [\1] ')
                    else
@@ -134,6 +138,10 @@ module Coconductor
       family == 'no-code-of-conduct'
     end
 
+    def other?
+      key == 'other'
+    end
+
     def fields
       @fields ||= Field.from_code_of_conduct(self)
     end
@@ -153,26 +161,28 @@ module Coconductor
       filename << '.md'
     end
 
-    def path
+    def filepath
+      return @filepath if defined? @filepath
       parts = key.split('/')
       parts.pop unless default_language?
       path = File.join(*parts[0...5], filename)
       path = File.expand_path path, self.class.vendor_dir
-      Pathname.new(path)
+      @filepath = Pathname.new(path)
     end
 
     # Raw content of code of conduct file, including TOML front matter
     def raw_content
-      unless File.exist?(path)
+      return if other?
+      unless File.exist?(filepath)
         msg = "'#{key}' is not a valid code of conduct key"
         raise Coconductor::InvalidCodeOfConduct, msg
       end
-      @raw_content ||= File.read(path, encoding: 'utf-8')
+      @raw_content ||= File.read(filepath, encoding: 'utf-8')
     end
 
     def toml
       @toml ||= begin
-        if parts.length == 3
+        if parts && parts.length == 3
           TOML::Parser.new(parts[1]).parsed
         else
           {}
@@ -181,11 +191,11 @@ module Coconductor
     end
 
     def parts
-      @parts ||= raw_content.split('+++')
+      @parts ||= raw_content.split('+++') if raw_content
     end
 
     def default_language?
-      language == DEFAULT_LANGUAGE
+      other? || language == DEFAULT_LANGUAGE
     end
   end
 end

data/lib/coconductor/field.rb

@@ -18,6 +18,7 @@ module Coconductor
       # Returns an array of Fields for the given code of conduct
       def from_code_of_conduct(code_of_conduct)
         matches = []
+        return [] unless code_of_conduct && code_of_conduct.content
 
         code_of_conduct.content.scan(REGEX) do |_m|
           matches << Regexp.last_match

data/lib/coconductor/version.rb

@@ -1,3 +1,3 @@
 module Coconductor
-  VERSION = '0.5.6'.freeze
+  VERSION = '0.6.0'.freeze
 end

metadata

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