console_utils 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3607787694af8ed4bc9e4466f95e9d090c312d22
-  data.tar.gz: fb4da9e048ac320e0aaa9d57fb919e90b2f505b2
+  metadata.gz: e948128135cc22042b253c75da22a6d9bd9febaa
+  data.tar.gz: 53cd176f69e9bf1757831b07f514cf974755ae1a
 SHA512:
-  metadata.gz: 2027cc176a4275fb61bec377d9dfc369bb51f736c84bb10f436da81c131ed0692896032a14802277b3c9f5af6119cbde468342cbf9864a4dc8bd3a6cc59e390c
-  data.tar.gz: 78be8092f07add77fca5eba1b95ff521af70f815c3818d76cc72b37da22ffb2bd95bf09ee4f3c974cbcfdd8312ffca77ce9aff7016b5ee9a9d797194eb67a60e
+  metadata.gz: 63a00ae0f1f4492c948caf7f5aa9336f425a5b9ad4a5027c87ac00ca568ad45190e8c2ae086d94c2b7aaf80da3b7ff23f055c3a86e584c9a418858c1c5d15fe5
+  data.tar.gz: cf73d753ad73eece8fc0bd3e8993f9ee6b65b9f87a85eca3663eb9cf0c593c1e5944a402c836e8d7ee09ed7e43e4fa11791248a4dde7d24ab0a90f965ab88db3

data/lib/console_utils.rb

@@ -50,7 +50,6 @@ module ConsoleUtils
 
   MODULES = [
     :ActiveRecordUtils,
-    :JSONOutput,
     :RequestUtils,
     :BenchUtils,
     :OtherUtils
@@ -58,6 +57,9 @@ module ConsoleUtils
 
   MODULES.each { |mod| autoload mod }
 
+  autoload :JSONOutput
+  autoload :ReplState
+
 
   # :section: Configuration
 
@@ -151,7 +153,7 @@ module ConsoleUtils
 
     def enabled_modules # :yields:
       unless block_given?
-        return to_enum(__method__) { ConsoleUtils::MODULES.size - disabled_modules.dize }
+        return to_enum(__method__) { ConsoleUtils::MODULES.size - disabled_modules.size }
       end
 
       (ConsoleUtils::MODULES - disabled_modules).each do |mod|
@@ -192,36 +194,18 @@ module ConsoleUtils
 
     # Setup enabled modules for Pry context
     def pry!
-      setup_modules_to { TOPLEVEL_BINDING.eval('self') }
+      setup_modules_to(TOPLEVEL_BINDING.eval('self'))
     end
 
     # Setup enabled modules by extending given context
-    def setup_modules_to # :yields:
-      logger.level = Logger::WARN
-
-      logger.tagged(name) do
-        unless block_given?
-          logger.warn { "Trying to setup with empty context" }
-          return
-        end
-
-        if ENV["CONSOLE_UTILS_DEBUG"] == "1"
-          logger.level = Logger::DEBUG
-          logger.debug { "Console instance: #{yield().inspect}" }
-        end
-
-        enabled_modules do |mod|
-          logger.debug { "extending with #{mod.inspect}" }
-          yield().extend(mod)
-        end
-      end
+    def setup_modules_to(context = nil)
+      ReplState.setup(context)
     end
-
   end
 
   ActiveSupport.run_load_hooks(:console_utils, self)
 end
 
-if defined?(Rails)
+if defined? Rails
   require "console_utils/railtie"
 end

data/lib/console_utils/railtie.rb

@@ -10,7 +10,14 @@ module ConsoleUtils
       options = app.config.console_utils
 
       options.disabled_modules ||= ConsoleUtils.disabled_modules
-      options.disabled_modules << :ActiveRecordUtils unless defined?(ActiveRecord)
+
+      if !defined?(ActiveRecord) || !ConsoleUtils.disabled_modules.include?(:ActiveRecordUtils)
+        options.disabled_modules << :ActiveRecordUtils
+
+        ActiveSupport.on_load(:active_record) do
+          ConsoleUtils.disabled_modules.delete(:ActiveRecordUtils)
+        end
+      end
 
       ActiveSupport.on_load(:console_utils) do
         options.each { |k, v| public_send(:"#{k}=", v) }

data/lib/console_utils/repl_state.rb

@@ -0,0 +1,82 @@
+module ConsoleUtils
+  class ReplState
+    IVAR = :"@__console_utils__"
+    EMPTY_CONTEXT_ALERT    = "Trying to setup with empty context".freeze
+    ALREADY_EXTENDED_ALERT = "Trying to setup again on fully extended context".freeze
+    CONTEXT_DEBUG_MSG      = "Console instance: %p".freeze
+    MODULE_EXTENDS_MSG     = "extending context...".freeze
+
+    def self.setup(context)
+      state = context.instance_variable_get(IVAR) || ReplState.new
+
+      return true if state.frozen?
+
+      logger.tagged("console_utils-#{VERSION}") do
+        if context.nil?
+          logger.warn { EMPTY_CONTEXT_ALERT }
+          return
+        end
+
+        unless state.persisted?
+          logger.level = Logger::WARN
+
+          if ENV["CONSOLE_UTILS_DEBUG"]
+            logger.level = Logger::DEBUG
+            logger.debug { CONTEXT_DEBUG_MSG % context }
+          end
+        end
+
+        if state.fully_extended?
+          logger.warn { ALREADY_EXTENDED_ALERT }
+        else
+          ConsoleUtils.enabled_modules do |mod|
+            state.extending(mod.to_s) do
+              logger.debug { MODULE_EXTENDS_MSG }
+              context.extend(mod)
+            end
+          end
+        end
+      end
+
+      context.instance_variable_set(IVAR, state.persist!)
+    end
+
+    def self.logger
+      ConsoleUtils.logger
+    end
+
+    def initialize
+      @version    = VERSION
+      @extensions = []
+      @persisted  = false
+    end
+
+    def persisted?
+      @persisted
+    end
+
+    def persist!
+      @persisted = true
+      fully_extended? ? freeze : self
+    end
+
+    def fully_extended?
+      @persisted && @extensions.size == ConsoleUtils.enabled_modules.size
+    end
+
+    def extending(mod_name)
+      if include?(mod_name)
+        true
+      else
+        ConsoleUtils.logger.tagged(mod_name) { yield }
+        @extensions << mod_name
+      end
+    end
+
+    def include?(mod)
+      @extensions.include?(mod.to_s)
+    end
+
+    alias_method :extended_with?, :include?
+  end
+end

data/lib/console_utils/request_utils/auth_automators.rb

@@ -1,9 +1,9 @@
 module ConsoleUtils::RequestUtils
   class DefaultAuthAutomator
     def self.call(rq)
+      p rq
       if rq.can_auto_auth?
-        rq.params[ConsoleUtils.token_param] ||=
-          ConsoleUtils.default_token.presence or ConsoleUtils.auto_token_for(rq.uid)
+        rq.params[ConsoleUtils.token_param] ||= ConsoleUtils.default_token.presence || ConsoleUtils.auto_token_for(rq.uid)
       end
     end
   end

data/lib/console_utils/request_utils/exap.rb

@@ -5,7 +5,11 @@ module ConsoleUtils::RequestUtils #:nodoc:
     INSPECT_FORMAT = "<Local: %s (%s)>".freeze
 
     ConsoleUtils.request_methods.each do |reqm|
-      define_method(reqm) { |*args| resp_wrap(reqm, *args) }
+      define_method(reqm) do |*args|
+        @url, *@_args = args
+        app.public_send(reqm, @url, *normalize_args)
+        self
+      end
     end
 
     def to_s
@@ -29,11 +33,5 @@ module ConsoleUtils::RequestUtils #:nodoc:
     def response_body
       app.controller.try(:response_body) || response.try(:body)
     end
-
-    def resp_wrap(meth, url, *args)
-      @url, @_args = url, args
-      app.send(meth, url, *normalize_args)
-      self
-    end
   end
 end

data/lib/console_utils/request_utils/request_params.rb

@@ -3,12 +3,14 @@ module ConsoleUtils::RequestUtils
     attr_accessor :uid
 
     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
-      @headers = headers
+      @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()}" }

data/lib/console_utils/version.rb

@@ -1,3 +1,3 @@
 module ConsoleUtils
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: console_utils
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Anton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-26 00:00:00.000000000 Z
+date: 2015-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -164,6 +164,7 @@ files:
 - lib/console_utils/other_utils.rb
 - lib/console_utils/pry.rb
 - lib/console_utils/railtie.rb
+- lib/console_utils/repl_state.rb
 - lib/console_utils/request_utils.rb
 - lib/console_utils/request_utils/auth_automators.rb
 - lib/console_utils/request_utils/exap.rb