parliament-opensearch 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89764f0e23de18af2c597be14a52198dc7011e16
-  data.tar.gz: 95f44a316c601778ad1fd466757b2b9b5deec1ce
+  metadata.gz: aa1e7fcde557b8ce18754819661d6caaa492639b
+  data.tar.gz: 0a12a2c9bc5cae5071545c48c9b99380390eac4b
 SHA512:
-  metadata.gz: d9d48aa35039abcee3cef6731d79af106f020b306098f11e01bca5bec6e49f16aecf7415d65613ce680dfa944b2f8a467a4236fe788aac86a51f67ace2d2c1df
-  data.tar.gz: acb15d5c8218eb7fd4d817f9dfe01683c734b3fff359b6c7cea1a59723d08e219bd3e617152d9ce69252c8f7b96ac67ca4b3ec94641d8f29c682b8f14f8dadc4
+  metadata.gz: bb06ee7a2bf36541c6606dbb269266bc94d9effaa9fcc9fc2d123c0ed609ccceb6a3a7eab64f72acd5c0f6efa36a9dc3b6d301d371b7485d949254206ca4d130
+  data.tar.gz: 3a63183474c23a308cffc5c93449ef7d5e8f75002a60c63ae61cba1d2c9d7f9e57755043c3af4c868705c3d50c58b9f7de7bf0d91be70da04faa060bb1301317

data/README.md

@@ -7,6 +7,7 @@
 [parliament-opensearch](http://github.com/ukparliament/opensearch) requires the following:
 * [Ruby](https://www.ruby-lang.org/en/)
 * [Bundler](http://http://bundler.io/)
+* [parliament-ruby](https://rubygems.org/gems/parliament-ruby)
 
 ## Installation
 
@@ -17,6 +18,15 @@ This gem is currently not available on RubyGems. To use it in an application, in
 gem 'parliament-opensearch', git: 'https://github.com/ukparliament/parliament-open-search.git', branch: 'master'
 ```
 
+You will also need to include the parliament-ruby gem.  Add the following to your Gemfile:
+```
+gem 'parliament-ruby'
+```
+then run:
+```
+bundle install
+```
+
 ## Usage
 
 This gem's main function is fetching data from an OpenSearch API and parsing it.

data/lib/parliament/builder/open_search_response_builder.rb

@@ -1,5 +1,3 @@
-require 'feedjira'
-
 module Parliament
   module Builder
     # OpenSearch response builder using Feedjira to parse the response.

data/lib/parliament/open_search.rb

@@ -1,16 +1,88 @@
-require 'rexml/document'
-
-require 'parliament'
-
-require 'parliament/open_search/version'
-require 'parliament/open_search/description_error'
-require 'parliament/request/open_search_request'
-require 'parliament/builder/open_search_response_builder'
-
 # Namespace for classes and modules that handle connections to, and processing of data from OpenSearch APIs.
 # @since 0.1.0
 module Parliament
   module OpenSearch
     # Currently just a namespace definition
+    class << self
+      def load!
+        if parliament_response?
+          register_parliament_response
+        else
+          raise(LoadError, "Missing requirement 'Parliament::Response'. Have you added `gem 'parliament-ruby'` to your Gemfile?")
+        end
+
+        if parliament_request?
+          register_parliament_request
+          register_opensearch_request
+        else
+          raise(LoadError, "Missing requirement 'Parliament::Request'. Have you added `gem 'parliament-ruby'` to your Gemfile?")
+        end
+
+        if parliament_builder?
+          register_parliament_builder
+          register_opensearch_builder
+        else
+          raise(LoadError, "Missing requirement 'Parliament::Builder'. Have you added `gem 'parliament-ruby'` to your Gemfile?")
+        end
+
+        register_opensearch
+        register_rexml_document
+        register_active_support_inflector
+        register_feedjira
+      end
+
+      def parliament_response?
+        defined?(::Parliament::Response)
+      end
+
+      def parliament_request?
+        defined?(::Parliament::Request)
+      end
+
+      def parliament_builder?
+        defined?(::Parliament::Builder)
+      end
+
+      private
+
+      def register_parliament_response
+        require 'parliament/response'
+      end
+
+      def register_parliament_request
+        require 'parliament/request'
+      end
+
+      def register_parliament_builder
+        require 'parliament/builder'
+      end
+
+      def register_opensearch
+        require 'parliament/open_search/version'
+        require 'parliament/open_search/description_error'
+      end
+
+      def register_opensearch_request
+        require 'parliament/request/open_search_request'
+      end
+
+      def register_opensearch_builder
+        require 'parliament/builder/open_search_response_builder'
+      end
+
+      def register_rexml_document
+        require 'rexml/document'
+      end
+
+      def register_active_support_inflector
+        require 'active_support/inflector'
+      end
+
+      def register_feedjira
+        require 'feedjira'
+      end
+    end
   end
-end
+end
+
+Parliament::OpenSearch.load!

data/lib/parliament/open_search/version.rb

@@ -1,5 +1,5 @@
 module Parliament
   module OpenSearch
-    VERSION = '0.2.3'.freeze
+    VERSION = '0.2.4'.freeze
   end
 end

data/lib/parliament/request/open_search_request.rb

@@ -75,7 +75,7 @@ module Parliament
           xml_response = request.get
 
           begin
-            xml_root = REXML::Document.new(xml_response.body).root
+            xml_root = REXML::Document.new(xml_response.response.body).root
             template = xml_root.elements['Url'].attributes['template']
 
             raise Parliament::OpenSearch::DescriptionError.new(url), "The document found does not contain a require node. Attempted to get a 'Url' element with the attribute 'template'. Please check the description document at '#{url}' and try again." if template.nil?

data/parliament-opensearch.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'feedjira', '~> 2.1', '>= 2.1.2'
-  spec.add_dependency 'parliament-ruby', '~> 0.7.4'
+  spec.add_dependency 'activesupport', '>= 5.0.0.1'
 
   spec.add_development_dependency 'bundler', '~> 1.14'
   spec.add_development_dependency 'rake', '~> 10.0'
@@ -30,4 +30,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'simplecov', '~> 0.12'
   spec.add_development_dependency 'vcr', '~> 3.0'
   spec.add_development_dependency 'webmock', '~> 2.3'
+  spec.add_development_dependency 'parliament-ruby', '~> 0.7.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: parliament-opensearch
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Rebecca Appleyard
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-18 00:00:00.000000000 Z
+date: 2017-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: feedjira
@@ -32,19 +32,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.1.2
 - !ruby/object:Gem::Dependency
-  name: parliament-ruby
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.4
+        version: 5.0.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.4
+        version: 5.0.0.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -143,6 +143,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.3'
+- !ruby/object:Gem::Dependency
+  name: parliament-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.4
 description: 'Parliamentary OpenSearch response builder '
 email:
 - rklappleyard@gmail.com
@@ -188,7 +202,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Parliamentary OpenSearch response builder