parliament-ruby 0.6.3 → 0.7.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 581a69e9850b75eef39d684fd40f5347ebcf8bb1
-  data.tar.gz: f28f46585c4dc4cfd9f14735918804e184367d4f
+  metadata.gz: 1d6e3ce9cb153b579936aca384cbdb8f73d1c824
+  data.tar.gz: 8ab2872d2a93301be8420d3ba7815ef809a855c4
 SHA512:
-  metadata.gz: 5e1f64b23a425ee4e1b9c4a816eeb1f583a7c84a382010b0da35c6ef2dfcb5fc5ea0fc5a4bb23764b8b50650edcb5985b718e918bca9b3192137543930d9217c
-  data.tar.gz: '08882fbca6ac37527cd83420cb0a6d1a8bbf120db74e73ebdc8114548b40110d988948fdeaf37c97e803f5d791adf15d81d0cf8a7813080462cfe6b9d9c35cc8'
+  metadata.gz: a7ba819f59a91286db8a2dd132b1b61d590e057ba93347da04692c87d0d10da37f03b9beeeda90aed8b18adf19871ecae6052da1eec46b2696166fd989b5ca8f
+  data.tar.gz: 18aa6d056e56843c7d08456d6b3a3b78dcdeeeac8ab2aecd78ded20b5ae785d80095755c607daa110663db61a9e0bab81ae9e2b65a16bdbbe67d379484af3f60

data/Gemfile

@@ -5,3 +5,6 @@ gemspec
 
 # Include coveralls for CI coverage reports
 gem 'coveralls', require: false
+
+gem 'pry'
+gem 'rb-readline'

data/lib/parliament/builder/base_response_builder.rb

@@ -0,0 +1,13 @@
+module Parliament
+  module Builder
+    class BaseResponseBuilder
+      def initialize(response)
+        @response = response
+      end
+
+      def build
+        @response
+      end
+    end
+  end
+end

data/lib/parliament/builder/ntriple_response_builder.rb

@@ -0,0 +1,25 @@
+module Parliament
+  module Builder
+    class NTripleResponseBuilder < Parliament::Builder::BaseResponseBuilder
+      def build
+        objects = Grom::Reader.new(@response.body).objects
+        objects.map { |object| assign_decorator(object) }
+
+        Parliament::Response.new(objects)
+      end
+
+      private
+
+      def assign_decorator(object)
+        return object unless object.respond_to?(:type)
+
+        object_type = Grom::Helper.get_id(object.type)
+
+        return object unless Parliament::Decorator.constants.include?(object_type.to_sym)
+
+        decorator_module = Object.const_get("Parliament::Decorator::#{object_type}")
+        object.extend(decorator_module)
+      end
+    end
+  end
+end

data/lib/parliament/builder/open_search_response_builder.rb

@@ -0,0 +1,17 @@
+require 'feedjira'
+
+module Parliament
+  module Builder
+    class OpenSearchResponseBuilder < Parliament::Builder::BaseResponseBuilder
+      OPEN_SEARCH_ELEMENTS = %w(totalResults Query startIndex itemsPerPage).freeze
+
+      def build
+        OPEN_SEARCH_ELEMENTS.each do |element|
+          Feedjira::Feed.add_common_feed_element(element)
+        end
+
+        Feedjira::Feed.parse(@response.body)
+      end
+    end
+  end
+end

data/lib/parliament/builder.rb

@@ -0,0 +1,5 @@
+module Parliament
+  module Builder
+    Dir[File.join(File.dirname(__FILE__), '../parliament/builder', '*.rb')].each { |builder| require builder }
+  end
+end

data/lib/parliament/decorator/constituency_group.rb

@@ -13,14 +13,14 @@ module Parliament
       #
       # @return [DateTime, nil] the start date of the Grom::Node or nil.
       def start_date
-        respond_to?(:constituencyGroupStartDate) ? DateTime.parse(constituencyGroupStartDate) : nil
+        @start_date ||= respond_to?(:constituencyGroupStartDate) ? DateTime.parse(constituencyGroupStartDate) : nil
       end
 
       # Alias constituencyGroupEndDate with fallback.
       #
       # @return [DateTime, nil] the end date of the Grom::Node or nil.
       def end_date
