kungfuig 0.3.1 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ac62b08dead08d021c21acbb9c5fe2bc673d928
-  data.tar.gz: 47b0818b81f566d87304a257cb6f5032bcb07eb4
+  metadata.gz: 69f461e7748885c43f77aa5ea2d1635b825f4cd2
+  data.tar.gz: 6bebc1fbf07394c0af30c7c44ea1cefff3d0a75a
 SHA512:
-  metadata.gz: a5816742eac7ae87672cadd8cc0fa89bca9dc88fe51feadd6ac02775c0e21b2a4fb53370a70207601d1b4c9b691ee40f3c9d79fa0bf0642f95e2d67f34428dcf
-  data.tar.gz: f6a24156db9d8f5e666d79cbeb397205f96030803149063a8ccd77b6436c1ff1053869ceddf261872c3b0c1c13ffe6383beae1f82831dfd797e363cd77de11bf
+  metadata.gz: 2976c6c64585dd06ae78443f2f0b480cb0dae0b0880d2cd5361efceee268de50a108c6c3562b0aef86da001d04f47d58048bedf585d1f7f77039e601c7bb9370
+  data.tar.gz: 67e7a375acdee7ec04b24794c4a6520949d03d7443a9056d28ab27e8d22a869927eea7dc4dd9188198b8626c7d363b73431972017982722a226d61a1b5b1f9ec

data/README.md

@@ -32,7 +32,7 @@ MyApp.kungfuig do
 end
 ```
 
-### Plugin to be called on method execution
+### Aspect to be called on method execution
 
 ```ruby
 class MyApp
@@ -44,7 +44,7 @@ class MyApp
 end
 
 MyApp.kungfuig do
-  plugin :report do |result|
+  aspect :report do |result|
     puts "MyApp#report returned #{result}"
   end
 end

data/lib/kungfuig.rb

@@ -3,6 +3,7 @@ require 'yaml'
 require 'hashie'
 
 module Kungfuig
+  ASPECT_PREFIX = '♻_'.freeze
   MX = Mutex.new
 
   module InstanceMethods
@@ -63,27 +64,34 @@ module Kungfuig
       !option(*keys).nil?
     end
 
+    # rubocop:disable Metrics/AbcSize
+    # rubocop:disable Metrics/CyclomaticComplexity
+    # rubocop:disable Metrics/MethodLength
     # @param hos [Hash|String] the new values taken from hash,
     #   mash or string (when string, should be either valid YAML file name or
     #   string with valid YAML)
     def merge_hash_or_string! hos
       options.deep_merge! case hos
-                          when NilClass then {} # aka skip
-                          when Hash then hos
+                          when NilClass then Hashie::Mash.new # aka skip
+                          when Hash then Hashie::Mash.new(hos)
                           when String
                             begin
                               File.exist?(hos) ? Hashie::Mash.load(hos) : Hashie::Mash.new(YAML.load(hos)).tap do |opts|
                                 fail ArgumentError.new "#{__callee__} expects valid YAML configuration file or YAML string." unless opts.is_a?(Hash)
                               end
-                            rescue ArgumentError => ae
+                            rescue ArgumentError
                               fail ArgumentError.new "#{__callee__} expects valid YAML configuration file. [#{hos}] contains invalid syntax."
-                            rescue Psych::SyntaxError => pse
+                            rescue Psych::SyntaxError
                               fail ArgumentError.new "#{__callee__} expects valid YAML configuration string. Got:\n#{hos}"
                             end
+                          when ->(h) { h.respond_to?(:to_hash) } then Hashie::Mash.new(h.to_hash)
                           else
                             fail ArgumentError.new "#{__callee__} accepts either String or Hash as parameter."
                           end
     end
+    # rubocop:enable Metrics/MethodLength
+    # rubocop:enable Metrics/CyclomaticComplexity
+    # rubocop:enable Metrics/AbcSize
     private :merge_hash_or_string!
   end
 
@@ -109,25 +117,37 @@ module Kungfuig
       instance_eval(&block)
     end
 
-    def plugin meth
-      fail ArgumentError.new "Plugin must have a codeblock" unless block_given?
-      fail NoMethodError.new "Plugin must be attached to existing method" unless instance_methods.include? meth.to_sym
-
-      ((@plugins ||= {})[meth.to_sym] ||= []) << Proc.new
-      plugins = @plugins
-      class_eval do
-        unless instance_methods(true).include?(:"∃#{meth}")
-          alias_method :"∃#{meth}", meth.to_sym
-          define_method meth.to_sym do |*args|
-            send(:"∃#{meth}", *args).tap do |result|
-              plugins[meth.to_sym].each do |p|
-                p.call result
+    # 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(true).include?(:"#{ASPECT_PREFIX}#{meth}")
+        class_eval <<-CODE
+          alias_method :#{ASPECT_PREFIX}#{meth}, :#{meth}
+          def #{meth}(*args, &cb)
+            ps = self.class.aspects(:#{meth})
+            ps[:before].each do |p|
+              p.call(*args) # TODO: make prependers able to change args!!!
+            end
+            send(:#{ASPECT_PREFIX}#{meth}, *args, &cb).tap do |result|
+              ps[:after].each do |p|
+                p.call result, *args
               end
             end
           end
-        end
-
+        CODE
       end
+
+      meth.to_sym
+    end
+    # rubocop:enable Metrics/MethodLength
+
+    def aspects meth = nil
+      @aspects ||= {}
+      meth ? @aspects[meth.to_sym] ||= {after: [], before: []} : @aspects
     end
     alias_method :set, :option!
   end

data/lib/kungfuig/aspector.rb

@@ -0,0 +1,40 @@
+require_relative '../kungfuig'
+
+module Kungfuig
+  # Generic helper for massive attaching aspects
+  module Aspector
+    # 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?(:'*') then klazz.instance_methods(false)
+          else klazz.instance_methods(false) & v
+          end
+        end.reduce(&:-)
+      end
+    end
+
+    def attach(klazz, before: nil, after: nil, exclude: nil)
+      raise ArgumentError, "Trying to attach nothing to #{klazz}. I need a block!" unless block_given?
+
+      klazz.send(:include, Kungfuig::Aspector) unless klazz.ancestors.include? Kungfuig::Aspector
+      cb = Proc.new
+
+      H.new.value_to_method_list(klazz, before, exclude).each do |m|
+        klazz.aspect(m, false, &cb)
+      end unless before.nil?
+
+      H.new.value_to_method_list(klazz, after, exclude).each do |m|
+        klazz.aspect(m, true, &cb)
+      end unless after.nil?
+
+      klazz.aspects
+    end
+    module_function :attach
+
+    private_constant :H
+  end
+end

data/lib/kungfuig/version.rb

@@ -1,3 +1,3 @@
 module Kungfuig
-  VERSION = "0.3.1"
+  VERSION = "0.4.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kungfuig
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.1
 platform: ruby
 authors:
 - Kantox LTD
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-21 00:00:00.000000000 Z
+date: 2016-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -125,6 +125,7 @@ files:
 - Rakefile
 - kungfuig.gemspec
 - lib/kungfuig.rb
+- lib/kungfuig/aspector.rb
 - lib/kungfuig/version.rb
 homepage: http://kantox.com
 licenses: