parliament-grom-decorators 0.25.0 → 0.25.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '0054219819c9cf5ba0fef958aca46148cba22a49'
-  data.tar.gz: 7d5e3321395c970117c3c1bafcb31568cee2feed
+  metadata.gz: 06de8a0e1256fab3b1a807da878c1620d1ec8b12
+  data.tar.gz: b85c5b82b9a3e28fbc170b74a0d5e4be1da88746
 SHA512:
-  metadata.gz: 9b458832d8f93df5eb2a0a1c7488c20ebc5f1bdf4928b9fce540b30dd68a05eaebe74d30f6999d04fd9f8962d526914da8c5ffc4cdfc0d6e3780afb335cd59f1
-  data.tar.gz: 494be78cd713accfe9eb06e3f353620457f248f925edaa4ebc2df1ab3c2c8c243b5c02cf59e1fad01ce2a48899c4f84f675b2a6cba76fc25c8938e1663de0b43
+  metadata.gz: b3d9e64d32e0286557265476675edf8555b4708c19f4cce629b5cc82822c61df5284b68e38d1a4519e5924d339c1ea9a1ae8bd0e208b0b01ce3cfa70ef30bcdb
+  data.tar.gz: 50b3a65514e3c96d45824f3b79e69d0d6c6492db0852023270a6b7ba8c70e2667ee1ec013f7a019ae4f4270cb36db3916c8813a19c6110091125e6df63cafda1

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

@@ -22,7 +22,7 @@ module Parliament
         #
         # @return [Integer, nil] the count of members of the Grom::Node or nil.
         def member_count
-          respond_to?(:count) ? count.to_i : nil
+          respond_to?(:memberCount) ? memberCount.to_i : nil
         end
 
         # Alias groupEndDate with fallback.
@@ -31,6 +31,11 @@ module Parliament
         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?('https://id.parliament.uk/schema/FormalBody')
+        end
       end
     end
   end

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 == 'https://id.parliament.uk/schema/SeatIncumbency' }
+          @seat_incumbencies ||= incumbencies.select { |inc| inc.type.include?('https://id.parliament.uk/schema/SeatIncumbency') }
         end
 
         # @return [Grom::Node] the seat incumbency as a Grom::Node or nil
@@ -303,11 +303,11 @@ module Parliament
         private
 
         def current_member_by_house?(house_name)
-          incumbencies.select { |incumbency| incumbency.house.name == house_name && incumbency.end_date.nil? }.any?
+          seat_incumbencies.select { |incumbency| incumbency.house.name == house_name && incumbency.end_date.nil? }.any?
         end
 
         def former_member_by_house?(house_name)
-          incumbencies.select { |incumbency| incumbency.house.name == house_name && incumbency.end_date }.any?
+          seat_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.25.0'.freeze
+      VERSION = '0.25.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.25.0
+  version: 0.25.1
 platform: ruby
 authors:
 - Rebecca Appleyard
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-25 00:00:00.000000000 Z
+date: 2018-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler