parliament-ruby 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35b478eb95f94d239b43577926d991cd8d7e185d
-  data.tar.gz: 80e3214e334fb5568e2474b76c6ccf4f510b469b
+  metadata.gz: d2b60187ee147754e45af117d67e186d9f243a03
+  data.tar.gz: 7f067fa0eae375acadb3615bb5a585327708895a
 SHA512:
-  metadata.gz: caa6aae8ea8c2a3c27fbecd534225010e7c4068651d972502bca85391d02623899a3f5f617671be79c1923f5a81259fd7d1e01043ad66c6fabe97b78811b807c
-  data.tar.gz: 9705db9a2c52ae0ae87e9fbe23693da6b1a1323b1766618f26f7e23dbfc7e39257ae3b32f73f4c9836f93bcad7ff33dff221956457ba4274dc9ce8cb8200b42c
+  metadata.gz: 4c326bb2d2ec7fd7f2541dce2ec400a3760c1de6779cb0b1fd089daad88f164bc2c696ebc1828dd3e2da562bd5f53328e31d671ae250a8a987a2d366b483eced
+  data.tar.gz: c5200240f342ec061ae7cceb581456a535e1c2d9a09806c6cf9c1cb0a5c1886220fbf12666f6c9a13c64918ed94a93fa20b92ece08074a80da47e663a3c900b4

data/lib/parliament/decorators/contact_point.rb

@@ -20,6 +20,10 @@ module Parliament
       def person
         respond_to?(:contactPointHasPerson) ? contactPointHasPerson : []
       end
+
+      def incumbency
+        respond_to?(:contactPointHasIncumbency) ? contactPointHasIncumbency.first : nil
+      end
     end
   end
 end

data/lib/parliament/decorators/house.rb

@@ -19,6 +19,10 @@ module Parliament
       def seats
         respond_to?(:houseHasHouseSeat) ? houseHasHouseSeat : []
       end
+
+      def house_incumbencies
+        respond_to?(:houseHasHouseIncumbency) ? houseHasHouseIncumbency : []
+      end
     end
   end
 end

data/lib/parliament/decorators/house_incumbency.rb

@@ -0,0 +1,31 @@
+module Parliament
+  module Decorators
+    module HouseIncumbency
+      def start_date
+        respond_to?(:incumbencyStartDate) ? DateTime.parse(incumbencyStartDate) : nil
+      end
+
+      def end_date
+        respond_to?(:incumbencyEndDate) ? DateTime.parse(incumbencyEndDate) : nil
+      end
+
+      def current?
+        has_end_date = respond_to?(:incumbencyEndDate)
+
+        !has_end_date
+      end
+
+      def house
+        respond_to?(:houseIncumbencyHasHouse) ? houseIncumbencyHasHouse.first : nil
+      end
+
+      def member
+        respond_to?(:incumbencyHasMember) ? incumbencyHasMember.first : nil
+      end
+
+      def contact_points
+        respond_to?(:incumbencyHasContactPoint) ? incumbencyHasContactPoint : []
+      end
+    end
+  end
+end

data/lib/parliament/decorators/incumbency.rb

@@ -0,0 +1,27 @@
+module Parliament
+  module Decorators
+    module Incumbency
+      def start_date
+        respond_to?(:incumbencyStartDate) ? DateTime.parse(incumbencyStartDate) : nil
+      end
+
+      def end_date
+        respond_to?(:incumbencyEndDate) ? DateTime.parse(incumbencyEndDate) : nil
+      end
+
+      def current?
+        has_end_date = respond_to?(:incumbencyEndDate)
+
+        !has_end_date
+      end
+
+      def member
+        respond_to?(:incumbencyHasMember) ? incumbencyHasMember.first : nil
+      end
+
+      def contact_points
+        respond_to?(:incumbencyHasContactPoint) ? incumbencyHasContactPoint : []
+      end
+    end
+  end
+end

data/lib/parliament/decorators/party.rb

@@ -1,4 +1,3 @@
-
 module Parliament
   module Decorators
     module Party

data/lib/parliament/decorators/person.rb

@@ -24,16 +24,16 @@ module Parliament
         full_name.rstrip
       end
 
-      def seat_incumbencies
-        respond_to?(:memberHasSeatIncumbency) ? memberHasSeatIncumbency : []
+      def incumbencies
+        respond_to?(:memberHasIncumbency) ? memberHasIncumbency : []
       end
 
       def seats
         return @seats unless @seats.nil?
 
         seats = []
-        seat_incumbencies.each do |seat_incumbency|
-          seats << seat_incumbency.seat
+        incumbencies.each do |incumbency|
+          seats << incumbency.seat if incumbency.respond_to?(:seat)
         end
 
         @seats = seats.flatten.uniq
@@ -87,6 +87,7 @@ module Parliament
       def gender
         gender_identities.empty? ? nil : gender_identities.first.gender
       end
+
     end
   end
 end

data/lib/parliament/decorators/seat_incumbency.rb

@@ -2,23 +2,19 @@ module Parliament
   module Decorators
     module SeatIncumbency
       def start_date
-        respond_to?(:seatIncumbencyStartDate) ? DateTime.parse(seatIncumbencyStartDate) : nil
+        respond_to?(:incumbencyStartDate) ? DateTime.parse(incumbencyStartDate) : nil
       end
 
       def end_date
-        respond_to?(:seatIncumbencyEndDate) ? DateTime.parse(seatIncumbencyEndDate) : nil
+        respond_to?(:incumbencyEndDate) ? DateTime.parse(incumbencyEndDate) : nil
       end
 
       def seat
         respond_to?(:seatIncumbencyHasHouseSeat) ? seatIncumbencyHasHouseSeat.first : nil
       end
 
-      def member
-        respond_to?(:seatIncumbencyHasMember) ? seatIncumbencyHasMember.first : nil
-      end
-
       def current?
-        has_end_date = respond_to?(:seatIncumbencyEndDate)
+        has_end_date = respond_to?(:incumbencyEndDate)
 
         !has_end_date
       end
@@ -32,7 +28,11 @@ module Parliament
       end
 
       def contact_points
-        respond_to?(:seatIncumbencyHasContactPoint) ? seatIncumbencyHasContactPoint : []
+        respond_to?(:incumbencyHasContactPoint) ? incumbencyHasContactPoint : []
+      end
+
+      def member
+        respond_to?(:incumbencyHasMember) ? incumbencyHasMember.first : nil
       end
     end
   end

data/lib/parliament/version.rb

@@ -1,3 +1,3 @@
 module Parliament
-  VERSION = '0.4.1'.freeze
+  VERSION = '0.5.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parliament-ruby
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Matt Rayner
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-28 00:00:00.000000000 Z
+date: 2017-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grom
@@ -149,7 +149,9 @@ files:
 - lib/parliament/decorators/gender.rb
 - lib/parliament/decorators/gender_identity.rb
 - lib/parliament/decorators/house.rb
+- lib/parliament/decorators/house_incumbency.rb
 - lib/parliament/decorators/house_seat.rb
+- lib/parliament/decorators/incumbency.rb
 - lib/parliament/decorators/party.rb
 - lib/parliament/decorators/party_membership.rb
 - lib/parliament/decorators/person.rb