xclarity_client 0.6.2 → 0.6.3

data/lib/xclarity_client/services/xclarity_service.rb

@@ -18,14 +18,16 @@ module XClarityClient
       # @return [Array] containing all `managed_resource` from LXCA
       # @see EndpointManagerMixin#managed_resource
       #
-      def fetch_all(opts = {})
+      def fetch_all(opts = {}, uri = {})
+        uri = managed_resource::BASE_URI if uri.empty? || uri.nil?
+
         $lxca_log.info "XclarityClient::Endpoints::XClarityService fetch_all",
                        "Sending request to #{managed_resource} resource"
 
-        response = @connection.do_get(managed_resource::BASE_URI, opts)
+        response = @connection.do_get(uri, :query => opts)
 
-        $lxca_log.info "XclarityClient::Endpoints::XClarityService fetch_all",
-                       "Response received from #{managed_resource::BASE_URI}"
+        $lxca_log.info("XclarityClient::Endpoints::XClarityService fetch_all",
+                       "Response received from #{uri}")
 
         build_response_with_resource_list(response, managed_resource)
       end
@@ -64,36 +66,32 @@ module XClarityClient
         build_response_with_resource_list(response, managed_resource)
       end
 
-      def get_object_with_opts(opts, resource)
-        raise "The opts cannot be empty" if opts.empty?
-        filter = ""
-
-        response = if not opts.empty?
-          if not opts.has_key? "type"
-            if opts.has_key? "filterWith"
-              filter += "?filterWith="
-              filter += "#{opts["filterWith"]}"
-
-            elsif opts.has_key? "sort"
-              filter += ",sort=" if filter != ""
-              filter += "?sort=" if filter == ""
-              filter += "#{opts["sort"]}"
-            end
-          else
-            filter += "?type=#{opts["type"]}"
-          end
-        $lxca_log.info "XclarityClient::ManagementMixin get_object_with_include", "Sending request to #{resource} resource using the following filter: #{filter}"
-        @connection.do_get(resource::BASE_URI + filter)
-        end
-
+      def get_object_with_opts(opts, resource, uri = '')
+        response = get_response_with_opts(opts, resource, uri)
         build_response_with_resource_list(response, managed_resource)
       end
 
+      def get_headers_with_opts(opts, resource)
+        get_response_with_opts(opts, resource).headers
+      end
+
       private
 
-      #
-      #
-      #
+      def get_response_with_opts(opts, resource, uri = '')
+        raise "The opts cannot be empty" if opts.empty?
+        uri = resource::BASE_URI if uri.empty? || uri.nil?
+
+        response = do_request_with_opts(uri, opts)
+      end
+
+      def do_request_with_opts(uri, opts)
+        allowed_query_keys = %w(type sort)
+        query = opts.select { |key| allowed_query_keys.include?(key) }
+        headers = opts['headers'] || Hash.new(0)
+
+        @connection.do_get(uri, :query => query, :headers => headers)
+      end
+
       def get_object_with_include_attributes(uuids, attributes)
         $lxca_log.info "XclarityClient::ManagementMixin get_object_with_include",
                        "Sending request to #{managed_resource} resource including the following attributes: #{attributes.join(",")}"
@@ -106,9 +104,6 @@ module XClarityClient
 
       end
 
-      #
-      #
-      #
       def get_object_with_exclude_attributes(uuids, attributes)
         $lxca_log.info "XclarityClient::ManagementMixin get_object_with_include",
                        "Sending request to #{managed_resource} resource excluding the following attributes: #{attributes.join(",")}"

data/lib/xclarity_client/version.rb

@@ -1,3 +1,3 @@
 module XClarityClient
-  VERSION = "0.6.2"
+  VERSION = "0.6.3"
 end

data/xclarity_client.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "webmock", "~> 2.1.0"
   spec.add_dependency             "faraday", "~> 0.9"
   spec.add_dependency             "faraday-cookie_jar", "~> 0.0.6"
+  spec.add_dependency             "httpclient", "~>2.8.3"
   spec.add_dependency             "uuid", "~> 2.3.8"
   spec.add_dependency             "faker", "~> 1.8.3"
   spec.add_dependency             "json-schema", "~> 2.8.0"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xclarity_client
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Manasa Rao
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-16 00:00:00.000000000 Z
+date: 2018-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -109,6 +109,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.6
+- !ruby/object:Gem::Dependency
+  name: httpclient
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.8.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.8.3
 - !ruby/object:Gem::Dependency
   name: uuid
   requirement: !ruby/object:Gem::Requirement