ardb 0.7.0 → 0.8.0

data/lib/ardb/record_spy.rb

@@ -18,7 +18,16 @@ module Ardb
 
     module ClassMethods
 
-      attr_reader :validations, :callbacks
+      attr_reader :associations, :callbacks, :validations
+
+      [ :belongs_to, :has_many, :has_one ].each do |method_name|
+
+        define_method(method_name) do |*args|
+          @associations ||= []
+          @associations << Association.new(method_name, *args)
+        end
+
+      end
 
       [ :validates_presence_of, :validates_uniqueness_of,
         :validates_inclusion_of
@@ -32,7 +41,12 @@ module Ardb
 
       end
 
-      [ :before_validation, :after_save ].each do |method_name|
+      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|
 
         define_method(method_name) do |*args, &block|
           @callbacks ||= []
@@ -47,13 +61,13 @@ module Ardb
 
     end
 
-    class Validation
-      attr_reader :type, :columns, :options
+    class Association
+      attr_reader :type, :name, :options
 
-      def initialize(type, *args)
-        @type    = type.to_sym
-        @options = args.last.kind_of?(::Hash) ? args.pop : {}
-        @columns = args
+      def initialize(type, name, options)
+        @type = type.to_sym
+        @name = name
+        @options = options
       end
     end
 
@@ -68,6 +82,21 @@ module Ardb
       end
     end
 
+    class Validation
+      attr_reader :type, :columns, :options, :method_name, :block
+
+      def initialize(type, *args, &block)
+        @type  = type.to_sym
+        @block = block
+        if type != :custom
+          @options = args.last.kind_of?(::Hash) ? args.pop : {}
+          @columns = args
+        else
+          @method_name = args.first
+        end
+      end
+    end
+
   end
 
 end

data/lib/ardb/version.rb

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

data/test/unit/ardb_tests.rb

@@ -28,6 +28,7 @@ module Ardb
     end
 
     should "init the adapter on init" do
+      Adapter.reset
       assert_nil Adapter.current
       begin
         subject.init

data/test/unit/record_spy_tests.rb

@@ -15,14 +15,40 @@ module Ardb::RecordSpy
     end
     subject{ MyRecord }
 
-    should have_readers :validations, :callbacks
+    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, :before_validation, :after_save
+    should have_imeths :validates_inclusion_of, :validate
+    should have_imeths :after_initialize, :before_validation, :after_save
 
     should "included the record spy instance methods" do
       assert_includes Ardb::RecordSpy::InstanceMethods, subject.included_modules
     end
 
+    should "add an association config with #belongs_to" do
+      subject.belongs_to :area, :foreign_key => :area_id
+      association = subject.associations.last
+      assert_equal :belongs_to, association.type
+      assert_equal :area,       association.name
+      assert_equal :area_id,    association.options[:foreign_key]
+    end
+
+    should "add an association config with #has_many" do
+      subject.has_many :comments, :as => :parent
+      association = subject.associations.last
+      assert_equal :has_many, association.type
+      assert_equal :comments, association.name
+      assert_equal :parent,   association.options[:as]
+    end
+
+    should "add an association config with #has_one" do
+      subject.has_one :linking, :class_name => 'Linking'
+      association = subject.associations.last
+      assert_equal :has_one,  association.type
+      assert_equal :linking,  association.name
+      assert_equal 'Linking', association.options[:class_name]
+    end
+
     should "add a validation config with #validates_presence_of" do
       subject.validates_presence_of :name, :email, :on => :create
       validation = subject.validations.last
@@ -48,6 +74,26 @@ module Ardb::RecordSpy
       assert_equal [ true, false], validation.options[:in]
     end
 
+    should "add a validation config with #validate" do
+      subject.validate :some_method
+      validation = subject.validations.last
+      assert_equal :custom,      validation.type
+      assert_equal :some_method, validation.method_name
+
+      proc = proc{ }
+      subject.validate(&proc)
+      validation = subject.validations.last
+      assert_equal :custom, validation.type
+      assert_equal proc,    validation.block
+    end
+
+    should "add a callback config with #after_initialize" do
+      subject.after_initialize :a_callback_method
+      callback = subject.callbacks.last
+      assert_equal :after_initialize, callback.type
+      assert_includes :a_callback_method, callback.args
+    end
+
     should "add a callback config with #before_validation" do
       subject.before_validation(:on => :create) do
         self.name = 'test'

metadata

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