console_utils 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ec5fe50875a44222ed008d871f20af1252723f7
-  data.tar.gz: 49c093ec238e4ab69757bf5068af54ac4cf78ac1
+  metadata.gz: 1cbb55a155eb323c890fe24163466ab6b1c081a1
+  data.tar.gz: 51077eec5dbdc7eb7949501216f5a2f934802011
 SHA512:
-  metadata.gz: 2d5a262aa068990424a189760e7d2a750575ecc6ab6f88f7c730f0f18c0fd6dbfc7c8cffda2f27e6092264c307dd16aa38fa1ef59815d3853122da5120259609
-  data.tar.gz: b2c35b09c9a3caf875c586b3d47bc5d8acd9764b5d090bb710c4d3545e9e128ae5f91e6013c149966d38e120cec5b463550939842f3510824878491f3c79abb4
+  metadata.gz: 6180d6fa56625afc702a252e3841a314557fdcb38e4cd3245e1c416097bea76b3e1c8d53f1a85b526102d70fc74da7a5da4908735f382f0b36131a2b8176b52e
+  data.tar.gz: 7b1448456a5999cab112ecc799e42c9c4d6368412a17fd8516d5726860068c440e42bee8d3deed122f82ebd7c5017ea3f157ef3feaf97cfe2f0212cfdd2d275b

data/lib/console_utils.rb

@@ -2,6 +2,7 @@ require 'active_support'
 require 'active_support/rails'
 require 'term/ansicolor'
 require 'console_utils/core_ext/array_to_proc'
+require 'console_utils/core_ext/local_values'
 require 'console_utils/repl_context'
 require 'console_utils/version'
 

data/lib/console_utils/core_ext/local_values.rb

@@ -0,0 +1,8 @@
+unless Binding.method_defined?(:local_values)
+  class Binding
+    # Returns a hash with symbol keys that maps local variable names to their corresponding values.
+    def local_values
+      Hash[local_variables.map { |name| [name.to_s, local_variable_get(name)] }]
+    end
+  end
+end

data/lib/console_utils/request_utils.rb

@@ -8,6 +8,7 @@ module ConsoleUtils #:nodoc:
   module RequestUtils
     extend ActiveSupport::Autoload
 
+    autoload :RequestParams
     autoload :Requester
     autoload :Exap
     autoload :Remo

data/lib/console_utils/request_utils/request_params.rb

@@ -0,0 +1,49 @@
+module ConsoleUtils::RequestUtils
+  class RequestParams
+    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!
+               end
+      else
+        need_shift!
+      end
+
+      params, headers_or_env = [uid_or_params, params] if need_shift?
+
+      @params         = params || {}
+      @headers_or_env = headers_or_env || {}
+
+      @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)
+      end
+    end
+
+    def to_a
+      [@params.presence, @headers_or_env.presence].tap(&:compact!)
+    end
+
+    def with_default(default_params = nil)
+      @params.merge!(default_params.is_a?(Hash) ? default_params : {})
+      to_a
+    end
+
+    def need_default_uid?
+      @uid == true
+    end
+
+    def need_shift!
+      @need_shift = true
+    end
+
+    def need_shift?
+      !!@need_shift
+    end
+  end
+end

data/lib/console_utils/request_utils/requester.rb

@@ -12,6 +12,7 @@ module ConsoleUtils::RequestUtils #:nodoc:
     COMPLETE_IN      = Term::ANSIColor.green("Complete in %s").freeze
     TRANSFERED       = Term::ANSIColor.cyan("Transfered: %s").freeze
 
+    class_attribute :default_params
     attr_reader :url
 
     def preview(mth = nil)
@@ -54,16 +55,9 @@ module ConsoleUtils::RequestUtils #:nodoc:
     protected
 
     def normalize_args
-      if ConsoleUtils.auto_token
-        uid = (@_args[0].is_a?(Hash) || @_args.empty?) ? ConsoleUtils.default_uid : @_args.shift
-        if uid.present?
-          printf(AUTOAUTH_FORMAT, uid, @_args)
-          opts = @_args.extract_options!
-          @_args.unshift(opts.tap { |x| x[ConsoleUtils.token_param] ||= __getobj__.autoken(uid) })
-        end
-      end
-
-      @_args
+      RequestParams.new(*@_args) { |uid| autoken(uid) }.
+        with_default(default_params).
+        to_a
     end
 
     # Copies to pasteboard
@@ -87,7 +81,7 @@ module ConsoleUtils::RequestUtils #:nodoc:
       @_size = nil
     end
 
-    private_constant :REQUEST_METHODS, :AUTOAUTH_FORMAT, :PBCOPY_MESSAGE,
+    private_constant :REQUEST_METHODS, :PBCOPY_MESSAGE,
                      :NO_RESPONSE, :COMPLETE_IN, :TRANSFERED,
                      :INFO_FORMAT
   end

data/lib/console_utils/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: console_utils
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Anton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-21 00:00:00.000000000 Z
+date: 2015-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -139,6 +139,7 @@ files:
 - lib/console_utils/bench_utils.rb
 - lib/console_utils/bench_utils/chips.rb
 - lib/console_utils/core_ext/array_to_proc.rb
+- lib/console_utils/core_ext/local_values.rb
 - lib/console_utils/other_utils.rb
 - lib/console_utils/pry.rb
 - lib/console_utils/railtie.rb
@@ -147,6 +148,7 @@ files:
 - lib/console_utils/request_utils/exap.rb
 - lib/console_utils/request_utils/json_output.rb
 - lib/console_utils/request_utils/remo.rb
+- lib/console_utils/request_utils/request_params.rb
 - lib/console_utils/request_utils/requester.rb
 - lib/console_utils/version.rb
 homepage: https://github.com/estum/console_utils