parliament-ruby 0.7.3.pre → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 85abecdcd5ffc39c4d3d886aa558bfad25e84ef1
-  data.tar.gz: cdc28cf4ab1ee9fae3a19214d95fe16e2aa9565c
+  metadata.gz: 72c73709b14ab1591a287636e7735c9758de56da
+  data.tar.gz: 14aaef8e1f7233189d8f99488ea4ecfe740341a2
 SHA512:
-  metadata.gz: 50b1146fe2b6908239916bb5fc6b7e5365a05d0a151068531375a82bfa85e45221fb457295f36c38f7335c796c74c6061461bc5d3a78b0adb990cd3b8ec5d895
-  data.tar.gz: eb032db60e9364d06c772401e16251b52afe89222f309db76c9ba28e73f0bc8be835b3320eef09d0f56d2dc66fede8e3761656034fbbbf2600fcc7d30dd22eb1
+  metadata.gz: 13f59fb73e8b3078dc74b8899fd39ddf0c8d013cfb0ab8c4a005d216e275fe18ea266f10337ad46a1ff86a0be2bb17e49cb4e9f86661d9f6d028e91041e30689
+  data.tar.gz: cc3d3831a3a52395f0bfb979f06fcfc56f47c36d589493ca79aa25597dcac4e3da5bb7463852d3696b810410398ac0ae3e50157d231434f26164b81c79d27de8

data/Gemfile

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

data/lib/parliament.rb

@@ -14,7 +14,7 @@ require 'parliament/server_error'
 require 'parliament/no_content_response_error'
 
 # Namespace for classes and modules that handle connections to, and processing of data from the parliamentary API.
-# @since 0.0.1
+# @since 0.1.0
 module Parliament
   # Currently just a namespace definition
 end

data/lib/parliament/builder.rb

@@ -1,9 +1,8 @@
 module Parliament
+  # Namespace for classes and modules that processes data from http requests.
+  # @since 0.7.0
   module Builder
-    require_relative '../parliament/builder/base_response_builder'
-
-    require_relative '../parliament/builder/ntriple_response_builder'
-
-    require_relative '../parliament/builder/open_search_response_builder'
+    require 'parliament/builder/base_response_builder'
+    require 'parliament/builder/ntriple_response_builder'
   end
 end

data/lib/parliament/decorator/person.rb

@@ -170,8 +170,8 @@ module Parliament
       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
-        statuses << 'Lord' unless no_current_house_incumbency
-        statuses << 'Former Lord' if former_lord
+        statuses << 'Member of the House of Lords' unless no_current_house_incumbency
+        statuses << 'Former Member of the House of Lords' if former_lord
         statuses << 'Former MP' if former_mp
 
         statuses

data/lib/parliament/request.rb

@@ -1,14 +1,8 @@
 module Parliament
-  # API request object, allowing the user to build a request to a graph-based API, download n-triple data and create
-  # ruby objects from that data.
-  #
-  # @since 0.1.0
-  #
-  # @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.
+  # Namespace for classes and modules that handle http connections.
+  # @since 0.7.0
   module Request
-    require_relative '../parliament/request/base_request'
-    require_relative '../parliament/request/open_search_request'
-    require_relative '../parliament/request/url_request'
+    require 'parliament/request/base_request'
+    require 'parliament/request/url_request'
   end
 end

data/lib/parliament/version.rb

@@ -1,3 +1,3 @@
 module Parliament
-  VERSION = '0.7.3.pre'.freeze
+  VERSION = '0.7.4'.freeze
 end

data/parliament-ruby.gemspec

@@ -20,7 +20,6 @@ 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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: parliament-ruby
 version: !ruby/object:Gem::Version
-  version: 0.7.3.pre
+  version: 0.7.4
 platform: ruby
 authors:
 - Matt Rayner
@@ -10,20 +10,6 @@ bindir: exe
 cert_chain: []
 date: 2017-04-10 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
@@ -161,7 +147,6 @@ files:
 - 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
@@ -182,7 +167,6 @@ files:
 - 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
@@ -204,9 +188,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.10

data/lib/parliament/builder/open_search_response_builder.rb

@@ -1,17 +0,0 @@
-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/request/open_search_request.rb

@@ -1,79 +0,0 @@
-module Parliament
-  module Request
-    class OpenSearchRequest < Parliament::Request::BaseRequest
-      require 'rexml/document'
-
-      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?
-
-          # Make a straight Net::HTTP request to get our description file
-          xml_response = Parliament::Request::BaseRequest.new(
-            base_url: url,
-            headers: { 'Accept' => 'application/opensearchdescription+xml' }
-          ).get
-
-          # Load the description as XML
-          xml_root = REXML::Document.new(xml_response.body).root
-          # TODO: Check for multiple 'Url' entries.
-          xml_root.elements['Url'].attributes['template'] # Get the URL
-        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