not_naughty 0.4.2 → 0.5

data/CHANGELOG

@@ -1,3 +1,14 @@
+=== 0.5 (2008-03-17)
+* added an error handler, can now handle SQL validation errors
+* renamed Errors to Violation and merged it with ValidationException
+* changed specs for 0.4.1
+
+=== 0.4.2 (2008-03-12)
+* fixed bug that causes infinite recursion in some apps that reload classes
+
+=== 0.4.1 (2008-03-12)
+* some minor changes in validator method
+
 === 0.4 (2008-02-18)
 * completed documentation
 * added spec for :each in Builder::ValidationDelegator

data/README

@@ -35,6 +35,14 @@ NotNaughty extends your ruby Project with a highly custumizable validation API.
      validates_bunchyness_of :bunchy_item
    end
 
+<b>Handle SQL error gracefully:</b>
+
+    class Person
+        validator.error_handler.handle(SQLError) do |err|
+          # do funny things...
+        end
+    end
+
 <b>Syntactical Sugar with Builder methods:</b>
 
    validates(:username, :password) {length :minimum => 6}

data/Rakefile

@@ -9,7 +9,7 @@ include FileUtils
 # Configuration
 ##############################################################################
 NAME = "not_naughty"
-VERS = "0.4.2"
+VERS = "0.5"
 CLEAN.include ["**/.*.sw?", "pkg/*", ".config", "doc/*", "coverage/*"]
 RDOC_OPTS = [
   "--quiet", 

data/lib/not_naughty.rb

@@ -4,6 +4,7 @@ require 'observer'
 
 require 'rubygems'
 require 'assistance'
+require 'tree'
 
 module Kernel#:nodoc:all
   methods.include? 'send!' or
@@ -19,7 +20,8 @@ module NotNaughty
   require 'not_naughty/validation'
   Validation.add_observer Builder
   
-  require 'not_naughty/errors'
+  require 'not_naughty/violation'
+  require 'not_naughty/error_handler'
   require 'not_naughty/instance_methods'
   
   # Extended classes get NotNaughty::Builder and NotNaughty::InstanceMethods.
@@ -42,6 +44,8 @@ module NotNaughty
   #   validator :create, :update # ~ - but with :create and :update states
   #   validator AnotherValidator # Instance of AnotherValidator
   #
+  #   validator AnotherValidator, :state_a, :state_b
+  #
   # The above examples work as long validator is not already called. To reset
   # an already assigned validator set <tt>@validator</tt> to nil.
   def validator(*states)
@@ -54,6 +58,7 @@ module NotNaughty
         end
       
       validator_klass.new(*states)
+      
     elsif superclass.respond_to? :validator
       superclass.validator.clone
       
@@ -69,19 +74,15 @@ module NotNaughty
   #
   # <b>Example:</b>
   #   validated_before :save # raise ValidationException unless valid?
-  #   validated_before :save, :without => :exception # => false unless valid?
-  def validated_before(method, *args)
+  def validated_before(method)
     __method = :"#{method}_without_validations"
     alias_method __method, method
     
-    without = args.extract_options![:without]
-    if [*without].include? :exception
-      define_method method do |*params|
-        if valid? then send! __method else false end
-      end
-    else
-      define_method method do |*params|
-        if valid? then send! __method else raise errors.to_exception end
+    define_method method do |*params|
+      begin
+        if valid? then send! __method else raise errors end
+      rescue Exception => error
+        self.class.validator.error_handler.raise error
       end
     end
   end

data/lib/not_naughty/builder.rb

@@ -46,7 +46,7 @@ module NotNaughty
         super receiver
       end
       def method_missing(method_sym, *params) #:nodoc:
-        method_sym, params = if @_sd_obj_params.any?
+        method_sym, params = unless @_sd_obj_params.empty?
           opts = @_sd_obj_opts.update params.extract_options!
           [:"validates_#{method_sym}_of", @_sd_obj_params + [opts]]
         else

data/lib/not_naughty/error_handler.rb

@@ -0,0 +1,48 @@
+class Tree::TreeNode
+  
+  def closest(obj)
+    if @name == obj then self
+    elsif @name > obj
+      closest = self
+      @children.any? { |child| node = child.closest(obj) and closest = node }
+      
+      closest
+    end
+  end
+  
+end
+
+module NotNaughty
+  
+  class ErrorHandler
+    
+    def initialize(handler = Kernel)
+      @handles = Tree::TreeNode.new Exception, proc { |e| handler.raise e }
+    end
+    
+    # Calls closest handle with exception.
+    def raise(exception)
+      handle = @handles.closest exception.class
+      handle.content.call exception
+    end
+    
+    # Inserts handle into the ordered tree.
+    def handle(exception_class, &block)
+      closest_handle = @handles.closest exception_class
+      
+      if closest_handle == exception_class then closest_handle.content = block
+      else
+        new_handle = Tree::TreeNode.new exception_class, block
+        
+        closest_handle.children do |child|
+          exception_class > child.name and
+          new_handle << closest_handle.remove!(child)
+        end
+        
+        closest_handle << new_handle
+      end
+    end
+    
+  end
+  
+end

data/lib/not_naughty/instance_methods.rb

@@ -2,7 +2,7 @@ module NotNaughty
   module InstanceMethods
     
     # Returns instance of Errors.
-    def errors() @errors ||= ::NotNaughty::Errors.new end
+    def errors() @errors ||= ::NotNaughty::Violation.new end
     
     # Returns true if all validations passed
     def valid?

data/lib/not_naughty/validation.rb

@@ -7,7 +7,7 @@ module NotNaughty
     
     BASEDIR = File.dirname __FILE__
     # Loader pattern
-    PATTERN = File.join BASEDIR, %w[validations %s_validation.rb]
+    PATTERN = File.join BASEDIR, %w[validations ** %s_validation.rb]
     
     # Loads validations.
     def self.load(*validations)
@@ -85,7 +85,7 @@ module NotNaughty
       
       (class << self; self; end).module_eval do
         alias_method :call, :call_with_conditions
-      end if @conditions.any?
+      end unless @conditions.empty?
     end
     
     # Conditions for use in Validations are usually used with Validations.

data/lib/not_naughty/validations/sequel/uniqueness_validation.rb

@@ -0,0 +1,24 @@
+module NotNaughty
+  
+  class UniquenessValidation < Validation
+    
+    def initialize(opts, attributes) #:nodoc:
+      __message = opts[:message] || '#{"%s".humanize} is not unique.'
+      
+      if opts[:allow_blank] or opts[:allow_nil]
+        __allow = if opts[:allow_blank] then :blank? else :nil? end
+        super opts, attributes do |obj, attr, val|
+          obj.errors.add attr, __message unless
+            v.send! __allow or
+            obj.model.find(attr => val).limit(1).length.zero?
+        end
+      else
+        super opts, attributes do |obj, attr, val|
+          obj.errors.add attr, __message unless
+            obj.model.find(attr => val).limit(1).length.zero?
+        end
+      end
+    end
+    
+  end
+end

data/lib/not_naughty/validator.rb

@@ -5,7 +5,7 @@ module NotNaughty
   # See new and get_state for more information.
   class Validator
     
-    attr_reader :states
+    attr_reader :states, :error_handler
     
     # By default it comes with the :default State unless other states are
     # provided.
@@ -22,16 +22,22 @@ module NotNaughty
       
       @states         = states.inject({}) {|m, s| m.update s => State.new(s)}
       @initial_state  = @states[states.first]
+      
+      @error_handler  = NotNaughty::ErrorHandler.new
     end
     
     def clone #:nodoc:
       states = [@initial_state.name] | @states.keys
+      error_handler = @error_handler.clone
       
       clone = self.class.new(*states)
       @states.each do |n, s|
         s.validations.each { |a, v| clone.states[n].validations[a] = v.clone }
       end
-      clone.instance_eval { @initial_state = @states[states.first] }
+      clone.instance_eval do
+        @initial_state = @states[states.first]
+        @error_handler = error_handler
+      end
       
       clone
     end

data/lib/not_naughty/{errors.rb → violation.rb}

@@ -3,10 +3,10 @@ module NotNaughty
   # == Container for failed validations.
   #
   # ...
-  class Errors
+  class Violation < RuntimeError
     extend Forwardable
     
-    def_delegators :@errors, :empty?, :clear, :[], :each, :to_yaml
+    def_delegators :@errors, :empty?, :clear, :[], :each
     
     include Enumerable
     
@@ -31,31 +31,6 @@ module NotNaughty
       end
     end
     
-    # Returns a ValidationException with <tt>self</tt> in <tt>:errors</tt>.
-    def to_exception
-      ValidationException.new self
-    end
   end
   
-  # == Exception class for NotNaughty
-  #
-  # Includes the instance of Errors that caused the Exception.
-  class ValidationException < RuntimeError
-    extend Forwardable
-    
-    attr_reader :errors
-    def_delegators :@errors, :on, :full_messages, :each
-    
-    # Returns instance of ValidationError with errors set
-    def initialize(errors)
-      @errors = errors
-
-      if errors.any?
-        super 'validation errors'
-      else
-        super 'no validation errors'
-      end
-    end
-  end
-
 end

data/lib/sequel_not_naughty.rb

@@ -54,6 +54,8 @@ module Sequel #:nodoc:
       
       # Applies plugin to a Sequel::Model.
       def self.apply(receiver, *args)
+        without = [args.extract_options![:without]].flatten
+        
         receiver.extend ::NotNaughty
         receiver.validator self, :create, :update
         
@@ -63,11 +65,15 @@ module Sequel #:nodoc:
         )
         
         receiver.extend ClassMethods
+        
         receiver.instance_eval { alias_method :save, :save! }
-        receiver.validated_before :save, *args
+        receiver.validated_before :save
+        
+        without.include? :exception or
+        receiver.validator.error_handler.handle(::NotNaughty::Violation) {false}
         
-        without = args.extract_options![:without]
-        receiver.send! :include, Hooks unless [*without].include? :hooks
+        without.include? :hooks or
+        receiver.send! :include, Hooks
       end
       
       # Returns state for given instance.

data/spec/error_handler_spec.rb

@@ -0,0 +1,21 @@
+require "#{ File.dirname(__FILE__) }/spec_helper.rb"
+
+describe subject::ErrorHandler do
+  before(:each) { @eh = subject::ErrorHandler.new }
+  
+  it "passed all Exceptions to Kernel.raise" do
+    proc { @eh.raise Exception.new }.should raise_error(Exception)
+  end
+  
+  it "calls the closest handle" do
+    @eh.handle(ArgumentError) {ArgumentError}
+    @eh.handle(StandardError) {StandardError}
+    
+    @eh.raise(ArgumentError.new).should == ArgumentError
+    @eh.raise(StandardError.new).should == StandardError
+    @eh.raise(NoMethodError.new).should == StandardError
+    
+    proc { @eh.raise ScriptError.new }.should raise_error(Exception)
+  end
+  
+end

