console_utils 0.6.2 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0b8ff5ade51bb1eeb010dd6c9bb40afcbd54ac9d
-  data.tar.gz: d94d2684a740245b6d3e541c812ab03785cdc23c
+SHA256:
+  metadata.gz: 9fd306eed79667af72048f0d5e5ed12c1bd6c0859c260e8d6523af47f81c88b2
+  data.tar.gz: d0bd5a629c0711fbb44e2a71e113dc41e0fda5faa8d56af937b97c0eeb480c73
 SHA512:
-  metadata.gz: 59bee05607a89edf2b91ec1730f2b25ca544f61cb9cccc3253eadd93ffe76e01fba31012a13076fbea7ed721934ecff9cd31bb9c6a02474fe92346faf3ece8cf
-  data.tar.gz: 33b2f85d32e419a10707081436867634d5c87edb8f177a3c9206cfe15c5ecea447049f6da5ad05801033e4ee18e4758e7f4af246ffd8fbc62dcde4017f9695bb
+  metadata.gz: 8abf3c1a57509b08e0cc61759ba3e5dc2c31b6cd88b90a751e86748e0b08a1ae8e6afa9cd46b1530c121b14ed9c40b62eebcf982090bebbdb19d4eca119b4184
+  data.tar.gz: f0000009774f5a91aa9ee63b5fff8127780f332d58c9b0aba6586056d56ad4bb0a3a9bb8e5a32f288c7fa1a67db9777a24d02cad9ea8349a5cecdf981fbac541

data/README.md

@@ -184,7 +184,7 @@ Also provides shorthand to find any user by id: `usr(id)`
 ## OtherUtils
 
 #### clr()
-Term::ANSIColor shorthand
+[Pastel](https://github.com/piotrmurach/pastel) shorthand
 
 #### shutting(:engine_key[, to: logger_level]) {}
 Shuts up the logger of a specified Rails engine for a given key (`:rails`, `:record`, `:controller` or `:view`).

data/console_utils.gemspec

@@ -20,8 +20,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_ruby_version = ">= 2.1"
 
-  spec.add_dependency "activesupport", ">= 4.1", "< 6"
-  spec.add_dependency "term-ansicolor"
+  spec.add_dependency "activesupport", ">= 5.2", "< 7"
+  spec.add_dependency "pastel"
   spec.add_dependency "awesome_print"
   spec.add_dependency "benchmark-ips"
   spec.add_dependency "pry-rails"

data/lib/console_utils.rb

@@ -1,7 +1,7 @@
 require 'active_support'
 require 'active_support/core_ext'
 require 'active_support/tagged_logging'
-require 'term/ansicolor'
+require 'pastel'
 require 'console_utils/core_ext/array_to_proc'
 require 'console_utils/core_ext/local_values'
 require 'console_utils/version'
@@ -140,6 +140,12 @@ module ConsoleUtils
   # which is useful when using the +simple_token_automator+ gem.
   mattr_accessor(:auth_automator) { ConsoleUtils::RequestUtils::DefaultAuthAutomator }
 
+  # :attr:
+  # Keeps any amount of callable objects to invoke them before each request,
+  # with an instance of <tt>ConsoleUtils::RequestUtils::RequestParams</tt>
+  # as only the argument.
+  # (default: <tt>[]</tt>)
+  mattr_accessor(:request_hooks) { [] }
 
   # :section: Class Methods
 
@@ -201,6 +207,10 @@ module ConsoleUtils
     def setup_modules_to(context = nil)
       ReplState.setup(context)
     end
+
+    def pastel
+      @pastel ||= Pastel.new
+    end
   end
 
   ActiveSupport.run_load_hooks(:console_utils, self)

data/lib/console_utils/active_record_utils.rb

@@ -6,7 +6,7 @@ module ConsoleUtils #:nodoc:
 
     def self.extended(mod)
       ActiveSupport.on_load(:active_record) do
-        ActiveRecord::Relation.send(:include, RandomRecord::FinderMethods)
+        ActiveRecord::Relation.send(:prepend, RandomRecord::FinderMethods)
         ActiveRecord::Base.send(:extend, RandomRecord::Querying)
       end
     end

data/lib/console_utils/active_record_utils/random_record.rb

@@ -9,8 +9,16 @@ module ConsoleUtils::ActiveRecordUtils  #:nodoc:
         random.first
       end
 
-      def anyid
-        model.type_for_attribute('id').send(:cast_value, connection.select_value(select(:id).random.limit(1)))
+      def anyid(n = nil)
+        if n
+          @_anyid_history[-n.abs].presence || anyid()
+        else
+          idval = connection.select_value(select(:id).random.limit(1))
+          model.type_for_attribute('id').send(:cast_value, idval).tap do |result|
+            (@_anyid_history ||= []) << result
+            @_anyid_history.shift if @_anyid_history.size > 10
+          end
+        end
       end
     end
 

data/lib/console_utils/other_utils.rb

@@ -1,8 +1,8 @@
 module ConsoleUtils #:nodoc:
   module OtherUtils
-    # <tt>Term::ANSIColor</tt> shorthand
+    # <tt>Pastel</tt> shorthand
     def clr
-      Term::ANSIColor
+      ConsoleUtils.pastel
     end
 
     # :call-seq:

data/lib/console_utils/request_utils/auth_automators.rb

@@ -1,7 +1,6 @@
 module ConsoleUtils::RequestUtils
   class DefaultAuthAutomator
     def self.call(rq)
-      p rq
       if rq.can_auto_auth?
         rq.params[ConsoleUtils.token_param] ||= ConsoleUtils.default_token.presence || ConsoleUtils.auto_token_for(rq.uid)
       end

data/lib/console_utils/request_utils/exap.rb

@@ -4,12 +4,15 @@ module ConsoleUtils::RequestUtils #:nodoc:
   class Exap < Requester
     INSPECT_FORMAT = "<Local: %s (%s)>".freeze
 
-    ConsoleUtils.request_methods.each do |reqm|
-      define_method(reqm) do |*args|
-        @url, *@_args = args
-        app.public_send(reqm, @url, *normalize_args)
-        self
-      end
+    ConsoleUtils.request_methods.each do |request_method|
+      class_eval <<~RUBY, __FILE__, __LINE__ + 1
+        def #{request_method}(url, *args)
+          @url = url
+          @_args = args
+          app.process(:#{request_method}, @url, **normalize_args.to_h)
+          self
+        end
+      RUBY
     end
 
     def to_s

data/lib/console_utils/request_utils/remo.rb

@@ -1,21 +1,25 @@
 require 'uri'
-require "console_utils/request_utils/requester"
+require 'open3'
+require 'shellwords'
+require 'console_utils/request_utils/requester'
 
 module ConsoleUtils::RequestUtils #:nodoc:
   class Remo < Requester
-    OUT_FORMAT      = "\n%{size_download}\n%{time_total}".freeze
     INSPECT_FORMAT  = "<Remote: %s in %s ms>".freeze
     INSPECT_NOTHING = "<Remote: nothing>".freeze
 
     attr_reader :request_method
 
-    ConsoleUtils.request_methods.each do |reqm|
-      define_method(reqm) do |url, *args|
-        @_args = args
-        @url   = urlify(url, *normalize_args)
-        @request_method = reqm.to_s.upcase
-        perform
-      end
+    ConsoleUtils.request_methods.each do |request_method|
+      class_eval <<~RUBY, __FILE__, __LINE__ + 1
+        def #{request_method}(url, *args)
+          @_args = args
+          @request_method = "#{request_method.to_s.upcase}"
+          @request_params = normalize_args
+          @url = urlify(url, @request_params.params)
+          perform
+        end
+      RUBY
     end
 
     def inspect
@@ -30,30 +34,125 @@ module ConsoleUtils::RequestUtils #:nodoc:
       @_body
     end
 
+    attr_reader :_result
+
     protected
 
     def perform
-      IO.popen(curl_command, "r+") { |io| set_payload!(io.readlines) }
+      data = @request_params.params.to_json unless params_to_query?
+      Curl.(request_method, url, data: data, headers: @request_params.headers) do |result, payload|
+        @_result = result
+        set_payload!(payload)
+      end
     end
 
     private
 
-    def set_payload!((*body_lines, size, time))
+    def set_payload!((*body_lines, code, time, size))
       @_body = body_lines.join
+      @_code = code.to_i
       @_size = size.to_f
       @_time = time.tr(?,, ?.).to_f
       self
     end
 
-    def curl_command
-      %W(#{ConsoleUtils.curl_bin} --silent --write-out #{OUT_FORMAT} -X #{request_method} #{url}).
-        tap { |cmd| puts "# #{cmd.shelljoin.inspect}" unless ConsoleUtils.curl_silence }
+    def urlify(path, options = nil)
+      URI.join(ConsoleUtils.remote_endpoint, path).
+        tap { |uri| uri.query = options.to_query if options && params_to_query? }.to_s
     end
 
-    def urlify(*args)
-      options = args.extract_options!
-      URI.join(ConsoleUtils.remote_endpoint, *args).
-        tap { |uri| uri.query = options.to_query }.to_s
+    def params_to_query?
+       ["GET", "HEAD"].include?(@request_method) || @request_method.headers["Content-Type"] != "application/json"
+    end
+
+    class Curl
+      OUT_FORMAT = '\n%{http_code}\n%{time_total}\n%{size_download}'.freeze
+      HEADER_JOIN_PROC = proc { |*kv| ["-H", kv.flatten.join(": ")] }
+
+      def self.call(*args)
+        result = new(*args)
+        yield(result.to_h, result.payload)
+      end
+
+      attr_reader :request, :response, :payload
+
+      def initialize(request_method, url, data: nil, headers: nil)
+        cmd = %W(#{ConsoleUtils.curl_bin} --silent -v -g)
+        cmd.push("-X#{request_method}")
+        cmd.push(url)
+
+        cmd.concat(headers.flat_map(&HEADER_JOIN_PROC)) if headers.present?
+        cmd.push("-d", data) if data.present?
+
+        cmd_line = Shellwords.join(cmd)
+        cmd_line << %( --write-out "#{OUT_FORMAT}")
+
+        puts "$ #{cmd_line}" if verbose?
+
+        @response = {}
+        @request  = {}
+        @payload  = []
+
+        Open3.popen3(cmd_line) do |stdin, stdout, stderr, thr|
+          # stdin.close
+          { stderr: stderr, stdout: stdout }.each do |key, io|
+            Thread.new do
+              begin
+                until (line = io.gets).nil? do
+                  key == :stderr ? process_stderr(line) : @payload << line
+                end
+              rescue => e
+                warn e
+              end
+            end
+          end
+          thr.join
+        end
+      end
+
+      KEY_MAP = { ">" => :request, "<" => :response }
+
+      def process_stderr(line)
+        # warn(line)
+        if type = KEY_MAP[line.chr]
+          line = line[2, line.size-1].strip
+
+          return if line.size == 0
+
+          case type
+          when :request; set_request(line)
+          when :response; set_response(line)
+          end
+        end
+      end
+
+      def set_request(line)
+        # warn("Request: #{line}")
+        if !@request.key?(:http_version) && line =~ /^(GET|POST|PUT|PATCH|HEAD|OPTION|DELETE) (.+?) HTTP\/(.+)$/
+          @request.merge!(method: $1, url: $2, http_version: $3)
+        else
+          header, value = line.split(": ", 2)
+          @request[header] = value
+        end
+      end
+
+      def set_response(line)
+        # warn("Response: #{line}")
+        if !@response.key?(:http_version) && line =~ /^HTTP\/(.+) (\d+?) (.+)$/
+          @response.merge!(http_version: $1, http_code: $2.to_i, http_status: $3)
+        else
+          header, value = line.split(": ", 2)
+          @response[header] = value
+        end
+      end
+
+      def to_h
+        { response: @response, request: @request }
+      end
+
+      def verbose?
+        !ConsoleUtils.curl_silence
+      end
     end
   end
 end

data/lib/console_utils/request_utils/request_params.rb

@@ -1,29 +1,24 @@
-module ConsoleUtils::RequestUtils
-  class RequestParams
-    attr_accessor :uid
+# frozen_string_literal: true
 
-    def initialize(uid_or_params = true, params = nil, headers = nil)
-      # puts "Request params: uid_or_params=#{uid_or_params} | params=#{params} | headers=#{headers}"
-
-      if uid_or_params.is_a? Hash
-        headers, params, uid_or_params = [params, uid_or_params, nil]
-      end
-
-      @params  = params  if params
-      @headers = headers if headers
-      @uid = auto_auth? && ((uid_or_params.nil? || uid_or_params == true) ? ConsoleUtils.default_uid : uid_or_params)
-
-      ConsoleUtils.logger.debug { "#{uid}, #{params()}, #{headers()}" }
+module ConsoleUtils::RequestUtils
+  RequestParams = Struct.new(:params, :headers)
 
-      auth_automator.(self)
+  class RequestParams
+    AutoUid = -> (uid) do
+      ConsoleUtils.request_auto_auth && ((uid.nil? || uid == true) ? ConsoleUtils.default_uid : uid)
     end
 
-    def params
-      @params ||= {}
-    end
+    attr_accessor :uid
 
-    def headers
-      @headers ||= {}
+    def initialize(uid = true, *rest, params: nil, headers: nil)
+      params, headers = rest if params.nil? && headers.nil? && rest.size > 0
+      params, headers, uid = [uid, params, nil] if uid.is_a?(Hash)
+      @uid = AutoUid[uid] || uid
+      super(params.to_h, headers.to_h)
+
+      ConsoleUtils.auth_automator.(self) if ConsoleUtils.auth_automator.respond_to?(:call)
+      ConsoleUtils.request_hooks.each { |hook| hook.(self) }
+      ConsoleUtils.logger.debug { "#{@uid}, #{self}" }
     end
 
     def to_a
@@ -39,21 +34,11 @@ module ConsoleUtils::RequestUtils
         headers.merge!(default_headers.to_h)
       end
 
-      to_a
+      self
     end
 
     def can_auto_auth?
-      auto_auth? && uid && auth_automator.respond_to?(:call)
-    end
-
-    private
-
-    def auto_auth?
-      ConsoleUtils.request_auto_auth
-    end
-
-    def auth_automator
-      ConsoleUtils.auth_automator
+      ConsoleUtils.request_auto_auth && @uid && ConsoleUtils.auth_automator.respond_to?(:call)
     end
   end
 end

data/lib/console_utils/request_utils/requester.rb

@@ -5,10 +5,8 @@ module ConsoleUtils::RequestUtils #:nodoc:
   class Requester < SimpleDelegator
     INFO_HASH_FIELDS = %i(url size time human_size human_time).freeze
     INFO_FORMAT      = "%#-.50{url} | %#10{human_size} | %#10{human_time}\n".freeze
-    NO_RESPONSE      = Term::ANSIColor.red(" \u27A7 Empty response's body.").freeze
-    PBCOPY_MESSAGE   = Term::ANSIColor.green(" \u27A4 Response body copied to pasteboard\n").freeze
-    COMPLETE_IN      = Term::ANSIColor.green("Complete in %s").freeze
-    TRANSFERED       = Term::ANSIColor.cyan("Transfered: %s").freeze
+    NO_RESPONSE      = ConsoleUtils.pastel.red(" \u27A7 Empty response's body.").freeze
+    PBCOPY_MESSAGE   = ConsoleUtils.pastel.green(" \u27A4 Response body copied to pasteboard\n").freeze
 
     class_attribute :default_params, instance_writer: false
     attr_reader :url
@@ -54,33 +52,55 @@ module ConsoleUtils::RequestUtils #:nodoc:
     end
 
     def to_info_hash
-      INFO_HASH_FIELDS.zip(INFO_HASH_FIELDS.map(&method(:public_send))).to_h
+      hsh = {}
+      INFO_HASH_FIELDS.each { |field| hsh[field] = public_send(field) }
+      hsh
     end
 
     protected
 
     def normalize_args
-      RequestParams.new(*@_args).with_default(default_params).tap do |args|
-        ConsoleUtils.logger.debug { args }
-      end
+      params = RequestParams.new(*@_args).with_default(default_params)
+      ConsoleUtils.logger.debug { params.to_a }
+      params
     end
 
     private
 
     def show_complete_in!(reset = true)
       return if @_time.nil?
-      puts "=> #{COMPLETE_IN % [time_ms]}"
+      if @_code && status_code = Rack::Utils::HTTP_STATUS_CODES[@_code]
+        print "=> ", pastel.public_send(status_color(@_code), "Completed ", pastel.bold("#{@_code} #{status_code}"), " in #{time_ms}"), "\n"
+      else
+        puts "=> #{pastel.green("Completed in #{time_ms}")}"
+      end
+    ensure
+      @_code = nil
       @_time = nil
     end
 
+    def pastel
+      ConsoleUtils.pastel
+    end
+
     def show_transfered!(reset = true)
       return if @_size.nil?
-      puts "=> #{TRANSFERED % [size_downloaded]}"
+      print "=> ", pastel.cyan("Transferred: #{size_downloaded}"), "\n"
+    ensure
       @_size = nil
     end
 
+    def status_color(code)
+      case code
+      when 200...400; :green
+      when 400...500; :red
+      when 500...600; :intense_red
+      else            :yellow
+      end
+    end
+
     private_constant :PBCOPY_MESSAGE,
-                     :NO_RESPONSE, :COMPLETE_IN, :TRANSFERED,
+                     :NO_RESPONSE,
                      :INFO_FORMAT
   end
 end

data/lib/console_utils/version.rb

@@ -1,3 +1,3 @@
 module ConsoleUtils
-  VERSION = "0.6.2"
+  VERSION = "0.10.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: console_utils
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.10.1
 platform: ruby
 authors:
 - Anton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-08 00:00:00.000000000 Z
+date: 2020-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,22 +16,22 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '7'
 - !ruby/object:Gem::Dependency
-  name: term-ansicolor
+  name: pastel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -193,8 +193,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Groovy tools for Rails Console.