parliament-ruby 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 723becb108a322e281da7b1caf864791ed4707ba
-  data.tar.gz: 26f7be8681949436953d83d45e4fddffb5044149
+  metadata.gz: fbf1462f8c45035775444da6cbb76f8dfd49a905
+  data.tar.gz: 3fc840d1285f95774e4c1d6b7bc496707dd1ed5f
 SHA512:
-  metadata.gz: bdcb1face1f18f79a9acf84c73673bde3aa7df4c1fa1fd279e253d2c891770fc97ddab9c75b4aa9c3c29c2cf92b35886bbfb196077be238cd527f2f06de3dda1
-  data.tar.gz: 2d86fbfdd19c45e0289900aa4381c89d983c11635ecf07ef0dba31640c6493dd4a3bb5b00b1cfd5812945975dd35cf2a3d67a1fb79541d2250474d1c6379d924
+  metadata.gz: 161013d67753e2b47ce04633355047795bad91d3505513c18afe3ba6ba670ac24e94cde0adc6370037de8cc8dfcb4ac7dfc064b706fa29ee8d3a743522fd0b6f
+  data.tar.gz: 0015226bef6ee2c28a9f4908fcb3166422bd28ebe300f9447f3bf2d21e78cdccf7986cfae1e27ee7e1880df14e953c38b7e93790d788afd59eeb438c529cd0df

data/lib/parliament.rb

@@ -1,4 +1,3 @@
-require 'pry'
 require 'net/http'
 require 'grom'
 
@@ -6,6 +5,9 @@ require 'parliament/version'
 require 'parliament/request'
 require 'parliament/response'
 
+# require all the decorators
+Dir[File.join(File.dirname(__FILE__), 'parliament/decorators', '*.rb')].each { |decorator| require decorator }
+
 module Parliament
   # Your code goes here...
 end

data/lib/parliament/decorators/constituency_area.rb

@@ -0,0 +1,17 @@
+module Parliament
+  module Decorators
+    module ConstituencyArea
+      def latitude
+        respond_to?(:constituencyAreaLatitude) ? constituencyAreaLatitude : ''
+      end
+
+      def longitude
+        respond_to?(:constituencyAreaLongitude) ? constituencyAreaLongitude : ''
+      end
+
+      def polygon
+        respond_to?(:constituencyAreaExtent) ? constituencyAreaExtent : ''
+      end
+    end
+  end
+end

data/lib/parliament/decorators/constituency_group.rb

@@ -0,0 +1,58 @@
+module Parliament
+  module Decorators
+    module ConstituencyGroup
+      def name
+        respond_to?(:constituencyGroupName) ? constituencyGroupName : ''
+      end
+
+      def start_date
+        respond_to?(:constituencyGroupStartDate) ? constituencyGroupStartDate : ''
+      end
+
+      def end_date
+        respond_to?(:constituencyGroupEndDate) ? constituencyGroupEndDate : ''
+      end
+
+      def seats
+        respond_to?(:constituencyGroupHasHouseSeat) ? constituencyGroupHasHouseSeat : []
+      end
+
+      def seat_incumbencies
+        return @seat_incumbencies unless @seat_incumbencies.nil?
+
+        seat_incumbencies = []
+        seats.each do |seat|
+          seat_incumbencies << seat.seat_incumbencies
+        end
+
+        @seat_incumbencies = seat_incumbencies.flatten.uniq
+      end
+
+      def members
+        return @members unless @members .nil?
+
+        members = []
+        seat_incumbencies.each do |seat_incumbency|
+          members << seat_incumbency.member
+        end
+
+        @members = members.flatten.uniq
+      end
+
+      def area
+        respond_to?(:constituencyGroupHasConstituencyArea) ? constituencyGroupHasConstituencyArea.first : nil
+      end
+
+      def contact_points
+        return @contact_points unless @contact_points.nil?
+
+        contact_points = []
+        seat_incumbencies.each do |seat_incumbency|
+          contact_points << seat_incumbency.contact_points
+        end
+
+        @contact_points = contact_points.flatten.uniq
+      end
+    end
+  end
+end

data/lib/parliament/decorators/contact_point.rb

@@ -0,0 +1,9 @@
+module Parliament
+  module Decorators
+    module ContactPoint
+      def postal_addresses
+        respond_to?(:contactPointHasPostalAddress) ? contactPointHasPostalAddress : []
+      end
+    end
+  end
+end

data/lib/parliament/decorators/gender.rb

@@ -0,0 +1,9 @@
+module Parliament
+  module Decorators
+    module Gender
+      def name
+        respond_to?(:genderName) ? genderName : ''
+      end
+    end
+  end
+end

data/lib/parliament/decorators/gender_identity.rb

@@ -0,0 +1,9 @@
+module Parliament
+  module Decorators
+    module GenderIdentity
+      def gender
+        respond_to?(:genderIdentityHasGender) ? genderIdentityHasGender.first : nil
+      end
+    end
+  end
+end

data/lib/parliament/decorators/house.rb

@@ -0,0 +1,9 @@
+module Parliament
+  module Decorators
+    module House
+      def name
+        respond_to?(:houseName) ? houseName : ''
+      end
+    end
+  end
+end

data/lib/parliament/decorators/house_seat.rb

@@ -0,0 +1,17 @@
+module Parliament
+  module Decorators
+    module HouseSeat
+      def house
+        respond_to?(:houseSeatHasHouse) ? houseSeatHasHouse.first : nil
+      end
+
+      def constituency
+        respond_to?(:houseSeatHasConstituencyGroup) ? houseSeatHasConstituencyGroup.first : nil
+      end
+
+      def seat_incumbencies
+        respond_to?(:houseSeatHasSeatIncumbency) ? houseSeatHasSeatIncumbency : []
+      end
+    end
+  end
+end

data/lib/parliament/decorators/party.rb

@@ -0,0 +1,14 @@
+
+module Parliament
+  module Decorators
+    module Party
+      def name
+        respond_to?(:partyName) ? partyName : ''
+      end
+
+      def party_memberships
+        respond_to?(:partyHasPartyMembership) ? partyHasPartyMembership : []
+      end
+    end
+  end
+end

data/lib/parliament/decorators/party_membership.rb

@@ -0,0 +1,17 @@
+module Parliament
+  module Decorators
+    module PartyMembership
+      def party
+        respond_to?(:partyMembershipHasParty) ? partyMembershipHasParty.first : nil
+      end
+
+      def start_date
+        respond_to?(:partyMembershipStartDate) ? partyMembershipStartDate : ''
+      end
+
+      def end_date
+        respond_to?(:partyMembershipEndDate) ? partyMembershipEndDate : ''
+      end
+    end
+  end
+end

data/lib/parliament/decorators/person.rb

@@ -0,0 +1,92 @@
+module Parliament
+  module Decorators
+    module Person
+      def given_name
+        respond_to?(:personGivenName) ? personGivenName : ''
+      end
+
+      def family_name
+        respond_to?(:personFamilyName) ? personFamilyName : ''
+      end
+
+      def other_name
+        respond_to?(:personOtherNames) ? personOtherNames : ''
+      end
+
+      def date_of_birth
+        respond_to?(:personDateOfBirth) ? personDateOfBirth : ''
+      end
+
+      def full_name
+        full_name = ''
+        full_name += respond_to?(:personGivenName) ? personGivenName + ' ' : ''
+        full_name += respond_to?(:personFamilyName) ? personFamilyName : ''
+        full_name.rstrip
+      end
+
+      def seat_incumbencies
+        respond_to?(:memberHasSeatIncumbency) ? memberHasSeatIncumbency : []
+      end
+
+      def seats
+        return @seats unless @seats.nil?
+
+        seats = []
+        seat_incumbencies.each do |seat_incumbency|
+          seats << seat_incumbency.seat
+        end
+
+        @seats = seats.flatten.uniq
+      end
+
+      def houses
+        return @houses unless @houses.nil?
+
+        houses = []
+        seats.each do |seat|
+          houses << seat.house
+        end
+
+        @houses = houses.flatten.uniq
+      end
+
+      def constituencies
+        return @constituencies unless @constituencies.nil?
+
+        constituencies = []
+        seats.each do |seat|
+          constituencies << seat.constituency
+        end
+
+        @constituencies = constituencies.flatten.uniq
+      end
+
+      def party_memberships
+        respond_to?(:partyMemberHasPartyMembership) ? partyMemberHasPartyMembership : []
+      end
+
+      def parties
+        return @parties unless @parties.nil?
+
+        parties = []
+        party_memberships.each do |party_membership|
+          parties << party_membership.party
+        end
+
+        @parties = parties.flatten.uniq.compact
+      end
+
+      def contact_points
+        respond_to?(:personHasContactPoint) ? personHasContactPoint : []
+      end
+
+      def gender_identities
+        respond_to?(:personHasGenderIdentity) ? personHasGenderIdentity : []
+      end
+
+      def gender
+        gender_identities.empty? ? nil : gender_identities.first.gender
+      end
+    end
+  end
+end

data/lib/parliament/decorators/postal_address.rb

@@ -0,0 +1,22 @@
+module Parliament
+  module Decorators
+    module PostalAddress
+      def full_address
+        address_array.join(', ')
+      end
+
+      private
+
+      def address_array
+        address_array = []
+        (1..5).each do |i|
+          if respond_to?("addressLine#{i}".to_sym)
+            address_array << instance_variable_get("@addressLine#{i}".to_sym)
+          end
+        end
+        address_array << postCode if respond_to?(:postCode)
+        address_array
+      end
+    end
+  end
+end

data/lib/parliament/decorators/seat_incumbency.rb

@@ -0,0 +1,39 @@
+module Parliament
+  module Decorators
+    module SeatIncumbency
+      def start_date
+        respond_to?(:seatIncumbencyStartDate) ? seatIncumbencyStartDate : ''
+      end
+
+      def end_date
+        respond_to?(:seatIncumbencyEndDate) ? seatIncumbencyEndDate : ''
+      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
+      end
+
+      def house
+        seat.nil? ? nil : seat.house
+      end
+
+      def constituency
+        seat.nil? ? nil : seat.constituency
+      end
+
+      def contact_points
+        respond_to?(:seatIncumbencyHasContactPoint) ? seatIncumbencyHasContactPoint : []
+      end
+    end
+  end
+end

data/lib/parliament/request.rb

@@ -27,7 +27,17 @@ module Parliament
       raise StandardError, 'This is a HTTPClientError' if response.is_a?(Net::HTTPClientError)
       raise StandardError, 'This is a HTTPServerError' if response.is_a?(Net::HTTPServerError)
 
-      Parliament::Response.new(Grom::Reader.new(response.body).objects)
+      objects = Grom::Reader.new(response.body).objects
+      objects.map { |object| assign_decorator(object) }
+
+      Parliament::Response.new(objects)
+    end
+
+    def assign_decorator(object)
+      object_type = Grom::Helper.get_id(object.type)
+      return object unless Parliament::Decorators.constants.include?(object_type.to_sym)
+      decorator_module = Object.const_get("Parliament::Decorators::#{object_type}")
+      object.extend(decorator_module)
     end
 
     private

data/lib/parliament/response.rb

@@ -5,7 +5,7 @@ module Parliament
     include Enumerable
     extend Forwardable
     attr_reader :nodes
-    def_delegators :@nodes, :size, :each, :select, :map, :select!, :map!, :count, :length
+    def_delegators :@nodes, :size, :each, :select, :map, :select!, :map!, :count, :length, :[]
 
     def initialize(nodes)
       @nodes = nodes

data/lib/parliament/version.rb

@@ -1,3 +1,3 @@
 module Parliament
-  VERSION = '0.1.0'.freeze
+  VERSION = '0.2.0'.freeze
 end

data/parliament-ruby.gemspec

@@ -21,15 +21,15 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'grom', '~> 0.2.0'
+  spec.add_dependency 'grom', '~> 0.3.5'
 
   spec.add_development_dependency 'bundler', '~> 1.13'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rubocop', '~> 0.47.1'
-  spec.add_development_dependency 'pry', '~> 0.10.4'
-  spec.add_development_dependency 'pry-nav', '~> 0.2.4'
   spec.add_development_dependency 'simplecov', '~> 0.12.0'
   spec.add_development_dependency 'vcr', '~> 3.0.3'
   spec.add_development_dependency 'webmock', '~> 2.3.2'
+  spec.add_development_dependency 'pry'
+  spec.add_development_dependency 'pry-nav'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parliament-ruby
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Matt Rayner
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-25 00:00:00.000000000 Z
+date: 2017-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grom
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.5
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -81,75 +81,75 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.47.1
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.4
+        version: 0.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.4
+        version: 0.12.0
 - !ruby/object:Gem::Dependency
-  name: pry-nav
+  name: vcr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.4
+        version: 3.0.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.4
+        version: 3.0.3
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 2.3.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 2.3.2
 - !ruby/object:Gem::Dependency
-  name: vcr
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.3
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.3
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: webmock
+  name: pry-nav
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.2
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.2
+        version: '0'
 description: Internal parliamentary data API wrapper for ruby
 email:
 - mattrayner1@gmail.com
@@ -157,7 +157,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".bash_profile"
 - ".gitignore"
 - ".hound.yml"
 - ".rspec"
@@ -172,6 +171,18 @@ files:
 - bin/console
 - bin/setup
 - lib/parliament.rb
+- lib/parliament/decorators/constituency_area.rb
+- lib/parliament/decorators/constituency_group.rb
+- lib/parliament/decorators/contact_point.rb
+- lib/parliament/decorators/gender.rb
+- lib/parliament/decorators/gender_identity.rb
+- lib/parliament/decorators/house.rb
+- lib/parliament/decorators/house_seat.rb
+- lib/parliament/decorators/party.rb
+- lib/parliament/decorators/party_membership.rb
+- lib/parliament/decorators/person.rb
+- lib/parliament/decorators/postal_address.rb
+- lib/parliament/decorators/seat_incumbency.rb
 - lib/parliament/request.rb
 - lib/parliament/response.rb
 - lib/parliament/version.rb
@@ -196,7 +207,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Internal parliamentary data API wrapper for ruby

data/.bash_profile

@@ -1 +0,0 @@
-alias be='bundle exec'