restool 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 584d88793980824115720aa0e0f037d0fae8c35439c4e24e16e33dc902b11e8b
-  data.tar.gz: 7adca6d17ead07b51bbe097b273e655e5ff34d365bbc95ffb33620e70588cffa
+  metadata.gz: b9ce87d4cd969d5298ee7c90baef25ac9f2f2c3b725e4ae241a1b00a1b46114b
+  data.tar.gz: 45766774466195ec86b84048d1aa659302d8cc4b50771a4a73c19246f15d4ec5
 SHA512:
-  metadata.gz: 0b93df06284266885ce45b9e83849a7125ed2d0f4bd82a236b5ea751aaa7860136aeaad9f248dd3ad5d6ab21d3948469a82973cbe0a19812a578d57cb43d4c55
-  data.tar.gz: d1a7b15cfc046896fc3b57d9092c1ffe33f50d21a1d8645327b68b7a28259b3e47ee9349e74115d77028c5b02cbf26607c995a4f9c9db0e6b2f7e02796d30bbb
+  metadata.gz: f62e492a295bd06e4f8699b19f98d895a66f5fabfd286ac8c64bcc3907194bc3ea463eed3206ee96567fd2793221a295bee8af2cffefa6698e98fbf61acd6e76
+  data.tar.gz: 379a2006d01cbc9d35e08030f70e690414f77f9d8ce17fe6dc75a8d97a3493daf3b7153dc1d59cbd6b9a18b749accf5e85238ea2d1763bc2f62e97212e77d3ea

data/lib/restool/mock/restool.rb

@@ -0,0 +1,25 @@
+module Restool
+  module Mock
+    def self.create(service_name, &response_handler)
+      service_config = Restool::Settings::Loader.load(service_name)
+
+      # remote_client = Restool::Service::RemoteClient.new(service_config.host,
+      #                                                    service_config.verify_ssl,
+      #                                                    service_config.persistent,
+      #                                                    service_config.timeout)
+
+      class FakeRemoteClient
+        def initialize
+        end
+
+        def make_request(path, operation_method, params, headers, basic_auth)
+
+        end
+      end
+
+
+      remote_client = double(make_request)
+      Restool::Service::RestoolService.new(service_config, response_handler, remote_client)
+    end
+  end
+end

data/lib/restool/settings/loader.rb

@@ -105,7 +105,7 @@ module Restool
       def self.config
         return @config if @config
 
-        files_to_load = Dir['config/restool/*'] + ['config/restool.yml', 'config/restool.json']
+        files_to_load = Dir['config/restool/*.yml'] + Dir['config/restool/*.yaml'] + ['config/restool.yml', 'config/restool.yaml', 'config/restool.json']
 
         @config = { 'services' => [] }
 
@@ -114,12 +114,12 @@ module Restool
 
           extension = File.extname(file_name)
 
-          content = if extension == '.yml'
-            YAML.load_file(file_name)
-          elsif extension == '.json'
-            json_file = File.read(file_name)
-            JSON.parse(json_file)
-          end
+          content = if extension == '.yml' || extension == '.yaml'
+                      YAML.load_file(file_name)
+                    elsif extension == '.json'
+                      json_file = File.read(file_name)
+                      JSON.parse(json_file)
+                    end
 
           @config['services'] += content['services']
         end
@@ -127,10 +127,6 @@ module Restool
         @config
       end
 
-      def self.validate
-        # TODO: perform validations
-      end
-
     end
   end
 end

data/lib/restool/traversal/converter.rb

@@ -19,6 +19,9 @@ module Restool
       def self.convert(request_response, response_representation, representations)
         object = Restool::Traversal::Object.new
 
+        object.class.__send__(:attr_accessor, :_raw)
+        object.__send__("_raw=", request_response)
+
         if request_response.is_a?(Array)
           request_response.map do |element|
             map_response_to_representation(response_representation, element, object, representations)
@@ -32,15 +35,15 @@ module Restool
 
       def self.map_response_to_representation(representation, request_response, object, representations)
         representation.fields.each do |field|
-          value = request_response[field.key]
+          value = request_response[field.key.to_s] || request_response[field.key.to_sym]
+
+          object.class.__send__(:attr_accessor, var_name(field))
 
           if value.nil?
             set_var(object, field, nil)
             next
           end
 
-          object.class.__send__(:attr_accessor, var_name(field))
-
           if Restool::Traversal::TRAVERSAL_TYPES.include?(field.type.to_sym)
             map_primitive_field(value, field, object)
           else

data/lib/restool/traversal/object.rb

@@ -1,17 +1,5 @@
 module Restool
   module Traversal
-    class Object
-
-      def to_hash
-        instance_variables
-          .inject({}) do |acum, var|
-            acum[var.to_s.delete('@')] = instance_variable_get(var)
-            acum
-          end
-      end
-
-      alias_method :to_h, :to_hash
-
-    end
+    class Object; end
   end
 end

data/lib/restool/version.rb

@@ -1,3 +1,3 @@
 module Restool
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: restool
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Juan Andres Zeni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-20 00:00:00.000000000 Z
+date: 2020-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: persistent_http
@@ -33,6 +33,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/restool.rb
+- lib/restool/mock/restool.rb
 - lib/restool/service/operation_definer.rb
 - lib/restool/service/remote_client.rb
 - lib/restool/service/remote_connector.rb