parliament-grom-decorators 0.16.0 → 0.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ad523cd88d147de784b0b0aec4f69620706b2ec
-  data.tar.gz: cc19188a654963369a101b77b123cb6b1ee5dc1b
+  metadata.gz: 1a18cf6f6ebcd272403e02d375bf359fc43ad6cb
+  data.tar.gz: 3bc8624b4104b47b6ce41ecce76343ec41ab09ab
 SHA512:
-  metadata.gz: 50eb95cf06896178db9128b10d00c49f1acacbc42733f51cf304dbdd49412121ac3ee966a048239b064776dc6a7a41b0be5c09ff89592dab4ff86276ff5c615f
-  data.tar.gz: 6157b14bfd09ac801fe2ba8262ca0142458e78a82a60af3b26103ebddf916147890108a39d5965d8481642d212f57d716ea0f160e07662f8d9ccce5900189bae
+  metadata.gz: 8dcb4d03ab7d15d485c08113c6b4888f39cc37ef46ad555c75004c729215dda0611aa5bc5429a401f23dfded828ba9d331fb01f24ec8d339482a99b8c04d139d
+  data.tar.gz: 6b507ecb6f981ea0e5fcb2b71e3177911f4ce725fe8753f54752d6bbef81e8cf23ab58983274377f84cab618a1aa484d52a1561395ead87b77fd26f7758c9e16

data/lib/parliament/grom/decorator.rb

@@ -7,7 +7,6 @@ require 'parliament/grom/decorator/european_region'
 require 'parliament/grom/decorator/gender'
 require 'parliament/grom/decorator/gender_identity'
 require 'parliament/grom/decorator/house'
-require 'parliament/grom/decorator/house_incumbency'
 require 'parliament/grom/decorator/house_seat'
 require 'parliament/grom/decorator/parliamentary_incumbency'
 require 'parliament/grom/decorator/party'

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

@@ -72,13 +72,6 @@ module Parliament
           @seat_incumbencies ||= incumbencies.select { |inc| inc.type == 'https://id.parliament.uk/schema/SeatIncumbency' }
         end
 
-        # Alias memberHasParliamentaryIncumbency with fallback.
-        #
-        # @return [Array, Array] the house incumbencies of the Grom::Node or an empty array.
-        def house_incumbencies
-          @house_incumbencies ||= incumbencies.select { |inc| inc.type == 'https://id.parliament.uk/schema/HouseIncumbency' }
-        end
-
         # Alias seatIncumbencyHasHouseSeat with fallback.
         #
         # @return [Array, Array] the seats of the Grom::Node or an empty array.
@@ -90,7 +83,7 @@ module Parliament
         #
         # @return [Array, Array] the houses of the Grom::Node or an empty array.
         def houses
-          @houses ||= [seats.map(&:house), house_incumbencies.map(&:house)].flatten.uniq.compact
+          @houses ||= [seats.map(&:house), seat_incumbencies.map(&:house)].flatten.uniq.compact
         end
 
         # Alias houseSeatHasConstituencyGroup with fallback.
@@ -162,18 +155,32 @@ module Parliament
           @statuses = statuses
         end
 
-        # Check whether #statuses includes 'Current MP'.
+        # Check whether they have a current seat on the House of Commons.
         #
-        # @return [Boolean] a boolean depending on whether or not the result of #statuses includes 'Current MP'.
+        # @return [Boolean] a boolean depending on whether or not they have a current seat incumbency in the House of Commons.
         def current_mp?
-          statuses[:house_membership_status].include?('Current MP')
+          current_member_by_house?('House of Commons')
         end
 
-        # Check whether #statuses includes 'Member of the House of Lords'.
+        # Check whether they are a former member of the House of Commons.
         #
-        # @return [Boolean] a boolean depending on whether or not the result of #statuses includes 'Member of the House of Lords'.
+        # @return [Boolean] a boolean depending on whether or not they have a current seat incumbency in the House of Commons.
+        def former_mp?
+          former_member_by_house?('House of Commons')
+        end
+
+        # Check whether they have a current seat on the House of Lords.
+        #
+        # @return [Boolean] a boolean depending on whether or not they have a current seat incumbency in the House of Lords.
         def current_lord?
-          statuses[:house_membership_status].include?('Member of the House of Lords')
+          current_member_by_house?('House of Lords')
+        end
+
+        # Check whether they are a former member of the House of Lords.
+        #
+        # @return [Boolean] a boolean depending on whether or not they have a current seat incumbency in the House of Lords.
+        def former_lord?
+          former_member_by_house?('House of Lords')
         end
 
         # Alias D79B0BAC513C4A9A87C9D5AFF1FC632F with fallback.
@@ -239,21 +246,30 @@ module Parliament
 
         private
 
+        def current_member_by_house?(house_name)
+          seat_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?
+        end
+
         def house_membership_status
           no_current_seat_incumbency = seat_incumbencies.select(&:current?).empty?
-          no_current_house_incumbency = house_incumbencies.select(&:current?).empty?
-          former_lord = (!house_incumbencies.empty? && no_current_house_incumbency)
-          former_mp = (!seat_incumbencies.empty? && no_current_seat_incumbency)
+          former_lord = former_lord?
+          former_mp = (seat_incumbencies.any? && no_current_seat_incumbency)
 
-          build_house_membership_status(no_current_seat_incumbency, no_current_house_incumbency, former_lord, former_mp)
+          build_house_membership_status(no_current_seat_incumbency, former_lord, former_mp)
         end
 
-        def build_house_membership_status(no_current_seat_incumbency, no_current_house_incumbency, former_lord, former_mp)
-          statuses = []
-          statuses << I18n.t('person.current.mp') unless no_current_seat_incumbency
-          statuses << I18n.t('person.current.member_of_the_house_of_lords') unless no_current_house_incumbency
-          statuses << I18n.t('person.former.member_of_the_house_of_lords') if former_lord
-          statuses << I18n.t('person.former.mp') if former_mp
+        def build_house_membership_status(no_current_seat_incumbency, former_lord, former_mp)
+          statuses     = []
+          current_mp   = current_mp?
+          current_lord = current_lord?
+          statuses << I18n.t('person.current.mp') if current_mp
+          statuses << I18n.t('person.current.member_of_the_house_of_lords') if current_lord
+          statuses << I18n.t('person.former.member_of_the_house_of_lords') if former_lord? && !current_lord
+          statuses << I18n.t('person.former.mp') if former_mp? && !current_mp
 
           convert_house_membership_status(statuses)
         end
@@ -261,7 +277,7 @@ module Parliament
         def general_membership_status
           statuses = []
           statuses << I18n.t('person.current.member') unless incumbencies.select(&:current?).empty?
-          statuses << I18n.t('person.former.member') if !incumbencies.empty? && incumbencies.select(&:current?).empty?
+          statuses << I18n.t('person.former.member') if incumbencies.any? && incumbencies.select(&:current?).empty?
           statuses
         end
 

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

@@ -66,6 +66,14 @@ module Parliament
         def member
           respond_to?(:parliamentaryIncumbencyHasMember) ? parliamentaryIncumbencyHasMember.first : nil
         end
+
+        def house_of_lords?
+          house.name == 'House of Lords'
+        end
+
+        def house_of_commons?
+          house.name == 'House of Commons'
+        end
       end
     end
   end

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parliament-grom-decorators
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.16.1
 platform: ruby
 authors:
 - Rebecca Appleyard
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-18 00:00:00.000000000 Z
+date: 2017-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -188,7 +188,6 @@ files:
 - lib/parliament/grom/decorator/helpers.rb
 - lib/parliament/grom/decorator/helpers/date_helper.rb
 - lib/parliament/grom/decorator/house.rb
-- lib/parliament/grom/decorator/house_incumbency.rb
 - lib/parliament/grom/decorator/house_seat.rb
 - lib/parliament/grom/decorator/member_image.rb
 - lib/parliament/grom/decorator/opposition_incumbency.rb

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

@@ -1,52 +0,0 @@
-module Parliament
-  module Grom
-    module Decorator
-      # Decorator namespace for Grom::Node instances with type: https://id.parliament.uk/schema/HouseIncumbency
-      module HouseIncumbency
-        include Helpers::DateHelper
-
-        # Alias parliamentaryIncumbencyStartDate with fallback.
-        #
-        # @return [DateTime, nil] the start date of the Grom::Node or nil.
-        def start_date
-          @start_date ||= respond_to?(:parliamentaryIncumbencyStartDate) ? DateTime.parse(parliamentaryIncumbencyStartDate) : nil
-        end
-
-        # Alias parliamentaryIncumbencyEndDate with fallback.
-        #
-        # @return [DateTime, nil] the end date of the Grom::Node or nil.
-        def end_date
-          @end_date ||= respond_to?(:parliamentaryIncumbencyEndDate) ? DateTime.parse(parliamentaryIncumbencyEndDate) : nil
-        end
-
-        # Checks if Grom::Node has an end date.
-        #
-        # @return [Boolean] a boolean depending on whether or not the Grom::Node has an end date.
-        def current?
-          end_date.nil?
-        end
-
-        # Alias houseIncumbencyHasHouse with fallback.
-        #
-        # @return [Grom::Node, nil] the house of the Grom::Node or nil.
-        def house
-          respond_to?(:houseIncumbencyHasHouse) ? houseIncumbencyHasHouse.first : nil
-        end
-
-        # Alias parliamentaryIncumbencyHasMember with fallback.
-        #
-        # @return [Grom::Node, nil] the member connected to the Grom::Node or nil.
-        def member
-          respond_to?(:parliamentaryIncumbencyHasMember) ? parliamentaryIncumbencyHasMember.first : nil
-        end
-
-        # Alias parliamentaryIncumbencyHasContactPoint with fallback.
-        #
-        # @return [Array, Array] the contact points of the Grom::Node or an empty array.
-        def contact_points
-          respond_to?(:parliamentaryIncumbencyHasContactPoint) ? parliamentaryIncumbencyHasContactPoint : []
-        end
-      end
-    end
-  end
-end