Validation support for ActiveModel::Validations without a shim

move validation helpers into ActiveModel::Validations for default base support
add check if attribute methods shim is being used
refactor specs for helper and attribute methods separation
more mongoid workarounds due to incorrect use of AS::Concern

spec/spec_helper.rb

@@ -24,15 +24,11 @@ LOCALE_PATH = File.expand_path(File.dirname(__FILE__) + '/../lib/generators/vali
 I18n.load_path.unshift(LOCALE_PATH)
 
 # Extend TestModel as you would another ORM/ODM module
-module TestModel
-  include ValidatesTimeliness::HelperMethods
+module TestModelShim
+  extend ActiveSupport::Concern
   include ValidatesTimeliness::AttributeMethods
 
-  def self.included(base)
-    base.extend HookMethods
-  end
-
-  module HookMethods
+  module ClassMethods
     # Hook method for attribute method generation
     def define_attribute_methods(attr_names)
       super
@@ -57,6 +53,10 @@ class Person
   define_attribute_methods model_attributes.keys
 end
 
+class PersonWithShim < Person
+  include TestModelShim
+end
+
 ActiveRecord::Base.time_zone_aware_attributes = true
 ActiveRecord::Base.establish_connection({:adapter => 'sqlite3', :database => ':memory:'})
 ActiveRecord::Migration.verbose = false
@@ -82,7 +82,7 @@ Rspec.configure do |c|
   c.include(RspecTagMatchers)
   c.before do
     Person.reset_callbacks(:validate)
-    Person.timeliness_validated_attributes = []
+    PersonWithShim.timeliness_validated_attributes = []
     Person._validators.clear
     Employee.reset_callbacks(:validate)
     Employee.timeliness_validated_attributes = []

spec/test_model.rb

@@ -1,12 +1,10 @@
 module TestModel
-  extend  ActiveSupport::Concern
+  extend ActiveSupport::Concern
+  extend ActiveModel::Translation
+  include ActiveModel::Validations
+  include ActiveModel::AttributeMethods
 
   included do
-    extend  ActiveModel::Translation
-    include ActiveModel::Validations
-    include ActiveModel::AttributeMethods
-    include DynamicMethods
-
     attribute_method_suffix ""
     attribute_method_suffix "="
     cattr_accessor :model_attributes
@@ -32,18 +30,6 @@ module TestModel
     end
   end
 
-  module DynamicMethods
-    def method_missing(method_id, *args, &block)
-      if !self.class.attribute_methods_generated?
-        self.class.define_attribute_methods self.class.model_attributes.keys.map(&:to_s)
-        method_name = method_id.to_s
-        send(method_id, *args, &block)
-      else
-        super
-      end
-    end
-  end
-
   def initialize(attributes = nil)
     @attributes = self.class.model_attributes.inject({}) do |hash, column|
       hash[column.to_s] = nil
@@ -62,5 +48,15 @@ module TestModel
     end
   end
 
+  def method_missing(method_id, *args, &block)
+    if !self.class.attribute_methods_generated?
+      self.class.define_attribute_methods self.class.model_attributes.keys.map(&:to_s)
+      method_name = method_id.to_s
+      send(method_id, *args, &block)
+    else
+      super
+    end
+  end
+
 end
 

spec/validates_timeliness/attribute_methods_spec.rb

@@ -2,12 +2,24 @@ require 'spec_helper'
 
 describe ValidatesTimeliness::AttributeMethods do
   it 'should define _timeliness_raw_value_for instance method' do
-    Person.instance_methods.should include('_timeliness_raw_value_for')
+    PersonWithShim.instance_methods.should include('_timeliness_raw_value_for')
+  end
+
+  describe ".timeliness_validated_attributes" do
+    it 'should return attributes validated with plugin validator' do
+      PersonWithShim.timeliness_validated_attributes = []
+      PersonWithShim.validates_date :birth_date
+      PersonWithShim.validates_time :birth_time
+      PersonWithShim.validates_datetime :birth_datetime
+
+      PersonWithShim.timeliness_validated_attributes.should == [ :birth_date, :birth_time, :birth_datetime ]
+    end
   end
   
   context "attribute write method" do
     class PersonWithCache
       include TestModel
+      include TestModelShim
       attribute :birth_date, :date
       attribute :birth_time, :time
       attribute :birth_datetime, :datetime
@@ -25,6 +37,7 @@ describe ValidatesTimeliness::AttributeMethods do
     context "with plugin parser" do
       class PersonWithParser
         include TestModel
+        include TestModelShim
         attribute :birth_date, :date
         attribute :birth_time, :time
         attribute :birth_datetime, :datetime
@@ -57,7 +70,7 @@ describe ValidatesTimeliness::AttributeMethods do
 
   context "before_type_cast method" do
     it 'should not be defined if ORM does not support it' do
-      Person.instance_methods(false).should_not include("birth_datetime_before_type_cast")
+      PersonWithShim.instance_methods(false).should_not include("birth_datetime_before_type_cast")
     end
   end
 end

spec/validates_timeliness/helper_methods_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe ValidatesTimeliness::HelperMethods do
+describe ValidatesTimeliness, 'HelperMethods' do
   it 'should define class validation methods' do
     Person.should respond_to(:validates_date)
     Person.should respond_to(:validates_time)
@@ -18,16 +18,4 @@ describe ValidatesTimeliness::HelperMethods do
     r.validates_date :birth_date
     r.errors[:birth_date].should_not be_empty
   end
-
-  describe ".timeliness_validated_attributes" do
-    it 'should return attributes validated with plugin validator' do
-      Person.timeliness_validated_attributes = []
-      Person.validates_date :birth_date
-      Person.validates_time :birth_time
-      Person.validates_datetime :birth_datetime
-
-      Person.timeliness_validated_attributes.should == [ :birth_date, :birth_time, :birth_datetime ]
-    end
-  end
-
 end

spec/validates_timeliness/validator_spec.rb

@@ -101,6 +101,7 @@ describe ValidatesTimeliness::Validator do
   describe ":format option" do
     class PersonWithFormatOption
       include TestModel
+      include TestModelShim
       attribute :birth_date, :date
       attribute :birth_time, :time
       attribute :birth_datetime, :datetime