-        respond_to?(:constituencyGroupEndDate) ? DateTime.parse(constituencyGroupEndDate) : nil
+        @end_date ||= respond_to?(:constituencyGroupEndDate) ? DateTime.parse(constituencyGroupEndDate) : nil
       end
 
       # Alias constituencyGroupHasHouseSeat with fallback.

data/lib/parliament/decorator/house_incumbency.rb

@@ -6,23 +6,21 @@ module Parliament
       #
       # @return [DateTime, nil] the start date of the Grom::Node or nil.
       def start_date
-        respond_to?(:incumbencyStartDate) ? DateTime.parse(incumbencyStartDate) : nil
+        @start_date ||= respond_to?(:incumbencyStartDate) ? DateTime.parse(incumbencyStartDate) : nil
       end
 
       # Alias incumbencyEndDate with fallback.
       #
       # @return [DateTime, nil] the end date of the Grom::Node or nil.
       def end_date
-        respond_to?(:incumbencyEndDate) ? DateTime.parse(incumbencyEndDate) : nil
+        @end_date ||= respond_to?(:incumbencyEndDate) ? DateTime.parse(incumbencyEndDate) : nil
       end
 
       # Checks if Grom::Node has an end date.
       #
       # @return [Boolean] a boolean depending on whether or not the Grom::Node has an end date.
       def current?
-        has_end_date = respond_to?(:incumbencyEndDate)
-
-        !has_end_date
+        end_date.nil?
       end
 
       # Alias houseIncumbencyHasHouse with fallback.

data/lib/parliament/decorator/incumbency.rb

@@ -6,23 +6,21 @@ module Parliament
       #
       # @return [DateTime, nil] the start date of the Grom::Node or nil.
       def start_date
-        respond_to?(:incumbencyStartDate) ? DateTime.parse(incumbencyStartDate) : nil
+        @start_date ||= respond_to?(:incumbencyStartDate) ? DateTime.parse(incumbencyStartDate) : nil
       end
 
       # Alias incumbencyEndDate with fallback.
       #
       # @return [DateTime, nil] the end date of the Grom::Node or nil.
       def end_date
-        respond_to?(:incumbencyEndDate) ? DateTime.parse(incumbencyEndDate) : nil
+        @end_date ||= respond_to?(:incumbencyEndDate) ? DateTime.parse(incumbencyEndDate) : nil
       end
 
       # Checks if Grom::Node has an end date.
       #
       # @return [Boolean] a boolean depending on whether or not the Grom::Node has an end date.
       def current?
-        has_end_date = respond_to?(:incumbencyEndDate)
-
-        !has_end_date
+        end_date.nil?
       end
 
       # Alias incumbencyHasMember with fallback.

data/lib/parliament/decorator/party_membership.rb

@@ -13,23 +13,21 @@ module Parliament
       #
       # @return [DateTime, nil] the start date of the Grom::Node or nil.
       def start_date
-        respond_to?(:partyMembershipStartDate) ? DateTime.parse(partyMembershipStartDate) : nil
+        @start_date ||= respond_to?(:partyMembershipStartDate) ? DateTime.parse(partyMembershipStartDate) : nil
       end
 
       # Alias partyMembershipEndDate with fallback.
       #
       # @return [DateTime, nil] the end date of the Grom::Node or nil.
       def end_date
-        respond_to?(:partyMembershipEndDate) ? DateTime.parse(partyMembershipEndDate) : nil
+        @end_date ||= respond_to?(:partyMembershipEndDate) ? DateTime.parse(partyMembershipEndDate) : nil
       end
 
       # Checks if Grom::Node has an end date.
       #
       # @return [Boolean] a boolean depending on whether or not the Grom::Node has an end date.
       def current?
-        has_end_date = respond_to?(:partyMembershipEndDate)
-
-        !has_end_date
+        end_date.nil?
       end
     end
   end

data/lib/parliament/decorator/person.rb

@@ -28,17 +28,20 @@ module Parliament
       #
       # @return [DateTime, nil] the date of birth of the Grom::Node or nil.
       def date_of_birth
