Now using validation_reflection-active_model for common Validation in…

…terface

This allows us to drop the ActiveRecord 2 specific adapter

.gitignore

@@ -15,6 +15,7 @@ tmtags
 
 ## BUNDLER
 .bundle/
+Gemfile.lock
 
 ## PROJECT::GENERAL
 coverage

Gemfile

@@ -1,16 +1,16 @@
 source 'http://rubygems.org'
 
-gem 'validation_reflection', '0.3.6'
+gem 'validation_reflection-active_model', '0.2.0'
 gem 'json'
 
 group :test do
   gem 'jspec'
   gem 'rspec'
   # gem 'activerecord', '2.3.8'
   gem 'activemodel', '3.0.0.beta4'
-  gem 'bson_ext', '1.0.1'
+  gem 'bson_ext', '1.0.4'
   gem 'mongoid', '2.0.0.beta9'
   gem 'crack'
   gem 'bourne'
   gem 'rack-test'
-end
+end

lib/client_side_validations/adapters/active_model.rb

@@ -21,6 +21,19 @@ def build_validation_hash(validation, message_key = 'message')
           if validation.kind == :inclusion || validation.kind == :exclusion
             validation.options[:in] = validation.options[:in].to_a
           end
+
+          if validation.kind == :size
+            validation.kind = :length
+          end
+
+          if validation.kind == :length &&
+            (range = (validation.options.delete(:within) || validation.options.delete(:in)))
+            validation.options[:minimum] = range.first
+            validation.options[:maximum] = range.last
+          elsif validation.kind == :inclusion || validation.kind == :exclusion
+            validation.options[:in] = validation.options[:in].to_a
+          end
+
           super
         end
 
@@ -31,38 +44,38 @@ def supported_validation?(validation)
         def get_validation_message(validation)
           default = case validation.kind
           when :presence
-            I18n.translate('errors.messages.blank')
+            I18n.translate(i18n_prefix + 'errors.messages.blank')
           when :format
-            I18n.translate('errors.messages.invalid')
+            I18n.translate(i18n_prefix + 'errors.messages.invalid')
           when :length
             if count = validation.options[:minimum]
-              I18n.translate('errors.messages.too_short').sub('%{count}', count.to_s)
+              I18n.translate(i18n_prefix + 'errors.messages.too_short').sub(orm_error_interpolation(:count), count.to_s)
             elsif count = validation.options[:maximum]
-              I18n.translate('errors.messages.too_long').sub('%{count}', count.to_s)
+              I18n.translate(i18n_prefix + 'errors.messages.too_long').sub(orm_error_interpolation(:count), count.to_s)
             end
           when :numericality
-            I18n.translate('errors.messages.not_a_number')
+            I18n.translate(i18n_prefix + 'errors.messages.not_a_number')
           when :uniqueness
             if defined?(ActiveRecord) && base.kind_of?(ActiveRecord::Base)
               I18n.translate('activerecord.errors.messages.taken')
             elsif defined?(Mongoid) && base.class.included_modules.include?(Mongoid::Document)
               I18n.translate('errors.messages.taken')
             end
           when :confirmation
-            I18n.translate('errors.messages.confirmation')
+            I18n.translate(i18n_prefix + 'errors.messages.confirmation')
           when :acceptance
-            I18n.translate('errors.messages.accepted')
+            I18n.translate(i18n_prefix + 'errors.messages.accepted')
           when :inclusion
-            I18n.translate('errors.messages.inclusion')
+            I18n.translate(i18n_prefix + 'errors.messages.inclusion')
           when :exclusion
-            I18n.translate('errors.messages.exclusion')
+            I18n.translate(i18n_prefix + 'errors.messages.exclusion')
           end
 
           message = validation.options.delete(:message)
           if message.kind_of?(String)
             message
           elsif message.kind_of?(Symbol)
-            I18n.translate("errors.models.#{base.class.to_s.downcase}.attributes.#{validation.attributes.first}.#{message}")
+            I18n.translate(i18n_prefix + "errors.models.#{base.class.to_s.downcase}.attributes.#{validation.attributes.first}.#{message}")
           else
             default
           end
@@ -72,6 +85,23 @@ def get_validation_method(validation)
           validation.kind.to_s
         end
 
+        def i18n_prefix
+          if defined?(::ActiveModel)
+            ''
+          else # ActiveRecord 2.x
+            'activerecord.'
+          end
+        end
+
+        def orm_error_interpolation(name)
+          if defined?(::ActiveModel)
+            "%{name}"
+
+          else # ActiveRecord 2.x
+            "{{#{name}}}"
+          end
+        end
+
       end
     end
   end

lib/client_side_validations/orm.rb

@@ -30,11 +30,17 @@ def dnc_csv_adapter
   DNCLabs::ClientSideValidations::Adapter = DNCLabs::ClientSideValidations::Adapters::ActiveModel
   klass = ActiveModel::Validations
 
-elsif defined?(ActiveRecord)
+else defined?(ActiveRecord)
   if ActiveRecord::VERSION::MAJOR == 2
-    require 'client_side_validations/adapters/active_record_2'
-    DNCLabs::ClientSideValidations::Adapter = DNCLabs::ClientSideValidations::Adapters::ActiveRecord2
+    require 'validation_reflection/active_model'
+    require 'client_side_validations/adapters/active_model'
+    DNCLabs::ClientSideValidations::Adapter = DNCLabs::ClientSideValidations::Adapters::ActiveModel
     klass = ActiveRecord::Base
+
+    ActiveRecord::Base.class_eval do
+      ::ActiveRecordExtensions::ValidationReflection.reflected_validations << :validates_size_of
+      ::ActiveRecordExtensions::ValidationReflection.install(self)
+    end
   end
 end