kungfuig 0.5.8 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 70ebdf0a5662d38602eac378b7ec01ec641f00b3
-  data.tar.gz: d4a756c9db21daa1548f3e41e04089d5c622527c
+  metadata.gz: 9d7f9a97f500edb6d6bf35a4cb678989571aac2a
+  data.tar.gz: 7b15f8867b76dd007cfda00c17275bb4a1d45057
 SHA512:
-  metadata.gz: 9997c1a39cdedef891fa5e02e50b496daa4ee87179294819818bcca442312d55d4cfe42e44f80c8152040f1644d401f0853ef16db7e09893834020581fc49810
-  data.tar.gz: 70bbeda0218ca5edaa9a2bbc88ffaba37522fa222dba3b4eed936a4426bd52dc50eeecd7c6fc323a6037306bf02e628f3fb289b9cf4c9daca5bdf6fa33229f0f
+  metadata.gz: 1b7646e393a547a7916291e4fd3e2a4d22fd6d1807cb6f5c67a9b3d2bdaccbcc817ed661aed83a2ccf7cee08b46ec09b3689d4317662755defacb8489ceb2a89
+  data.tar.gz: 2907858a439b6818f99b5fb783d3603bb2fe7ebd9bf0dd2c1637de93cc2a07cb23e4e9b53319ba89415e89efed67de8b16ad5ec0906c0e633607584a6006cdfc

data/.rubocop.yml

@@ -10,6 +10,11 @@ Style/AsciiComments:
     - 'lib/**/*'
     - 'spec/**/*'
 
+Style/Documentation:
+  Exclude:
+    - 'lib/**/*'
+    - 'spec/**/*'
+
 Style/RaiseArgs:
   Exclude:
     - 'lib/**/*'
@@ -18,3 +23,8 @@ Style/SpecialGlobalVars:
   Exclude:
     - 'lib/**/*'
     - 'spec/**/*'
+
+Style/MultilineBlockChain:
+  Exclude:
+    - 'lib/**/*'
+    - 'spec/**/*'

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2016-03-21 14:26:06 +0100 using RuboCop version 0.37.2.
+# on 2016-04-22 13:12:24 +0200 using RuboCop version 0.39.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -13,37 +13,37 @@ Lint/UnusedBlockArgument:
   Exclude:
     - 'features/step_definitions/kungfuig_steps.rb'
 
-# Offense count: 2
-Lint/UselessAssignment:
-  Exclude:
-    - 'lib/kungfuig.rb'
-
-# Offense count: 2
+# Offense count: 10
 Metrics/AbcSize:
-  Max: 26
+  Max: 41
 
-# Offense count: 1
+# Offense count: 4
 Metrics/CyclomaticComplexity:
-  Max: 7
+  Max: 12
 
-# Offense count: 13
+# Offense count: 77
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes.
 # URISchemes: http, https
 Metrics/LineLength:
-  Max: 180
+  Max: 174
 
-# Offense count: 2
+# Offense count: 6
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
-  Max: 16
+  Max: 24
 
-# Offense count: 1
+# Offense count: 2
+Metrics/PerceivedComplexity:
+  Max: 8
+
+# Offense count: 3
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: prefer_alias, prefer_alias_method
 Style/Alias:
   Exclude:
     - 'lib/kungfuig.rb'
+    - 'lib/kungfuig/prepender.rb'
 
 # Offense count: 4
 # Cop supports --auto-correct.
@@ -65,22 +65,7 @@ Style/BracesAroundHashParameters:
   Exclude:
     - 'features/step_definitions/kungfuig_steps.rb'
 
-# Offense count: 3
-Style/Documentation:
-  Exclude:
-    - 'spec/**/*'
-    - 'test/**/*'
-    - 'lib/kungfuig.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: empty_lines, no_empty_lines
-Style/EmptyLinesAroundBlockBody:
-  Exclude:
-    - 'lib/kungfuig.rb'
-
-# Offense count: 10
+# Offense count: 21
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: require_parentheses, require_no_parentheses, require_no_parentheses_except_multiline
@@ -98,12 +83,6 @@ Style/MutableConstant:
   Exclude:
     - 'lib/kungfuig/version.rb'
 
-# Offense count: 6
-# Configuration parameters: SupportedStyles.
-# SupportedStyles: compact, exploded
-Style/RaiseArgs:
-  EnforcedStyle: compact
-
 # Offense count: 6
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
@@ -119,16 +98,28 @@ Style/SpaceAroundOperators:
   Exclude:
     - 'features/support/env.rb'
 
-# Offense count: 2
+# Offense count: 4
+# Cop supports --auto-correct.
+Style/SpaceBeforeSemicolon:
+  Exclude:
+    - 'lib/kungfuig/prepender.rb'
+
+# Offense count: 20
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBraces, SupportedStyles.
 # SupportedStyles: space, no_space
 Style/SpaceInsideHashLiteralBraces:
   Enabled: false
 
-# Offense count: 3
+# Offense count: 12
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles, ConsistentQuotesInMultiline.
 # SupportedStyles: single_quotes, double_quotes
 Style/StringLiterals:
   Enabled: false
+
+# Offense count: 2
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: snake_case, camelCase
+Style/VariableName:
+  Enabled: false

data/kungfuig.gemspec

@@ -28,9 +28,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'pry', '~> 0.10'
 
-  spec.add_development_dependency 'rspec', '~> 2.12'
+  spec.add_development_dependency 'rspec', '~> 3'
   spec.add_development_dependency 'cucumber', '~> 1.3'
   spec.add_development_dependency 'yard', '~> 0'
 
-  spec.add_development_dependency 'rspec-sidekiq', '~> 1'
+  spec.add_development_dependency 'rspec-sidekiq', '~> 2'
 end

data/lib/kungfuig/aspector.rb

@@ -4,14 +4,22 @@ module Kungfuig
     # Helper methods
     class H
       def value_to_method_list klazz, values_inc, values_exc
-        [values_inc, values_exc].map do |v|
-          v = [*v].map(&:to_sym)
-          case
-          when v.empty? then []
-          when v.include?('*'), v.include?(:'*') then klazz.instance_methods(false)
-          else klazz.instance_methods & v
-          end
-        end.reduce(&:-) - klazz.instance_methods(false).select { |m| m.to_s.start_with?('to_') }
+        # FIXME MOVE JOKER HANDLING INTO PREPENDER !!!!
+        if klazz.is_a?(Module)
+          [values_inc, values_exc].map do |v|
+            v = [*v].map(&:to_sym)
+            case
+            when v.empty? then []
+            when v.include?('*'), v.include?(:'*') then klazz.instance_methods(false)
+            else klazz.instance_methods & v
+            end
+          end.reduce(&:-) - klazz.instance_methods(false).select { |m| m.to_s.start_with?('to_') }
+        else
+          # NOT YET IMPLEMENTED FIXME MOVE TO PREPENDER
+          [values_inc, values_exc].map do |v|
+            [*v].map(&:to_sym)
+          end.reduce(&:-)
+        end
       end
 
       def remap_hash_for_easy_iteration hash
@@ -27,41 +35,34 @@ module Kungfuig
         m, k = string.split('#').reverse
         (k ? Kernel.const_get(k).method(m) : method(m)).to_proc
       end
+
+      def try_to_class name
+        Kernel.const_defined?(name.to_s) ? Kernel.const_get(name.to_s) : name
+      end
     end
 
-    # rubocop:disable Metrics/CyclomaticComplexity
-    # rubocop:disable Metrics/MethodLength
     def attach(to, before: nil, after: nil, exclude: nil)
-      klazz = begin
-                case to
-                when Class then to                    # got a class! wow, somebody has the documentation read
-                when String then Kernel.const_get(to) # we are ready to get a class name
-                when Symbol then Kernel.const_get(to.to_s)
-                else class << to; self; end           # attach to klazz’s eigenclass if object given
-                end
-              rescue => e
-                raise ArgumentError, "Unable to attach to #{to}. I need a valid class/method name!\nOriginal exception: #{e.message}"
-              end
-
       raise ArgumentError, "Trying to attach nothing to #{klazz}##{to}. I need a block!" unless block_given?