-        respond_to?(:personDateOfBirth) ? DateTime.parse(personDateOfBirth) : nil
+        @date_of_birth ||= respond_to?(:personDateOfBirth) ? DateTime.parse(personDateOfBirth) : nil
       end
 
       # Builds a full name using personGivenName and personFamilyName.
       #
       # @return [String, String] the full name of the Grom::Node or an empty string.
       def full_name
-        full_name = ''
-        full_name += respond_to?(:personGivenName) ? personGivenName + ' ' : ''
-        full_name += respond_to?(:personFamilyName) ? personFamilyName : ''
-        full_name.rstrip
+        return @full_name unless @full_name.nil?
+
+        full_name = []
+        full_name << personGivenName if respond_to?(:personGivenName)
+        full_name << personFamilyName if respond_to?(:personFamilyName)
+
+        @full_name = full_name.join(' ')
       end
 
       # Alias memberHasIncumbency with fallback.
@@ -52,68 +55,35 @@ module Parliament
       #
       # @return [Array, Array] the seat incumbencies of the Grom::Node or an empty array.
       def seat_incumbencies
-        if respond_to?(:memberHasIncumbency)
-          memberHasIncumbency.select { |inc| inc.type == 'http://id.ukpds.org/schema/SeatIncumbency' }
-        else
-          []
-        end
+        @seat_incumbencies ||= incumbencies.select { |inc| inc.type == 'http://id.ukpds.org/schema/SeatIncumbency' }
       end
 
       # Alias memberHasIncumbency with fallback.
       #
       # @return [Array, Array] the house incumbencies of the Grom::Node or an empty array.
       def house_incumbencies
-        if respond_to?(:memberHasIncumbency)
-          memberHasIncumbency.select { |inc| inc.type == 'http://id.ukpds.org/schema/HouseIncumbency' }
-        else
-          []
-        end
+        @house_incumbencies ||= incumbencies.select { |inc| inc.type == 'http://id.ukpds.org/schema/HouseIncumbency' }
       end
 
       # Alias seatIncumbencyHasHouseSeat with fallback.
       #
       # @return [Array, Array] the seats of the Grom::Node or an empty array.
       def seats
-        return @seats unless @seats.nil?
-
-        seats = []
-        seat_incumbencies.each do |incumbency|
-          seats << incumbency.seat if incumbency.respond_to?(:seat)
-        end
-
-        @seats = seats.flatten.uniq
+        @seats ||= seat_incumbencies.map(&:seat).flatten.uniq
       end
 
       # Alias houseSeatHasHouse with fallback.
       #
       # @return [Array, Array] the houses of the Grom::Node or an empty array.
       def houses
-        return @houses unless @houses.nil?
-
-        houses = []
-        seats.each do |seat|
-          houses << seat.house
-        end
-
-        house_incumbencies.each do |inc|
-          houses << inc.house
-        end
-
-        @houses = houses.flatten.uniq
+        @houses ||= [seats.map(&:house), house_incumbencies.map(&:house)].flatten.uniq
       end
 
       # Alias houseSeatHasConstituencyGroup with fallback.
       #
       # @return [Array, Array] the constituencies of the Grom::Node or an empty array.
       def constituencies
-        return @constituencies unless @constituencies.nil?
-
-        constituencies = []
-        seats.each do |seat|
-          constituencies << seat.constituency
-        end
-
-        @constituencies = constituencies.flatten.uniq
+        @constituencies ||= seats.map(&:constituency).flatten.uniq
       end
 
       # Alias partyMemberHasPartyMembership with fallback.
@@ -127,14 +97,7 @@ module Parliament
       #
       # @return [Array, Array] the parties of the Grom::Node or an empty array.
       def parties
-        return @parties unless @parties.nil?
-
-        parties = []
-        party_memberships.each do |party_membership|
-          parties << party_membership.party
-        end
-
-        @parties = parties.flatten.uniq.compact
+        @parties ||= party_memberships.map(&:party).flatten.uniq.compact
       end
 
       # Alias personHasContactPoint with fallback.
@@ -203,6 +166,7 @@ module Parliament
         build_house_membership_status(no_current_seat_incumbency, no_current_house_incumbency, former_lord, former_mp)
       end
 
+      # TODO: Convert hard-coded strings to language file values
       def build_house_membership_status(no_current_seat_incumbency, no_current_house_incumbency, former_lord, former_mp)
         statuses = []
         statuses << 'Current MP' unless no_current_seat_incumbency

data/lib/parliament/decorator/seat_incumbency.rb

@@ -23,13 +23,18 @@ module Parliament
         respond_to?(:seatIncumbencyHasHouseSeat) ? seatIncumbencyHasHouseSeat.first : nil
       end
 
-      # Checks if Grom::Node has an end date.
+      # Checks if Grom::Node has no end date.
       #
       # @return [Boolean] a boolean depending on whether or not the Grom::Node has an end date.
       def current?
-        has_end_date = respond_to?(:incumbencyEndDate)
+        !former?
+      end
 
-        !has_end_date
+      # Checks if Grom::Node has an end date.
+      #
+      # @return [Boolean] a boolean depending on whether or not the Grom::Node has an end date.
+      def former?
+        respond_to?(:incumbencyEndDate)
       end
 
       # Alias houseSeatHasHouse with fallback.

data/lib/parliament/request/base_request.rb

@@ -0,0 +1,136 @@
+module Parliament
+  module Request
+    class BaseRequest
+      attr_reader :base_url, :headers
+      # Creates a new instance of Parliament::Request.
+      #
+      # An interesting note for #initialize is that setting base_url on the class, or using the environment variable
+      # PARLIAMENT_BASE_URL means you don't need to pass in a base_url. You can pass one anyway to override the
+      # environment variable or class parameter.  Similarly, headers can be set by either settings the headers on the class, or passing headers in.
+      #
+      # @example Setting the base_url on the class
+      #   Parliament::Request.base_url = 'http://example.com'
+      #
+      #   Parliament::Request.new.base_url #=> 'http://example.com'
+      #
+      # @example Setting the base_url via environment variable
+      #   ENV['PARLIAMENT_BASE_URL'] #=> 'http://test.com'
+      #
+      #   Parliament::Request.new.base_url #=> 'http://test.com'
+      #
+      # @example Setting the base_url via a parameter
+      #   Parliament::Request.base_url #=> nil
+      #   ENV['PARLIAMENT_BASE_URL'] #=> nil
+      #
+      #   Parliament::Request.new(base_url: 'http://example.com').base_url #=> 'http://example.com'
+      #
+      # @example Overriding the base_url via a parameter
+      #   ENV['PARLIAMENT_BASE_URL'] #=> 'http://test.com'
+      #
+      #   Parliament::Request.new(base_url: 'http://example.com').base_url #=> 'http://example.com'
+      #
+      # @example Setting the headers on the class
+      #   Parliament::Request.headers = { 'Accept' => 'Test' }
+      #
+      #   Parliament::Request.new.headers #=> '{ 'Accept' => 'Test' }
+      #
+      # @example Setting the headers via a parameter
+      #   Parliament::Request.headers #=> nil
+      #
+      #   Parliament::Request.new(headers: '{ 'Accept' => 'Test' }).headers #=> { 'Accept' => 'Test' }
+      #
+      # @example Overriding the headers via a parameter
+      #   Parliament::Request.headers = { 'Accept' => 'Test' }
+      #
+      #   Parliament::Request.new(headers: '{ 'Accept' => 'Test2' }).headers #=> { 'Accept' => 'Test2' }
+      #
+      # @param [String] base_url the base url of our api. (expected: http://example.com - without the trailing slash).
+      # @param [Hash] headers the headers being sent in the request.
+      def initialize(base_url: nil, headers: nil, builder: nil)
+        @base_url = base_url || self.class.base_url
+        @headers = headers || self.class.headers || {}
+        @builder = builder || Parliament::Builder::BaseResponseBuilder
+      end
+
+      # Using our url built via #method_missing, make a HTTP GET request and process results into a response.
+      #
+      # @example HTTP GET request
+      #   request = Parliament::Request.new(base_url: 'http://example.com')
+      #
+      #   # url: http://example.com/people/123456
+      #   response = request.people('123456').get #=> #<Parliament::Response ...>
+      #
+      # @example HTTP GET request with URI encoded form values
+      #   request = Parliament::Request.new(base_url: 'http://example.com')
+      #
+      #   # url: http://example.com/people/current?limit=10&page=4&lang=en-gb
+      #   response = request.people.current.get({ limit: 10, page: 4, lang: 'en-gb' }) #=> #<Parliament::Response ...>
+      #
+      # @raise [Parliament::ServerError] when the server responds with a 5xx status code.
+      # @raise [Parliament::ClientError] when the server responds with a 4xx status code.
+      # @raise [Parliament::NoContentResponseError] when the server responds with a 204 status code.
+      #
+      # @param [Hash] params (optional) additional URI encoded form values to be added to the URI.
+      #
+      # @return [Parliament::Response] a Parliament::Response object containing all of the nodes returned from the URL.
+      def get(params: nil)
+        endpoint_uri = URI.parse(query_url)
+        endpoint_uri.query = URI.encode_www_form(params.to_a) unless params.nil?
+
+        http = Net::HTTP.new(endpoint_uri.host, endpoint_uri.port)
+        http.use_ssl = true if endpoint_uri.scheme == 'https'
+
+        net_response = http.start do |h|
+          api_request = Net::HTTP::Get.new(endpoint_uri.request_uri)
+          add_headers(api_request)
+
+          h.request api_request
+        end
+
+        handle_errors(net_response)
+
+        build_response(net_response)
+      end
+
+      private
+
+      # @attr [String] base_url the base url of our api. (expected: http://example.com - without the trailing slash).
+      # @attr [Hash] headers the headers being sent in the request.
+      class << self
+        attr_accessor :base_url, :headers
+      end
+
+      def build_response(net_response)
+        @builder.new(net_response).build
+      end
+
+      def query_url
+        @base_url
+      end
+
+      def default_headers
+        { 'Accept' => 'application/n-triples' }
+      end
+
+      def add_headers(request)
+        headers = default_headers.merge(@headers)
+        headers.each do |key, value|
+          request.add_field(key, value)
+        end
+      end
+
+      def handle_errors(response)
+        case response
+        when Net::HTTPSuccess # 2xx Status
+          exception_class = Parliament::NoContentResponseError if response.code == '204'
+        when Net::HTTPClientError # 4xx Status
+          exception_class = Parliament::ClientError
+        when Net::HTTPServerError # 5xx Status
+          exception_class = Parliament::ServerError
+        end
+
+        raise exception_class.new(query_url, response) if exception_class
+      end
+    end
+  end
+end

data/lib/parliament/request/open_search_request.rb

@@ -0,0 +1,73 @@
+module Parliament
+  module Request
+    class OpenSearchRequest < Parliament::Request::BaseRequest
+      OPEN_SEARCH_PARAMETERS = {
+          count:            10,
+          start_index:      1,
+          start_page:       1,
+          language:         '*',
+          output_encoding:  'UTF-8',
+          input_encoding:   'UTF-8'
+      }.freeze
+
+      def initialize(base_url: nil, headers: nil, builder: nil)
+        @base_url = Parliament::Request::OpenSearchRequest.get_description(base_url) || self.class.base_url || ENV['OPENSEARCH_DESCRIPTION_URL']
+        @open_search_parameters = self.class.open_search_parameters
+
+        super(base_url: @base_url, headers: headers, builder: builder)
+      end
+
+      def get(search_params, params: nil)
+        setup_query_url(search_params)
+
+        super(params: params)
+      end
+
+      private
+
+      class << self
+        attr_reader :base_url, :open_search_parameters
+
+        def base_url=(base_url)
+          @base_url = get_description(base_url)
+        end
+
+        def open_search_parameters
+          OPEN_SEARCH_PARAMETERS.dup
+        end
+
+        def get_description(url)
+          return if url.nil?
+
+          request = Parliament::Request::BaseRequest.new(base_url: url,
+                                                         headers: { 'Accept' => 'application/opensearchdescription+xml' })
+          xml_response = request.get
+
+          xml_root = REXML::Document.new(xml_response.body).root
+          xml_root.elements['Url'].attributes['template']
+        end
+      end
+
+      def query_url
+        @query_url
+      end
+
+      def setup_query_url(search_params)
+        search_terms = search_params[:query]
+        query_url = @base_url.dup
+        query_url.gsub!('{searchTerms}', search_terms)
+
+        @open_search_parameters.each do |key, value|
+          camel_case_key = ActiveSupport::Inflector.camelize(key.to_s, false)
+          if search_params.keys.include?(key)
+            query_url.gsub!("{#{camel_case_key}?}", search_params[key].to_s)
+          else
+            query_url.gsub!("{#{camel_case_key}?}", value.to_s)
+          end
+        end
+
+        @query_url = query_url
+      end
+    end
+  end
+end

data/lib/parliament/request/url_request.rb

@@ -0,0 +1,60 @@
+module Parliament
+  module Request
+    class UrlRequest < Parliament::Request::BaseRequest
+      def initialize(base_url: nil, headers: nil, builder: nil)
+        @endpoint_parts = []
+        base_url ||= ENV['PARLIAMENT_BASE_URL']
+
+        super
+      end
+
+      # Overrides ruby's method_missing to allow creation of URLs through method calls.
+      #
+      # @example Adding a simple URL part
+      #   request = Parliament::Request.new(base_url: 'http://example.com')
+      #
+      #   # url: http://example.com/people
+      #   request.people
+      #
+      # @example Adding a simple URL part with parameters
+      #   request = Parliament::Request.new(base_url: 'http://example.com')
+      #
+      #   # url: http://example.com/people/123456
+      #   request.people('123456')
+      #
+      # @example Chaining URL parts and using hyphens
+      #   request = Parliament::Request.new(base_url: 'http://example.com')
+      #
+      #   # url: http://example.com/people/123456/foo/bar/hello-world/7890
+      #   request.people('123456').foo.bar('hello-world', '7890')
+      #
+      # @param [Symbol] method the 'method' (url part) we are processing.
+      # @param [Array<Object>] params parameters passed to the specified method (url part).
+      # @param [Block] block additional block (kept for compatibility with method_missing API).
+      #
+      # @return [Parliament::Request] self.
+      def method_missing(method, *params, &block)
+        @endpoint_parts << method.to_s
+        @endpoint_parts << params
+        @endpoint_parts = @endpoint_parts.flatten!
+
+        block&.call
+
+        self || super
+      end
+
+      # This class always responds to method calls, even those missing. Therefore, respond_to_missing? always returns true.
+      #
+      # @return [Boolean] always returns true.
+      def respond_to_missing?(_, _ = false)
+        true # responds to everything, always
+      end
+
+      private
+
+      def query_url
+        [@base_url, @endpoint_parts].join('/')
+      end
+    end
+  end
+end

data/lib/parliament/request.rb

@@ -6,193 +6,7 @@ module Parliament
   #
   # @attr_reader [String] base_url the base url of our api. (expected: http://example.com - without the trailing slash).
   # @attr_reader [Hash] headers the headers being sent in the request.
-  class Request
-    attr_reader :base_url, :headers
-
-    # Creates a new instance of Parliament::Request.
-    #
-    # An interesting note for #initialize is that setting base_url on the class, or using the environment variable
-    # PARLIAMENT_BASE_URL means you don't need to pass in a base_url. You can pass one anyway to override the
-    # environment variable or class parameter.  Similarly, headers can be set by either settings the headers on the class, or passing headers in.
-    #
-    # @example Setting the base_url on the class
-    #   Parliament::Request.base_url = 'http://example.com'
-    #
-    #   Parliament::Request.new.base_url #=> 'http://example.com'
-    #
-    # @example Setting the base_url via environment variable
-    #   ENV['PARLIAMENT_BASE_URL'] #=> 'http://test.com'
-    #
-    #   Parliament::Request.new.base_url #=> 'http://test.com'
-    #
-    # @example Setting the base_url via a parameter
-    #   Parliament::Request.base_url #=> nil
-    #   ENV['PARLIAMENT_BASE_URL'] #=> nil
-    #
-    #   Parliament::Request.new(base_url: 'http://example.com').base_url #=> 'http://example.com'
-    #
-    # @example Overriding the base_url via a parameter
-    #   ENV['PARLIAMENT_BASE_URL'] #=> 'http://test.com'
-    #
-    #   Parliament::Request.new(base_url: 'http://example.com').base_url #=> 'http://example.com'
-    #
-    # @example Setting the headers on the class
-    #   Parliament::Request.headers = { 'Accept' => 'Test' }
-    #
-    #   Parliament::Request.new.headers #=> '{ 'Accept' => 'Test' }
-    #
-    # @example Setting the headers via a parameter
-    #   Parliament::Request.headers #=> nil
-    #
-    #   Parliament::Request.new(headers: '{ 'Accept' => 'Test' }).headers #=> { 'Accept' => 'Test' }
-    #
-    # @example Overriding the headers via a parameter
-    #   Parliament::Request.headers = { 'Accept' => 'Test' }
-    #
-    #   Parliament::Request.new(headers: '{ 'Accept' => 'Test2' }).headers #=> { 'Accept' => 'Test2' }
-    #
-    # @param [String] base_url the base url of our api. (expected: http://example.com - without the trailing slash).
-    # @param [Hash] headers the headers being sent in the request.
-    def initialize(base_url: nil, headers: nil)
-      @endpoint_parts = []
-      @base_url = base_url || self.class.base_url || ENV['PARLIAMENT_BASE_URL']
-      @headers = headers || self.class.headers || {}
-    end
-
-    # Overrides ruby's method_missing to allow creation of URLs through method calls.
-    #
-    # @example Adding a simple URL part
-    #   request = Parliament::Request.new(base_url: 'http://example.com')
-    #
-    #   # url: http://example.com/people
-    #   request.people
-    #
-    # @example Adding a simple URL part with parameters
-    #   request = Parliament::Request.new(base_url: 'http://example.com')
-    #
-    #   # url: http://example.com/people/123456
-    #   request.people('123456')
-    #
-    # @example Chaining URL parts and using hyphens
-    #   request = Parliament::Request.new(base_url: 'http://example.com')
-    #
-    #   # url: http://example.com/people/123456/foo/bar/hello-world/7890
-    #   request.people('123456').foo.bar('hello-world', '7890')
-    #
-    # @param [Symbol] method the 'method' (url part) we are processing.
-    # @param [Array<Object>] params parameters passed to the specified method (url part).
-    # @param [Block] block additional block (kept for compatibility with method_missing API).
-    #
-    # @return [Parliament::Request] self.
-    def method_missing(method, *params, &block)
-      @endpoint_parts << method.to_s
-      @endpoint_parts << params
-      @endpoint_parts = @endpoint_parts.flatten!
-
-      block&.call
-
-      self || super
-    end
-
-    # This class always responds to method calls, even those missing. Therefore, respond_to_missing? always returns true.
-    #
-    # @return [Boolean] always returns true.
-    def respond_to_missing?(_, _ = false)
-      true # responds to everything, always
-    end
-
-    # Using our url built via #method_missing, make a HTTP GET request and process results into a response.
-    #
-    # @example HTTP GET request
-    #   request = Parliament::Request.new(base_url: 'http://example.com')
-    #
-    #   # url: http://example.com/people/123456
-    #   response = request.people('123456').get #=> #<Parliament::Response ...>
-    #
-    # @example HTTP GET request with URI encoded form values
-    #   request = Parliament::Request.new(base_url: 'http://example.com')
-    #
-    #   # url: http://example.com/people/current?limit=10&page=4&lang=en-gb
-    #   response = request.people.current.get({ limit: 10, page: 4, lang: 'en-gb' }) #=> #<Parliament::Response ...>
-    #
-    # @raise [Parliament::ServerError] when the server responds with a 5xx status code.
-    # @raise [Parliament::ClientError] when the server responds with a 4xx status code.
-    # @raise [Parliament::NoContentResponseError] when the server responds with a 204 status code.
-    #
-    # @param [Hash] params (optional) additional URI encoded form values to be added to the URI.
-    #
-    # @return [Parliament::Response] a Parliament::Response object containing all of the nodes returned from the URL.
-    def get(params: nil)
-      endpoint_uri = URI.parse(api_endpoint)
-      endpoint_uri.query = URI.encode_www_form(params.to_a) unless params.nil?
-
-      http = Net::HTTP.new(endpoint_uri.host, endpoint_uri.port)
-      http.use_ssl = true if endpoint_uri.scheme == 'https'
-
-      net_response = http.start do |h|
-        api_request = Net::HTTP::Get.new(endpoint_uri.request_uri)
-        add_headers(api_request)
-
-        h.request api_request
-      end
-
-      handle_errors(net_response)
-
-      build_parliament_response(net_response)
-    end
-
-    private
-
-    # @attr [String] base_url the base url of our api. (expected: http://example.com - without the trailing slash).
-    # @attr [Hash] headers the headers being sent in the request.
-    class << self
-      attr_accessor :base_url, :headers
-    end
-
-    def default_headers
-      { 'Accept' => 'application/n-triples' }
-    end
-
-    def add_headers(request)
-      headers = default_headers.merge(@headers)
-      headers.each do |key, value|
-        request.add_field(key, value)
-      end
-    end
-
-    def api_endpoint
-      [@base_url, @endpoint_parts].join('/')
-    end
-
-    def handle_errors(response)
-      case response
-      when Net::HTTPSuccess # 2xx Status
-        exception_class = Parliament::NoContentResponseError if response.code == '204'
-      when Net::HTTPClientError # 4xx Status
-        exception_class = Parliament::ClientError
-      when Net::HTTPServerError # 5xx Status
-        exception_class = Parliament::ServerError
-      end
-
-      raise exception_class.new(api_endpoint, response) if exception_class
-    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 assign_decorator(object)
-      return object unless object.respond_to?(:type)
-
-      object_type = Grom::Helper.get_id(object.type)
-
-      return object unless Parliament::Decorator.constants.include?(object_type.to_sym)
-
-      decorator_module = Object.const_get("Parliament::Decorator::#{object_type}")
-      object.extend(decorator_module)
-    end
+  module Request
+    Dir[File.join(File.dirname(__FILE__), '../parliament/request', '*.rb')].each { |request| require request }
   end
 end

data/lib/parliament/version.rb

@@ -1,3 +1,3 @@
 module Parliament
-  VERSION = '0.6.3'.freeze
+  VERSION = '0.7.0.pre'.freeze
 end

data/lib/parliament.rb

@@ -6,6 +6,7 @@ require 'parliament/request'
 require 'parliament/response'
 require 'parliament/utils'
 require 'parliament/decorator'
+require 'parliament/builder'
 
 require 'parliament/network_error'
 require 'parliament/client_error'

data/parliament-ruby.gemspec

@@ -13,7 +13,6 @@ Gem::Specification.new do |spec|
   spec.homepage      = 'http://github.com/ukparliament/parliament_ruby'
   spec.license       = 'Nonstandard'
 
-
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
@@ -21,6 +20,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
+  spec.add_dependency 'feedjira', '~> 2.1.2'
   spec.add_dependency 'grom', '~> 0.3.6'
 
   spec.add_development_dependency 'bundler', '~> 1.13'

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: parliament-ruby
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.7.0.pre
 platform: ruby
 authors:
 - Matt Rayner
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-31 00:00:00.000000000 Z
+date: 2017-04-07 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: feedjira
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.1.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.1.2
 - !ruby/object:Gem::Dependency
   name: grom
   requirement: !ruby/object:Gem::Requirement
@@ -144,6 +158,10 @@ files:
 - bin/console
 - bin/setup
 - lib/parliament.rb
+- lib/parliament/builder.rb
+- lib/parliament/builder/base_response_builder.rb
+- lib/parliament/builder/ntriple_response_builder.rb
+- lib/parliament/builder/open_search_response_builder.rb
 - lib/parliament/client_error.rb
 - lib/parliament/decorator.rb
 - lib/parliament/decorator/constituency_area.rb
@@ -163,6 +181,9 @@ files:
 - lib/parliament/network_error.rb
 - lib/parliament/no_content_response_error.rb
 - lib/parliament/request.rb
+- lib/parliament/request/base_request.rb
+- lib/parliament/request/open_search_request.rb
+- lib/parliament/request/url_request.rb
 - lib/parliament/response.rb
 - lib/parliament/server_error.rb
 - lib/parliament/utils.rb
@@ -183,12 +204,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Internal parliamentary API wrapper