data/spec/not_naughty_spec.rb

@@ -14,12 +14,13 @@ describe subject do
     subject::should be_const_defined(:Validator)
     subject::should be_const_defined(:Builder)
     subject::should be_const_defined(:InstanceMethods)
-    subject::should be_const_defined(:Errors)
+    subject::should be_const_defined(:Violation)
   end
   it "should define a validator" do
     validated = Class.new(Object).extend subject
     validated.should respond_to(:validator)
-    validated.validator.should be_an_instance_of(subject::Validator)
+    validated.validator(:state).should be_an_instance_of(subject::Validator)
+    validated.validator.states.should have_key(:state)
     
     validator = Class.new(subject::Validator)
     validated = Class.new(Object).extend subject
@@ -62,12 +63,13 @@ describe subject do
     validated.validated_before :clone
     instance = validated.new
     instance.should_receive(:valid?).once.and_return(false)
-    lambda { instance.clone }.should raise_error(subject::ValidationException)
+    lambda { instance.clone }.should raise_error(subject::Violation)
   end
   it "should return false if invalid and method called" do
     validated = Class.new(Object).extend subject
     
-    validated.validated_before :clone, :without => :exception
+    validated.validated_before :clone
+    validated.validator.error_handler.handle(subject::Violation) {false}
     instance = validated.new
     instance.should_receive(:valid?).once.and_return(false)
     instance.clone.should == false

data/spec/sequel_validated_spec.rb

@@ -14,7 +14,7 @@ describe Sequel::Plugins::NotNaughty do
     @obj.validator.should_receive(:has_validations?)
     @obj.validator.should_receive(:invoke).with(@instance)
     
-    @instance.errors.should be_an_instance_of(subject::Errors)
+    @instance.errors.should be_an_instance_of(subject::Violation)
     @instance.should respond_to(:validate)
     @instance.should respond_to(:valid?)
     @instance.should respond_to(:save_without_validations)
@@ -93,5 +93,6 @@ describe Sequel::Plugins::NotNaughty do
     i.should_not_receive(:after_validate)
     i.validate
   end
+  it "should alias the validate_with_hooks just once"
   
 end

data/spec/validator_spec.rb

@@ -10,7 +10,16 @@ describe subject::Validator, 'with default state' do
   it "should shoult return default state" do
     @validator.get_state(nil).name.should == :default
   end
-
+  it "should have an errors handler" do
+    @validator.error_handler.should be_kind_of(NotNaughty::ErrorHandler)
+  end
+  it "should clone the error handler" do
+    rnd = rand(10)
+    
+    @validator.error_handler.should_receive(:clone).and_return(rnd)
+    @validator.clone.error_handler.should == rnd
+  end
+  
 end
 
 describe NotNaughty::Validator, 'with custom states' do

data/spec/violation_spec.rb

@@ -0,0 +1,36 @@
+require "#{ File.dirname(__FILE__) }/spec_helper.rb"
+
+describe subject::Violation do
+  
+  before(:each) { @errors = subject::Violation.new }
+  
+  it "should add errors in a hash" do
+    @errors.add :attribute, 'Message'
+
+    @errors.instance_variable_get(:@errors)[:attribute].
+    should include('Message')
+  end
+  it "should return full messages" do
+    @errors.add :attribute, 'Message #{"%s".capitalize}'
+
+    @errors.full_messages.
+    should == ['Message Attribute']
+  end
+  it "should be kind of RuntimeError" do
+    @errors.should be_kind_of(RuntimeError)
+  end
+  it "should have methods delegated" do
+    probe = mock 'Probe'
+    methods = [:empty?, :clear, :[], :each]
+    
+    methods.each { |m| probe.should_receive m }
+    @errors.instance_variable_set :@errors, probe
+    
+    methods.each { |m| @errors.send! m }
+  end
+  it "should return evaluated errors messages" do
+    @errors.add :attribute, 'Message #{"%s".capitalize}'
+    @errors.on(:attribute).should == ['Message Attribute']
+  end
+  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: not_naughty
 version: !ruby/object:Gem::Version 
-  version: 0.4.2
+  version: "0.5"
 platform: ruby
 authors: 
 - "Florian A\xC3\x9Fmann"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-03-12 00:00:00 +01:00
+date: 2008-03-17 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -28,7 +28,7 @@ files:
 - README
 - Rakefile
 - spec/builder_spec.rb
-- spec/errors_spec.rb
+- spec/error_handler_spec.rb
 - spec/not_naughty_spec.rb
 - spec/rcov.opts
 - spec/sequel_spec_helper.rb
@@ -38,9 +38,10 @@ files:
 - spec/validation_spec.rb
 - spec/validations_spec.rb
 - spec/validator_spec.rb
+- spec/violation_spec.rb
 - lib/not_naughty
 - lib/not_naughty/builder.rb
-- lib/not_naughty/errors.rb
+- lib/not_naughty/error_handler.rb
 - lib/not_naughty/instance_methods.rb
 - lib/not_naughty/validation.rb
 - lib/not_naughty/validations
@@ -50,7 +51,10 @@ files:
 - lib/not_naughty/validations/length_validation.rb
 - lib/not_naughty/validations/numericality_validation.rb
 - lib/not_naughty/validations/presence_validation.rb
+- lib/not_naughty/validations/sequel
+- lib/not_naughty/validations/sequel/uniqueness_validation.rb
 - lib/not_naughty/validator.rb
+- lib/not_naughty/violation.rb
 - lib/not_naughty.rb
 - lib/sequel_not_naughty.rb
 - CHANGELOG

data/spec/errors_spec.rb

@@ -1,61 +0,0 @@
-require "#{ File.dirname(__FILE__) }/spec_helper.rb"
-
-describe subject::Errors do
-  
-  before(:each) { @errors = subject::Errors.new }
-  
-  it "should add errors in a hash" do
-    @errors.add :attribute, 'Message'
-
-    @errors.instance_variable_get(:@errors)[:attribute].
-    should include('Message')
-  end
-  it "should return full messages" do
-    @errors.add :attribute, 'Message #{"%s".capitalize}'
-
-    @errors.full_messages.
-    should == ['Message Attribute']
-  end
-  it "should return an #{subject::ValidationException} with errors" do
-    exception = @errors.to_exception
-    exception.should be_an_instance_of(subject::ValidationException)
-    exception.errors.should == @errors
-  end
-  it "should have methods delegated" do
-    probe = mock 'Probe'
-    methods = [:empty?, :clear, :[], :each, :to_yaml]
-    
-    methods.each { |m| probe.should_receive m }
-    @errors.instance_variable_set :@errors, probe
-    
-    methods.each { |m| @errors.send! m }
-  end
-  it "should return evaluated errors messages" do
-    @errors.add :attribute, 'Message #{"%s".capitalize}'
-    @errors.on(:attribute).should == ['Message Attribute']
-  end
-  
-end
-
-describe subject::ValidationException do
-  
-  it "should return an exception with errors" do
-    probe = mock 'probe'
-    probe.should_receive(:any?).and_return(true)
-    exception = subject::ValidationException.new probe
-
-    lambda { raise exception }.should_not raise_error(TypeError)
-    exception.errors.should == probe
-  end
-  it "should have methods delegated" do
-    methods = [:on, :full_messages, :each]
-
-    probe = mock 'Probe'
-    probe.should_receive(:any?).and_return(true)
-    exception = subject::ValidationException.new probe
-
-    methods.each { |m| probe.should_receive m }
-    methods.each { |m| exception.send! m }
-  end
-  
-end