validates_timeliness 3.0.0.beta → 3.0.0.beta.2

data/README.rdoc

@@ -29,10 +29,10 @@ As plugin (from master)
 
   rails plugin install git://github.com/adzap/validates_timeliness.git
 
-As gem (not working as yet)
+As gem (in beta)
 
   # in Gemfile
-  gem 'validates_timeliness'
+  gem 'validates_timeliness', '3.0.0.beta'
 
   # Run bundler
   $ bundle install

data/lib/validates_timeliness/attribute_methods.rb

@@ -18,6 +18,7 @@ module ValidatesTimeliness
           def #{attr_name}=(value)
             @attributes_cache ||= {}
             @attributes_cache["_#{attr_name}_before_type_cast"] = value
+            #{ "value = ValidatesTimeliness::Parser.parse(value, :#{type}) if value.is_a?(String)" if ValidatesTimeliness.use_plugin_parser }
             super
           end
         EOV

data/lib/validates_timeliness/helper_methods.rb

@@ -10,30 +10,28 @@ module ValidatesTimeliness
     end
 
     module ValidationMethods
-      def validates_timeliness_of(*attr_names)
-        options = _merge_attributes(attr_names)
-        attributes = options[:attributes].inject({}) {|validated, attr_name|
-          attr_name = attr_name.to_s
-          validated[attr_name] = options[:type]
-          validated
-        }
-        self.timeliness_validated_attributes = attributes
-        validates_with Validator, options
-      end
-
       def validates_date(*attr_names)
-        options = attr_names.extract_options!
-        validates_timeliness_of *(attr_names << options.merge(:type => :date))
+        timeliness_validation_for attr_names, :date
       end
 
       def validates_time(*attr_names)
-        options = attr_names.extract_options!
-        validates_timeliness_of *(attr_names << options.merge(:type => :time))
+        timeliness_validation_for attr_names, :time
       end
 
       def validates_datetime(*attr_names)
-        options = attr_names.extract_options!
-        validates_timeliness_of *(attr_names << options.merge(:type => :datetime))
+        timeliness_validation_for attr_names, :datetime
+      end
+
+      def timeliness_validation_for(attr_names, type)
+        options = _merge_attributes(attr_names)
+        options[:type] = type
+        attributes = attr_names.inject({}) {|validated, attr_name|
+          attr_name = attr_name.to_s
+          validated[attr_name] = type
+          validated
+        }
+        self.timeliness_validated_attributes = attributes
+        validates_with Validator, options
       end
 
     end

data/lib/validates_timeliness/parser.rb

@@ -10,15 +10,7 @@ module ValidatesTimeliness
   # string values.
   #
   class Parser
-    cattr_accessor :time_formats,
-                   :date_formats,
-                   :datetime_formats,
-                   :time_expressions,
-                   :date_expressions,
-                   :datetime_expressions,
-                   :format_tokens,
-                   :format_proc_args
-
+    cattr_reader :time_expressions, :date_expressions, :datetime_expressions
 
     # Set the threshold value for a two digit year to be considered last century
     #
@@ -73,6 +65,7 @@ module ValidatesTimeliness
     #   by the next lowest length valid repeating token (e.g. yyy will be
     #   replaced with yy)
 
+    cattr_accessor :time_formats
     @@time_formats = [
       'hh:nn:ss',
       'hh-nn-ss',
@@ -87,6 +80,7 @@ module ValidatesTimeliness
       'h_ampm'
     ]
 
+    cattr_accessor :date_formats
     @@date_formats = [
       'yyyy-mm-dd',
       'yyyy/mm/dd',
@@ -101,6 +95,7 @@ module ValidatesTimeliness
       'd mmm yy'
     ]
 
+    cattr_accessor :datetime_formats
     @@datetime_formats = [
       'yyyy-mm-dd hh:nn:ss',
       'yyyy-mm-dd h:nn',
@@ -132,11 +127,11 @@ module ValidatesTimeliness
     # is required. The first capture group will be considered a literal and put
     # into the validation regexp string as-is. This is a hack.
     #
+    cattr_accessor :format_tokens
     @@format_tokens = {
       'ddd'  => [ '\w{3,9}' ],
       'dd'   => [ '\d{2}',   :day ],
       'd'    => [ '\d{1,2}', :day ],
-      'ampm' => [ '[aApP]\.?[mM]\.?', :meridian ],
       'mmm'  => [ '\w{3,9}', :month ],
       'mm'   => [ '\d{2}',   :month ],
       'm'    => [ '\d{1,2}', :month ],
@@ -149,6 +144,7 @@ module ValidatesTimeliness
       'ss'   => [ '\d{2}',   :sec ],
       's'    => [ '\d{1,2}', :sec ],
       'u'    => [ '\d{1,6}', :usec ],
+      'ampm' => [ '[aApP]\.?[mM]\.?', :meridian ],
       'zo'   => [ '[+-]\d{2}:?\d{2}', :offset ],
       'tz'   => [ '[A-Z]{1,4}' ],
       '_'    => [ '\s?' ]
@@ -163,6 +159,7 @@ module ValidatesTimeliness
     # The code can be used to manipulate the arg value if required, otherwise
     # should just be the arg name.
     #
+    cattr_accessor :format_proc_args
     @@format_proc_args = {
       :year     => [0,   'y', 'unambiguous_year(y)'],
       :month    => [1,   'm', 'month_index(m)'],
@@ -175,7 +172,6 @@ module ValidatesTimeliness
       :meridian => [nil, 'md', nil]
     }
 
-
     @@type_wrapper = {
       :date     => [/\A/, nil],
       :time     => [nil , /\Z/],

data/lib/validates_timeliness/version.rb

@@ -1,3 +1,3 @@
 module ValidatesTimeliness
-  VERSION = '3.0.0.beta'
+  VERSION = '3.0.0.beta.2'
 end

data/lib/validates_timeliness.rb

@@ -9,6 +9,7 @@ require 'active_support/core_ext/date_time/acts_like'
 require 'active_support/core_ext/date_time/conversions'
 
 module ValidatesTimeliness
+  autoload :Parser,  'validates_timeliness/parser'
   autoload :VERSION, 'validates_timeliness/version'
 
   # Add plugin to supported ORMs (only :active_record for now)
@@ -45,7 +46,6 @@ module ValidatesTimeliness
   end
 end
 
-require 'validates_timeliness/parser'
 require 'validates_timeliness/conversion'
 require 'validates_timeliness/validator'
 require 'validates_timeliness/helper_methods'

data/spec/spec_helper.rb

@@ -56,6 +56,7 @@ class Person
   define_attribute_methods model_attributes
 end
 
+ActiveRecord::Base.time_zone_aware_attributes = true
 ActiveRecord::Base.establish_connection({:adapter => 'sqlite3', :database => ':memory:'})
 ActiveRecord::Migration.verbose = false
 ActiveRecord::Schema.define(:version => 1) do

data/spec/validates_timeliness/attribute_methods_spec.rb

@@ -6,16 +6,43 @@ describe ValidatesTimeliness::AttributeMethods do
   end
   
   context "attribute write method" do
-    class EmployeeCopy < ActiveRecord::Base
+    class EmployeeWithCache < ActiveRecord::Base
       set_table_name 'employees'
       validates_datetime :birth_datetime
     end
 
     it 'should cache attribute raw value' do
-      r = EmployeeCopy.new
+      r = EmployeeWithCache.new
       r.birth_datetime = date_string = '2010-01-01'
       r._timeliness_raw_value_for(:birth_datetime).should == date_string
     end
+
+    context "with plugin parser" do
+      class EmployeeWithParser < ActiveRecord::Base
+        set_table_name 'employees'
+        validates_datetime :birth_date
+      end
+
+      before :all do
+        ValidatesTimeliness.use_plugin_parser = true
+      end
+
+      it 'should parse a string value' do
+        ValidatesTimeliness::Parser.should_receive(:parse) 
+        r = EmployeeWithParser.new
+        r.birth_date = '2010-01-01'
+      end
+
+      it 'should be strict on day values' do
+        r = EmployeeWithParser.new
+        r.birth_date = '2010-02-31'
+        r.birth_date.should be_nil
+      end
+
+      after :all do
+        ValidatesTimeliness.use_plugin_parser = false
+      end
+    end
   end
 
   context "before_type_cast method" do

data/validates_timeliness.gemspec

@@ -2,12 +2,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{validates_timeliness}
-  s.version = "3.0.0.beta"
+  s.version = "3.0.0.beta.2"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Adam Meehan"]
   s.autorequire = %q{validates_timeliness}
-  s.date = %q{2010-09-17}
+  s.date = %q{2010-09-21}
   s.description = %q{Date and time validation plugin for Rails which allows custom formats}
   s.email = %q{adam.meehan@gmail.com}
   s.extra_rdoc_files = ["README.rdoc", "LICENSE", "CHANGELOG"]

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: validates_timeliness
 version: !ruby/object:Gem::Version 
-  hash: 31098225
+  hash: 62196423
   prerelease: true
   segments: 
   - 3
   - 0
   - 0
   - beta
-  version: 3.0.0.beta
+  - 2
+  version: 3.0.0.beta.2
 platform: ruby
 authors: 
 - Adam Meehan
@@ -16,7 +17,7 @@ autorequire: validates_timeliness
 bindir: bin
 cert_chain: []
 
-date: 2010-09-17 00:00:00 +10:00
+date: 2010-09-21 00:00:00 +10:00
 default_executable: 
 dependencies: []