lib/tram/policy.rb in tram-policy-0.1.1 vs lib/tram/policy.rb in tram-policy-0.2.0

@@ -14,14 +14,15 @@
 
     class << self
       # Registers a validator
       #
       # @param  [#to_sym, Array<#to_sym>] names
+      # @option opts [Boolean] :stop_on_failure
       # @return [self]
       #
-      def validate(name, **opts)
-        validators[name.to_sym] = opts
+      def validate(name = nil, **opts, &block)
+        local << Validator.new(scope, name, block, opts)
         self
       end
 
       # Policy constructor/validator (alias for [.new])
       #
@@ -32,18 +33,21 @@
         new(*args)
       end
 
       private
 
-      def validators
-        @validators ||= {}
+      def scope
+        @scope ||= ["tram-policy", *Inflector.underscore(name)]
       end
 
-      def inherited(klass)
-        super
-        validators.each { |name, opts| klass.validate name, opts }
+      def local
+        @local ||= []
       end
+
+      def all
+        ((self == Tram::Policy) ? [] : superclass.send(:all)) + local
+      end
     end
 
     # Translates a message in the scope of current policy
     #
     # @param  [#to_s] message
@@ -105,14 +109,13 @@
 
     private
 
     def initialize(*)
       super
-      @__scope__ = ["tram-policy", Inflector.underscore(self.class.name)]
-      self.class.send(:validators).each do |name, opts|
+      self.class.send(:all).each do |validator|
         size = errors.count
-        send(name)
-        break if (errors.count > size) && opts[:stop_on_failure]
+        validator.check(self)
+        break if (errors.count > size) && validator.stop_on_failure
       end
     end
   end
 end