-      klazz.send(:include, Kungfuig) unless klazz.ancestors.include? Kungfuig
+
       cb = Proc.new
 
+      klazz = case to
+              when Module then to # got a class! wow, somebody has the documentation read
+              when String, Symbol then H.new.try_to_class(to) # we are ready to get a class name
+              else class << to; self; end # attach to klazz’s eigenclass if object given
+              end
+
       H.new.value_to_method_list(klazz, before, exclude).each do |m|
-        # FIXME: log methods that failed to be wrapped more accurately? # Kungfuig.✍(klazz, m, e.inspect)
-        klazz.aspect(m, false, &cb)
+        Kungfuig::Prepender.new(to, m).before(&cb)
       end unless before.nil?
 
       H.new.value_to_method_list(klazz, after, exclude).each do |m|
-        # FIXME: log methods that failed to be wrapped more accurately? # Kungfuig.✍(klazz, m, e.inspect)
-        klazz.aspect(m, true, &cb)
+        Kungfuig::Prepender.new(to, m).after(&cb)
       end unless after.nil?
 
       klazz.aspects
     end
     module_function :attach
-    # rubocop:enable Metrics/MethodLength
-    # rubocop:enable Metrics/CyclomaticComplexity
 
     # 'Test':
     #   after:

data/lib/kungfuig/jobber.rb

@@ -23,9 +23,7 @@ module Kungfuig
         )
       end
 
-      # rubocop:disable Metrics/AbcSize
-      # rubocop:disable Metrics/MethodLength
-      def bottleneck(receiver, method, result, *args)
+      def bottleneck(method:nil, receiver:nil, result:nil, args:nil, **_)
         respond_to = ->(m, r) { r.respond_to? m.to_sym }
         r = case receiver
             when Hash, Array, String then receiver
@@ -39,14 +37,12 @@ module Kungfuig
 
         Kernel.const_get(@hash[receiver_class.name][method]).perform_async(r, method, result, *args)
       rescue => e
-        Kungfuig.✍([
+        Kungfuig.✍(receiver: [
           "Fail [#{e.message}]",
           *e.backtrace.unshift("Backtrace:").join("#{$/}⮩  "),
           "while #{receiver}"
-        ].join($/), method, result, *args)
+        ].join($/), method: method, result: result, args: args)
       end
-      # rubocop:enable Metrics/MethodLength
-      # rubocop:enable Metrics/AbcSize
     end
   end
 end

data/lib/kungfuig/prepender.rb

