wondeclient 0.0.8 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: acfaeb03fb1a4a32bc6fe4deac7b48919a8383b2
-  data.tar.gz: f2da64930bbc7924ad1539af7dee4d847f199a56
+  metadata.gz: cbf4d3fdbd06cd47b5391798d89f6b619cfc9a26
+  data.tar.gz: 268d65a0b69de5f07fd47fc3b528505df330718b
 SHA512:
-  metadata.gz: ad72fc204caefba8c8750131e28c81d730404d278fe2710c6f3592a50b3124e878213cbbea073e7f3bf1485097c98056dd4c8bf788ac26bba4347fbb26ad43ff
-  data.tar.gz: 6f0249a6d397dfb3a11fbc83b4434ed1fb33ad930a2d2af4118b5eb961e487418a53394ef512c3d1c6bf0fea45dd4450cd1aed5e90fd241fdd50c27a85196b7a
+  metadata.gz: 1a4bcdfa67f747cc558fb3fbaea6d3ad5ea6988bd3fa40074889a28ca7e7c06269ed538b044252edeb030b083228e6e860390951eceb0879b3beb11595738172
+  data.tar.gz: 4027df247fdd2ad830c14317e8a22723a277e7cb4359df80d6acc3aefa02f25da4db53d71b52c158e63f86df2666cd182d226297749ff0eb6642daf9f9245796

data/lib/endpoints.rb

@@ -2,7 +2,7 @@ module Wonde
   # Top level Endpoints class, most of our classes inherit from this
   # Some methods use this directly
   class Endpoints
-    require 'unirest'
+    require 'rest-client'
     require 'ostruct'
     require "addressable/uri"
     require 'json'
@@ -26,7 +26,7 @@ module Wonde
     def getRequest(endpoint)
       puts "self.endpoint: " + self.endpoint if ENV["debug_wonde"]
       puts "endpoint:" + endpoint if ENV["debug_wonde"]
-      return getUrl(self.endpoint + endpoint)
+      getUrl(self.endpoint + endpoint)
     end
 
     # Forwards request info to unirest
@@ -34,7 +34,14 @@ module Wonde
     # @param url [String]
     # @return [Object]
     def getUrl(url)
-      return _client().get(url)
+      RestClient::Request.execute(
+        method: :get,
+        url: url,
+        headers: {
+          "Authorization" => "Bearer #{self.token}",
+          "User-Agent" => "wonde-rb-client-#{self.version}"
+        }
+      )
     end
 
     # Builds get request and passes it along
@@ -56,48 +63,61 @@ module Wonde
       end
       response = getRequest(uri).body["data"]
       puts response if ENV["debug_wonde"]
-      jsonized = response.to_json
-      puts jsonized if ENV["debug_wonde"]
-      object = JSON.parse(jsonized, object_class: OpenStruct)
+      object = JSON.parse(response, object_class: OpenStruct)
       puts object if ENV["debug_wonde"]
-      return object
+      object
     end
 
     def postRequest(endpoint, body=Hash.new())
       puts "self.endpoint:\n " + self.endpoint if ENV["debug_wonde"]
       puts "endpoint:\n" + endpoint if ENV["debug_wonde"]
       puts "body:\n" + body.to_json if ENV["debug_wonde"]
-      return postUrl(self.endpoint + endpoint, body)
+      postUrl(self.endpoint + endpoint, body)
     end
 
     def postUrl(url, body=Hash.new())
       puts body.to_json if ENV["debug_wonde"]
-      return _client().post(url, headers:{ "Accept" => "application/json",
-                                          "Content-Type" => "application/json"},
-                        parameters:body.to_json)
+      RestClient::Request.execute(
+        method: :post,
+        url: url,
+        headers: {
+          "Authorization" => "Basic #{self.token}",
+          "User-Agent" => "wonde-rb-client-#{self.version}",
+          "Accept" => "application/json",
+          "Content-Type" => "application/json",
+        },
+        payload: body.to_json,
+      )
     end
 
     def post(body=Hash.new())
-      hash_response = self.postRequest(self.uri, body).body
+      hash_response = JSON.parse(self.postRequest(self.uri, body).body)
       if hash_response.nil?
         return Hash.new()
       end
-      return OpenStruct.new hash_response
-
+      OpenStruct.new hash_response
     end
 
     def deleteRequest(endpoint, body=Hash.new())
       puts "self.endpoint: " + self.endpoint if ENV["debug_wonde"]
       puts "endpoint:" + endpoint if ENV["debug_wonde"]
       puts "body:" + body.to_json if ENV["debug_wonde"]
-      return deleteUrl(self.endpoint + endpoint, body)
+      deleteUrl(self.endpoint + endpoint, body)
     end
 
     def deleteUrl(url, body=Hash.new())
       puts body.to_json if ENV["debug_wonde"]
-      return _client().delete(url, headers:{ "Accept" => "application/json",
-                                          "Content-Type" => "application/json"},
-                        parameters:body.to_json)
+      RestClient::Request.execute(
+        method: :delete,
+        url: url,
+        headers: {
+          "Authorization" => "Basic #{self.token}",
+          "User-Agent" => "wonde-rb-client-#{self.version}",
+          "Accept" => "application/json",
+          "Content-Type" => "application/json",
+        },
+        payload: body.to_json,
+      )
     end
 
     def delete(body=Hash.new())
@@ -105,8 +125,7 @@ module Wonde
       if hash_response.nil?
         return Hash.new()
       end
-      return OpenStruct.new hash_response
-
+      OpenStruct.new hash_response
     end
 
     def all(includes = Array.new(), parameters = Hash.new())
@@ -124,18 +143,9 @@ module Wonde
       end
       response = getRequest(uri).body
       puts response if ENV["debug_wonde"]
-      jsonized = response.to_json
-      puts jsonized if ENV["debug_wonde"]
-      object = JSON.parse(jsonized, object_class: OpenStruct)
+      object = JSON.parse(response, object_class: OpenStruct)
       puts object if ENV["debug_wonde"]
-      return ResultIterator.new(object,self.token)
+      ResultIterator.new(object,self.token)
     end
-
-    private
-      def _client()
-        Unirest.default_header('Authorization', ('Basic ' + self.token))
-        Unirest.default_header("User-Agent", ("wonde-rb-client-" + self.version))
-        return Unirest
-      end
   end
 end

data/lib/resultiterator.rb

@@ -21,10 +21,9 @@ module Wonde
     def each
       original_length = @myarray.length - 1
       @myarray.each_with_index do |val,index|
-        if index >= original_length and self.meta.pagination.more
+        if index >= original_length and self.meta and self.meta.pagination.more
           resp = self.getUrl(self.meta.pagination.next).body
-          jsonized = resp.to_json
-          nextResponse = JSON.parse(jsonized, object_class: OpenStruct)
+          nextResponse = JSON.parse(resp, object_class: OpenStruct)
           p nextResponse if ENV["debug_wonde"]
           self.meta  = nextResponse.meta unless nextResponse.meta.nil?
           nextResponse.data.each do |element|

metadata

@@ -1,29 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: wondeclient
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.1.1
 platform: ruby
 authors:
 - Mike Donlon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-05 00:00:00.000000000 Z
+date: 2019-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: unirest
+  name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 2.0.0
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.3.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.3.5
 description: Wonde Client
 email: 'miked63017@gmail.com '
 executables:
@@ -93,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: Wonde Client