From 3ac65b507f1c080d7e42438e337212589121f75c Mon Sep 17 00:00:00 2001
From: Adam Meehan <adam.meehan@gmail.com>
Date: Tue, 2 Dec 2008 20:34:02 +1100
Subject: [PATCH] renamed methods which have been moved out of AR and so dont
 need to be fully qualified

---
 lib/validates_timeliness.rb                             | 8 ++++----
 lib/validates_timeliness/validate_timeliness_matcher.rb | 2 +-
 lib/validates_timeliness/validator.rb                   | 4 ++--
 spec/validation_methods_spec.rb                         | 6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/lib/validates_timeliness.rb b/lib/validates_timeliness.rb
index e79704a..12c2246 100644
--- a/lib/validates_timeliness.rb
+++ b/lib/validates_timeliness.rb
@@ -24,13 +24,13 @@ ValidatesTimeliness::Formats.compile_format_expressions
 
 module ValidatesTimeliness
   
-  mattr_accessor :ignore_datetime_restriction_errors
-  mattr_accessor :date_time_error_value_formats
+  mattr_accessor :ignore_restriction_errors
+  mattr_accessor :error_value_formats
   mattr_accessor :default_error_messages
   
-  @@ignore_datetime_restriction_errors = false
+  @@ignore_restriction_errors = false
     
-  @@date_time_error_value_formats = {
+  @@error_value_formats = {
     :time     => '%H:%M:%S',
     :date     => '%Y-%m-%d',
     :datetime => '%Y-%m-%d %H:%M:%S'
diff --git a/lib/validates_timeliness/validate_timeliness_matcher.rb b/lib/validates_timeliness/validate_timeliness_matcher.rb
index c7631f1..9f781d5 100644
--- a/lib/validates_timeliness/validate_timeliness_matcher.rb
+++ b/lib/validates_timeliness/validate_timeliness_matcher.rb
@@ -92,7 +92,7 @@ module Spec
         
         def format_value(value)
           return value if value.is_a?(String)
-          value.strftime(ValidatesTimeliness.date_time_error_value_formats[options[:type]])
+          value.strftime(ValidatesTimeliness.error_value_formats[options[:type]])
         end
       end
 
diff --git a/lib/validates_timeliness/validator.rb b/lib/validates_timeliness/validator.rb
index 2fb3b5e..d0c6582 100644
--- a/lib/validates_timeliness/validator.rb
+++ b/lib/validates_timeliness/validator.rb
@@ -36,7 +36,7 @@ module ValidatesTimeliness
       
       type_cast_method = self.class.restriction_type_cast_method(type)
       
-      display = ValidatesTimeliness.date_time_error_value_formats[type]
+      display = ValidatesTimeliness.error_value_formats[type]
       
       value = value.send(type_cast_method)
       
@@ -51,7 +51,7 @@ module ValidatesTimeliness
             add_error(record, attr_name, error_messages[option] % compare.strftime(display))
           end
         rescue
-          unless ValidatesTimeliness.ignore_datetime_restriction_errors
+          unless ValidatesTimeliness.ignore_restriction_errors
             add_error(record, attr_name, "restriction '#{option}' value was invalid")
           end
         end
diff --git a/spec/validation_methods_spec.rb b/spec/validation_methods_spec.rb
index 6039ec5..7c64e32 100644
--- a/spec/validation_methods_spec.rb
+++ b/spec/validation_methods_spec.rb
@@ -376,11 +376,11 @@ describe ValidatesTimeliness::ValidationMethods do
     end
 
     before :all do
-      ValidatesTimeliness.ignore_datetime_restriction_errors = true
+      ValidatesTimeliness.ignore_restriction_errors = true
     end
 
     after :all do
-      ValidatesTimeliness.ignore_datetime_restriction_errors = false
+      ValidatesTimeliness.ignore_restriction_errors = false
     end
     
     before :each do
@@ -426,7 +426,7 @@ describe ValidatesTimeliness::ValidationMethods do
     
     describe "custom formats" do
       before :all do
-        ValidatesTimeliness.date_time_error_value_formats = {
+        ValidatesTimeliness.error_value_formats = {
           :time => '%H:%M %p',
           :date => '%d-%m-%Y',
           :datetime => '%d-%m-%Y %H:%M %p'