whimsy-asf 0.0.28 → 0.0.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3a8906d01060615578b69bec11d4f3477afa5de
-  data.tar.gz: 7e6a121bfebc1a4b911f8820d7c207a5a87536e8
+  metadata.gz: ad85a450b2c0f9eb8db1ea052ff18a897a9cb860
+  data.tar.gz: a171e20900e07773512c3c2f15defe92a0e5a5b2
 SHA512:
-  metadata.gz: d0f0a7b47cab1138e7ae5a6d0205f71a3b1ce81246259a893900d71155cf8a2889f54c0dc03fe9847d06f74384c6453cbdf96137eef1b9bb981d9bd81274fd8c
-  data.tar.gz: a31dd5f6649829e9a08509ed748f56541868dba7dd5e2711f272873c780aa223c17c562d6cb4c857cb2934f464c066f19ff5112225f342e2b48392edfbed4a19
+  metadata.gz: 529060e1226ff2791961a7fee509bf0a73213d09fb5bfc55224b815a34da3f5ee0e37d177806edc2aa81141f2218a504b952a22f3f2c415e413a095a895d2890
+  data.tar.gz: a5d70499742e73d75163eb4142f60f9571fd4b5178c40dbabaece33e903f4f640f4e56f57cc0e87c26afe9ea39d83700c7395359f865871bc24aad54f2ac3e1a

data/asf.version

@@ -1 +1 @@
-0.0.28
+0.0.29

data/lib/whimsy/asf/agenda/front.rb

@@ -19,15 +19,28 @@ class ASF::Board::Agenda
         list = nil
 
         absent = attr['text'].scan(/Absent:\n\n.*?\n\n/m).join
+        directors = attr['text'].scan(/^ +Directors[ \S]*?:\n\n.*?\n\n/m).join
+        officers = attr['text'].scan(/^ +Executive[ \S]*?:\n\n.*?\n\n/m).join
 
         # attempt to identify the people mentioned in the Roll Call
         people = attr['text'].scan(/ {8}(\w.*)/).flatten.each do |sname|
           next if sname == 'none'
-
           name = sname
+
+          role = :guest
+          role = :director if directors.include? name
+          role = :officer if officers.include? name
+
+          sort_name = name.split(' ').rotate(-1).join(' ')
+          if sort_name.start_with? '('
+            sort_name = sort_name.split(' ').rotate(-1).join(' ') 
+          end
+
           if @quick
             attr['people'][name.gsub(/\W/, '_')] = {
               name: name,
+              sortName: sort_name,
+              role: role,
               attending: !absent.include?(name)
             }
           else
@@ -70,12 +83,19 @@ class ASF::Board::Agenda
 
               attr['people'][person.id] = {
                 name: name,
+                sortName: sort_name,
+                role: role,
                 member: person.asf_member?,
                 attending: !absent.include?(name)
               }
             end
           end
         end
+
+        if attr['people']
+          attr['people'] = Hash[attr['people'].
+            sort_by {|id, person| person[:sortName]}]
+        end
       elsif attr['title'] == 'Call to order'
         attr['timestamp'] = timestamp(attr['text'][/\d+:\d+([ap]m)?/])
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: whimsy-asf
 version: !ruby/object:Gem::Version
-  version: 0.0.28
+  version: 0.0.29
 platform: ruby
 authors:
 - Sam Ruby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-17 00:00:00.000000000 Z
+date: 2015-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri