coconductor 0.8.3 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb8c8fc5b15b69abac508b7760ecf97b7a407da9afade75ffc6dbb9379441832
-  data.tar.gz: e6a8229720bd964c96fc44811d99ba49ea217a5a3d200d6db08d87e96a5af95d
+  metadata.gz: b71c775a757f82264c097801280f182591524317178c4e3116d6b6c4f123d086
+  data.tar.gz: 2e3cde6e96c80a419e43f0bafaca5ecb2f263b8d58a93b688d746cdedccac3d6
 SHA512:
-  metadata.gz: 5994ee69cf976ef579f1834ef146b985874c20f72ceb2bc11cff97971dcd5870cf4cd9a8a578c7cd911344203a36dccd7839d23f196dd6a01830a56414c77a68
-  data.tar.gz: a0c75ecfdabb7bc483697961baede66367d7769b594ca9b36d06d410c8ab4e3116be424fb855c398bc1cac9a6cad0846a2ace57cc0a8e9ad86cb64c212fd0f9b
+  metadata.gz: 0c452909e461a7311b4d9022c427319a025a7b9788e0a8d3883e93b530e82ed0ccf5ee90218c49731ac8699e7b3a97e2806a7f881b60bc43ffe31bba9e8d64d7
+  data.tar.gz: 337bc8152131a12b6686640560f5695569bfd0d3a2aa83a30ee59f31eb4a7babe67e0752793ca756366210e37d030a7b4794addf3ed2e86f9a096edd7e100464

data/lib/coconductor/code_of_conduct.rb

@@ -123,9 +123,6 @@ module Coconductor
       # See https://github.com/stumpsyn/policies/pull/21
       @content ||= if parts.nil?
                      nil
-                   elsif citizen_code_of_conduct?
-                     fields = %w[COMMUNITY_NAME GOVERNING_BODY]
-                     parts.last.gsub(/ (#{Regexp.union(fields)}) /, ' [\1] ')
                    else
                      parts.last
                    end
@@ -155,10 +152,23 @@ module Coconductor
       other? || none?
     end
 
+    # Returns all fields found in the code of conduct
+    #
+    # Each field will have a unique _raw_text_, uniq-ing _identical_ fields
     def fields
       @fields ||= Field.from_code_of_conduct(self)
     end
 
+    # Returns all fields found in the code of conduct, uniq'd by normalized key
+    #
+    # Where the same field exists twice, preferance will be given to the first
+    # occurance to contain a description
+    def unique_fields
+      @unique_fields ||= begin
+        fields.sort_by { |f| f.description ? 0 : 1 }.uniq(&:key)
+      end
+    end
+
     def ==(other)
       other.is_a?(CodeOfConduct) && key == other.key
     end

data/lib/coconductor/field.rb

@@ -28,7 +28,7 @@ module Coconductor
           new(m[0], name: m[:name], description: m[:description])
         end
 
-        fields.uniq(&:key)
+        fields.uniq(&:raw_text)
       end
 
       # Returns all fields accross all vendored codes of conduct

data/lib/coconductor/version.rb

@@ -1,3 +1,3 @@
 module Coconductor
-  VERSION = '0.8.3'.freeze
+  VERSION = '0.9.0'.freeze
 end

metadata

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