parliament-grom-decorators 0.29.0 → 0.30.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 69068c3ab18f674b86ff50b32a608f8bfc6453b1
-  data.tar.gz: 322b764827d32d6017cae3ed08002dafc185a3cf
+  metadata.gz: 61ac05487ac2d1b3e88ef39f0361119e613c6653
+  data.tar.gz: f7b968e9b68959d11f6d536445ea5e2861802c27
 SHA512:
-  metadata.gz: c281487dfc8d0c27875214bfbacbd234efaa7a303b2be9b430f6fcf1b812992a3b6711d2d84dcc95eeac398fed3f48b768849f3abfe3b20e2249e7132f014d82
-  data.tar.gz: 78d073630b3ec21f2cf916da27dff4a1b36c71a3a39c43f7d5cfecff3f45c135f62023ef62e9e19adbaf1ee4a6da8ea91271a76e0b623559304d4dcde889a53e
+  metadata.gz: c9d8cd1fe703a8549672297179ddf8c3e24b1225d7a01d6ed0a7d9a2338aaa9bcea59d45fe6867540b8eab0d60fa00bd3be1b48cbe6b00d34c8ca955b5d57e13
+  data.tar.gz: e9faf90985cc7c74ea445cfa86f3b3992c7589bb45488e90ea0fcb93235506b0cc45292d3dbb402aa7d00da570697f45541e1e50c5f421ca23c6df708651988e

data/lib/parliament/grom/decorator.rb

@@ -1,54 +1,7 @@
 require 'parliament/grom/decorator/version'
 require 'parliament/grom/decorator/helpers'
-require 'parliament/grom/decorator/answer'
-require 'parliament/grom/decorator/answering_body'
-require 'parliament/grom/decorator/answering_body_allocation'
-require 'parliament/grom/decorator/article_type'
-require 'parliament/grom/decorator/audience'
-require 'parliament/grom/decorator/business_item'
-require 'parliament/grom/decorator/collection'
-require 'parliament/grom/decorator/concept'
-require 'parliament/grom/decorator/constituency_area'
-require 'parliament/grom/decorator/constituency_group'
-require 'parliament/grom/decorator/contact_point'
-require 'parliament/grom/decorator/european_region'
-require 'parliament/grom/decorator/formal_body'
-require 'parliament/grom/decorator/formal_body_chair'
-require 'parliament/grom/decorator/formal_body_membership'
-require 'parliament/grom/decorator/formal_body_type'
-require 'parliament/grom/decorator/gender'
-require 'parliament/grom/decorator/gender_identity'
-require 'parliament/grom/decorator/government_incumbency'
-require 'parliament/grom/decorator/government_position'
-require 'parliament/grom/decorator/gov_register_government_organisation'
-require 'parliament/grom/decorator/group'
-require 'parliament/grom/decorator/house'
-require 'parliament/grom/decorator/house_seat'
-require 'parliament/grom/decorator/incumbency'
-require 'parliament/grom/decorator/laid_thing'
-require 'parliament/grom/decorator/laying'
-require 'parliament/grom/decorator/laying_body'
-require 'parliament/grom/decorator/member_image'
-require 'parliament/grom/decorator/parliamentary_incumbency'
-require 'parliament/grom/decorator/parliaments'
-require 'parliament/grom/decorator/party'
-require 'parliament/grom/decorator/party_membership'
-require 'parliament/grom/decorator/person'
-require 'parliament/grom/decorator/position'
-require 'parliament/grom/decorator/postal_address'
-require 'parliament/grom/decorator/procedure_route'
-require 'parliament/grom/decorator/procedure_step'
-require 'parliament/grom/decorator/procedure'
-require 'parliament/grom/decorator/proposed_negative_statutory_instrument_paper'
-require 'parliament/grom/decorator/question'
-require 'parliament/grom/decorator/seat_incumbency'
-require 'parliament/grom/decorator/statutory_instrument_paper'
-require 'parliament/grom/decorator/opposition_incumbency'
-require 'parliament/grom/decorator/opposition_position'
-require 'parliament/grom/decorator/web_article'
-require 'parliament/grom/decorator/work_package'
-require 'parliament/grom/decorator/work_packageable_thing'
-require 'parliament/grom/decorator/work_packaged_thing'
+
+Dir['./lib/parliament/grom/decorator/*.rb'].each { |file| require file }
 
 # Namespace for classes and modules that handle connections to, and processing of data from the parliamentary API.
 # @since 0.1.0
@@ -58,57 +11,13 @@ module Parliament
     #
     # @since 0.1.0
     module Decorator
-      MAPPING = {
-        'Answer'                                   => Answer,
-        'AnsweringBody'                            => AnsweringBody,
-        'AnsweringBodyAllocation'                  => AnsweringBodyAllocation,
-        'ArticleType'                              => ArticleType,
-        'Audience'                                 => Audience,
-        'BusinessItem'                             => BusinessItem,
-        'Collection'                               => Collection,
-        'Concept'                                  => Concept,
-        'ConstituencyArea'                         => ConstituencyArea,
-        'ConstituencyGroup'                        => ConstituencyGroup,
-        'ContactPoint'                             => ContactPoint,
-        'EuropeanRegion'                           => EuropeanRegion,
-        'FormalBodyChair'                          => FormalBodyChair,
-        'FormalBodyMembership'                     => FormalBodyMembership,
-        'FormalBodyType'                           => FormalBodyType,
-        'FormalBody'                               => FormalBody,
-        'Gender'                                   => Gender,
-        'GenderIdentity'                           => GenderIdentity,
-        'GovernmentIncumbency'                     => GovernmentIncumbency,
-        'GovernmentPosition'                       => GovernmentPosition,
-        'GovRegisterGovernmentOrganisation'        => GovRegisterGovernmentOrganisation,
-        'Group'                                    => Group,
-        'House'                                    => House,
-        'HouseSeat'                                => HouseSeat,
-        'Incumbency'                               => Incumbency,
-        'LaidThing'                                => LaidThing,
-        'Laying'                                   => Laying,
-        'LayingBody'                               => LayingBody,
-        'MemberImage'                              => MemberImage,
-        'OppositionIncumbency'                     => OppositionIncumbency,
-        'OppositionPosition'                       => OppositionPosition,
-        'ParliamentPeriod'                         => ParliamentPeriod,
-        'ParliamentaryIncumbency'                  => ParliamentaryIncumbency,
-        'Party'                                    => Party,
-        'PartyMembership'                          => PartyMembership,
-        'Person'                                   => Person,
-        'Position'                                 => Position,
-        'Procedure'                                => Procedure,
-        'ProcedureRoute'                           => ProcedureRoute,
-        'ProcedureStep'                            => ProcedureStep,
-        'ProposedNegativeStatutoryInstrumentPaper' => ProposedNegativeStatutoryInstrumentPaper,
-        'PostalAddress'                            => PostalAddress,
-        'Question'                                 => Question,
-        'SeatIncumbency'                           => SeatIncumbency,
-        'StatutoryInstrumentPaper'                 => StatutoryInstrumentPaper,
-        'WebArticle'                               => WebArticle,
-        'WorkPackage'                              => WorkPackage,
-        'WorkPackageableThing'                     => WorkPackageableThing,
-        'WorkPackagedThing'                        => WorkPackagedThing
-      }.freeze
+      INTERNAL_MODULES = %i[
+        Helpers
+        VERSION
+      ].freeze
+
+      MAPPING = {}
+      (constants - INTERNAL_MODULES).each { |constant| MAPPING[constant.to_s] = const_get(constant) }
 
       class << self
         # Gets the root directory of the gem

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

@@ -84,7 +84,7 @@ module Parliament
         #
         # @return [Boolean] whether or not the group is a select committee.
         def select_committee?
-          type.include?('https://id.parliament.uk/schema/SelectCommittee')
+          type.include?(Parliament::Utils::Helpers::RequestHelper.namespace_uri_schema_path('SelectCommittee'))
         end
 
         # Checks what type of committee a Grom::Node represents.

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

@@ -34,7 +34,7 @@ module Parliament
 
         # @return [Boolean] whether the group is also a formal body.
         def formal_body?
-          type.include?('https://id.parliament.uk/schema/FormalBody')
+          type.include?(Parliament::Utils::Helpers::RequestHelper.namespace_uri_schema_path('FormalBody'))
         end
       end
     end

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

@@ -8,7 +8,7 @@ module Parliament
           # @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"
-          def date_range(date_format: '%-d %B %Y')
+          def date_range(date_format: '%-d %-B %Y')
             return I18n.t('date_unavailable') if start_date.nil?
             if end_date
               "#{I18n.l(start_date, format: date_format)} #{I18n.t('to')} #{I18n.l(end_date, format: date_format)}"

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

@@ -82,7 +82,7 @@ module Parliament
         #
         # @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?('https://id.parliament.uk/schema/SeatIncumbency') }
+          @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

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

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

data/parliament-grom-decorators.gemspec

@@ -29,5 +29,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'webmock', '~> 2.3'
   spec.add_development_dependency 'parliament-ruby'
   spec.add_development_dependency 'parliament-ntriple', '~> 0.2'
+  spec.add_development_dependency 'parliament-utils', '~> 0.8'
   spec.add_development_dependency 'timecop', '~> 0.8'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: parliament-grom-decorators
 version: !ruby/object:Gem::Version
-  version: 0.29.0
+  version: 0.30.0
 platform: ruby
 authors:
 - Rebecca Appleyard
@@ -136,6 +136,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: parliament-utils
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement