parliament-grom-decorators 0.32.1 → 1.0.0.pre.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 2b63b54876c78cf5e78ed79d2f669f7d0642714fbaceb524924a425e2acdb8f5
-  data.tar.gz: 8664a9264a6132fc22ea93ff2bd7c8ff3f9dbc166cd2917a488fcabebd2c226b
+SHA1:
+  metadata.gz: 519f56b2e41fd46bf0cdb118b963ab5d04a4b7dd
+  data.tar.gz: 3ebe80a10134f7b5dede8bfc063e527f53765047
 SHA512:
-  metadata.gz: 4bd67a2c8126a27ffef228fd8ad78ca2107e8868223556aba894a5f0e80fe4254f40c6969aa28a3c8a6d2f78dfa26769173faa4056515ff13b45aad44b1db0e0
-  data.tar.gz: 300222fadfd47c03abfdc724f527b32ddaf1880e567c2a6514992f085576f33634e78ad8966a80d06d44713fee0fe601009376de0dc437b025d456821ebe0190
+  metadata.gz: f4b3ebe7fd09aee13560d6db37532d2d8c007f9741b9512f0173cf415ed70f5791cac72364164c0c5560550488db369fcded571e5f912790804af67160716945
+  data.tar.gz: 5d18e3749ad7132330ebeb99e6a49e454e6f239e09864340d49e9928dd118343f663cac35c1ce9aed07747eaf8f1190ffb7595d97cb82028fe5f7a79936018d6

data/.ruby-version

@@ -1 +1 @@
-2.6.1
+2.5.1

data/.travis.yml

@@ -1,4 +1,3 @@
 language: ruby
-before_install: gem install bundler
 rvm:
-  - 2.6.1
+  - 2.3.1

data/config/locales/en.yml

@@ -22,19 +22,4 @@
 en:
   to_present: 'to present'
   to: 'to'
-  person:
-    current:
-      mp: 'Current MP'
-      member_of_the_house_of_lords: 'Member of the House of Lords'
-      member: 'Current Member'
-    former:
-      mp: 'Former MP'
-      member_of_the_house_of_lords: 'Former Member of the House of Lords'
-      member: 'Former Member'
-    committee:
-      member: 'committee member'
-      lay: 'Lay'
-      ex_officio: 'Ex officio'
-      co_opted: 'Co-opted'
-      alternate: 'Alternate'
   date_unavailable: '[Date unavailable]'

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

@@ -4,12 +4,6 @@ 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.
         #
@@ -18,24 +12,12 @@ module Parliament
           @start_date ||= respond_to?(:groupStartDate) ? DateTime.parse(groupStartDate) : nil
         end
 
-        # Alias member count with fallback.
-        #
-        # @return [Integer, nil] the count of members of the Grom::Node or nil.
-        def member_count
-          respond_to?(:memberCount) ? memberCount.to_i : nil
-        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
-
-        # @return [Boolean] whether the group is also a formal body.
-        def formal_body?
-          type.include?(Parliament::Utils::Helpers::RequestHelper.namespace_uri_schema_path('FormalBody'))
-        end
       end
     end
   end

data/lib/parliament/grom/decorator/helpers/date_helper.rb

@@ -5,9 +5,13 @@ module Parliament
         # Namespace for date helper methods
         module DateHelper
           # Format start_date and end_date into a readable string
+          #
           # @param [String] date_format a string that represents the format we want to use for the date
+          #
           # @example Format a node with an end_date with the date format YYYY-MM-DD
           #   "grom_node_instance.date_range('%Y-%m-%d)" #=> "2010-01-01 to 2015-01-01"
+          #
+          # @return [String] formatted date range
           def date_range(date_format: '%-d %-B %Y')
             return I18n.t('date_unavailable') if start_date.nil?
             if end_date

data/lib/parliament/grom/decorator/helpers/utils.rb

@@ -0,0 +1,37 @@
+module Parliament
+  module Grom
+    module Decorator
+      module Helpers
+        # Namespace for utility methods
+        module Utils
+          class << self
+            # Checks that a collection responds to first and that the first element is of the given class
+            #
+            # @param [Enumerable] enumerable object which responds to #first
+            # @param [Class] klass the class we expect the first element to be
+            #
+            # @example When the first element is of the expected class
+            #   Parliament::Grom::Decorator::Helpers::Utils.type_safe_first(['hello'], String) #=> 'hello'
+            #
+            # @example When the first element is not of the expected class
+            #   Parliament::Grom::Decorator::Helpers::Utils.type_safe_first(['hello'], Fixnum) #=> nil
+            #
+            # @example When the enumerable does not respond to first
+            #   Parliament::Grom::Decorator::Helpers::Utils.type_safe_first('hello', String) #=> nil
+            #
+            # @return [String] formatted date range
+            def type_safe_first(enumerable, klass)
+              return nil unless enumerable.respond_to?(:first)
+
+              first_element = enumerable.first
+
+              return nil unless first_element.is_a?(klass)
+
+              first_element
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,4 +1,6 @@
 require 'parliament/grom/decorator/helpers/date_helper'
+require 'parliament/grom/decorator/helpers/utils'
+
 module Parliament
   module Grom
     module Decorator

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

@@ -7,7 +7,10 @@ module Parliament
         #
         # @return [Grom::Node, nil] a laying Grom::Node or nil.
         def laying
-          respond_to?(:laidThingHasLaying) ? laidThingHasLaying.first : nil
+          return @laying if @laying
+          return nil unless respond_to?(:laidThingHasLaying)
+
+          @laying = Helpers::Utils.type_safe_first(laidThingHasLaying, Parliament::Grom::Decorator::Laying)
         end
       end
     end

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

@@ -14,14 +14,20 @@ module Parliament
         #
         # @return [Grom::Node, nil] the LayingBody of the Grom::Node or nil.
         def body
-          respond_to?(:layingHasLayingBody) ? layingHasLayingBody.first : nil
+          return @body if @body
+          return nil unless respond_to?(:layingHasLayingBody)
+
+          @body = Helpers::Utils.type_safe_first(layingHasLayingBody, Parliament::Grom::Decorator::Group)
         end
 
         # Alias layingHasLayingPerson with fallback.
         #
         # @return [Grom::Node, nil] the LayingPerson of the Grom::Node or nil.
         def person
-          respond_to?(:layingHasLayingPerson) ? layingHasLayingPerson.first : nil
+          return @person if @person
+          return nil unless respond_to?(:layingHasLayingPerson)
+
+          @person = Helpers::Utils.type_safe_first(layingHasLayingPerson, Parliament::Grom::Decorator::Person)
         end
       end
     end

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

@@ -1,38 +1,7 @@
 module Parliament
   module Grom
     module Decorator
-      # Decorator namespace for Grom::Node instances with type: https://id.parliament.uk/schema/Person.
       module Person
-        include Helpers::DateHelper
-
-        # Alias personGivenName with fallback.
-        #
-        # @return [String, String] the given name of the Grom::Node or an empty string.
-        def given_name
-          respond_to?(:personGivenName) ? personGivenName : ''
-        end
-
-        # Alias personFamilyName with fallback.
-        #
-        # @return [String, String] the family name of the Grom::Node or an empty string.
-        def family_name
-          respond_to?(:personFamilyName) ? personFamilyName : ''
-        end
-
-        # Alias personOtherNames with fallback.
-        #
-        # @return [String, String] the other names of the Grom::Node or an empty string.
-        def other_name
-          respond_to?(:personOtherNames) ? personOtherNames : ''
-        end
-
-        # Alias personDateOfBirth with fallback.
-        #
-        # @return [DateTime, nil] the date of birth of the Grom::Node or nil.
-        def date_of_birth
-          @date_of_birth ||= respond_to?(:personDateOfBirth) ? DateTime.parse(personDateOfBirth) : nil
-        end
-
         # Builds a full name using personGivenName and personFamilyName.
         #
         # @return [String, String] the full name of the Grom::Node or an empty string.
@@ -46,317 +15,12 @@ module Parliament
           @full_name = full_name.join(' ')
         end
 
-        # Alias personHasPersonImage with fallback.
-        #
-        # @return [String, String] the image location of the Grom::Node or a placeholder string.
-        def image_id(show_placeholder: true)
-          if respond_to?(:memberHasMemberImage)
-            memberHasMemberImage.first.graph_id
-          else
-            show_placeholder ? 'placeholder' : nil
-          end
-        end
-
-        # Alias personPimsId with fallback.
-        #
-        # @return [Array, Array] the pims_id of the Grom::Node or nil.
-        def pims_id
-          respond_to?(:personPimsId) ? personPimsId : nil
-        end
-
-        # Alias memberMnisId with fallback.
-        #
-        # @return [Array, Array] the mnis_id of the Grom::Node or nil.
-        def mnis_id
-          respond_to?(:memberMnisId) ? memberMnisId : nil
-        end
-
-        # Alias memberHasParliamentaryIncumbency with fallback.
-        #
-        # @return [Array, Array] all the incumbencies of the Grom::Node or an empty array.
-        def incumbencies
-          respond_to?(:memberHasParliamentaryIncumbency) ? memberHasParliamentaryIncumbency : []
-        end
-
-        # Alias memberHasParliamentaryIncumbency with fallback.
-        #
-        # @return [Array, Array] the seat incumbencies of the Grom::Node or an empty array.
-        def seat_incumbencies
-          @seat_incumbencies ||= incumbencies.select { |inc| inc.type.include?(Parliament::Utils::Helpers::RequestHelper.namespace_uri_schema_path('SeatIncumbency')) }
-        end
-
-        # @return [Grom::Node] the seat incumbency as a Grom::Node or nil
-        def current_seat_incumbency
-          @current_seat_incumbency ||= seat_incumbencies.select(&:current?)&.first
-        end
-
-        # @return [Grom::Node] the most recent seat incumbency as a Grom::Node or nil
-        def most_recent_seat_incumbency
-          @most_recent_seat_incumbency ||= seat_incumbencies.sort_by!(&:start_date).reverse.first
-        end
-
-        # Alias seatIncumbencyHasHouseSeat with fallback.
-        #
-        # @return [Array, Array] the seats of the Grom::Node or an empty array.
-        def seats
-          @seats ||= seat_incumbencies.map(&:seat).flatten.uniq.compact
-        end
-
-        # Alias houseSeatHasHouse with fallback.
-        # @return [Array, Array] the houses of the Grom::Node or an empty array.
-        def houses
-          @houses ||= [seats.map(&:house), seat_incumbencies.map(&:house)].flatten.uniq.compact
-        end
-
-        # Alias houseSeatHasConstituencyGroup with fallback.
-        #
-        # @return [Array, Array] the constituencies of the Grom::Node or an empty array.
-        def constituencies
-          @constituencies ||= seats.map(&:constituency).flatten.uniq.compact
-        end
-
-        # Alias partyMemberHasPartyMembership with fallback.
-        #
-        # @return [Array, Array] the party memberships of the Grom::Node or an empty array.
-        def party_memberships
-          respond_to?(:partyMemberHasPartyMembership) ? partyMemberHasPartyMembership : []
-        end
-
-        # Alias partyMembershipHasParty with fallback.
-        #
-        # @return [Array, Array] the parties of the Grom::Node or an empty array.
-        def parties
-          @parties ||= party_memberships.map(&:party).flatten.uniq.compact
-        end
-
-        # Alias partyMembershipHasParty with fallback.
-        #
-        # @return [Grom::Node] the current party of the Grom::Node or nil.
-        def current_party
-          @current_party ||= party_memberships.select(&:current?).select(&:party)&.first&.party
-        end
-
-        # Alias partyMembershipHasParty with fallback.
-        #
-        # @return [Grom::Node] the current party membership of the Grom::Node or nil.
-        def current_party_membership
-          @current_party_membership ||= party_memberships.select(&:current?).select(&:party)&.first
-        end
-
-        # Alias personHasContactPoint with fallback.
-        #
-        # @return [Array, Array] the contact points of the Grom::Node or an empty array.
-        def contact_points
-          respond_to?(:personHasContactPoint) ? personHasContactPoint : []
-        end
-
-        # Alias personHasGenderIdentity with fallback.
-        #
-        # @return [Array, Array] the gender identities of the Grom::Node or an empty array.
-        def gender_identities
-          respond_to?(:personHasGenderIdentity) ? personHasGenderIdentity : []
-        end
-
-        # Alias genderIdentityHasGender with fallback.
-        #
-        # @return [Array, Array] the gender of the Grom::Node or nil.
-        def gender
-          gender_identities.empty? ? nil : gender_identities.first.gender
-        end
-
-        # Gets the gender pronoun of the Grom::Node.
-        #
-        # @return [String, String] the gender pronoun of the Grom::Node.
-        def gender_pronoun
-          if gender
-            return 'She' if gender.name == 'Female'
-            return 'He' if gender.name == 'Male'
-          end
-          'They'
-        end
-
-        # Checks the statuses of the Grom::Node.
-        #
-        # @return [Hash, Hash] the statuses of the Grom::Node or an empty hash.
-        def statuses
-          return @statuses unless @statuses.nil?
-
-          statuses = {}
-          statuses[:house_membership_status] = house_membership_status
-          statuses[:general_membership_status] = general_membership_status
-
-          @statuses = statuses
-        end
-
-        # Check whether they have a current seat on the House of Commons.
-        #
-        # @return [Boolean] a boolean depending on whether or not they have a current seat incumbency in the House of Commons.
-        def current_mp?
-          current_member_by_house?('House of Commons')
-        end
-
-        # Check whether they are a former member of the House of Commons.
-        #
-        # @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?
-          current_member_by_house?('House of Lords')
-        end
-
-        # Check whether member is an ex_officio?.
-        #
-        # @return [Boolean] a boolean depending on whether or not member is an ex_officio?
-        def ex_officio?
-          respond_to?(:memberHasExOfficioMembership)
-        end
-
-        # Check whether member is an alternate?.
-        #
-        # @return [Boolean] a boolean depending on whether or not member is an alternate?
-        def alternate?
-          respond_to?(:memberHasAlternateMembership)
-        end
-
-        # Check whether person is a lay member?.
-        #
-        # @return [Boolean] a boolean depending on whether or person is a lay member or not
-        def lay_member?
-          respond_to?(:formalBodyLayPersonMnisId)
-        end
-
-        def committee_membership_type
-          committee_membership_type = []
-          committee_membership_type << I18n.t('person.committee.lay') if lay_member?
-          committee_membership_type << I18n.t('person.committee.ex_officio') if ex_officio?
-          committee_membership_type << I18n.t('person.committee.alternate') if alternate?
-          committee_membership_type << I18n.t('person.committee.member')
-          committee_membership_type
-        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
-
-        # Check whether they are a Member or a Lord from their latest seat incumbency.
-        # Current incumbencies are higher priority when determining a person_type
-        # Therefore check first for former, then current
-        # @return [String] 'member' if they are a member, 'lord' if they are a lord.
-        def person_type
-          person_type = 'member' if former_mp?
-          person_type = 'lord' if former_lord?
-          person_type = 'member' if current_mp?
-          person_type = 'lord' if current_lord?
-          person_type
-        end
-
-        # Alias D79B0BAC513C4A9A87C9D5AFF1FC632F with fallback.
-        #
-        # @return [String, String] the full title of the Grom::Node or an empty string.
-        def full_title
-          respond_to?(:D79B0BAC513C4A9A87C9D5AFF1FC632F) ? self.D79B0BAC513C4A9A87C9D5AFF1FC632F : ''
-        end
-
         # Alias F31CBD81AD8343898B49DC65743F0BDF with fallback.
         #
         # @return [String, String] the display name of the Grom::Node or the full name.
         def display_name
           respond_to?(:F31CBD81AD8343898B49DC65743F0BDF) ? self.F31CBD81AD8343898B49DC65743F0BDF : full_name
         end
-
-        # Alias A5EE13ABE03C4D3A8F1A274F57097B6C with fallback.
-        #
-        # @return [String, String] the sort name of the Grom::Node or an empty string.
-        def sort_name
-          respond_to?(:A5EE13ABE03C4D3A8F1A274F57097B6C) ? self.A5EE13ABE03C4D3A8F1A274F57097B6C : ''
-        end
-
-        # Alias personHasFormalBodyMembership with fallback.
-        #
-        # @return [Array, Array] all the formal body memberships of the Grom::Node or an empty array.
-        def formal_body_memberships
-          respond_to?(:personHasFormalBodyMembership) ? personHasFormalBodyMembership : []
-        end
-
-        # Alias governmentIncumbency with fallback.
-        #
-        # @return [Array, Array] all the government incumbencies of the Grom::Node or an empty array.
-        def government_incumbencies
-          respond_to?(:governmentPersonHasGovernmentIncumbency) ? governmentPersonHasGovernmentIncumbency : []
-        end
-
-        # Alias personHasPersonalWebLink with fallback.
-        #
-        # @return [Array, Array] all the personal weblinks of the Grom::Node or an empty Array.
-        def personal_weblinks
-          [*get_weblinks_by_predicate(:personHasPersonalWebLink)]
-        end
-
-        # Alias personHasTwitterWebLink with fallback.
-        #
-        # @return [Array, Array] all the Twitter weblinks of the Grom::Node or an empty array.
-        def twitter_weblinks
-          [*get_weblinks_by_predicate(:personHasTwitterWebLink)]
-        end
-
-        # Alias personHasFacebookWebLink with fallback.
-        #
-        # @return [Array, Array] all the Facebook weblinks of the Grom::Node or an empty array.
-        def facebook_weblinks
-          [*get_weblinks_by_predicate(:personHasFacebookWebLink)]
-        end
-
-        # Check whether a person has any weblinks
-        def weblinks?
-          (personal_weblinks + twitter_weblinks + facebook_weblinks).any?
-        end
-
-        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
-          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
-
-        def general_membership_status
-          statuses = []
-          statuses << I18n.t('person.current.member') unless incumbencies.select(&:current?).empty?
-          statuses << I18n.t('person.former.member') if incumbencies.any? && incumbencies.select(&:current?).empty?
-          statuses
-        end
-
-        def convert_house_membership_status(statuses)
-          statuses.each_with_index do |status, index|
-            status[0] = status[0].downcase if index != 0
-          end
-        end
-
-        def get_weblinks_by_predicate(weblink_predicate)
-          (respond_to?(weblink_predicate) && (current_mp? || current_lord?) ? send(weblink_predicate) : nil)
-        end
       end
     end
   end

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

@@ -3,19 +3,6 @@ module Parliament
     module Decorator
       # Decorator namespace for Grom::Node instances with type: https://id.parliament.uk/schema/Procedure
       module Procedure
-        # Alias procedureName with fallback.
-        #
-        # @return [String, String] the name of the Grom::Node or an empty string.
-        def name
-          respond_to?(:procedureName) ? procedureName : ''
-        end
-
-        # Alias procedureHasWorkPackage with fallback.
-        #
-        # @return [Array, Array] an array of WorkPackage Grom::Nodes or an empty array.
-        def work_packages
-          respond_to?(:procedureHasWorkPackage) ? procedureHasWorkPackage : []
-        end
       end
     end
   end

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

@@ -3,13 +3,6 @@ module Parliament
     module Decorator
       # Decorator namespace for Grom::Node instances with type: https://id.parliament.uk/schema/ProposedNegativeStatutoryInstrumentPaper
       module ProposedNegativeStatutoryInstrumentPaper
-        # Alias proposedNegativeStatutoryInstrumentPaperName with fallback.
-        #
-        # @return [String, String] the name of the Grom::Node or an empty string.
-        def name
-          respond_to?(:proposedNegativeStatutoryInstrumentPaperName) ? proposedNegativeStatutoryInstrumentPaperName : ''
-        end
-
         # Alias proposedNegativeStatutoryInstrumentPaperPrecedesStatutoryInstrumentPaper with fallback.
         #
         # @return [Array, Array] an array of StatutoryInstrumentPaper Grom::Nodes or an empty array.

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

@@ -3,34 +3,6 @@ module Parliament
     module Decorator
       # Decorator namespace for Grom::Node instances with type: https://id.parliament.uk/schema/StatutoryInstrumentPaper
       module StatutoryInstrumentPaper
-        # Alias statutoryInstrumentPaperName with fallback.
-        #
-        # @return [String, String] the name of the Grom::Node or an empty string.
-        def name
-          respond_to?(:statutoryInstrumentPaperName) ? statutoryInstrumentPaperName : ''
-        end
-
-        # Alias statutoryInstrumentPaperPrefix with fallback.
-        #
-        # @return [String, String] the prefix of the Grom::Node or an empty string.
-        def prefix
-          respond_to?(:statutoryInstrumentPaperPrefix) ? statutoryInstrumentPaperPrefix : ''
-        end
-
-        # Alias statutoryInstrumentPaperYear with fallback.
-        #
-        # @return [String, String] the year of the Grom::Node or an empty string.
-        def year
-          respond_to?(:statutoryInstrumentPaperYear) ? statutoryInstrumentPaperYear : ''
-        end
-
-        # Alias statutoryInstrumentPaperNumber with fallback.
-        #
-        # @return [String, String] the number of the Grom::Node or an empty string.
-        def number
-          respond_to?(:statutoryInstrumentPaperNumber) ? statutoryInstrumentPaperNumber : ''
-        end
-
         # Alias statutoryInstrumentPaperMadeDate with fallback.
         #
         # @return [Date, nil] the coming into force date of the Grom::Node or nil.
@@ -38,13 +10,6 @@ module Parliament
           respond_to?(:statutoryInstrumentPaperMadeDate) ? DateTime.parse(statutoryInstrumentPaperMadeDate) : nil
         end
 
-        # Alias statutoryInstrumentPaperComingIntoForceNote with fallback.
-        #
-        # @return [String, String] the coming into force date of the Grom::Node or an empty string.
-        def coming_into_force_note
-          respond_to?(:statutoryInstrumentPaperComingIntoForceNote) ? statutoryInstrumentPaperComingIntoForceNote : ''
-        end
-
         # Alias Date with fallback.
         #
         # @return [Date, nil] the coming into force date of the Grom::Node or nil.

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

@@ -1,7 +1,7 @@
 module Parliament
   module Grom
     module Decorator
-      VERSION = '0.32.1'.freeze
+      VERSION = '1.0.0-pre'.freeze
     end
   end
 end

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

@@ -3,45 +3,15 @@ module Parliament
     module Decorator
       # Decorator namespace for Grom::Node instances with type: https://id.parliament.uk/schema/WorkPackage
       module WorkPackage
-        include Helpers::DateHelper
         # Alias workPackageHasProcedure with fallback.
         # NB: Currently, work packages only have one procedure
         #
         # @return [Grom::Node, nil] a Procedure Grom::Node or nil.
         def procedure
-          respond_to?(:workPackageHasProcedure) ? workPackageHasProcedure.first : nil
-        end
-
-        # Alias workPackageHasWorkPackageableThing with fallback.
-        # NB: Currently, work packages only have one work packageable thing
-        #
-        # @return [Grom::Node, nil] a Procedure Grom::Node or nil.
-        def work_packageable_thing
-          respond_to?(:workPackageHasWorkPackageableThing) ? workPackageHasWorkPackageableThing.first : nil
-        end
-
-        # @return [String, nil] the name of the Grom::Node or an empty string.
-        def work_packageable_thing_name
-          work_packageable_thing&.name
-        end
+          return @procedure if @procedure
+          return nil unless respond_to?(:workPackageHasProcedure)
 
-        # Alias workPackageHasBusinessItem with fallback.
-        #
-        # @return [Array, Array] an array of BusinessItem Grom::Nodes or an empty array.
-        def business_items
-          respond_to?(:workPackageHasBusinessItem) ? workPackageHasBusinessItem : []
-        end
-
-        # @return [Grom::Node, nil] a Laying Grom::Node or nil.
-        def laying
-          respond_to?(:workPackageHasProcedure) ? workPackageHasProcedure.first : nil
-        end
-
-        # Alias oldestBusinessItemDate with fallback.
-        #
-        # @return [Date, nil] a date or nil.
-        def oldest_business_item_date
-          respond_to?(:oldestBusinessItemDate) ? DateTime.parse(oldestBusinessItemDate) : nil
+          @procedure = Helpers::Utils.type_safe_first(workPackageHasProcedure, Parliament::Grom::Decorator::Procedure)
         end
       end
     end