performify 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a683e8557fe63bce6b47dc99f35e9df354f1df02
-  data.tar.gz: 6ccd6d959c82eddae847f73c531e1fc8bd8f8d89
+  metadata.gz: 367bfe01f77286f482805897593ecc737774a018
+  data.tar.gz: 2c3c2ea399f9ada30d3bea8816fea838e0808dde
 SHA512:
-  metadata.gz: ab7e975a64c0877e3e7fccb9e1fff3669288621c92d84f2007b6e34c110e672f089ba771581726ffcfcb919909e86b9b480797e0808c396b37ace33b6f8a133e
-  data.tar.gz: d911869f274a6e69d26f29ffd5998bad0ffe4bdbbf811f1837204768665f68d44b26b221e5d36c4fd4d7c10222997d80990d9fe3f89629e3b43e3d401fe1e417
+  metadata.gz: 3a2447ad50e473e7d49c49c94f633d0f269286a5aaa96e502d8e184491dc3281ac40cfd89037abd6904291f7a8e138c8e7df3aae4c6317fd854bcb92420f3be7
+  data.tar.gz: e850cd17689446b5ba68e58d91829b46896370a8976c83439d7a3596c07a60098af758d3659fe924bbfe274e8427a6b65936bdc63eb6acf4ef8875eb5a888558

data/lib/performify/base.rb

@@ -7,17 +7,13 @@ module Performify
     extend Performify::Validation
 
     attr_reader :current_user
+    attr_reader :args
 
     def initialize(current_user = nil, **args)
       @current_user = current_user
+      @args = args
 
-      define_singleton_method(:execute!) do |&block|
-        return if defined?(@result)
-        super(&block)
-      end
-
-      validate(args)
-      define_singleton_methods(args)
+      prepare_instance
 
       fail!(with_callbacks: true) if errors?
     end
@@ -73,7 +69,17 @@ module Performify
       @result.blank?
     end
 
-    private def define_singleton_methods(args)
+    private def prepare_instance
+      define_singleton_method(:execute!) do |&block|
+        return if defined?(@result)
+        super(&block)
+      end
+
+      validate
+      define_singleton_methods
+    end
+
+    private def define_singleton_methods
       param_names = schema ? schema.rules.keys : args.keys
       param_names.each do |param_name|
         define_singleton_method(param_name) { args[param_name] }

data/lib/performify/callbacks.rb

@@ -24,7 +24,7 @@ module Performify
         raise UnknownTypeOfCallbackError, "Type #{type_of_callback} is not allowed"
       end
       cbs = (@service_callbacks || {}).fetch(type_of_callback, [])
-      cbs.each { |cb| instance.instance_eval(&cb) }
+      cbs.each { |cb| cb.is_a?(Proc) ? instance.instance_eval(&cb) : instance.send(cb) }
       nil
     end
 

data/lib/performify/validation.rb

@@ -19,7 +19,7 @@ module Performify
         self.class.schema
       end
 
-      def validate(args)
+      def validate
         return args if schema.nil?
         result = schema.call(args)
         errors!(result.errors) unless result.success?

data/lib/performify/version.rb

@@ -1,3 +1,3 @@
 module Performify
-  VERSION = '0.4.1'.freeze
+  VERSION = '0.4.2'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: performify
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Sergey Tsvetkov