api_recipes 0.7.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dfd5a3d85babd54baa4d9001c52362cc5dfff4421cf3f9e7a2417e78b3f5eb2b
-  data.tar.gz: 316bd1cefa28669906a4e87a56ef7e64ed14369cf2099262ad5ed85fa0544b05
+  metadata.gz: fc2b26e8c66139a2ff051ef066bb512b389a48bcbfa2ba2b391f1dc29719426d
+  data.tar.gz: 281afb372a91edac6bbc1bc6335da2fb413e856ed7f32cff476f9c527d4dc459
 SHA512:
-  metadata.gz: 28bd374672f163b8912794f12e33bbaaa9168f03940651dda9fba2bb88899b5202ea51cace5ed0a814508eef4dcbb195ac32826590c12d1e5d91a31f66a93d84
-  data.tar.gz: 0bbb7e6ec0b1f02254449edfb03731b05927e5ac3bdc51a3fc2c2a89ae8ccbe79238f70ebe022978611ca4e49a0e9b1b95c96a3c4977360f36686424371b492e
+  metadata.gz: 610ff709c864f8cb71f29f42a0a50cd75318e0ce184801f8aa40102d35301b937afdd1c3a56381f783e405763aad2ac4886205809c2b26a07d73a9433e368c81
+  data.tar.gz: a3a0cd7ac6a1b7aaea7fe3f5989d4e1c7b071f6d7b18ffc99b4fbff56689114407310f37e459cee183a56b78529f51fe39b59712b4dc5cbd31577fc7e451b2b7

data/api_recipes.gemspec

@@ -18,6 +18,5 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
   spec.required_ruby_version = '> 2.2.0'
 
-  spec.add_dependency 'oj', '~> 3.7.0'
   spec.add_dependency 'http', '~> 4.1.1'
 end

data/lib/api_recipes.rb

@@ -1,11 +1,11 @@
 require 'http'
-require 'oj'
 
 require 'api_recipes/utils'
 require 'api_recipes/exceptions'
 require 'api_recipes/configuration'
 require 'api_recipes/resource'
 require 'api_recipes/endpoint'
+require 'api_recipes/response'
 require 'api_recipes/settings'
 
 module ApiRecipes
@@ -26,16 +26,18 @@ module ApiRecipes
       if self.respond_to? endpoint_name
         raise EndpointNameClashError.new(self, endpoint_name)
       else
+        ep = Endpoint.new(endpoint_name, configs)
+        ApiRecipes.copy_global_authorizations_to_endpoint ep
+        ApiRecipes._aprcps_thread_storage[endpoint_name] = {}
+        ApiRecipes._aprcps_thread_storage[endpoint_name][self] = ep
+
         define_method endpoint_name do
           unless ApiRecipes._aprcps_thread_storage[endpoint_name]
             ApiRecipes._aprcps_thread_storage[endpoint_name] = {}
           end
           unless ApiRecipes._aprcps_thread_storage[endpoint_name][self.class]
-            ep = Endpoint.new(endpoint_name, configs)
-            ApiRecipes.copy_global_authorizations_to_endpoint ep
-            ApiRecipes._aprcps_thread_storage[endpoint_name][self.class] = ep
+            ApiRecipes._aprcps_thread_storage[endpoint_name][self.class] = ep.clone
           end
-
           ApiRecipes._aprcps_thread_storage[endpoint_name][self.class]
         end
         define_singleton_method endpoint_name do
@@ -43,11 +45,8 @@ module ApiRecipes
             ApiRecipes._aprcps_thread_storage[endpoint_name] = {}
           end
           unless ApiRecipes._aprcps_thread_storage[endpoint_name][self]
-            ep = Endpoint.new(endpoint_name, configs)
-            ApiRecipes.copy_global_authorizations_to_endpoint ep
-            ApiRecipes._aprcps_thread_storage[endpoint_name][self] = ep
+            ApiRecipes._aprcps_thread_storage[endpoint_name][self] = ep.clone
           end
-
           ApiRecipes._aprcps_thread_storage[endpoint_name][self]
         end
       end

data/lib/api_recipes/exceptions.rb

@@ -28,6 +28,13 @@ module ApiRecipes
     end
   end
 
+  class ProvidedObjectNotAsResponseData < Exception
+    def initialize(object_class, data_class)
+      message = "provided object #{object_class} is not compatible with response data that is of type #{data_class}"
+      super(message)
+    end
+  end
+
   class ResponseCodeNotAsExpected < Exception
     attr_reader :resource, :route, :expected_code, :response_code, :response_body
 

data/lib/api_recipes/resource.rb

@@ -1,6 +1,8 @@
 module ApiRecipes
   class Resource
 
+    attr_reader :request, :response
+
     def initialize(name, endpoint, routes = {})
       @name = name
       @routes = routes
@@ -9,6 +11,18 @@ module ApiRecipes
       generate_routes
     end
 
+    def fill(object)
+      data = @response.parse
+      if block_given?
+        tap do
+          try_to_fill object, data
+          yield object, data, @response.status
+        end
+      else
+        try_to_fill object, data
+      end
+    end
+
     private
 
     def build_path(route_name, route_attributes, provided_params)
@@ -24,9 +38,28 @@ module ApiRecipes
       return path, provided_params
     end
 
-    def build_request
+    def build_request(route, route_attributes, *pars)
+      unless route_attributes
+        route_attributes = {}
+      end
+      # Merge route attributes with defaults and deep clone route attributes
+      route_attributes = Marshal.load(Marshal.dump(Settings::DEFAULT_ROUTE_ATTRIBUTES.merge(route_attributes).deep_symbolize_keys))
+
+      params = pars.extract_options!
+      path, residual_params = build_path(route, route_attributes, params)
+      residual_params = nil unless residual_params.any?
+      uri = build_uri_from path
 
+      @request = request_with_auth
+      @response = @request.send(route_attributes[:method], uri, encode_residual_params(route_attributes, residual_params))
+      check_response_code route, route_attributes, @response
 
+      if block_given?
+        data = @response.parse
+        tap { yield data, @response.status }
+      else
+        self
+      end
     end
 
     def build_uri_from(path)
@@ -42,15 +75,15 @@ module ApiRecipes
     def check_response_code(route, route_attributes, response)
       # Check if :ok_code is present, check the response
       if ok_code = route_attributes[:ok_code]
-        code = response.code
+        code = response.status.code
         # If the code does not match, apply the requested strategy (see FAIL_OPTIONS)
         unless code == ok_code
           case settings[:on_nok_code]
-            when :do_nothing
-            when :raise
-              raise ResponseCodeNotAsExpected.new(nil, @name, route, ok_code, code, response.body)
-            when :return_false
-              return false
+          when :do_nothing
+          when :raise
+            raise ResponseCodeNotAsExpected.new(nil, @name, route, ok_code, code, response.body)
+          when :return_false
+            return false
           end
         end
       end
@@ -61,12 +94,12 @@ module ApiRecipes
       if Settings::AVAILABLE_PARAMS_ENCODINGS.include? route_attributes[:encode_params_as].to_s
         { route_attributes[:encode_params_as].to_sym => residual_params }
       else
-        # default to query string params (get) or json (other methods)
+        # Default to query string params (get) or json (other methods)
         case route_attributes[:method].to_sym
-          when :get
-            { params: residual_params }
-          when :post, :put, :patch, :delete
-            { json: residual_params }
+        when :get
+          { params: residual_params }
+        when :post, :put, :patch, :delete
+          { json: residual_params }
         end
       end
     end
@@ -85,7 +118,7 @@ module ApiRecipes
         end
         unless respond_to? route.to_sym
           define_singleton_method route.to_sym do |*params, &block|
-            start_request route, attrs, *params, &block
+            build_request route, attrs, *params, &block
           end
         else
           raise RouteNameClashWithExistentMethod.new(@name, route)
@@ -100,10 +133,10 @@ module ApiRecipes
 
     def port
       settings[:port] || case settings[:protocol]
-                           when 'http'
-                             80
-                           when 'https'
-                             443
+                         when 'http'
+                           80
+                         when 'https'
+                           443
                          end
     end
 
@@ -131,27 +164,29 @@ module ApiRecipes
       @endpoint.configs
     end
 
-    def start_request(route, route_attributes, *pars)
-      unless route_attributes
-        route_attributes = {}
+    def try_to_fill(object, data)
+      case data
+      when Hash
+        res = fill_object_with object, data
+      when Array
+        res = []
+        data.each do |element|
+          res << fill_object_with(object.new, element)
+        end
       end
-      # Merge route attributes with defaults and deep clone route attributes
-      route_attributes = Marshal.load(Marshal.dump(Settings::DEFAULT_ROUTE_ATTRIBUTES.merge(route_attributes).deep_symbolize_keys))
 
-      params = pars.extract_options!
-      path, residual_params = build_path(route, route_attributes, params)
-      residual_params = nil unless residual_params.any?
-      uri = build_uri_from path
-
-      response = request_with_auth.send(route_attributes[:method], uri, encode_residual_params(route_attributes, residual_params))
-      check_response_code route, route_attributes, response
+      res
+    end
 
-      if block_given?
-        body = Oj.load(response.body.to_s)
-        yield body, response.code, response.reason
-      else
-        response
+    def fill_object_with(object, data)
+      data.each do |key, value|
+        begin
+          object.send "#{key}=", value
+        rescue
+        end
       end
+
+      object
     end
   end
 end

data/lib/api_recipes/response.rb

@@ -0,0 +1,5 @@
+module ApiRecipes
+  class Response < HTTP::Response
+
+  end
+end

data/lib/api_recipes/version.rb

@@ -1,3 +1,3 @@
 module ApiRecipes
-  VERSION = '0.7.1'
+  VERSION = '1.0.0'
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: api_recipes
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Alessandro Verlato
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-15 00:00:00.000000000 Z
+date: 2019-07-09 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: oj
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.7.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.7.0
 - !ruby/object:Gem::Dependency
   name: http
   requirement: !ruby/object:Gem::Requirement
@@ -72,6 +58,7 @@ files:
 - lib/api_recipes/endpoint.rb
 - lib/api_recipes/exceptions.rb
 - lib/api_recipes/resource.rb
+- lib/api_recipes/response.rb
 - lib/api_recipes/settings.rb
 - lib/api_recipes/utils.rb
 - lib/api_recipes/version.rb