nice_http 1.6.4 → 1.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46d0a610c87e7bd8c88e34a5825b9fe6a9e06a33299f88585c97e3bf4489e961
-  data.tar.gz: eb7977a7f5da3eb1abb76e93fd89d15a697137830c9ee8c2d54951ac04f78093
+  metadata.gz: e9134ed46c6d297b4e68c88b5e3e7e868100301bf24e3faaaa2aa17e0d75a989
+  data.tar.gz: 9ab95966908fb2365dd6573c9ddfbda4cb429741f06989fe589fb4176b4f927b
 SHA512:
-  metadata.gz: a9461df52a09637c5be242e95680e7b3f1ba38de8d5b71fc95d7f706ea6519c479b4d55d75aeca2600927ca8343fcdc0efff4a97fd7deea99ccac7431ac67a05
-  data.tar.gz: a84a1ec6d23ca1e103d792136072b1f5e498d86e2d04cf995bd21388e6b0740f1bf87ca19b8866c67e3ff8c94c7c7691ab714e440cd788fd6251290a4d405497
+  metadata.gz: 508f31aa41e757f510b95ae162ff145dce5e7a493fa0e09564414dae12b069fca20a4acb480ffd4633cb63b5cae993c2ad3620b3517e74f80e9e71b89714cd69
+  data.tar.gz: f99a4e393761bb8e69faf913ff22895f753dd531f2094b7d38eefaa66200c52bd3e454c95354823515ac0db2af3badd8e05b5dddab7a2445ed1e61f4949d5e20

data/lib/nice_http.rb

@@ -43,7 +43,6 @@ require_relative "nice_http/http_methods"
 # @attr [Hash] values_for The default values to set on the data in case not specified others
 ######################################################
 class NiceHttp
-  
   include NiceHttpManageRequest
   include NiceHttpManageResponse
   include NiceHttpHttpMethods
@@ -173,7 +172,7 @@ class NiceHttp
     require "net/https"
     @host = self.class.host
     @port = self.class.port
-    @prepath = ''
+    @prepath = ""
     @ssl = self.class.ssl
     @headers = self.class.headers.dup
     @values_for = self.class.values_for.dup
@@ -196,7 +195,7 @@ class NiceHttp
       @host = uri.host unless uri.host.nil?
       @port = uri.port unless uri.port.nil?
       @ssl = true if !uri.scheme.nil? && (uri.scheme == "https")
-      @prepath = uri.path unless uri.path=='/'
+      @prepath = uri.path unless uri.path == "/"
     elsif args.is_a?(Hash) && !args.keys.empty?
       @host = args[:host] if args.keys.include?(:host)
       @port = args[:port] if args.keys.include?(:port)
@@ -212,21 +211,21 @@ class NiceHttp
     end
 
     begin
-      log_filename =''
+      log_filename = ""
       if @log.kind_of?(String) or @log == :fix_file or @log == :file or @log == :file_run
         if @log.kind_of?(String)
           log_filename = @log
         elsif @log == :fix_file
-          log_filename = 'nice_http.log'
+          log_filename = "nice_http.log"
         elsif @log == :file
           log_filename = "nice_http_#{Time.now.strftime("%Y-%m-%d-%H%M%S")}.log"
         elsif @log == :file_run
           log_filename = "#{caller.first[/[^:]+/]}.log"
         end
         if self.class.log_files.key?(log_filename)
-          @logger = self.class.log_files[log_filename] 
+          @logger = self.class.log_files[log_filename]
         else
-          f = File.new(log_filename, 'w')
+          f = File.new(log_filename, "w")
           f.sync = true
           @logger = Logger.new f
           self.class.log_files[log_filename] = @logger
@@ -235,7 +234,7 @@ class NiceHttp
         @logger = Logger.new STDOUT
       elsif @log == :no
         @logger = Logger.new nil
-      else 
+      else
         raise InfoMissing, :log
       end
       @logger.level = Logger::INFO
@@ -244,13 +243,12 @@ class NiceHttp
       raise InfoMissing, :log
     end
 
-
     if @host.to_s != "" and (@host.start_with?("http:") or @host.start_with?("https:"))
       uri = URI.parse(@host)
       @host = uri.host unless uri.host.nil?
       @port = uri.port unless uri.port.nil?
       @ssl = true if !uri.scheme.nil? && (uri.scheme == "https")
-      @prepath = uri.path unless uri.path=='/'
+      @prepath = uri.path unless uri.path == "/"
     end
 
     raise InfoMissing, :port if @port.to_s == ""
@@ -261,7 +259,7 @@ class NiceHttp
     raise InfoMissing, :use_mocks unless @use_mocks.is_a?(TrueClass) or @use_mocks.is_a?(FalseClass)
     raise InfoMissing, :headers unless @headers.is_a?(Hash)
     raise InfoMissing, :values_for unless @values_for.is_a?(Hash)
-    
+
     begin
       if !@proxy_host.nil? && !@proxy_port.nil?
         @http = Net::HTTP::Proxy(@proxy_host, @proxy_port).new(@host, @port)

data/lib/nice_http/http_methods.rb

@@ -25,7 +25,7 @@ module NiceHttpHttpMethods
   def get(arg)
     begin
       path, data, headers_t = manage_request(arg)
-      
+
       @start_time = Time.now if @start_time.nil?
       if @use_mocks and arg.kind_of?(Hash) and arg.keys.include?(:mock_response)
         data = ""
@@ -73,7 +73,7 @@ module NiceHttpHttpMethods
             http_redir.cookies.merge!(@cookies)
             http_redir.headers.merge!(headers_t)
             #todo: remove only the server at the begining in case in query is the server it will be replaced when it should not be
-            resp = http_redir.get(path.gsub(server, "")) 
+            resp = http_redir.get(path.gsub(server, ""))
             @response = http_redir.response
           else
             @logger.warn "It seems like the http connection cannot redirect to #{server} because there is no active connection for that server. You need to create previously one."
@@ -499,31 +499,28 @@ module NiceHttpHttpMethods
   ######################################################
   def send_request(request_hash)
     unless request_hash.is_a?(Hash) and request_hash.key?(:method) and request_hash.key?(:path) and
-      request_hash[:method].is_a?(Symbol) and 
-      [:get, :head, :post, :put, :delete, :patch].include?(request_hash[:method])
-
+           request_hash[:method].is_a?(Symbol) and
+           [:get, :head, :post, :put, :delete, :patch].include?(request_hash[:method])
       message = "send_request: it needs to be supplied a Request Hash that includes a :method and :path. "
       message += "Supported methods: :get, :head, :post, :put, :delete, :patch"
       @logger.fatal message
       return {fatal_error: message, code: nil, message: nil}
     else
       case request_hash[:method]
-        when :get
-          resp = get request_hash
-        when :post
-          resp = post request_hash
-        when :head
-          resp = head request_hash
-        when :put
-          resp = put request_hash
-        when :delete
-          resp = delete request_hash
-        when :patch
-          resp = patch request_hash
+      when :get
+        resp = get request_hash
+      when :post
+        resp = post request_hash
+      when :head
+        resp = head request_hash
+      when :put
+        resp = put request_hash
+      when :delete
+        resp = delete request_hash
+      when :patch
+        resp = patch request_hash
       end
       return resp
     end
-
   end
-
-end
+end

data/lib/nice_http/manage_request.rb

@@ -11,6 +11,8 @@ module NiceHttpManageRequest
   ######################################################
   def manage_request(*arguments)
     require "json"
+
+    @prev_request = Hash.new() if @prev_request.nil?
     begin
       content_type_included = false
       path = ""
@@ -26,7 +28,7 @@ module NiceHttpManageRequest
       elsif arguments.size == 1 and arguments[0].kind_of?(String)
         path = arguments[0].to_s()
       end
-      path = (@prepath + path).gsub('//','/') unless path.nil? or path.start_with?('http:') or path.start_with?('https:')
+      path = (@prepath + path).gsub("//", "/") unless path.nil? or path.start_with?("http:") or path.start_with?("https:")
       @cookies.each { |cookie_path, cookies_hash|
         cookie_path = "" if cookie_path == "/"
         path_to_check = path
@@ -90,8 +92,8 @@ module NiceHttpManageRequest
         if arguments[0].include?(:values) and !arguments[0].include?(:values_for)
           arguments[0][:values_for] = arguments[0][:values]
         end
-        
-        if @values_for.size>0
+
+        if @values_for.size > 0
           if arguments[0][:values_for].nil?
             arguments[0][:values_for] = @values_for.dup
           else
@@ -112,11 +114,11 @@ module NiceHttpManageRequest
           if data.kind_of?(String)
             if arguments[0].include?(:values_for)
               arguments[0][:values_for].each { |key, value|
-                data.gsub!(/"(#{key})":\s*"([^"]*)"/,'"\1": "'+value+'"')  # "key":"value"
-                data.gsub!(/(#{key}):\s*"([^"]*)"/,'\1: "'+value+'"')  # key:"value"
-                data.gsub!(/(#{key}):\s*'([^']*)'/,'\1: \''+value+"'")  # key:'value'
-                data.gsub!(/"(#{key})":\s*(\w+)/,'"\1": '+value)  # "key":456
-                data.gsub!(/(#{key}):\s*(\w+)/,'\1: '+value)  # key:456
+                data.gsub!(/"(#{key})":\s*"([^"]*)"/, '"\1": "' + value + '"')  # "key":"value"
+                data.gsub!(/(#{key}):\s*"([^"]*)"/, '\1: "' + value + '"')  # key:"value"
+                data.gsub!(/(#{key}):\s*'([^']*)'/, '\1: \'' + value + "'")  # key:'value'
+                data.gsub!(/"(#{key})":\s*(\w+)/, '"\1": ' + value)  # "key":456
+                data.gsub!(/(#{key}):\s*(\w+)/, '\1: ' + value)  # key:456
               }
             end
           elsif data.kind_of?(Hash)
@@ -191,16 +193,21 @@ module NiceHttpManageRequest
       headers_t.each { |key, val| headers_ts += key.to_s + ":" + val.to_s() + ", " }
       message = "#{"- " * 25}\n"
       if arguments.size == 1 and arguments[0].kind_of?(Hash) and arguments[0].key?(:name)
-        message+= "#{method_s.upcase} Request: #{arguments[0][:name]}\n"
+        message += "#{method_s.upcase} Request: #{arguments[0][:name]}"
       else
-        message+= "#{method_s.upcase} Request\n"
+        message += "#{method_s.upcase} Request"
+      end
+      message += "\n path: " + path.to_s() + "\n"
+      if @debug or @prev_request[:path] != path or @prev_request[:headers] != headers_t or @prev_request[:data] != data
+        message += " headers: {" + headers_ts.to_s() + "}\n"
+        message += " data: " + data_s.to_s() + "\n"
+        message = @message_server + "\n" + message
+      else
+        message += " Same as the last request."
       end
-      message += " path: " + path.to_s() + "\n"
-      message += " headers: {" + headers_ts.to_s() + "}\n"
-      message += " data: " + data_s.to_s() + "\n"
-      message = @message_server + "\n" + message
       if path.to_s().scan(/^https?:\/\//).size > 0 and path.to_s().scan(/^https?:\/\/#{@host}/).size == 0
         # the path is for another server than the current
+        # todo: identify if it is better to log the request, or if it is done later
       else
         self.class.last_request = message
         @logger.info(message)
@@ -209,6 +216,9 @@ module NiceHttpManageRequest
       if data.to_s() != "" and encoding.to_s().upcase != "UTF-8" and encoding != ""
         data = data.to_s().encode(encoding, "UTF-8")
       end
+      @prev_request[:path] = path
+      @prev_request[:data] = data
+      @prev_request[:headers] = headers_t
       return path, data, headers_t
     rescue Exception => stack
       @logger.fatal(stack)
@@ -216,5 +226,4 @@ module NiceHttpManageRequest
       return :error
     end
   end
-
-end
+end

data/lib/nice_http/manage_response.rb

@@ -10,6 +10,7 @@ module NiceHttpManageResponse
   ######################################################
   def manage_response(resp, data)
     require "json"
+    @prev_response = Hash.new() if @prev_response.nil?
     begin
       if @start_time.kind_of?(Time)
         @response[:time_elapsed_total] = Time.now - @start_time
@@ -40,8 +41,8 @@ module NiceHttpManageResponse
       if resp.kind_of?(Hash) and !resp.has_key?(:header)
         resp[:header] = {}
       end
-      
-      #todo: check this. not sure if this is valid anymore since resp it will be a hash only when mock_response      
+
+      #todo: check this. not sure if this is valid anymore since resp it will be a hash only when mock_response
       if resp.kind_of?(Hash)
         resp.each { |k, v|
           if k != :code and k != :message and k != :data and k != :'set-cookie' and k != :header
@@ -76,8 +77,8 @@ module NiceHttpManageResponse
         resp.each { |key, val| @response[key.to_sym] = val.to_s().encode("UTF-8", encoding_response.to_s()) }
       else
         @response[:message] = resp.message
-        resp.each { |key, val| 
-          @response[key.to_sym] = val 
+        resp.each { |key, val|
+          @response[key.to_sym] = val
         }
       end
 
@@ -88,59 +89,59 @@ module NiceHttpManageResponse
       end
 
       @response[:code] = resp.code
-
-      unless @response.nil?
-        message = "\nRESPONSE: \n " + @response[:code].to_s() + ":" + @response[:message].to_s()
-        #if @debug
-          self.class.last_response = message if @debug
-          @response.each { |key, value|
-            if value.to_s() != ""
-              value_orig = value
-              if key.kind_of?(Symbol)
-                if key == :code or key == :data or key == :header or key == :message
-                  if key == :data and !@response[:'content-type'].to_s.include?('text/html')
-                    begin
-                      JSON.parse(value_orig)
-                      data_s = JSON.pretty_generate(JSON.parse(value_orig))
-                    rescue
-                      data_s = value_orig
-                    end
-                    if @debug
-                      self.class.last_response += "\n " + key.to_s() + ": '" + data_s.gsub("<", "&lt;") + "'\n"
-                    end
-                    if value_orig != value
-                      message += "\n " + key.to_s() + ": '" + value.gsub("<", "&lt;") + "'\n"
-                    else
-                      message += "\n " + key.to_s() + ": '" + data_s.gsub("<", "&lt;") + "'\n"
-                    end
+      message = "\nRESPONSE: \n " + @response[:code].to_s() + ":" + @response[:message].to_s()
+      if @debug or @prev_response[:'content-type']!=@response[:'content-type'] or @prev_response[:'content-length']!=@response[:'content-length'] or
+        @prev_response[:data]!=@response[:data] or @prev_response[:code]!=@response[:code] or @prev_response[:message]!= @response[:message]
+        self.class.last_response = message if @debug
+        @response.each { |key, value|
+          if value.to_s() != ""
+            value_orig = value
+            if key.kind_of?(Symbol)
+              if key == :code or key == :data or key == :header or key == :message
+                if key == :data and !@response[:'content-type'].to_s.include?("text/html")
+                  begin
+                    JSON.parse(value_orig)
+                    data_s = JSON.pretty_generate(JSON.parse(value_orig))
+                  rescue
+                    data_s = value_orig
+                  end
+                  if @debug
+                    self.class.last_response += "\n " + key.to_s() + ": '" + data_s.gsub("<", "&lt;") + "'\n"
+                  end
+                  if value_orig != value
+                    message += "\n " + key.to_s() + ": '" + value.gsub("<", "&lt;") + "'\n"
                   else
-                    if @debug
-                      self.class.last_response += "\n " + key.to_s() + ": '" + value.to_s().gsub("<", "&lt;") + "'"
-                      message += "\n " + key.to_s() + ": '" + value.to_s().gsub("<", "&lt;") + "'"
-                    end
+                    message += "\n " + key.to_s() + ": '" + data_s.gsub("<", "&lt;") + "'\n"
                   end
                 else
                   if @debug
                     self.class.last_response += "\n " + key.to_s() + ": '" + value.to_s().gsub("<", "&lt;") + "'"
-                  end  
-                  message += "\n " + key.to_s() + ": '" + value.to_s().gsub("<", "&lt;") + "'"
+                    message += "\n " + key.to_s() + ": '" + value.to_s().gsub("<", "&lt;") + "'"
+                  end
                 end
-              elsif !@response.include?(key.to_sym)
+              else
                 if @debug
                   self.class.last_response += "\n " + key.to_s() + ": '" + value.to_s().gsub("<", "&lt;") + "'"
                 end
                 message += "\n " + key.to_s() + ": '" + value.to_s().gsub("<", "&lt;") + "'"
               end
+            elsif !@response.include?(key.to_sym)
+              if @debug
+                self.class.last_response += "\n " + key.to_s() + ": '" + value.to_s().gsub("<", "&lt;") + "'"
+              end
+              message += "\n " + key.to_s() + ": '" + value.to_s().gsub("<", "&lt;") + "'"
             end
-          }
-        #end
-        @logger.info message
-        if @response.kind_of?(Hash)
-          if @response.keys.include?(:requestid)
-            @headers["requestId"] = @response[:requestid]
-            self.class.request_id = @response[:requestid]
-            @logger.info "requestId was found on the response header and it has been added to the headers for the next request"
           end
+        }
+      else
+        message += "\n Same as the last response."
+      end
+      @logger.info message
+      if @response.kind_of?(Hash)
+        if @response.keys.include?(:requestid)
+          @headers["requestId"] = @response[:requestid]
+          self.class.request_id = @response[:requestid]
+          @logger.info "requestId was found on the response header and it has been added to the headers for the next request"
         end
       end
 
@@ -173,9 +174,10 @@ module NiceHttpManageResponse
           end
         end
       end
+      @prev_response = @response
     rescue Exception => stack
       @logger.fatal stack
       @logger.fatal "manage_response Error on method #{method_s} "
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nice_http
 version: !ruby/object:Gem::Version
-  version: 1.6.4
+  version: 1.6.5
 platform: ruby
 authors:
 - Mario Ruiz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-15 00:00:00.000000000 Z
+date: 2019-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nice_hash
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.11'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.11'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.11.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement