whyvalidationssuckin96 1.3.1 → 1.4.0

data/Rakefile

@@ -20,9 +20,15 @@ rescue LoadError
 end
 
 require 'rake/testtask'
-Rake::TestTask.new(:test_non_rails) do |test|
+Rake::TestTask.new(:test_core) do |test|
   test.libs << 'lib' << 'test'
-  test.test_files = FileList['test/**/*_test.rb'].exclude("test/rails/**/*_test.rb")
+  test.test_files = FileList['test/**/*_test.rb'].exclude("test/{rails,riot}/**/*_test.rb")
+  test.verbose = true
+end
+
+Rake::TestTask.new(:test_riot) do |test|
+  test.libs << 'lib' << 'test'
+  test.test_files = FileList["test/riot/**/*_test.rb"]
   test.verbose = true
 end
 
@@ -32,7 +38,7 @@ Rake::TestTask.new(:test_rails) do |test|
   test.verbose = true
 end
 
-task :test => [:check_dependencies, :test_non_rails, :test_rails]
+task :test => [:check_dependencies, :test_core, :test_riot, :test_rails]
 task :default => :test
 
 begin

data/VERSION

@@ -1 +1 @@
-1.3.1
+1.4.0

data/lib/whyvalidationssuckin96/test/riot.rb

@@ -0,0 +1,46 @@
+module WhyValidationsSuckIn96
+  module Test
+    module Riot
+      class ValidationAssertionMacro < ::Riot::AssertionMacro
+        class << self
+          attr_accessor :validation_macro_name
+        end
+        
+        WhyValidationsSuckIn96::ValidationBuilder::RegisteredMacros.keys.each do |macro_name|
+          Class.new(self) do
+            self.validation_macro_name = macro_name
+            register macro_name
+          end
+        end
+        
+        def evaluate(model, *validation_args)
+          attribute, options = validation_args
+          if has_validation?(model, attribute, options || {})
+            pass("#{model} #{validation_macro_name} #{attribute}")
+          else
+            fail("expected #{model} to #{validation_macro_name} #{attribute}")
+          end
+        end
+        
+        def validation_macro_name
+          self.class.validation_macro_name
+        end
+        
+      private
+      
+        def has_validation?(klass, attribute, validation_opts)
+          v_klass = WhyValidationsSuckIn96::ValidationBuilder::RegisteredMacros[validation_macro_name]
+          raise "No registered validation exists for #{validation_macro_name}" unless v_klass
+          klass.validation_collection.any? do |(vc,opts)|
+            vc == v_klass && opts.all? do |k,v| 
+              # @todo - this is a hack to skip the attribute based validation options
+              next(true) if k == :attribute && v == attribute
+              validation_opts[k] == v
+            end
+          end
+        end
+        
+      end # ValidationAssertionMacro
+    end   # Riot
+  end     # Test
+end       # WhyValidationsSuckIn96

data/lib/whyvalidationssuckin96/validation_builder.rb

@@ -2,6 +2,7 @@ require 'whyvalidationssuckin96/validation'
 
 module WhyValidationsSuckIn96
   class ValidationBuilder
+    RegisteredMacros = {}
     
     # @param [Module, Class] klass_or_mod     The Class or Module to add validations to
     # @param [Proc]          definition_block The block to evaluate to define validations
@@ -18,6 +19,7 @@ module WhyValidationsSuckIn96
     # @param [Symbol] macro_name       The name to register this macro with
     # @param [Class]  validation_class The class implementing the validation
     def self.register_macro(macro_name, validation_class)
+      RegisteredMacros[macro_name] = validation_class
       define_method(macro_name) do |*args|
         attrs, options = extract_options(args)
         attrs.each do |attr|

data/test/riot/macros_test.rb

