not-naughty 0.6.1 → 0.6.2

data/CHANGELOG.rdoc

@@ -1,3 +1,9 @@
+=== 0.6.2 (2008-10-31)
+* NotNaughty::Builder is now NotNaughty::ClassMethods
+* NotNaughty::Builder::ValidationDelegator is now NotNaughty::ClassMethods::Builder
+* NotNaughty::ClassMethods::Builder does not inherit from Delegation anymore, so { format :with => /rx/ } works
+* NotNaughty::Validation loads validations from directories listed in load_paths
+
 === 0.6.1 (2008-10-10)
 * builder/validation cleanups
 * added gemspecs for github

data/Rakefile

@@ -9,7 +9,7 @@ include FileUtils
 # Configuration
 ##############################################################################
 NAME = "not-naughty"
-VERS = "0.6.1"
+VERS = "0.6.2"
 CLEAN.include %w[ pkg doc coverage ]
 RDOC_OPTS = [
   "--quiet",

data/lib/not_naughty.rb

@@ -1,4 +1,3 @@
-require 'delegate'
 require 'forwardable'
 require 'observer'
 
@@ -12,19 +11,20 @@ require 'core_extensions'
 module NotNaughty
   require 'not_naughty/validator'
 
-  require 'not_naughty/builder'
+  require 'not_naughty/class_methods'
   require 'not_naughty/validation'
-  Validation.add_observer Builder
+  Validation.add_observer ClassMethods
 
   require 'not_naughty/violation'
   require 'not_naughty/error_handler'
   require 'not_naughty/instance_methods'
 
-  # Extended classes get NotNaughty::Builder and NotNaughty::InstanceMethods.
+  # Extended classes get NotNaughty::ClassMethods and
+  # NotNaughty::InstanceMethods.
   def self.extended(base)
     base.instance_eval do
       include InstanceMethods
-      extend Builder
+      extend ClassMethods
     end
   end
 

data/lib/not_naughty/class_methods.rb

@@ -0,0 +1,78 @@
+module NotNaughty
+  module ClassMethods
+
+    def self.update(validation) # :nodoc:
+      if basename = validation.name[/([^:]+)Validation$/, 1]
+        define_method 'validates_%s_of' % basename.downcase do |*params|
+          validator.add_validation(validation, *params)
+        end
+      end
+    end
+
+    # == Syntactic sugar.
+    #
+    # <b>Example:</b>
+    #   validates { presence_of :example, :if => :reading? }
+    #     # => validate_presence_of :example, :if => :reading?
+    #   validates(:name) { presence and length :minimum => 6 }
+    #     # => validates_presence_of :name
+    #          validates_length_of :name, :minimum => 6
+    #   validates(:temp, :if => water?) { value :lt => 100 }
+    #     # => validates_value_of :temp, :lt => 100, :if => water?
+    def validates(*params, &block)
+      Builder.new(self, *params).instance_eval(&block)
+    end
+
+    # Allows adding validations the legacy way.
+    def validates_each(*attributes, &block)
+      validator.add_validation(*attributes, &block)
+    end
+
+    # With this you get syntactical sugar for all descendants of Validation
+    # see validates for examples.
+    class Builder
+
+      def initialize(klass, *params) # :nodoc:
+        @_vd_obj            = klass
+        @_vd_obj_opts       = params.extract_options!
+        @_vd_obj_attrs      = params
+
+        methods = ClassMethods.instance_methods(false).grep(/^validates_.+_of$/)
+
+        if @_vd_obj_attrs.empty?
+          for method in methods
+            eval <<-EOS
+              def self.#{ method[/^validates_(.+)$/, 1] }(*params)
+                params << @_vd_obj_opts.merge(params.extract_options!)
+
+                begin
+                  @_vd_obj.__send__(:#{ method }, *params)
+                rescue Exception
+                  $@.delete_if { |s| /^\\(eval\\):/ =~ s }
+                  raise
+                end
+              end
+            EOS
+          end
+        else
+          for method in methods
+            eval <<-EOS
+              def self.#{ method[/^validates_(.+)_of$/, 1] }(*args)
+                params = @_vd_obj_attrs.dup
+                params << @_vd_obj_opts.merge(args.extract_options!)
+
+                begin
+                  @_vd_obj.__send__(:#{ method }, *params)
+                rescue Exception
+                  $@.delete_if { |s| /^\\(eval\\):/ =~ s }
+                  raise
+                end
+              end
+            EOS
+          end
+        end
+      end
+    end
+
+  end
+end

data/lib/not_naughty/validation.rb

@@ -5,14 +5,20 @@ module NotNaughty
   # See new for more information.
   class Validation
 
-    BASEDIR = File.dirname __FILE__
-    # Loader pattern
-    PATTERN = File.join BASEDIR, %w[validations ** %s_validation.rb]
+    # Returns array of paths which are scanned for validations by load.
+    def self.load_paths
+      @load_paths
+    end
+    @load_paths = [File.join(%W[#{ File.dirname __FILE__ } validations])]
+    PATTERN = File.join %w[%s ** %s_validation.rb]
 
-    # Loads validations.
+    # Loads validations from load_paths.
     def self.load(*validations)
       validations.each do |validation|
-        Dir.glob(PATTERN % validation).each { |path| require path }
+        @load_paths.each do |load_path|
+          pattern = PATTERN % [load_path, validation]
+          Dir[pattern].each { |validation_path| require validation_path }
+        end
       end
     end
 

data/spec/{builder_spec.rb → class_methods_spec.rb}

@@ -1,6 +1,6 @@
 require "#{ File.dirname(__FILE__) }/spec_helper.rb"
 
-describe subject::Builder do
+describe subject::ClassMethods do
 
   before(:each) do
     @validatable = Class.new(Object) do
@@ -10,14 +10,12 @@ describe subject::Builder do
       def validation_state() state end
     end
     @validatable.validator = mock 'Validator'
-    @validatable.extend(subject::Builder)
+    @validatable.extend(subject::ClassMethods)
   end
 
   it "should have a delegator class" do
-    subject::Builder.constants.
-      should include('ValidationDelegator')
-    subject::Builder.const_get('ValidationDelegator').
-      should < SimpleDelegator
+    subject::ClassMethods.constants.
+      should include('Builder')
   end
   it "should provide the :validates builder method" do
     @validatable.should respond_to(:validates)
@@ -36,9 +34,12 @@ describe subject::Builder do
   end
   it "should add validation for :firstname and :lastname via :validates" do
     @validatable.validator.should_receive(:add_validation).
-      with(NotNaughty::PresenceValidation, :firstname, :lastname, {}).twice
+      with(NotNaughty::PresenceValidation, :firstname, :lastname, {})
     @validatable.validates { presence_of :firstname, :lastname }
-    @validatable.validates(:firstname, :lastname) { presence :name }
+
+    @validatable.validator.should_receive(:add_validation).
+      with(NotNaughty::FormatValidation, :firstname, :lastname, :with => /Hello World!/)
+    @validatable.validates(:firstname, :lastname) { format :with => /Hello World!/ }
   end
   it "should register validation" do
     validation = Class.new(subject::Validation) do
@@ -54,23 +55,8 @@ describe subject::Builder do
   end
   it "should build the Validations with :validates_each" do
     @validatable.validator = mock 'Validator'
-    @validatable.validator.
-      should_receive(:add_validation).
-      with(:a, :b)
-    @validatable.validates_each(:a, :b) {|o, a, v|}
-
-    pending 'expect a block'
-  end
-  it "should support :each in validates block" do
-    @validatable.validator = mock 'Validator'
-    @validatable.validator.
-      should_receive(:add_validation).
-      with(:a, :b, {})
-    @validatable.validates do
-      each(:a, :b) {|o, a, v|}
-    end
-
-    pending 'expect a block'
+    @validatable.validator.should_receive(:add_validation)
+    @validatable.validates_each
   end
   it "should raise a NoMethodError is builder method does not exist" do
     lambda { @validatable.validates() { bunch_of :holy_crap } }.

data/spec/not_naughty_spec.rb

@@ -1,6 +1,6 @@
 require "#{ File.dirname(__FILE__) }/spec_helper.rb"
 
-module subject::Builder
+module subject::ClassMethods
   def self.extended(base) end
 end
 module subject::InstanceMethods
@@ -12,7 +12,7 @@ describe subject do
   it "should load necessary files" do
     subject::should be_const_defined(:Validation)
     subject::should be_const_defined(:Validator)
-    subject::should be_const_defined(:Builder)
+    subject::should be_const_defined(:ClassMethods)
     subject::should be_const_defined(:InstanceMethods)
     subject::should be_const_defined(:Violation)
   end
@@ -31,7 +31,7 @@ describe subject do
   it "should extend the receiver if validator is defined" do
     validated = Class.new(Object)
 
-    subject::Builder.should_receive(:extended).with(validated)
+    subject::ClassMethods.should_receive(:extended).with(validated)
     subject::InstanceMethods.should_receive(:included).with(validated)
 
     validated.extend subject
@@ -74,9 +74,9 @@ describe subject do
     instance.should_receive(:valid?).once.and_return(false)
     instance.clone.should == false
   end
-  it "should add Builder to Validation observers" do
+  it "should add ClassMethods to Validation observers" do
     subject::Validation.instance_variable_get(:@observer_peers).
-    should include(subject::Builder)
+    should include(subject::ClassMethods)
   end
 
 end

data/spec/spec_helper.rb

@@ -2,6 +2,7 @@ require 'rubygems'
 require 'spec'
 
 require "#{ File.dirname __FILE__ }/../lib/not_naughty.rb"
+NotNaughty::Validation.load 'format', 'presence'
 
 def subject() ::NotNaughty end
 def h(something)

data/spec/validation_spec.rb

@@ -1,12 +1,11 @@
-require "#{ File.dirname(__FILE__) }/spec_helper.rb"
+require "#{ File.dirname __FILE__ }/spec_helper.rb"
 
 describe subject::Validation do
 
   it "should register validations if inherited" do
-    subject::Builder.
-      should_receive(:update).any_number_of_times.
+    subject::ClassMethods.
+      should_receive(:update).once.
       with Class.new(subject::Validation)
-    pending 'This one kinda sucks...'
   end
   it "should build validations with block" do
     block = proc {|o, a, v|}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: not-naughty
 version: !ruby/object:Gem::Version 
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors: 
 - "Florian A\xC3\x9Fmann"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-10 00:00:00 +02:00
+date: 2008-10-31 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -36,7 +36,7 @@ files:
 - COPYING
 - README.rdoc
 - Rakefile
-- spec/builder_spec.rb
+- spec/class_methods_spec.rb
 - spec/error_handler_spec.rb
 - spec/not_naughty_spec.rb
 - spec/rcov.opts
@@ -48,7 +48,7 @@ files:
 - spec/violation_spec.rb
 - lib/core_extensions.rb
 - lib/not_naughty
-- lib/not_naughty/builder.rb
+- lib/not_naughty/class_methods.rb
 - lib/not_naughty/error_handler.rb
 - lib/not_naughty/instance_methods.rb
 - lib/not_naughty/validation.rb

data/lib/not_naughty/builder.rb

@@ -1,67 +0,0 @@
-module NotNaughty
-
-  # == Builder that builds
-  #
-  # With this you get syntactical sugar for all descendants of Validation, see
-  # validates for examples.
-  module Builder
-
-    # Observer method that creates Validation builder methods.
-    #
-    # A Validation with the class name TestValidation will get the
-    # builder method <tt>validate_test_of</tt> that adds a validation via
-    # add_validation in the current <tt>validator</tt>.
-    def self.update(validation)
-      if basename = validation.name[/([^:]+)Validation$/, 1]
-        define_method 'validates_%s_of' % basename.downcase do |*params|
-          validator.add_validation(validation, *params)
-        end
-      end
-    end
-
-    # == Syntactic sugar.
-    #
-    # <b>Example:</b>
-    #   validates { presence_of :example, :if => :reading? }
-    #     # => validate_presence_of :example, :if => :reading?
-    #   validates(:name) { presence and length :minimum => 6 }
-    #     # => validates_presence_of :name
-    #          validates_length_of :name, :minimum => 6
-    #   validates(:temp, :if => water?) { value :lt => 100 }
-    #     # => validates_value_of :temp, :lt => 100, :if => water?
-    def validates(*params, &block)
-      ValidationDelegator.new(self, *params).instance_eval(&block)
-    end
-
-    # Allows adding validations the legacy way.
-    def validates_each(*attributes, &block)
-      validator.add_validation(*attributes, &block)
-    end
-
-    class ValidationDelegator < SimpleDelegator #:nodoc:all
-      def initialize(receiver, *params)
-        @_sd_obj_opts       = params.extract_options!
-        @_sd_obj_attributes = params
-
-        super receiver
-      end
-      def method_missing(method_sym, *params) #:nodoc:
-        valid = @_sd_obj_opts.merge params.extract_options!
-        valid = Marshal.load Marshal.dump(valid)
-
-        method_sym, params = unless @_sd_obj_attributes.empty?
-          [:"validates_#{ method_sym }_of", @_sd_obj_attributes + [valid]]
-        else
-          [:"validates_#{ method_sym }", params + [valid]]
-        end
-
-        if @_sd_obj.respond_to? method_sym
-          @_sd_obj.send(method_sym, *params); true
-        else
-          raise NoMethodError, "unable to evaluate ´#{method_sym}(#{ params.map {|p|p.inspect} * ','})'"
-        end
-      end
-    end
-
-  end
-end