nice_http 1.7.11 → 1.7.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b25e87b3aa0fc0441ef89f640ab48775c51d18d15bfc9432436560f2ed419350
-  data.tar.gz: 7ebac02ad1e04ec6ceec028d3bd8755cfda8ae3c8e89900c49d1fbd313907ef2
+  metadata.gz: 2c3b6a7f67e9be9c37ccf1f54de716e4163bc933f28a9b1cceb882b807eb8373
+  data.tar.gz: 421a4c70d2028c87801ace548aa60567ea14606be1c54fccc85c63376e4e698c
 SHA512:
-  metadata.gz: 3ca1df8e19b1d4632bfdff00c9e358386597b10501006c9c7f877e4b311c11e0ceff6e53217b1843402e6a2c4dae01dbd304af3f59c29bcba5526e9d9a8d4133
-  data.tar.gz: d0c52aeee6739d242b7fd417dc622f05ea6b8d8517b77809d64a55945385230766b422753a4c07293231bc2f8e8bc1f269dd875c54a0202f6dee6c5a3caf2422
+  metadata.gz: a20057e02aadea9d15d0e337c83a6116ea9306a8d50a600a57ec8a959f84054d8447b36c283cf0feb05bf201d60657678e637a2c6437edcda98f1275a257f6d7
+  data.tar.gz: 6f5eef4527c42c7698a4156b64503acab99c8add891961e8a9847f25b1d0ad9b79d5824c3fbc72ae681717d3d539187db744e5267183f0411396c350dbd5bfa3

data/README.md

@@ -380,8 +380,8 @@ Other values you can supply:
 
 Example of logs:
 ```
-I, [2019-03-22T18:38:58.518964 #29412]  INFO -- : (47266856647720): Http connection created. host:www.reqres.in,  port:443,  ssl:true, mode:, proxy_host: , proxy_port:  
-I, [2019-03-22T18:38:58.537106 #29412]  INFO -- : (47266856647720): Http connection: https://www.reqres.in:443
+I, [2019-03-22T18:38:58.518964 #29412]  INFO -- : (47266856647720): Http connection created. host:reqres.in,  port:443,  ssl:true, mode:, proxy_host: , proxy_port:  
+I, [2019-03-22T18:38:58.537106 #29412]  INFO -- : (47266856647720): Http connection: https://reqres.in:443
 
 
 - - - - - - - - - - - - - - - - - - - - - - - - - 
@@ -493,7 +493,7 @@ threads = []
 40.times do |num|
     threads << Thread.new do
         Thread.current.name = num.to_s
-        http = NiceHttp.new("https://www.reqres.in")
+        http = NiceHttp.new("https://reqres.in")
         request = {
           path: '/api/users',
           data: { name: 'morpheus', job: 'leader' },
@@ -529,7 +529,7 @@ This is an example of the output:
 
 ```yaml
 ---
-www.reqres.in:443:
+reqres.in:443:
   :num_requests: 11
   :time_elapsed:
     :total: 2.947269038

data/lib/nice_http.rb

@@ -16,6 +16,7 @@ require_relative "nice_http/http_methods"
 # @attr [Boolean] ssl If you use ssl or not
 # @attr [Hash] headers Contains the headers you will be using on your connection
 # @attr [Boolean] debug In case true shows all the details of the communication with the host
+# @attr [String] log_path The path where the logs will be stored. By default empty string.
 # @attr [String, Symbol] log :fix_file, :no, :screen, :file, "path and file name".
 #   :fix_file, will log the communication on nice_http.log. (default).
 #   :no, will not generate any logs.
@@ -65,7 +66,7 @@ class NiceHttp
   end
 
   class << self
-    attr_accessor :host, :port, :ssl, :headers, :debug, :log, :proxy_host, :proxy_port,
+    attr_accessor :host, :port, :ssl, :headers, :debug, :log_path, :log, :proxy_host, :proxy_port,
                   :last_request, :last_response, :request_id, :use_mocks, :connections,
                   :active, :auto_redirect, :log_files, :values_for, :create_stats, :stats
   end
@@ -87,6 +88,7 @@ class NiceHttp
     @values_for = {}
     @debug = false
     @log = :fix_file
+    @log_path = ''
     @proxy_host = nil
     @proxy_port = nil
     @last_request = nil
@@ -125,13 +127,13 @@ class NiceHttp
     subclass.reset!
   end
 
-  attr_reader :host, :port, :ssl, :debug, :log, :proxy_host, :proxy_port, :response, :num_redirects
+  attr_reader :host, :port, :ssl, :debug, :log, :log_path, :proxy_host, :proxy_port, :response, :num_redirects
   attr_accessor :headers, :cookies, :use_mocks, :auto_redirect, :logger, :values_for
 
   ######################################################
   # Change the default values for NiceHttp supplying a Hash
   #
-  # @param par [Hash] keys: :host, :port, :ssl, :headers, :debug, :log, :proxy_host, :proxy_port, :use_mocks, :auto_redirect, :values_for, :create_stats
+  # @param par [Hash] keys: :host, :port, :ssl, :headers, :debug, :log, :log_path, :proxy_host, :proxy_port, :use_mocks, :auto_redirect, :values_for, :create_stats
   ######################################################
   def self.defaults=(par = {})
     @host = par[:host] if par.key?(:host)
@@ -140,6 +142,7 @@ class NiceHttp
     @headers = par[:headers].dup if par.key?(:headers)
     @values_for = par[:values_for].dup if par.key?(:values_for)
     @debug = par[:debug] if par.key?(:debug)
+    @log_path = par[:log_path] if par.key?(:log_path)
     @log = par[:log] if par.key?(:log)
     @proxy_host = par[:proxy_host] if par.key?(:proxy_host)
     @proxy_port = par[:proxy_port] if par.key?(:proxy_port)
@@ -250,7 +253,7 @@ class NiceHttp
       if self.log.is_a?(String)
         file_name = self.log
       else
-        file_name = "./nice_http.log"
+        file_name = "./#{self.log_path}nice_http.log"
       end
     end
     require "fileutils"
@@ -295,6 +298,8 @@ class NiceHttp
   #
   #             debug -- true, false (default)
   #
+  #             log_path -- string with path for the logs, empty string (default)
+  #
   #             log -- :no, :screen, :file, :fix_file (default).
   #
   #                 A string with a path can be supplied.
@@ -326,6 +331,7 @@ class NiceHttp
     @values_for = self.class.values_for.dup
     @debug = self.class.debug
     @log = self.class.log
+    @log_path = self.class.log_path
     @proxy_host = self.class.proxy_host
     @proxy_port = self.class.proxy_port
     @use_mocks = self.class.use_mocks
@@ -353,6 +359,7 @@ class NiceHttp
       @values_for = args[:values_for].dup if args.keys.include?(:values_for)
       @debug = args[:debug] if args.keys.include?(:debug)
       @log = args[:log] if args.keys.include?(:log)
+      @log_path = args[:log_path] if args.keys.include?(:log_path)
       @proxy_host = args[:proxy_host] if args.keys.include?(:proxy_host)
       @proxy_port = args[:proxy_port] if args.keys.include?(:proxy_port)
       @use_mocks = args[:use_mocks] if args.keys.include?(:use_mocks)
@@ -363,7 +370,6 @@ class NiceHttp
     if @log.kind_of?(String) or @log == :fix_file or @log == :file or @log == :file_run
       if @log.kind_of?(String)
         log_filename = @log.dup
-
         unless log_filename.start_with?(".")
           if caller.first.start_with?(Dir.pwd)
             folder = File.dirname(caller.first[/[^:]+/])
@@ -389,7 +395,29 @@ class NiceHttp
       if Thread.current.name.to_s != ""
         log_filename.gsub!(/\.log$/, "_#{Thread.current.name}.log")
       end
-      if self.class.log_files.key?(log_filename)
+      unless @log_path.to_s == ''
+        log_filename.gsub!(Dir.pwd,'.')
+        dpath = @log_path.split("/")
+        dfile = log_filename.split("/")
+        log_filenamepath = ''
+        dfile.each_with_index do |d,i|
+          if d==dpath[i]
+            log_filenamepath<<"#{d}/"
+          else
+            log_filename = @log_path + "#{log_filename.gsub(/^#{log_filenamepath}/,'')}"
+            break
+          end
+        end
+        log_filename = "./#{log_filename}" unless log_filename[0..1]=='./'
+        log_filename = ".#{log_filename}" unless log_filename[0]=='.'
+
+        unless File.exist?(log_filename)
+          require 'fileutils'
+          FileUtils.mkdir_p(File.dirname(log_filename))
+        end
+      end
+
+      if self.class.log_files.key?(log_filename) and File.exist?(log_filename)
         @logger = self.class.log_files[log_filename]
       else
         begin

data/lib/nice_http/manage_request.rb

@@ -136,8 +136,11 @@ module NiceHttpManageRequest
               if arguments[0].include?(:values_for)
                 if arguments[0][:values_for].is_a?(Array)
                   data_n = row.set_values(arguments[0][:values_for][indx])
-                else
+                elsif arguments[0][:values_for].is_a?(Hash)
                   data_n = row.set_values(arguments[0][:values_for])
+                else
+                  @logger.fatal("Wrong format on request application/json, be sure is a Hash, Array of Hashes or JSON string. values_for needs to be an array or a hash.")
+                  return :error, :error, :error
                 end
               else
                 data_n = row

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nice_http
 version: !ruby/object:Gem::Version
-  version: 1.7.11
+  version: 1.7.12
 platform: ruby
 authors:
 - Mario Ruiz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-04 00:00:00.000000000 Z
+date: 2019-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nice_hash
@@ -19,7 +19,7 @@ dependencies:
         version: '1.12'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.12.3
+        version: 1.12.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '1.12'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.12.3
+        version: 1.12.4
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement