jerakia-client 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41235c0866e57a0198525ca97e027ff65066d3a0
-  data.tar.gz: 3bd66f87579d4bb94f63a17c6856a736e13f3903
+  metadata.gz: d78261a665e3aab11432e9f299884d8da2f559b3
+  data.tar.gz: 1191309b5880c56711d3026f37251af7fd31ceea
 SHA512:
-  metadata.gz: 1fdc4de8499ea158e70298308454b1226881d14c18c8bded713b6c75ddd7159545da1eb67597143a85c662a25ad7a21e0e2d2b013e974611c06c4c73bec489ed
-  data.tar.gz: 0aa925c1bc7c941d031aa2a2ff47b16dc695b094c5baa8dac0ee629c4416592963553d79c7ceb97e27240d1f68ecce23d1d7fd766d6750639655f55cfe3944e4
+  metadata.gz: e5ab8fee8ab8fbf8de0db70c8a047f3d62890f9397e40c62c7547107e414e25e0404bd79b7b3d66cf300996a17dc51c29565b04f57748a64cb6fae08d2ee28e7
+  data.tar.gz: b60fa98db98cae175e13b7dbf82ac827d477dec51fa3199ed96981890d7f84163779c896c03accec93ae32501a23e0a156c787c23497d590d244cce71d97ca0d

data/lib/jerakia/client/error.rb

@@ -11,5 +11,8 @@ class Jerakia
 
     class HTTPError < RuntimeError
     end
+
+    class ScopeNotFoundError < RuntimeError
+    end
   end
 end

data/lib/jerakia/client/version.rb

@@ -1,6 +1,6 @@
 class Jerakia
   class Client
-    VERSION = '0.4.1'.freeze
+    VERSION = '0.5.0'.freeze
   end
 end
     

data/lib/jerakia/client.rb

@@ -1,4 +1,3 @@
-require 'rest-client'
 require 'jerakia/client/error'
 require 'jerakia/client/version'
 require 'jerakia/client/lookup'
@@ -6,6 +5,7 @@ require 'jerakia/client/scope'
 require 'jerakia/client/token'
 require 'uri'
 require 'json'
+require 'net/http'
 
 class Jerakia
   class Client
@@ -74,36 +74,39 @@ class Jerakia
       "#{@config[:proto]}://#{@config[:host]}:#{@config[:port]}"
     end
 
+    def http_send(request)
+      request.add_field("X-Authentication",  token)
+      response = Net::HTTP.new(@config[:host], @config[:port]).start do |http|
+        http.request(request)
+      end
 
-    def get(url_path, params={})
-      headers = { 'X-Authentication' => token }
-      uri_params = '?' + URI.encode_www_form(params)
-      url = url_address + url_path + uri_params
-      begin
-        response = RestClient.get(url, headers)
-
-      rescue RestClient::Unauthorized => e
+      case response.code
+      when "200"
+        return JSON.parse(response.body)
+      when "401"
         raise Jerakia::Client::AuthorizationError, "Request not authorized"
-      rescue RestClient::ResourceNotFound => e
-        return nil
-      rescue RestClient::Exception => e
-        raise Jerakia::Client::Error, e.response.body
+      when "501"
+        raise Jerakia::Client::ScopeNotFoundError, "Scope data not found" if response.body =~ /No scope data found/
+        raise Jerakia::Client::Error, response.body
+      else
+        raise Jerakia::Client::Error, response.body
       end
-      return JSON.parse(response.body)
+    end
+
+
+    def get(url_path, params={})
+      uri = URI.parse(url_address +  url_path)
+      uri.query = URI.encode_www_form(params)
+      request = Net::HTTP::Get.new(uri.to_s)
+      return http_send(request)
     end
 
     def put(url_path, params)
-      headers = {
-        'X-Authentication' => token,
-        :content_type => :json
-      }
-      url = url_address + url_path
-      begin
-        response = RestClient.put(url, params.to_json, headers)
-      rescue RestClient::Unauthorized => e
-        raise Jerakia::Client::AuthorizationError, "Request not authorized"
-      end
-      return JSON.parse(response.body)
+      uri = URI.parse(url_address + url_path)
+      request = Net::HTTP::Put.new(uri.path)
+      request.add_field('Content-Type', 'application/json')
+      request.body = params.to_json
+      return http_send(request)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jerakia-client
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Craig Dunn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-17 00:00:00.000000000 Z
+date: 2017-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor