parliament-grom-decorators 0.24.0 → 0.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 237cd75404e1e9b7414813fe6703c7eb29bd6b59
-  data.tar.gz: a77c9965d2f48d55481127151059e9342745978e
+  metadata.gz: '0054219819c9cf5ba0fef958aca46148cba22a49'
+  data.tar.gz: 7d5e3321395c970117c3c1bafcb31568cee2feed
 SHA512:
-  metadata.gz: ec47ca9e7f5b3efe00ffffcbf73ec0a309b5d469865d459b618a77049a286e227089ff3df11a19cecc0dcb2462f5b2a1778f31e014b170cc63691e32d157d7cb
-  data.tar.gz: bfccc5e33a802105b3e7d49736896baf5822dcb525877b3cfabb3f2dcc134c9060cc00d9d660aba9c5eefa659a67d2c408f49a4a39e0d45a4f51290723f94faf
+  metadata.gz: 9b458832d8f93df5eb2a0a1c7488c20ebc5f1bdf4928b9fce540b30dd68a05eaebe74d30f6999d04fd9f8962d526914da8c5ffc4cdfc0d6e3780afb335cd59f1
+  data.tar.gz: 494be78cd713accfe9eb06e3f353620457f248f925edaa4ebc2df1ab3c2c8c243b5c02cf59e1fad01ce2a48899c4f84f675b2a6cba76fc25c8938e1663de0b43

data/lib/parliament/grom/decorator/formal_body.rb

@@ -19,6 +19,18 @@ module Parliament
           respond_to?(:formalBodyHasFormalBodyChair)
         end
 
+        # Alias is_chair with fallback.
+        #
+        # @return [Array, Array] an array of Position Grom::Nodes representing the chair or an empty array.
+        def chairs
+          respond_to?(:formalBodyHasFormalBodyChair) ? formalBodyHasFormalBodyChair : []
+        end
+
+        # @return [Array, Array] array of Person Grom::Node(s) representing the current incumbent(s) of chair position(s).
+        def chair_people
+          chairs.first&.incumbencies&.first&.people || []
+        end
+
         # Alias formalBodyStartDate with fallback.
         #
         # @return [DateTime, nil] the start date of the Grom::Node or nil.
@@ -56,10 +68,32 @@ module Parliament
 
         # Checks if Grom::Node has contact points.
         #
-        # @return [Array, Array] an arry containing the contact_point(s), or an empty array.
+        # @return [Array, Array] an array containing the contact_point(s), or an empty array.
         def contact_points
           @contact_points ||= respond_to?(:formalBodyHasContactPoint) ? Array(formalBodyHasContactPoint) : []
         end
+
+        # Checks if Grom::Node has a house.
+        #
+        # @return [Array, Array] an array of House Grom::Nodes, or an empty array.
+        def houses
+          respond_to?(:formalBodyHasHouse) ? formalBodyHasHouse : []
+        end
+
+        # Checks if the type of Grom::Node is a select committee.
+        #
+        # @return [Boolean] whether or not the group is a select committee.
+        def select_committee?
+          type.include?('https://id.parliament.uk/schema/SelectCommittee')
+        end
+
+        # Checks what type of committee a Grom::Node represents.
+        # TODO: Build out as the types of possible committee types grows
+        #
+        # @return [String, String] whether or not the group is a select committee.
+        def committee_type
+          select_committee? ? 'select' : ''
+        end
       end
     end
   end

data/lib/parliament/grom/decorator/group.rb

@@ -4,6 +4,12 @@ module Parliament
       # Decorator namespace for Grom::Node instances with type: https://id.parliament.uk/schema/Group.
       module Group
         include Helpers::DateHelper
+        # Alias groupName with fallback.
+        #
+        # @return [String, String] the name of the Grom::Node or an empty string.
+        def name
+          respond_to?(:groupName) ? groupName : ''
+        end
 
         # Alias groupStartDate with fallback.
         #
@@ -12,20 +18,6 @@ module Parliament
           @start_date ||= respond_to?(:groupStartDate) ? DateTime.parse(groupStartDate) : nil
         end
 
-        # Alias formalBodyName with fallback.
-        #
-        # @return [String, String] the formal body name of the Grom::Node or an empty string.
-        def formal_body_name
-          @formal_body_name ||= respond_to?(:formalBodyName) ? formalBodyName : ''
-        end
-
-        # Alias formalBodyRemit with fallback.
-        #
-        # @return [String, String] the formal body remit of the Grom::Node or an empty string.
-        def formal_body_remit
-          @formal_body_remit ||= respond_to?(:formalBodyRemit) ? formalBodyRemit : ''
-        end
-
         # Alias member count with fallback.
         #
         # @return [Integer, nil] the count of members of the Grom::Node or nil.
@@ -33,33 +25,12 @@ module Parliament
           respond_to?(:count) ? count.to_i : nil
         end
 
-        # Alias is_joint with fallback.
-        #
-        # @return [Boolean] a boolean depending on whether or not the Grom::Node is joint.
-        def joint?
-          respond_to?(:formalBodyHasLeadHouse)
-        end
-
-        # Alias is_chair with fallback.
-        #
-        # @return [Boolean] a boolean depending on whether or not the Grom::Node is chair.
-        def has_chair?
-          respond_to?(:formalBodyHasFormalBodyChair)
-        end
-
         # Alias groupEndDate with fallback.
         #
         # @return [DateTime, nil] the end date of the Grom::Node or nil.
         def end_date
           @end_date ||= respond_to?(:groupEndDate) ? DateTime.parse(groupEndDate) : nil
         end
-
-        # Alias groupName with fallback.
-        #
-        # @return [String, String] the name of the Grom::Node or an empty string.
-        def name
-          respond_to?(:groupName) ? groupName : ''
-        end
       end
     end
   end

data/lib/parliament/grom/decorator/person.rb

@@ -303,11 +303,11 @@ module Parliament
         private
 
         def current_member_by_house?(house_name)
-          seat_incumbencies.select { |incumbency| incumbency.house.name == house_name && incumbency.end_date.nil? }.any?
+          incumbencies.select { |incumbency| incumbency.house.name == house_name && incumbency.end_date.nil? }.any?
         end
 
         def former_member_by_house?(house_name)
-          seat_incumbencies.select { |incumbency| incumbency.house.name == house_name && incumbency.end_date }.any?
+          incumbencies.select { |incumbency| incumbency.house.name == house_name && incumbency.end_date }.any?
         end
 
         def house_membership_status

data/lib/parliament/grom/decorator/version.rb

@@ -1,7 +1,7 @@
 module Parliament
   module Grom
     module Decorator
-      VERSION = '0.24.0'.freeze
+      VERSION = '0.25.0'.freeze
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parliament-grom-decorators
 version: !ruby/object:Gem::Version
-  version: 0.24.0
+  version: 0.25.0
 platform: ruby
 authors:
 - Rebecca Appleyard
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-23 00:00:00.000000000 Z
+date: 2018-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler