console_utils 0.1.6 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1cbb55a155eb323c890fe24163466ab6b1c081a1
-  data.tar.gz: 51077eec5dbdc7eb7949501216f5a2f934802011
+  metadata.gz: 885596f011ab0c949a352aa22abe4e9c85d93ac2
+  data.tar.gz: bd7daaf39ea1b539f5bae93ac4a0751580ca08a8
 SHA512:
-  metadata.gz: 6180d6fa56625afc702a252e3841a314557fdcb38e4cd3245e1c416097bea76b3e1c8d53f1a85b526102d70fc74da7a5da4908735f382f0b36131a2b8176b52e
-  data.tar.gz: 7b1448456a5999cab112ecc799e42c9c4d6368412a17fd8516d5726860068c440e42bee8d3deed122f82ebd7c5017ea3f157ef3feaf97cfe2f0212cfdd2d275b
+  metadata.gz: bee127748adcea9da28b3372869aa3770dc14048b54b31454ea6e78d2945c9893375c8391bda662c9b8c8919b1b741e6613c1517b49c9e2fb2dd5b7735757b00
+  data.tar.gz: 6fab7992b4534b45d5058a54db989faee505a47b9839cbd7eb243196f4b94fa53a00edbf6a01e26cf2a437dd41205792d168a1009d5f58f00514c606d71bb94d

data/README.md

@@ -60,10 +60,11 @@ end
 * `auto_token` - Enable auto-fetch of user's auth token in requests (default: `true`)
 * `curl_bin` - Binary path to curl (using in remote requests). (default: `"curl"`)
 * `curl_silence` - Disable print out generated curl command with remote requests. (default: `false`)
+* `default_token` - A plain string of the default token used to authorize user (default: `nil`)
 * `default_uid` - ID of the user which will be used by default in requests (default: `1`)
 * `disabled_modules` - An array of disabled modules' names (default: `[]`)
 * `jq_command` - Command for jq json formatter (default: `"jq . -C"`)
-* `json_formatter` - JSON formatter used in API request helpers (:default or :jq)
+* `json_formatter` - JSON formatter used in API request helpers (`:default` or `:jq`)
 * `logger` - Output logger (Rails.logger by default)
 * `remote_endpoint` - Remote endpoint used in remote API request helpers (default: `"http://example.com"`)
 * `token_param` - A name of the request parameter used to authorize user by a token (default: `:token`)

data/lib/console_utils.rb

@@ -90,6 +90,11 @@ module ConsoleUtils
   mattr_accessor(:token_param) { :token }
   ##
   # :attr:
+  # A plain string of the default token used to authorize user
+  # (default: <tt>nil</tt>)
+  mattr_accessor(:default_token)
+  ##
+  # :attr:
   # JSON formatter used in API request helpers
   # (<tt>:default</tt> or <tt>:jq</tt>)
   mattr_accessor(:json_formatter) { :default }
@@ -120,39 +125,61 @@ module ConsoleUtils
   # :section: Class Methods
 
   class << self
-    def config
-      self
-    end
+    alias_method :config, :itself
 
     # :method: self.configure
     def configure
       yield(config)
     end
 
+    def enabled_modules
+      ConsoleUtils::MODULES - disabled_modules
+    end
+
+    # Yields each enabled module with a given block
+    def each_enabled_module
+      enabled_modules.each { |mod| yield const_get(mod) }
+    end
+
     # Returns User's class set in the <tt>:user_class_name</tt>
     def user_model
       Object.const_get(user_model_name)
     end
     alias_method :user_class, :user_model
 
+    def user_scope(scope = nil)
+      case scope
+      when nil    then user_model
+      when Symbol then user_model.public_send(scope)
+                  else user_model.all.merge(scope)
+      end
+    end
+
     # Finds +user_model+ by +user_primary_key+.
     # If the first argument is <tt>:any</tt>, gets a random user.
     def find_user(id, scope: nil)
-      case id
-      when :any
-        (scope || user_model).anyone
+      if id == :any
+        user_scope(scope).anyone.tap do |u|
+          puts "random user #{user_primary_key}: #{u.public_send(user_primary_key)}"
+        end
       else
-        (scope || user_model).where(user_primary_key => id).first!
+        user_scope(scope).where(user_primary_key => id).first!
       end
     end
 
-    def enabled_modules
-      ConsoleUtils::MODULES - disabled_modules
+    def auto_token_for(id)
+      user = find_user(id, scope: user_model.select([:id, user_token_column]))
+      user.public_send(user_token_column)
     end
 
