parliament-opensearch 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 9aaef22b881a53601e90f1795f861a18f3b8c6d6
-  data.tar.gz: c9052a9a6c15a060d22d587ffb72ca12225a7ac9
+SHA256:
+  metadata.gz: 380092882f71f2f3c548c26317db539ef9dd32889d2c9df0cadbf24ea08e44d0
+  data.tar.gz: dd0accac1c3e6ef7e81caaaf245481ca8171e08657715523f6a3ef3caf4260e8
 SHA512:
-  metadata.gz: caa76984a92b396ca0a5f7de48070c78039f20e5689d9345c74792b23a329154c9c333ac56eedb9626888d122d12879f69339700ea65f8adca9ae1d86b98c1c0
-  data.tar.gz: 5b54b76cb9eac0e17a64370bbeb76f583e24cc328b76b9e890a48ebd014fa29dbc1f55aeac59ea4efccc859dbcb1d116214fc2d949a46396cd4f5578350416d9
+  metadata.gz: 30b5478eab0a089b35888e1e0f412d25f4bf323d2110e1331bd1c5d28c0f37697ece7aa4b888b22aeaf2212553cab979136ea521a3f63304488260ac414be9a0
+  data.tar.gz: 4e54ef5523182bff03a927f0144f04614f6e421b7944f4e4e9c172968a3af0d0dceaec909984b169f10398807b12b0ed92c748769961dbec590ba5e1b28b0920

data/lib/parliament/open_search/version.rb

@@ -1,5 +1,5 @@
 module Parliament
   module OpenSearch
-    VERSION = '0.6.0'.freeze
+    VERSION = '0.7.0'.freeze
   end
 end

data/lib/parliament/request/open_search_request.rb

@@ -26,7 +26,7 @@ module Parliament
       # @param [String] description_url the url for the OpenSearch API description file. (expected: http://example.com/description.xml - without the trailing slash).
       # @param [Hash] headers the headers being sent in the request.
       # @param [Parliament::OpenSearch::Builder] builder the builder required to create the response.
-      def initialize(description_url: nil, headers: nil, builder: nil, request_id: nil)
+      def initialize(description_url: nil, headers: {}, builder: nil, request_id: nil)
         @description_url = description_url ||= self.class.description_url
 
         raise Parliament::OpenSearch::DescriptionError.new(@description_url), 'No description URL passed to Parliament::OpenSearchRequest#new and, no Parliament::OpenSearchRequest#base_url value set. Without a description URL, we are unable to make any search requests.' if @description_url.nil? && self.class.templates.nil?
@@ -34,7 +34,7 @@ module Parliament
         @templates = Parliament::OpenSearch::DescriptionCache.fetch(@description_url, request_id)
         @open_search_parameters = self.class.open_search_parameters
 
-        super(base_url: nil, headers: headers, builder: builder)
+        super(base_url: nil, headers: default_headers.merge(headers), builder: builder)
       end
 
       # Sets up the query url using the base_url and parameters, then make an HTTP GET request and process results.
@@ -91,6 +91,17 @@ module Parliament
 
         @query_url = query_url
       end
+
+      # Default headers we use when performing a request
+      #
+      # @return [Hash] a hash of default headers
+      def default_headers
+        {}.tap do |hash|
+          hash['Accept']                     = 'application/atom+xml'
+          hash['Ocp-Apim-Subscription-Key']  = ENV['OPENSEARCH_AUTH_TOKEN'] if ENV['OPENSEARCH_AUTH_TOKEN']
+          hash['Api-Version']                = ENV['PARLIAMENT_API_VERSION'] if ENV['PARLIAMENT_API_VERSION']
+        end
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: parliament-opensearch
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Rebecca Appleyard
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-09 00:00:00.000000000 Z
+date: 2018-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: feedjira
@@ -219,7 +219,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Parliamentary OpenSearch response builder