@@ -0,0 +1,51 @@
+require 'teststrap'
+require 'whyvalidationssuckin96/test/riot'
+
+context "validation macro assertions" do
+  
+  context "being registered" do
+    setup do
+      WhyValidationsSuckIn96::ValidationBuilder::RegisteredMacros
+    end
+  
+    should "actually have more than one registered macro to ensure these tests are valid" do
+      topic.size > 1
+    end
+
+    should "add a riot assertion macro for each registered validation" do
+      WhyValidationsSuckIn96::ValidationBuilder::RegisteredMacros.keys.all? do |k|
+        Riot::Assertion.macros.has_key?(k.to_s)
+      end
+    end
+  end # being registered
+  
+  context "asserting against a class" do
+    setup do 
+      klass = Class.new do
+        include WhyValidationsSuckIn96::ValidationSupport
+        setup_validations do
+          validates_format_of :foo, :with => /[a-z]/
+        end
+      end
+      
+      Riot::Assertion.new("test") { klass }
+    end
+    
+    should "fail if there's no validation against the specified attribute" do
+      topic.validates_format_of(:ministry).run(Riot::Situation.new).first
+    end.equals(:fail)
+    
+    should "fail if there's a validation against the specified attribute but no options are specified" do
+      topic.validates_format_of(:foo).run(Riot::Situation.new).first
+    end.equals(:fail)
+    
+    should "fail if there's a validation against the specified attribute but bad options are specified" do
+      topic.validates_format_of(:foo, :with => //).run(Riot::Situation.new).first
+    end.equals(:fail)
+    
+    should "pass if there's a validation against the specified attribute and good options are specified" do
+      topic.validates_format_of(:foo, :with => /[a-z]/).run(Riot::Situation.new).first
+    end.equals(:pass)
+
+  end # asserting against a class
+end   # validation macro assertions

data/test/validation_builder_test.rb

@@ -59,4 +59,17 @@ context "validation builder" do
     end.equals(1)
     
   end # when defining multiple validations with the same name in the one validation definition
+  
+  context "register_macro" do
+    should "add a key to the registered macros constant" do
+      WhyValidationsSuckIn96::ValidationBuilder.register_macro(:this_is_a_test_macro, Class.new)
+      WhyValidationsSuckIn96::ValidationBuilder::RegisteredMacros.has_key?(:this_is_a_test_macro)
+    end
+    
+    should "store the validation class in the registered macros constant" do
+      klass = Class.new
+      WhyValidationsSuckIn96::ValidationBuilder.register_macro(:this_is_another_test_macro, klass)
+      WhyValidationsSuckIn96::ValidationBuilder::RegisteredMacros[:this_is_another_test_macro].object_id == klass.object_id
+    end
+  end # register_macro
 end   # validation builder

data/whyvalidationssuckin96.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{whyvalidationssuckin96}
-  s.version = "1.3.1"
+  s.version = "1.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["gabrielg", "douglasmeyer"]
-  s.date = %q{2010-01-27}
+  s.date = %q{2010-01-30}
   s.description = %q{A library for setting up model validations, such as in ActiveRecord.}
   s.email = %q{gabriel.gironda@gmail.com}
   s.extra_rdoc_files = [
@@ -90,6 +90,7 @@ Gem::Specification.new do |s|
      "lib/whyvalidationssuckin96/rails/macros.rb",
      "lib/whyvalidationssuckin96/rails/macros/validates_uniqueness.rb",
      "lib/whyvalidationssuckin96/skippable_validation.rb",
+     "lib/whyvalidationssuckin96/test/riot.rb",
      "lib/whyvalidationssuckin96/validation.rb",
      "lib/whyvalidationssuckin96/validation_builder.rb",
      "lib/whyvalidationssuckin96/validation_collection.rb",
@@ -111,6 +112,7 @@ Gem::Specification.new do |s|
      "test/rails/association_validation_test.rb",
      "test/rails/base_validation_overrides_test.rb",
      "test/rails/macros/validates_uniqueness_test.rb",
+     "test/riot/macros_test.rb",
      "test/skippable_validation_test.rb",
      "test/teststrap.rb",
      "test/validation_builder_test.rb",
@@ -141,6 +143,7 @@ Gem::Specification.new do |s|
      "test/rails/association_validation_test.rb",
      "test/rails/base_validation_overrides_test.rb",
      "test/rails/macros/validates_uniqueness_test.rb",
+     "test/riot/macros_test.rb",
      "test/skippable_validation_test.rb",
      "test/teststrap.rb",
      "test/validation_builder_test.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: whyvalidationssuckin96
 version: !ruby/object:Gem::Version 
-  version: 1.3.1
+  version: 1.4.0
 platform: ruby
 authors: 
 - gabrielg
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-27 00:00:00 -06:00
+date: 2010-01-30 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -126,6 +126,7 @@ files:
 - lib/whyvalidationssuckin96/rails/macros.rb
 - lib/whyvalidationssuckin96/rails/macros/validates_uniqueness.rb
 - lib/whyvalidationssuckin96/skippable_validation.rb
+- lib/whyvalidationssuckin96/test/riot.rb
 - lib/whyvalidationssuckin96/validation.rb
 - lib/whyvalidationssuckin96/validation_builder.rb
 - lib/whyvalidationssuckin96/validation_collection.rb
@@ -147,6 +148,7 @@ files:
 - test/rails/association_validation_test.rb
 - test/rails/base_validation_overrides_test.rb
 - test/rails/macros/validates_uniqueness_test.rb
+- test/riot/macros_test.rb
 - test/skippable_validation_test.rb
 - test/teststrap.rb
 - test/validation_builder_test.rb
@@ -199,6 +201,7 @@ test_files:
 - test/rails/association_validation_test.rb
 - test/rails/base_validation_overrides_test.rb
 - test/rails/macros/validates_uniqueness_test.rb
+- test/riot/macros_test.rb
 - test/skippable_validation_test.rb
 - test/teststrap.rb
 - test/validation_builder_test.rb