@@ -0,0 +1,156 @@
+module Kungfuig
+  module I★I
+  end
+
+  LAMBDA = lambda do |λ, e, **hash|
+    begin
+      Kungfuig::Prepender.error! e, **hash
+      λ[:on_error].call(e, **hash) if λ[:on_error]
+    rescue => e
+      Kungfuig::Prepender.error! e, reason: :on_error
+    end
+  end
+
+  class Prepender
+    class MalformedTarget < StandardError
+      def initialize msg, args
+        super "#{msg}. Target arguments: [#{args.inspect}]."
+      end
+    end
+
+    AGRESSIVE_ERRORS = true
+
+    class << self
+      def errors
+        @errors ||= []
+      end
+
+      def error! e, **hash
+        errors << [e, hash]
+      end
+
+      def anteponer *args
+        raise MalformedTarget.new "Factory requires a block; use Prepender#new for more accurate tuning", args unless block_given?
+        Prepender.new(*args, &Proc.new)
+      end
+    end
+
+    attr_reader :method, :receiver, :options, :λ
+
+    # Parameters might be:
+    # • 1
+    #   — method instance
+    #   — string in form "Class#method"
+    # • 2
+    #   — class (String, Symbol or Class), method name (String, Symbol)
+    #   — instance (Object), method name (String, Symbol)
+    def initialize *args, **params
+      @λ = { before: nil, after: nil, on_hook: nil }
+      @klazz, @method, @receiver =  case args.size
+                                    when 1
+                                      case args.first
+                                      when Method then [(class << args.first.receiver ; self ; end), args.first.name, args.first.receiver]
+                                      when UnboundMethod then [args.first.owner, args.first.name]
+                                      when String
+                                        k, m = args.first.split('#')
+                                        [k, m && m.to_sym]
+                                      end
+                                    when 2
+                                      case args.first
+                                      when Module, String then [args.first, args.last.to_sym]
+                                      when Symbol then [args.first.to_s.split('_').map(&:capitalize).join, args.last.to_sym]
+                                      else
+                                        [(class << args.first ; self ; end), args.last.to_sym, args.first]
+                                      end
+                                    end
+
+      @options = params
+      after(Proc.new) if block_given? # assign the block to after by default
+
+      raise MalformedTarget.new "Unable to lookup class", args unless @klazz
+      raise MalformedTarget.new "Unable to lookup method", args unless @method
+
+      postpone_hook
+    end
+
+    def before λ = nil
+      @λ[__callee__] = λ || (block_given? ? Proc.new : nil)
+      self
+    end
+    alias_method :after, :before
+    alias_method :on_hook, :before
+    alias_method :on_error, :before
+
+    protected
+
+    def klazz
+      return @klazz if @klazz.is_a?(Module)
+      @klazz = Kernel.const_get(@klazz) if Kernel.const_defined?(@klazz)
+      @klazz
+    end
+
+    def ready?
+      @receiver && @receiver.respond_to?(@method) ||
+        klazz.is_a?(Module) && klazz.instance_methods.include?(@method)
+    end
+
+    def to_hash
+      {
+        klazz: klazz,
+        method: @method,
+        lambdas: @λ
+      }
+    end
+
+    def hook
+      status = {}
+
+      λ = (hash = to_hash).delete(:lambdas)
+
+      p = Module.new do
+        include Kungfuig::I★I
+        define_method(hash[:method]) do |*args, **params, &cb|
+          before_params = hash.merge(receiver: self, args: args, params: params, cb: cb)
+          begin
+            λ[:before].call(**before_params) if λ[:before]
+          rescue => e
+            status[:before] = e
+            LAMBDA.call λ, e, **hash
+          end
+
+          super(*args, **params, &cb).tap do |result|
+            begin
+              λ[:after].call(**before_params.merge(result: result)) if λ[:after]
+            rescue => e
+              status[:after] = e
+              LAMBDA.call λ, e, **hash
+            end
+          end
+        end
+      end
+      klazz.send(:include, Kungfuig) unless klazz.ancestors.include? Kungfuig
+      klazz.send(:prepend, p)
+
+    rescue => e
+      status[:rescued] = e
+      raise MalformedTarget.new e.message, "#{@klazz}##{@method}" if AGRESSIVE_ERRORS
+    ensure
+      begin
+        λ[:on_hook].call(status) if λ[:on_hook]
+      rescue => e
+        LAMBDA.call λ, e, reason: :on_hook
+      end
+    end
+
+    def postpone_hook
+      return hook if ready?
+
+      TracePoint.new(:end) do |tp|
+        if tp.self.name == @klazz && ready?
+          hook
+          tp.disable
+        end
+      end.enable
+    end
+  end
+end

data/lib/kungfuig/version.rb

@@ -1,3 +1,3 @@
 module Kungfuig
-  VERSION = "0.5.8"
+  VERSION = "0.6.0"
 end

data/lib/kungfuig.rb

@@ -4,16 +4,13 @@ require 'hashie'
 require 'kungfuig/version'
 require 'kungfuig/color'
 require 'kungfuig/aspector'
+require 'kungfuig/prepender'
 
 module Kungfuig
-  ASPECT_PREFIX = '♻_'.freeze
-  ASPECT_TEMPLATE = -> { %i(after before).map { |k| [k, []] }.to_h }
-
   MX = Mutex.new
 
-  # rubocop:disable Style/VariableName
   # rubocop:disable Style/MethodName
