console_utils 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c3fe1a107afccfae81595c74595bdb4dfd18352
-  data.tar.gz: d3fb4f250a454750a58edb0d34eaa4b2bdac1d67
+  metadata.gz: 22a211280b416bdaf805b0230552de96331ce71e
+  data.tar.gz: 83669052246d74df2a926a254f08104e7fca8da6
 SHA512:
-  metadata.gz: f053b200ef2551b711a80aa1259810e80c4394dc364c00a4e6310ac7a090ea3e5d91241898c7062783f052b51c584212b1f9e5e094cad932eb2ca82ecc591f00
-  data.tar.gz: 00f07b42ef8d7007d56c094166ea0d1816d05e037927b8954acb0211d767bf1f9c5fe349afa77ef25977b3680a821afec99c30ce1687d38d98119ff40e40323e
+  metadata.gz: 893930c9027842760bc57f49a85078cee0ed60cc7aa6818379afa3d4026c2e11d61be17df10e308216bf07d24cc9b4f0d96803d1f61ca0300ee48689fc49b195
+  data.tar.gz: 0e20c16c9eee9d4608ec3b6a9f829d195d32abf85a9455a29910de9b152d5648288ed30ebeb6bb6ffbba634c3617151cf98d5bacbe17e5ceebc165ab839ec4b6

data/lib/console_utils/json_output/base_formatter.rb

@@ -0,0 +1,30 @@
+module ConsoleUtils
+  module JSONOutput
+    # The abstract singleton class for a prettified JSON formatting.
+    class BaseFormatter
+      include Singleton
+
+      # Prints formatted JSON to stdout.
+      def call(body) # :yields:
+        formatted = format_with_fallback(body)
+        if block_given?
+          yield(formatted)
+        else
+          puts formatted
+        end
+      end
+
+      # Formats a given JSON string
+      def format(body)
+        raise NotImplementedError
+      end
+
+      def format_with_fallback(body)
+        format(body)
+      rescue ParseError => error
+        warn error
+        return body.to_s
+      end
+    end
+  end
+end

data/lib/console_utils/json_output/default_formatter.rb

@@ -0,0 +1,13 @@
+module ConsoleUtils
+  module JSONOutput
+    # The default formatter uses standart JSON library to output prettified JSON
+    class DefaultFormatter < BaseFormatter
+      def format(body) #:nodoc:
+        JSON.pretty_generate JSON(body), :allow_nan => true, :max_nesting => false
+      rescue JSON::ParseError, JSON::GeneratorError
+        error = $!
+        raise ParseError, "#{error.class.to_s}: #{error.message}"
+      end
+    end
+  end
+end

data/lib/console_utils/json_output/jq_formatter.rb

@@ -0,0 +1,18 @@
+require "open3"
+
+module ConsoleUtils
+  module JSONOutput
+    # The jq formatter uses the external {jq}[http://stedolan.github.com/jq] utility.
+    class JqFormatter < BaseFormatter
+      delegate :jq_command, :to => :ConsoleUtils
+
+      def format(body) #:nodoc:
+        output, err, s = Open3.capture3(jq_command, stdin_data: body)
+
+        raise ParseError, err.squish unless s.success?
+
+        output
+      end
+    end
+  end
+end

data/lib/console_utils/json_output.rb

@@ -0,0 +1,38 @@
+module ConsoleUtils
+  module JSONOutput
+    extend ActiveSupport::Autoload
+
+    class ParseError < StandardError
+      def initialize(original_message = nil)
+        super("Failed to format a json. (#{original_message})")
+      end
+    end
+
+    eager_autoload do
+      autoload :BaseFormatter
+    end
+
+    autoload :DefaultFormatter
+    autoload :JqFormatter
+
+    FORMATTER_CLASSES = {}
+
+    # Get current formatter object
+    def self.formatter
+      const_get(formatter_class_name).instance
+    end
+
+    def self.json_formatter # :nodoc:
+      ConsoleUtils.json_formatter
+    end
+
+    def self.formatter_class_name # :nodoc:
+      FORMATTER_CLASSES[json_formatter] ||= "#{json_formatter}_formatter".classify.freeze
+    end
+
+    private_constant :FORMATTER_CLASSES
+    private_class_method :json_formatter, :formatter_class_name
+  end
+
+  JSONOutput.eager_load!
+end

data/lib/console_utils/request_utils/exap.rb

@@ -13,13 +13,22 @@ module ConsoleUtils::RequestUtils #:nodoc:
     end
 
     def inspect
-      format INSPECT_FORMAT, request.path, response.status
+      format INSPECT_FORMAT, request.try(:path), response.try(:status)
     end
 
     private
 
-    delegate :controller, to: :app, prefix: true, allow_nil: true
-    delegate :request, :response, to: :app_controller, allow_nil: true
+    def request
+      app.controller.try(:request)
+    end
+
+    def response
+      app.controller.try(:response)
+    end
+
+    def response_body
+      app.controller.try(:response_body) || response.try(:body)
+    end
 
     def resp_wrap(meth, url, *args)
       @url, @_args = url, args

data/lib/console_utils/request_utils/requester.rb

@@ -16,7 +16,7 @@ module ConsoleUtils::RequestUtils #:nodoc:
 
     def preview(mth = nil)
       if output = to_s.presence
-        JSONOutput.formatter.(output)
+        ConsoleUtils::JSONOutput.formatter.(output)
         show_complete_in!
         show_transfered!
         yield(self) if block_given?
@@ -27,7 +27,7 @@ module ConsoleUtils::RequestUtils #:nodoc:
 
     # Copies to pasteboard
     def pbcopy(content = nil)
-      content ||= JSONOutput::Default.instance.format(to_s)
+      content ||= ConsoleUtils::JSONOutput::Default.instance.format_with_fallback(to_s)
       IO.popen('pbcopy', 'w') { |io| io << content.to_s }
       puts PBCOPY_MESSAGE
     end

data/lib/console_utils/request_utils.rb

@@ -13,11 +13,6 @@ module ConsoleUtils #:nodoc:
     autoload :Exap
     autoload :Remo
 
-    autoload :JSONOutput do
-      autoload :Default
-      autoload :Jq
-    end
-
     autoload :DefaultAuthAutomator, "console_utils/request_utils/auth_automators"
     autoload :SimpleTokenAutomator, "console_utils/request_utils/auth_automators"
 

data/lib/console_utils/version.rb

@@ -1,3 +1,3 @@
 module ConsoleUtils
-  VERSION = "0.3.2"
+  VERSION = "0.4.0"
 end

data/lib/console_utils.rb

@@ -50,6 +50,7 @@ module ConsoleUtils
 
   MODULES = [
     :ActiveRecordUtils,
+    :JSONOutput,
     :RequestUtils,
     :BenchUtils,
     :OtherUtils

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: console_utils
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Anton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-29 00:00:00.000000000 Z
+date: 2015-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -140,6 +140,10 @@ files:
 - 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/json_output.rb
+- lib/console_utils/json_output/base_formatter.rb
+- lib/console_utils/json_output/default_formatter.rb
+- lib/console_utils/json_output/jq_formatter.rb
 - lib/console_utils/other_utils.rb
 - lib/console_utils/pry.rb
 - lib/console_utils/railtie.rb
@@ -147,7 +151,6 @@ files:
 - lib/console_utils/request_utils.rb
 - lib/console_utils/request_utils/auth_automators.rb
 - 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

data/lib/console_utils/request_utils/json_output.rb

@@ -1,62 +0,0 @@
-module ConsoleUtils::RequestUtils
-  module JSONOutput
-    FORMATTERS = {}
-
-    # The abstract singleton class for a prettified JSON formatting.
-    class Formatter
-      include Singleton
-
-      # Prints formatted JSON to stdout.
-      def call(body)
-        formatted = format(body)
-        if block_given?
-          yield(formatted)
-        else
-          puts formatted
-        end
-      end
-
-      # Formats a given JSON string
-      def format(body)
-        raise NotImplementedError
-      end
-
-      def self.inherited(sub) #:nodoc:
-        super
-        key = sub.name.demodulize.underscore.to_sym
-        FORMATTERS[key] = sub
-      end
-    end
-
-    # The default formatter uses standart JSON library to output prettified JSON
-    class Default < Formatter
-      def format(body) #:nodoc:
-        JSON.pretty_generate JSON(body), :allow_nan => true, :max_nesting => false
-      rescue JSON::GeneratorError => e
-        warn "Warning: Failed to format a json.", e.message, body
-        body.to_s
-      end
-    end
-
-    # The jq formatter uses the external {jq}[http://stedolan.github.com/jq] utility.
-    class Jq < Formatter
-      delegate :jq_command, :to => :ConsoleUtils
-
-      def format(body) #:nodoc:
-        IO.popen(jq_command, 'r+') { |io| (io << body).tap(&:close_write).read }
-      end
-    end
-
-    class << self
-      delegate :json_formatter, :to => :ConsoleUtils
-
-      # Get current formatter object
-      def formatter
-        FORMATTERS[json_formatter].instance
-      end
-    end
-
-    private_constant :Formatter
-    private_class_method :json_formatter
-  end
-end