console_utils 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '09a3c963c0f381509271a6f9598e6546cefd3ae48fed7dbe0b753f96b24b6eac'
-  data.tar.gz: 10ab073e39883263b7053d6709c47351c6f858befe278574f14338a9c29a7bab
+  metadata.gz: a398186f93724b6e079f8443d514f2e509c68cff8b2f30194538369007278818
+  data.tar.gz: 73897b3d111dd2faaa0a53a20f89a2bff7ef7a7e14752ff46ce33bc942218f84
 SHA512:
-  metadata.gz: 320d84f01062d96ca794a77e6fa568e9e9d26bc255c13986b2f17cba51199471bf4f48724d6d201baf479c2c093e0f6dc6301241b4a5a2b6fd5da579e6b5e8a2
-  data.tar.gz: 2b1d9fc87d8492976646a6ef0521ec1728b74fe7f4a488a412871fac73e44cee81bd05d3e6b61beeabade0085d46b7dcb7f19e99f6140499d18cdd1c17cbff5c
+  metadata.gz: 94d282e685e0cda6ca1ab63dad2a647f4b39b9ac26800caef074988315e6230626315c3b12c8a8e9be6245a598412bedd2d9fdfcf476e64d92c7711201219434
+  data.tar.gz: 857a57629b1fd1ab6ab855f0b8dc3ac7a4349b1def0729359e9439efe9c1c75cb1d6f1156d41ea8eb19b36a4f0ae1eafa7e4ab886e4e7bedc72cc6ff0fa1e4b2

data/console_utils.gemspec

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

data/lib/console_utils.rb

@@ -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
 

data/lib/console_utils/request_utils/exap.rb

@@ -9,7 +9,7 @@ module ConsoleUtils::RequestUtils #:nodoc:
         def #{request_method}(url, *args)
           @url = url
           @_args = args
-          app.request_via_redirect(:#{request_method}, @url, *normalize_args.to_a)
+          app.process(:#{request_method}, @url, **normalize_args.to_h)
           self
         end
       RUBY

data/lib/console_utils/request_utils/request_params.rb

@@ -1,29 +1,23 @@
-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, params = nil, headers = nil)
+      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
@@ -43,17 +37,7 @@ module ConsoleUtils::RequestUtils
     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/version.rb

@@ -1,3 +1,3 @@
 module ConsoleUtils
-  VERSION = "0.9.0"
+  VERSION = "0.10.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: console_utils
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Anton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-02 00:00:00.000000000 Z
+date: 2020-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
         version: '7'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
         version: '7'
@@ -193,8 +193,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Groovy tools for Rails Console.