-    # Yields each enabled module with a given block
-    def each_enabled_module
-      enabled_modules.each { |mod| yield const_get(mod) }
+    # Setup enabled modules for IRB context
+    def irb!
+      setup_modules_to(ReplContext.instance.irb!)
+    end
+
+    # Setup enabled modules for Pry context
+    def pry!
+      setup_modules_to(ReplContext.instance.pry!)
     end
 
     # Setup enabled modules by extending given context
@@ -163,14 +190,6 @@ module ConsoleUtils
       puts "Console instance: #{context.inspect}" if ENV["CONSOLE_UTILS_DEBUG"]
       each_enabled_module { |mod| context.send(:extend, mod) }
     end
-
-    def irb!
-      setup_modules_to(ReplContext.instance.irb!)
-    end
-
-    def pry!
-      setup_modules_to(ReplContext.instance.pry!)
-    end
   end
 
   ActiveSupport.run_load_hooks(:console_utils, self)

data/lib/console_utils/request_utils.rb

@@ -24,9 +24,7 @@ module ConsoleUtils #:nodoc:
     #
     # Returns user's token by primary key. Use <tt>:any</tt> to get random user.
     def autoken(id)
-      user = id == :any ? user_scope.anyone : ConsoleUtils.find_user(id, scope: user_scope)
-      puts "User #{user.public_send(ConsoleUtils.user_primary_key)}" if id == :any
-      user.public_send(ConsoleUtils.user_token_column)
+      ConsoleUtils.auto_token_for(id)
     end
 
     # :call-seq:
@@ -73,11 +71,5 @@ module ConsoleUtils #:nodoc:
     def remo
       Remo.new(self)
     end
-
-    private
-
-    def user_scope
-      ConsoleUtils.user_model.select([:id, :auth_token])
-    end
   end
 end

data/lib/console_utils/request_utils/request_params.rb

@@ -3,10 +3,8 @@ module ConsoleUtils::RequestUtils
     def initialize(uid_or_params = true, params = nil, headers_or_env = nil)
       if ConsoleUtils.auto_token
         @uid = case uid_or_params
-               when Numeric, true, false, nil
-                 uid_or_params
-               when headers_or_env.nil?
-                 need_shift!
+               when Numeric, true, false, nil then uid_or_params
+               when headers_or_env.nil?       then need_shift!
                end
       else
         need_shift!
@@ -14,28 +12,36 @@ module ConsoleUtils::RequestUtils
 
       params, headers_or_env = [uid_or_params, params] if need_shift?
 
-      @params         = params || {}
-      @headers_or_env = headers_or_env || {}
+      @params = params.is_a?(Hash) ? params : {}
+      @headers = headers_or_env.to_h
 
-      @uid = ConsoleUtils.default_uid if need_default_uid?
-
-      if @uid.present?
-        @params[ConsoleUtils.token_param] ||= yield(@uid) if block_given?
-        printf(Requester::AUTOAUTH_FORMAT, @uid, to_a)
+      if need_default_token?
+        use_token ConsoleUtils.default_token
+      else
+        @uid = ConsoleUtils.default_uid if need_default_uid?
+        use_token ConsoleUtils.auto_token_for(@uid) if @uid.present?
       end
     end
 
     def to_a
-      [@params.presence, @headers_or_env.presence].tap(&:compact!)
+      [@params.presence, @headers.presence].tap(&:compact!)
+    end
+
+    def use_token value
+      @params[ConsoleUtils.token_param] ||= value
     end
 
     def with_default(default_params = nil)
-      @params.merge!(default_params.is_a?(Hash) ? default_params : {})
+      @params.merge!(default_params.to_h)
       to_a
     end
 
     def need_default_uid?
-      @uid == true
+      @uid == true && ConsoleUtils.default_token.nil?
+    end
+
+    def need_default_token?
+      @uid == true && ConsoleUtils.default_token.present?
     end
 
     def need_shift!

data/lib/console_utils/request_utils/requester.rb

@@ -6,7 +6,6 @@ module ConsoleUtils::RequestUtils #:nodoc:
     REQUEST_METHODS  = %i(get post put delete patch).freeze
     INFO_HASH_FIELDS = %i(url size time human_size human_time).freeze
     INFO_FORMAT      = "%#-.50{url} | %#10{human_size} | %#10{human_time}\n".freeze
-    AUTOAUTH_FORMAT  = %('ID: %s' %p\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

data/lib/console_utils/version.rb

@@ -1,3 +1,3 @@
 module ConsoleUtils
-  VERSION = "0.1.6"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: console_utils
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.2.0
 platform: ruby
 authors:
 - Anton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-23 00:00:00.000000000 Z
+date: 2015-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails