parliament-ruby 0.10.2 → 1.0.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5774765ecf5e81915f04321515617f4dba8652f5
-  data.tar.gz: 2c6d1f152b7f5bdc7f0fc96d11ef612be6bb4a21
+  metadata.gz: 291f639647bb81fcc5dd82a384cd0ecff70db477
+  data.tar.gz: 26f6551f09bcd80f4ff351ba55189bb77bc71580
 SHA512:
-  metadata.gz: d74971c00ab0f377dc59820698cdb9ad632f9943ab3dbec0c3228e7a5e318a8a1dffaaf03634b8f28733390edb8a52c0c65da1f03658a5b19d5f5e83aca01f42
-  data.tar.gz: c2c7951d0c5123c755b1640b60af25771d9dde6267bd115bdca69e2704e212fccaf82e8285fd1aae805f4d5d7c09a7179a3ade1b234508fe1770e88599d3b67c
+  metadata.gz: 1dd49cab50167b71972428f3d53f61f22f72b8ff8d7dd69af0607d616d9280e19fee121864697ed9e423a0981e72b90ca8eae03b85146f8c6885f2a7b7d865a1
+  data.tar.gz: 321ece67fd29fea8af22fcd3197a12218edb9443a3760e4525ed84a158fe3ba787a9ca38c8c5a4abd5501d01f867c2e73b12ee8b1c03e09f11ce13f82e2575a3

data/README.md

@@ -21,7 +21,7 @@
     - [`#filter`](#filter)
     - [`#sort_by`](#sort_by)
     - [`#reverse_sort_by`](#reverse_sort_by)
-  - [`Partliament::Utils`](#partliamentutils)
+  - [`Parliament::Utils`](#parliamentutils)
     - [Methods](#methods-1)
       - [`Parliament::Utils.sort_by`](#parliamentutilssort_by)
       - [`Parliament::Utils.reverse_sort_by`](#parliamentutilsreverse_sort_by)
@@ -137,7 +137,7 @@ response.each do |node|
   #
   # You would be able to access the `name` attribute like so:
   puts node.name #=> 'Matthew Rayner'
-  
+
   # If your n-triple file contains a triple who's object is a URI, and that URI is defined within your file, a link will
   # be created, allowing you to 'connect' the two objects. For example, with the following triples:
   # <http://id.ukpds.org/1234> <http://id.ukpds.org/schema/name> 'Matthew Rayner' .
@@ -148,7 +148,7 @@ response.each do |node|
   puts node.graph_id        #=> '12345'
   puts node.name            #=> 'Matthew Rayner'
   puts node.partyMembership #=> [#<Grom::Node @startDate=...>]
-  
+
   puts node.partyMembership.first.startDate #=> "1992-04-09"
 end
 ```
@@ -214,7 +214,7 @@ sorted_response.each { |node| puts "#{node.graph_id} - #{node.respond_to?(:start
 # http://id.ukpds.org/3141 - undefined
 ```
 
-### `Partliament::Utils`
+### `Parliament::Utils`
 Included with [parliament-ruby][parliament-ruby] is `Parliament::Utils`. This module includes helper methods commonly used throughout parliament.uk.
 
 #### Methods

data/lib/parliament/network_error.rb

@@ -7,7 +7,7 @@ module Parliament
   # @since 0.6.0
   class NetworkError < StandardError
     def initialize(url, response)
-      super("#{response.code} HTTP status code received from: #{url} - #{response.message}")
+      super("#{response.code} HTTP status code received from: #{url} - #{response.status_message}")
     end
   end
 end

data/lib/parliament/request/base_request.rb

@@ -1,3 +1,5 @@
+require 'typhoeus'
+
 module Parliament
   module Request
     # Base request object, allowing the user to make a request to an API.
@@ -55,10 +57,10 @@ module Parliament
       # @param [Parliament::Builder] builder the builder to use in order to build a response.
       # @params [Module] decorators the decorator module to use in order to provide possible alias methods for any objects created by the builder.
       def initialize(base_url: nil, headers: nil, builder: nil, decorators: nil)
-        @base_url = base_url || self.class.base_url
-        @headers = headers || self.class.headers || {}
-        @builder = builder || Parliament::Builder::BaseResponseBuilder
-        @decorators = decorators
+        @base_url     = base_url || self.class.base_url
+        @headers      = headers || self.class.headers || {}
+        @builder      = builder || Parliament::Builder::BaseResponseBuilder
+        @decorators   = decorators
         @query_params = {}
       end
 
@@ -86,20 +88,22 @@ module Parliament
       #
       # @return [Parliament::Response::BaseResponse] a Parliament::Response::BaseResponse object containing all of the data returned from the URL.
       def get(params: nil)
-        @query_params = @query_params.merge(params) unless params.nil?
+        Typhoeus::Config.user_agent = 'Ruby'
 
-        endpoint_uri = URI.parse(query_url)
-        endpoint_uri.query = URI.encode_www_form(@query_params.to_a) unless @query_params.empty?
+        @query_params = @query_params.merge(params) unless params.nil?
 
-        http = Net::HTTP.new(endpoint_uri.host, endpoint_uri.port)
-        http.use_ssl = true if endpoint_uri.scheme == 'https'
+        endpoint_uri    = URI.parse(query_url)
+        endpoint_params = URI.encode_www_form(@query_params.to_a) unless @query_params.empty?
 
-        net_response = http.start do |h|
-          api_request = Net::HTTP::Get.new(endpoint_uri.request_uri)
-          add_headers(api_request)
+        typhoeus_request = Typhoeus::Request.new(
+          endpoint_uri,
+          method:          :get,
+          params:          endpoint_params,
+          headers:         headers,
+          accept_encoding: 'gzip'
+        )
 
-          h.request api_request
-        end
+        net_response = typhoeus_request.run
 
         handle_errors(net_response)
 
@@ -132,25 +136,24 @@ module Parliament
       #
       # @return [Parliament::Response::BaseResponse] a Parliament::Response::BaseResponse object containing all of the data returned from the URL.
       def post(params: nil, body: nil, timeout: 60)
-        @query_params = @query_params.merge(params) unless params.nil?
+        Typhoeus::Config.user_agent = 'Ruby'
 
-        endpoint_uri = URI.parse(query_url)
-        endpoint_uri.query = URI.encode_www_form(@query_params.to_a) unless @query_params.empty?
-
-        http = Net::HTTP.new(endpoint_uri.host, endpoint_uri.port)
-        http.use_ssl = true if endpoint_uri.scheme == 'https'
-        http.read_timeout = timeout
+        @query_params = @query_params.merge(params) unless params.nil?
 
-        request = Net::HTTP::Post.new(
-          endpoint_uri.request_uri,
-          'Content-Type' => 'application/json'
+        endpoint_uri       = URI.parse(query_url)
+        endpoint_params    = URI.encode_www_form(@query_params.to_a) unless @query_params.empty?
+
+        typhoeus_request = Typhoeus::Request.new(
+          endpoint_uri,
+          method:          :post,
+          params:          endpoint_params,
+          headers:         headers.merge({ 'Content-Type' => 'application/json' }),
+          accept_encoding: 'gzip',
+          timeout:         timeout,
+          body:            body
         )
 
-        add_headers(request)
-
-        request.body = body unless body.nil?
-
-        net_response = http.request(request)
+        net_response = typhoeus_request.run
 
         handle_errors(net_response)
 
@@ -174,28 +177,26 @@ module Parliament
       end
 
       def default_headers
-        { 'Accept' => 'application/n-triples' }
+        { '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
+      def headers
+        default_headers.merge(@headers)
       end
 
       def handle_errors(net_response)
-        case net_response
-        when Net::HTTPOK # 2xx Status
-          exception_class = Parliament::NoContentResponseError if net_response['Content-Length'] == '0' || (net_response['Content-Length'].nil? && net_response.body.nil?)
-        when Net::HTTPClientError # 4xx Status
-          exception_class = Parliament::ClientError
-        when Net::HTTPServerError # 5xx Status
-          exception_class = Parliament::ServerError
-        end
+        exception_class = if net_response.success? # 2xx Status
+                            Parliament::NoContentResponseError if net_response.headers&.[]('Content-Length') == '0' ||
+                              (net_response.headers&.[]('Content-Length').nil? && net_response.body.empty?)
+                          elsif /\A4\w{2}/.match(net_response.code.to_s) # 4xx Status
+                            Parliament::ClientError
+                          elsif /\A5\w{2}/.match(net_response.code.to_s) # 5xx Status
+                            Parliament::ServerError
+                          end
 
         raise exception_class.new(query_url, net_response) if exception_class
       end
     end
   end
 end
+

data/lib/parliament/request/url_request.rb

@@ -13,7 +13,7 @@ module Parliament
       #
       # @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.
-      # @param [Parliament::Builder] builder the builder to use in order to build a response.
+      # @param [Parliament::Builder] builder the builder to use in order to build a response.{{}}
       # @param [Module] decorators the decorator module to use in order to provide possible alias methods for any objects created by the builder.
       # @example Passing headers
       #
@@ -53,6 +53,7 @@ module Parliament
       # @return [Parliament::Request::UrlRequest] self (this is to allow method chaining).
       def method_missing(method, *params, &block)
         @endpoint_parts << method.to_s
+
         @endpoint_parts << params
         @endpoint_parts = @endpoint_parts.flatten!
 
@@ -72,7 +73,6 @@ module Parliament
         uri_string = [@base_url, @endpoint_parts].join('/').gsub(' ', '%20')
 
         uri = URI.parse(uri_string)
-        uri.query = URI.encode_www_form(@query_params) unless @query_params.empty?
 
         uri.to_s
       end

data/lib/parliament/version.rb

@@ -1,3 +1,3 @@
 module Parliament
-  VERSION = '0.10.2'.freeze
+  VERSION = '1.0.0.pre'.freeze
 end

data/parliament-ruby.gemspec

@@ -20,6 +20,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
+  spec.add_dependency 'typhoeus', '~> 1.3'
+
   spec.add_development_dependency 'bundler', '~> 1.13'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: parliament-ruby
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  version: 1.0.0.pre
 platform: ruby
 authors:
 - Matt Rayner
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-08 00:00:00.000000000 Z
+date: 2018-03-16 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: typhoeus
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -188,12 +202,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.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Internal parliamentary API wrapper