ardb 0.8.0 → 0.9.0

data/lib/ardb/record_spy.rb

@@ -29,8 +29,10 @@ module Ardb
 
       end
 
-      [ :validates_presence_of, :validates_uniqueness_of,
-        :validates_inclusion_of
+      [ :validates_acceptance_of, :validates_confirmation_of,
+        :validates_exclusion_of,  :validates_format_of, :validates_inclusion_of,
+        :validates_length_of, :validates_numericality_of,
+        :validates_presence_of, :validates_size_of, :validates_uniqueness_of
       ].each do |method_name|
         type = method_name.to_s.match(/\Avalidates_(.+)_of\Z/)[1]
 
@@ -41,12 +43,33 @@ module Ardb
 
       end
 
+      def validates_associated(*args)
+        @validations ||= []
+        @validations << Validation.new(:associated, *args)
+      end
+
+      def validates_with(*args)
+        @validations ||= []
+        @validations << Validation.new(:with, *args)
+      end
+
+      def validates_each(*args, &block)
+        @validations ||= []
+        @validations << Validation.new(:each, *args, &block)
+      end
+
       def validate(method_name = nil, &block)
         @validations ||= []
         @validations << Validation.new(:custom, method_name, &block)
       end
 
-      [ :after_initialize, :before_validation, :after_save ].each do |method_name|
+      [ :before_validation, :after_validation,
+        :before_create,  :around_create,  :after_create,
+        :before_update,  :around_update,  :after_update,
+        :before_save,    :around_save,    :after_save,
+        :before_destroy, :around_destroy, :after_destroy,
+        :after_initialize, :after_find
+      ].each do |method_name|
 
         define_method(method_name) do |*args, &block|
           @callbacks ||= []
@@ -83,16 +106,18 @@ module Ardb
     end
 
     class Validation
-      attr_reader :type, :columns, :options, :method_name, :block
+      attr_reader :type, :args, :options, :method_name, :block
+      alias :columns :args
+      alias :associations :args
+      alias :classes :args
 
       def initialize(type, *args, &block)
         @type  = type.to_sym
+        @options = args.last.kind_of?(::Hash) ? args.pop : {}
+        @args = args
         @block = block
-        if type != :custom
-          @options = args.last.kind_of?(::Hash) ? args.pop : {}
-          @columns = args
-        else
-          @method_name = args.first
+        if @type == :custom
+          @method_name = @args.first
         end
       end
     end

data/lib/ardb/version.rb

@@ -1,3 +1,3 @@
 module Ardb
-  VERSION = "0.8.0"
+  VERSION = "0.9.0"
 end

data/test/unit/record_spy_tests.rb

@@ -17,9 +17,19 @@ module Ardb::RecordSpy
 
     should have_readers :associations, :callbacks, :validations
     should have_imeths :belongs_to, :has_many, :has_one
-    should have_imeths :validates_presence_of, :validates_uniqueness_of
-    should have_imeths :validates_inclusion_of, :validate
-    should have_imeths :after_initialize, :before_validation, :after_save
+    should have_imeths :validates_acceptance_of, :validates_confirmation_of
+    should have_imeths :validates_exclusion_of,  :validates_format_of
+    should have_imeths :validates_inclusion_of, :validates_length_of
+    should have_imeths :validates_numericality_of, :validates_presence_of
+    should have_imeths :validates_size_of, :validates_uniqueness_of
+    should have_imeths :validates_associated, :validates_with, :validates_each
+    should have_imeths :validate
+    should have_imeths :before_validation, :after_validation
+    should have_imeths :before_create,  :around_create,  :after_create
+    should have_imeths :before_update,  :around_update,  :after_update
+    should have_imeths :before_save,    :around_save,    :after_save
+    should have_imeths :before_destroy, :around_destroy, :after_destroy
+    should have_imeths :after_initialize, :after_find
 
     should "included the record spy instance methods" do
       assert_includes Ardb::RecordSpy::InstanceMethods, subject.included_modules
@@ -53,25 +63,37 @@ module Ardb::RecordSpy
       subject.validates_presence_of :name, :email, :on => :create
       validation = subject.validations.last
       assert_equal :presence, validation.type
-      assert_includes :name, validation.columns
+      assert_equal :create,   validation.options[:on]
+      assert_includes :name,  validation.columns
       assert_includes :email, validation.columns
-      assert_equal :create, validation.options[:on]
     end
 
-    should "add a validation config with #validates_uniqueness_of" do
-      subject.validates_uniqueness_of :name, :scope => :area_id
+    should "add a validation config with #validates_associated" do
+      subject.validates_associated :area, :linkings
       validation = subject.validations.last
-      assert_equal :uniqueness, validation.type
-      assert_includes :name, validation.columns
-      assert_equal :area_id, validation.options[:scope]
+      assert_equal :associated, validation.type
+      assert_includes :area,     validation.associations
+      assert_includes :linkings, validation.associations
     end
 
-    should "add a validation config with #validates_inclusion_of" do
-      subject.validates_inclusion_of :active, :in => [ true, false]
+    should "add a validation config with #validates_associated" do
+      first_validation_class  = Class.new
+      second_validation_class = Class.new
+      subject.validates_with first_validation_class, second_validation_class
       validation = subject.validations.last
-      assert_equal :inclusion, validation.type
-      assert_includes :active, validation.columns
-      assert_equal [ true, false], validation.options[:in]
+      assert_equal :with, validation.type
+      assert_includes first_validation_class,  validation.classes
+      assert_includes second_validation_class, validation.classes
+    end
+
+    should "add a validation config with #validates_each" do
+      block = proc{ }
+      subject.validates_each(:name, :email, &block)
+      validation = subject.validations.last
+      assert_equal :each, validation.type
+      assert_equal block, validation.block
+      assert_includes :name,  validation.columns
+      assert_includes :email, validation.columns
     end
 
     should "add a validation config with #validate" do
@@ -80,11 +102,11 @@ module Ardb::RecordSpy
       assert_equal :custom,      validation.type
       assert_equal :some_method, validation.method_name
 
-      proc = proc{ }
-      subject.validate(&proc)
+      block = proc{ }
+      subject.validate(&block)
       validation = subject.validations.last
       assert_equal :custom, validation.type
-      assert_equal proc,    validation.block
+      assert_equal block,    validation.block
     end
 
     should "add a callback config with #after_initialize" do
@@ -105,13 +127,6 @@ module Ardb::RecordSpy
       assert_equal 'test', @instance.name
     end
 
-    should "add a callback config with #after_save" do
-      subject.after_save :a_callback_method
-      callback = subject.callbacks.last
-      assert_equal :after_save, callback.type
-      assert_includes :a_callback_method, callback.args
-    end
-
   end
 
   class GeneratorTests < BaseTests

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ardb
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 59
   prerelease: 
   segments: 
   - 0
-  - 8
+  - 9
   - 0
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors: 
 - Kelly Redding
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-06-19 00:00:00 Z
+date: 2013-06-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   prerelease: false