-  def ✍(receiver, method, result, *args)
+  def ✍(receiver: nil, method: nil, result: nil, args: nil, **params)
     require 'logger'
     @✍ ||= Kernel.const_defined?('Rails') && Rails.logger || Logger.new($stdout)
     message = receiver.is_a?(String) ? "#{receiver} | #{method}" : "#{receiver.class}##{method}"
@@ -23,9 +20,7 @@ module Kungfuig
   end
   module_function :✍
   # rubocop:enable Style/MethodName
-  # rubocop:enable Style/VariableName
 
-  # rubocop:disable Metrics/MethodLength
   def load_stuff hos
     case hos
     when NilClass then Hashie::Mash.new # aka skip
@@ -45,7 +40,6 @@ module Kungfuig
       fail ArgumentError.new "#{__callee__} accepts either String or Hash as parameter."
     end
   end
-  # rubocop:enable Metrics/MethodLength
   module_function :load_stuff
 
   module InstanceMethods
@@ -113,14 +107,6 @@ module Kungfuig
       options.deep_merge! Kungfuig.load_stuff hos
     end
     private :merge_hash_or_string!
-
-    def lookup_aspects meth
-      # ⇓⇓⇓ eigenclass              ⇓⇓⇓ ancestors
-      [(class << self; self; end), *self.class.ancestors].inject(ASPECT_TEMPLATE.call) do |memo, c|
-        c.respond_to?(:aspects?) && c.aspects? ? c.aspects(meth.to_sym).merge(memo) { |_, c1, c2| c1 | c2 } : memo
-      end
-    end
-    private :lookup_aspects
   end
 
   def self.included base
@@ -145,41 +131,18 @@ module Kungfuig
       instance_eval(&block)
     end
 
-    # rubocop:disable Metrics/MethodLength
     def aspect meth, after = true
       fail ArgumentError.new "Aspect must have a codeblock" unless block_given?
       fail NoMethodError.new "Aspect must be attached to existing method" unless instance_methods.include? meth.to_sym
 
-      aspects(meth)[after ? :after : :before] << Proc.new
-
-      unless instance_methods.include?(:"#{ASPECT_PREFIX}#{meth}")
-        class_eval <<-CODE
-          alias_method :'#{ASPECT_PREFIX}#{meth}', :'#{meth}'
-          def #{meth}(*args, &cb)
-            ps = lookup_aspects(:'#{meth}')
-            ps[:before].each do |p|
-              p.call(self, :'#{meth}', nil, *args) # FIXME: allow argument modification!!!
-            end
-            send(:'#{ASPECT_PREFIX}#{meth}', *args, &cb).tap do |result|
-              ps[:after].each do |p|
-                p.call(self, :'#{meth}', result, *args)
-              end
-            end
-          end
-        CODE
-      end
-
-      meth.to_sym
-    end
-    # rubocop:enable Metrics/MethodLength
-
-    def aspects?
-      @aspects.is_a?(Hash)
+      Kungfuig::Prepender.new(self, meth).public_send((after ? :after : :before), &Proc.new)
     end
 
-    def aspects meth = nil
-      @aspects ||= {}
-      meth ? @aspects[meth.to_sym] ||= Kungfuig::ASPECT_TEMPLATE.call : @aspects
+    def aspects
+      ancestors.select { |a| a.name.nil? && a.ancestors.include?(I★I) }
+               .flat_map { |m| m.instance_methods(false) }
+               .group_by { |e| e }
+               .map { |k, v| [k, v.count] }.to_h
     end
     alias_method :set, :option!
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kungfuig
 version: !ruby/object:Gem::Version
-  version: 0.5.8
+  version: 0.6.0
 platform: ruby
 authors:
 - Kantox LTD
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-12 00:00:00.000000000 Z
+date: 2016-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -92,14 +92,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.12'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.12'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
@@ -134,14 +134,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '2'
 description: Config with goodnesses.
 email:
 - aleksei.matiushkin@kantox.com
@@ -168,6 +168,7 @@ files:
 - lib/kungfuig/aspector.rb
 - lib/kungfuig/color.rb
 - lib/kungfuig/jobber.rb
+- lib/kungfuig/prepender.rb
 - lib/kungfuig/version.rb
 homepage: http://kantox.com
 licenses: