parliament-ruby 0.5.6 → 0.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a76fd77763a9fe33a35de30104d82946e7f07177
-  data.tar.gz: 50b97f4b12cc039d3d27b32e10847492c781f5f6
+  metadata.gz: 5be3624320b2e71f2c866d40afafe52136efeff5
+  data.tar.gz: 42f22e3125fad051a6136ab25c94cccd50826aea
 SHA512:
-  metadata.gz: 159d6a84432278a212bc1f882813475cef341a4d83adb6fc48b89cfaaf2610a80ba532402bf35beb2c749247e4bf64c87f6848ce43e63af962e2f8b3ee63df91
-  data.tar.gz: b9bf0127cdf490412fe162eb88db4681981a924de28f2cdffc5f3cb37a92057de9e8da75245a6aded8b5522507972823da623186d38ef6335eaacceb6862cc7e
+  metadata.gz: f7ef3458bf75e223766b6a0d0e6e8e1c8b9604bd49afd74883aab3b40cc2b252ad8ea41e372e32b833418a5ae679ab5ddb3a2853c07c4c26bb9e0e425830a9f2
+  data.tar.gz: 245c285b50a42044f4791439e3081365ecd8e2933a9a80e4e1afd153569348fa5ad6ee255fb7b0f92ced6c22d71b182f92f8f802c6bf2132badc84ba745908ca

data/lib/parliament/decorators/constituency_group.rb

@@ -53,6 +53,12 @@ module Parliament
 
         @contact_points = contact_points.flatten.uniq
       end
+
+      def current?
+        has_end_date = respond_to?(:constituencyGroupEndDate)
+
+        !has_end_date
+      end
     end
   end
 end

data/lib/parliament/decorators/incumbency.rb

@@ -22,6 +22,14 @@ module Parliament
       def contact_points
         respond_to?(:incumbencyHasContactPoint) ? incumbencyHasContactPoint : []
       end
+
+      def seat
+        respond_to?(:seatIncumbencyHasHouseSeat) ? seatIncumbencyHasHouseSeat.first : nil
+      end
+
+      def house
+        respond_to?(:houseIncumbencyHasHouse) ? houseIncumbencyHasHouse.first : nil
+      end
     end
   end
 end

data/lib/parliament/decorators/party.rb

@@ -10,7 +10,7 @@ module Parliament
       end
 
       def member_count
-        respond_to?(:count) ? count : nil
+        respond_to?(:count) ? count.to_i : nil
       end
     end
   end

data/lib/parliament/decorators/person.rb

@@ -25,11 +25,27 @@ module Parliament
       end
 
       def incumbencies
-        respond_to?(:memberHasIncumbency) ? memberHasIncumbency : []
+        if respond_to?(:memberHasIncumbency)
+          memberHasIncumbency.select { |inc| inc.type == 'http://id.ukpds.org/schema/Incumbency' }
+        else
+          []
+        end
       end
 
       def seat_incumbencies
-        respond_to?(:memberHasIncumbency) ? memberHasIncumbency : []
+        if respond_to?(:memberHasIncumbency)
+          memberHasIncumbency.select { |inc| inc.type == 'http://id.ukpds.org/schema/SeatIncumbency' }
+        else
+          []
+        end
+      end
+
+      def house_incumbencies
+        if respond_to?(:memberHasIncumbency)
+          memberHasIncumbency.select { |inc| inc.type == 'http://id.ukpds.org/schema/HouseIncumbency' }
+        else
+          []
+        end
       end
 
       def seats
@@ -51,6 +67,10 @@ module Parliament
           houses << seat.house
         end
 
+        house_incumbencies.each do |inc|
+          houses << inc.house
+        end
+
         @houses = houses.flatten.uniq
       end
 
@@ -91,6 +111,18 @@ module Parliament
       def gender
         gender_identities.empty? ? nil : gender_identities.first.gender
       end
+
+      def statuses
+        return @statuses unless @statuses.nil?
+
+        statuses = []
+        statuses << 'Current MP' unless seat_incumbencies.select(&:current?).empty?
+        statuses << 'Lord' unless house_incumbencies.select(&:current?).empty?
+        statuses << 'Former Lord' if !house_incumbencies.empty? && house_incumbencies.select(&:current?).empty?
+        statuses << 'Former MP' if !seat_incumbencies.empty? && seat_incumbencies.select(&:current?).empty?
+
+        @statuses = statuses
+      end
     end
   end
 end

data/lib/parliament/version.rb

@@ -1,3 +1,3 @@
 module Parliament
-  VERSION = '0.5.6'.freeze
+  VERSION = '0.5.7'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parliament-ruby
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.5.7
 platform: ruby
 authors:
 - Matt Rayner
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-06 00:00:00.000000000 Z
+date: 2017-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grom