parliament-ruby 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fbf1462f8c45035775444da6cbb76f8dfd49a905
-  data.tar.gz: 3fc840d1285f95774e4c1d6b7bc496707dd1ed5f
+  metadata.gz: ff75c94a11fda9a042d4060e4f3c783f69bbed88
+  data.tar.gz: b71eaa4c8b334182313f055214c33956c7f9e01f
 SHA512:
-  metadata.gz: 161013d67753e2b47ce04633355047795bad91d3505513c18afe3ba6ba670ac24e94cde0adc6370037de8cc8dfcb4ac7dfc064b706fa29ee8d3a743522fd0b6f
-  data.tar.gz: 0015226bef6ee2c28a9f4908fcb3166422bd28ebe300f9447f3bf2d21e78cdccf7986cfae1e27ee7e1880df14e953c38b7e93790d788afd59eeb438c529cd0df
+  metadata.gz: 30c5a0245be4f796d5bb21366d83026f0b3d66eb26848d2d38e15919fd0727cd1e9e95a966fc7ea18d0e191bd964f919f766e89821eb63e1d26688580f0af29c
+  data.tar.gz: 2a7e5c955c09ce45f9e792edf9f066dbee83614cdca78dec5f7fa9467d987a69045cc4d4d16cdec91cb90b545ddda6e9c084c2390002c137f17eb70ae8e3c57d

data/.rubocop.yml

@@ -53,5 +53,5 @@ AllCops:
   Exclude:
     - '*.gemspec'
     - 'vendor/**/*'
-    - 'spec/fixtures/**/*'
+    - 'spec/**/*'
     - 'tmp/**/*'

data/lib/parliament/decorators/contact_point.rb

@@ -4,6 +4,22 @@ module Parliament
       def postal_addresses
         respond_to?(:contactPointHasPostalAddress) ? contactPointHasPostalAddress : []
       end
+
+      def email
+        instance_variable_get('@email'.to_sym).nil? ? '' : instance_variable_get('@email'.to_sym)
+      end
+
+      def phone_number
+        respond_to?(:phoneNumber) ? phoneNumber : ''
+      end
+
+      def fax_number
+        respond_to?(:faxNumber) ? faxNumber : ''
+      end
+
+      def person
+        respond_to?(:contactPointHasPerson) ? contactPointHasPerson : []
+      end
     end
   end
 end

data/lib/parliament/decorators/house.rb

@@ -4,6 +4,21 @@ module Parliament
       def name
         respond_to?(:houseName) ? houseName : ''
       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 seats
+        respond_to?(:houseHasHouseSeat) ? houseHasHouseSeat : []
+      end
     end
   end
 end

data/lib/parliament/decorators/party_membership.rb

@@ -6,11 +6,11 @@ module Parliament
       end
 
       def start_date
-        respond_to?(:partyMembershipStartDate) ? partyMembershipStartDate : ''
+        respond_to?(:partyMembershipStartDate) ? DateTime.parse(partyMembershipStartDate) : nil
       end
 
       def end_date
-        respond_to?(:partyMembershipEndDate) ? partyMembershipEndDate : ''
+        respond_to?(:partyMembershipEndDate) ? DateTime.parse(partyMembershipEndDate) : nil
       end
     end
   end

data/lib/parliament/decorators/person.rb

@@ -14,7 +14,7 @@ module Parliament
       end
 
       def date_of_birth
-        respond_to?(:personDateOfBirth) ? personDateOfBirth : ''
+        respond_to?(:personDateOfBirth) ? DateTime.parse(personDateOfBirth) : nil
       end
 
       def full_name

data/lib/parliament/decorators/seat_incumbency.rb

@@ -2,11 +2,11 @@ module Parliament
   module Decorators
     module SeatIncumbency
       def start_date
-        respond_to?(:seatIncumbencyStartDate) ? seatIncumbencyStartDate : ''
+        respond_to?(:seatIncumbencyStartDate) ? DateTime.parse(seatIncumbencyStartDate) : nil
       end
 
       def end_date
-        respond_to?(:seatIncumbencyEndDate) ? seatIncumbencyEndDate : ''
+        respond_to?(:seatIncumbencyEndDate) ? DateTime.parse(seatIncumbencyEndDate) : nil
       end
 
       def seat

data/lib/parliament/no_content_error.rb

@@ -0,0 +1,9 @@
+module Parliament
+  class NoContentError < StandardError
+    attr_reader :message
+
+    def initialize
+      @message = 'No content'
+    end
+  end
+end

data/lib/parliament/request.rb

@@ -22,17 +22,38 @@ module Parliament
     end
 
     def get
-      response = Net::HTTP.get_response(URI(api_endpoint))
+      net_response = Net::HTTP.get_response(URI(api_endpoint))
 
-      raise StandardError, 'This is a HTTPClientError' if response.is_a?(Net::HTTPClientError)
-      raise StandardError, 'This is a HTTPServerError' if response.is_a?(Net::HTTPServerError)
+      handle_errors(net_response)
+
+      build_parliament_response(net_response)
+    end
 
+    def build_parliament_response(response)
       objects = Grom::Reader.new(response.body).objects
       objects.map { |object| assign_decorator(object) }
 
       Parliament::Response.new(objects)
     end
 
+    def handle_errors(response)
+      handle_not_found_error(response)
+      handle_server_error(response)
+      handle_no_content_error(response)
+    end
+
+    def handle_server_error(response)
+      raise StandardError, 'This is a HTTPServerError' if response.is_a?(Net::HTTPServerError)
+    end
+
+    def handle_not_found_error(response)
+      raise StandardError, 'This is a HTTPClientError' if response.is_a?(Net::HTTPClientError)
+    end
+
+    def handle_no_content_error(response)
+      raise Parliament::NoContentError if response.code == '204'
+    end
+
     def assign_decorator(object)
       object_type = Grom::Helper.get_id(object.type)
       return object unless Parliament::Decorators.constants.include?(object_type.to_sym)

data/lib/parliament/response.rb

@@ -21,9 +21,18 @@ module Parliament
         end
       end
 
+      result = build_responses(filtered_objects)
+
+      types.size == 1 ? result.first : result
+    end
+
+    def build_responses(filtered_objects)
+      result = []
+
       filtered_objects.each do |objects|
-        Parliament::Response.new(objects)
+        result << Parliament::Response.new(objects)
       end
+      result
     end
   end
 end

data/lib/parliament/version.rb

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

data/lib/parliament.rb

@@ -4,6 +4,7 @@ require 'grom'
 require 'parliament/version'
 require 'parliament/request'
 require 'parliament/response'
+require 'parliament/no_content_error'
 
 # require all the decorators
 Dir[File.join(File.dirname(__FILE__), 'parliament/decorators', '*.rb')].each { |decorator| require decorator }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parliament-ruby
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Matt Rayner
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-08 00:00:00.000000000 Z
+date: 2017-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grom
@@ -183,6 +183,7 @@ files:
 - lib/parliament/decorators/person.rb
 - lib/parliament/decorators/postal_address.rb
 - lib/parliament/decorators/seat_incumbency.rb
+- lib/parliament/no_content_error.rb
 - lib/parliament/request.rb
 - lib/parliament/response.rb
 - lib/parliament/version.rb