ezapi 1.0.3 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f0962a3e1cd704e7372c2012eb7aac9cd3ad7347
-  data.tar.gz: 4d7c95b461c471028caaed8cc72244a1a731453b
+SHA256:
+  metadata.gz: 761da417fc008adaa056d5082dd32fd7bc801d24c6cc7f05eedf2d75efab3d9a
+  data.tar.gz: 90bac2c1a65e471dad2bc63be04c490059f6d3138d4245417e3daef341a7558f
 SHA512:
-  metadata.gz: 550de5432b19cd0c3e130b45b07b5a45d45bf04e7bb9f4a2360700edd3d8d95057eaba43badfe808e584653831bc606b3d69d2add8c460347d93b3ec3454c62d
-  data.tar.gz: 65983059d16a94236aeeef36533e39447fcd941eea57a259d65e16d438ae80ddd596f9ca1e5d1f6cd3f9d7ca0828f9075318a07054e93d4162b757189d0c4123
+  metadata.gz: 0363121ce4e4c8683571845357ad7da8247a2ddd51512c01a70e02470f098b0fa0b9b7c2bfd4d30849f779cfbf5421f30237210a635c25aacb2aaab0efcb4f39
+  data.tar.gz: fd981f6ff400eeba8eea46481e538e36c0d95a977a428221a849a302c8b6e4ce10ba1d733ef184b5868eca5d7d4ce0c7026389c579b8ce1317a98ac5575b4024

data/ezapi.gemspec

@@ -31,6 +31,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'rest-client', '~> 2.0'
   spec.add_dependency 'activesupport', '>= 4.2'
+  spec.add_dependency 'nokogiri', '~> 1.6', '>= 1.6.8'
   spec.add_development_dependency 'bundler', '~> 2.0', '>= 2.0.1'
   spec.add_development_dependency "rake", ">= 12.3.3"
   spec.add_development_dependency "rspec", "~> 3.0"

data/lib/ezapi/client.rb

@@ -2,6 +2,7 @@ require 'rest-client'
 require 'json'
 require 'base64'
 require 'uri'
+require 'nokogiri'
 
 module EZApi
   module Client
@@ -24,20 +25,31 @@ module EZApi
     end
 
     def request(full_url, method, params={}, headers=self.request_headers, request_arguments={})
-      default_request = {method: method, url: full_url, payload: params.to_json, headers: headers}
+      response = raw_request(full_url, method, params, headers, request_arguments)
 
       begin
-        response = RestClient::Request.execute(default_request.merge(request_arguments))
-        JSON.parse(response) unless response.empty?
+        if response.headers && response.headers[:content_type] == "application/xml"
+          Nokogiri::XML(response.body)
+        else
+          JSON.parse(response.body) unless response.empty?
+        end
       rescue JSON::ParserError => e
         nil
+      end
+    end
+
+    def raw_request(full_url, method, params={}, headers=self.request_headers, request_arguments={})
+      params = params.is_a?(Hash) ? params.to_json : params
+      default_request = {method: method, url: full_url, payload: params, headers: headers}
+      begin
+        RestClient::Request.execute(default_request.merge(request_arguments))
       rescue RestClient::ExceptionWithResponse => e
         if response_code = e.http_code and response_body = e.http_body
           handle_api_error(response_code, response_body)
         else
           handle_restclient_error(e)
         end
-      rescue RestClient::Exception, Errno::ECONNREFUSED, SocketError => e
+      rescue RestClient::Exception, Errno::ECONNREFUSED, SocketError, Timeout::Error  => e
         handle_restclient_error(e)
       end
     end

data/lib/ezapi/version.rb

@@ -1,3 +1,3 @@
 module EZApi
-  VERSION = "1.0.3"
+  VERSION = "1.0.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ezapi
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.7
 platform: ruby
 authors:
 - Nicholas
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-08-27 00:00:00.000000000 Z
+date: 2021-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -38,6 +38,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.6.8
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.6.8
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -145,8 +165,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.6.14
+rubygems_version: 3.0.6
 signing_key:
 specification_version: 4
 summary: Easily Communicate with APIs