console_utils 0.7.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: cf9d61e130700afa5abe8e93c11b6fada2eb6cb4
-  data.tar.gz: e406176372e604f376c6806cc5d48c0141b46241
+SHA256:
+  metadata.gz: 1b476b929197a0b2c0c282737682ba40f6fe8c02d14858f253f569a47ea20c52
+  data.tar.gz: 77abfe7679f71f9f7aae8089ec2a660675d86c3ebe139ed9005b6ce4880473b0
 SHA512:
-  metadata.gz: ab3c2fd6ebbed1a16715e688e28ca54179fd091e3ca49a93031b3cf6b612f7e59771c8ff9dcd01fe8be898677328d4af1b839fc871f554773b4be2390149ffa9
-  data.tar.gz: 21b6aa7cc8c3bf5fe6aa5a5d1952256ee7153915ad595b80170639d909617fea473f05fa27252bcda6903d5d9cbfdcf3d3926c5fefc0edaefd625527d0cda211
+  metadata.gz: b4c557b3bae82eaf659e3384351e51afa271965b8b0496414cb6624401c01063ba3cc49635571de0ac3e7c24eff3119e13fbc5d20058582a049844cec33508d5
+  data.tar.gz: 0ea55105bfdfea055fe4e21cd1e76f31f1966d1a7b835bc410683047f1bf126f627432c171ad3016fce5d47b95b29b21493c64689fa2332ec3e7cda52f75514c

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/request_utils/exap.rb

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

data/lib/console_utils/request_utils/remo.rb

@@ -14,8 +14,9 @@ module ConsoleUtils::RequestUtils #:nodoc:
       class_eval <<~RUBY, __FILE__, __LINE__ + 1
         def #{request_method}(url, *args)
           @_args = args
-          @url = urlify(url, *normalize_args)
           @request_method = "#{request_method.to_s.upcase}"
+          @request_params = normalize_args
+          @url = urlify(url, @request_params.params)
           perform
         end
       RUBY
@@ -38,7 +39,8 @@ module ConsoleUtils::RequestUtils #:nodoc:
     protected
 
     def perform
-      Curl.(request_method, url) do |result, payload|
+      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
@@ -54,14 +56,18 @@ module ConsoleUtils::RequestUtils #:nodoc:
       self
     end
 
-    def urlify(*args)
-      options = args.extract_options!
-      URI.join(ConsoleUtils.remote_endpoint, *args).
-        tap { |uri| uri.query = options.to_query }.to_s
+    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 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
+      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)
@@ -70,20 +76,33 @@ module ConsoleUtils::RequestUtils #:nodoc:
 
       attr_reader :request, :response, :payload
 
-      def initialize(request_method, url)
-        cmd = %W(#{ConsoleUtils.curl_bin} --silent -v --write-out #{OUT_FORMAT} -X #{request_method} #{url})
-        puts "# #{cmd.shelljoin.inspect}" unless ConsoleUtils.curl_silence
+      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(Shellwords.join(cmd)) do |stdin, stdout, stderr, thr|
+        Open3.popen3(cmd_line) do |stdin, stdout, stderr, thr|
           # stdin.close
-          { stderr: stderr, stdin: stdout }.each do |key, io|
+          { stderr: stderr, stdout: stdout }.each do |key, io|
             Thread.new do
-              while line = io.gets
-                key == :stderr ? process_stderr(line) : @payload << line
+              begin
+                until (line = io.gets).nil? do
+                  key == :stderr ? process_stderr(line) : @payload << line
+                end
+              rescue => e
+                warn e
               end
             end
           end
@@ -120,7 +139,7 @@ module ConsoleUtils::RequestUtils #:nodoc:
       def set_response(line)
         # warn("Response: #{line}")
         if !@response.key?(:http_version) && line =~ /^HTTP\/(.+) (\d+?) (.+)$/
-          @response.merge!(http_version: $1, http_code: $2, http_status: $3)
+          @response.merge!(http_version: $1, http_code: $2.to_i, http_status: $3)
         else
           header, value = line.split(": ", 2)
           @response[header] = value
@@ -130,6 +149,10 @@ module ConsoleUtils::RequestUtils #:nodoc:
       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

@@ -39,7 +39,7 @@ module ConsoleUtils::RequestUtils
         headers.merge!(default_headers.to_h)
       end
 
-      to_a
+      self
     end
 
     def can_auto_auth?

data/lib/console_utils/request_utils/requester.rb

@@ -60,9 +60,9 @@ module ConsoleUtils::RequestUtils #:nodoc:
     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

data/lib/console_utils/version.rb

@@ -1,3 +1,3 @@
 module ConsoleUtils
-  VERSION = "0.7.0"
+  VERSION = "0.8.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: console_utils
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Anton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-14 00:00:00.000000000 Z
+date: 2019-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -194,7 +194,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Groovy tools for Rails Console.