date_validator 0.0.0 → 0.2.0

data/README.rdoc

@@ -1,14 +1,15 @@
 = date_validator
 
-A simple date validator for Rails 3. And I mean simple:
+A simple date validator for Rails 3.
 
-  gem install codegram-date_validator
-  
-In your model:
+  gem sources -a http://gemcutter.org/
+  gem install date_validator
 
-  validates_date_of :expiration_date, :after => Time.now, :before => Time.now + 1.year
+And I mean simple. In your model:
 
-For now these the available options you can use:
+  validates :expiration_date, :date => { :after => Time.now, :before => Time.now + 1.year }
+
+For now these are the available options you can use:
 
   :after
   :before
@@ -17,7 +18,7 @@ For now these the available options you can use:
 
 Pretty much self-explanatory! :) And if you like remarkable, just install this gem as well:
 
-  gem install codegram-remarkable_date_validator
+  gem install remarkable_date_validator
 
 == Note on Patches/Pull Requests
  

data/Rakefile

@@ -9,8 +9,12 @@ begin
     gem.description = "A simple date validator for Rails 3. Currently supporting :after, :before, :after_or_equal_to and :before_or_equal_to options. Remarkable-friendly :)"
     gem.email = "info@codegram.com"
     gem.homepage = "http://github.com/codegram/date_validator"
-    gem.authors = ["Oriol Gual", "Josep Jaume Rey", "Josep Mª Bach"]
+    gem.authors = ["Oriol Gual", "Josep Mª Bach", "Josep Jaume Rey"]
+
+    gem.add_dependency 'activemodel', '>= 3.0.0.beta3'
+
     gem.add_development_dependency "rspec"
+
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.0.0
+0.2.0

data/date_validator.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{date_validator}
-  s.version = "0.0.0"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Oriol Gual", "Josep Jaume Rey", "Josep M\302\252 Bach"]
-  s.date = %q{2010-04-26}
+  s.authors = ["Oriol Gual", "Josep M\302\252 Bach", "Josep Jaume Rey"]
+  s.date = %q{2010-04-27}
   s.description = %q{A simple date validator for Rails 3. Currently supporting :after, :before, :after_or_equal_to and :before_or_equal_to options. Remarkable-friendly :)}
   s.email = %q{info@codegram.com}
   s.extra_rdoc_files = [
@@ -24,8 +24,10 @@ Gem::Specification.new do |s|
      "Rakefile",
      "VERSION",
      "date_validator.gemspec",
+     "init.rb",
      "lib/date_validator.rb",
      "spec/date_validator_spec.rb",
+     "spec/spec.opts",
      "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/codegram/date_validator}
@@ -43,11 +45,15 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<activemodel>, [">= 3.0.0.beta3"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
     else
+      s.add_dependency(%q<activemodel>, [">= 3.0.0.beta3"])
       s.add_dependency(%q<rspec>, [">= 0"])
     end
   else
+    s.add_dependency(%q<activemodel>, [">= 3.0.0.beta3"])
     s.add_dependency(%q<rspec>, [">= 0"])
   end
 end
+

data/init.rb

@@ -0,0 +1 @@
+require 'date_validator'

data/lib/date_validator.rb

@@ -1,35 +1,48 @@
-class DateValidator < ActiveModel::EachValidator
-  CHECKS = { :after => :>, :after_or_equal_to => :>=,
-            :before => :<, :before_or_equal_to => :<=}.freeze
+module ActiveModel
+  module Validations
+    class DateValidator < ActiveModel::EachValidator
+      CHECKS = { :after => :>, :after_or_equal_to => :>=,
+                :before => :<, :before_or_equal_to => :<=}.freeze
 
-  def initialize(options)
-    super(options.reverse_merge(:allow_nil => false))
-  end
+      def initialize(options)
+        super(options.reverse_merge(:allow_nil => false))
+      end
 
-  def check_validity!
-    keys = CHECKS.keys
-    options.slice(*keys).each do |option, value|
-      next if value.is_a?(Time) || value.is_a?(Proc) || value.is_a?(Symbol)
-      raise ArgumentError, ":#{option} must be a date, a symbol or a proc"
-    end
-  end
+      def check_validity!
+        keys = CHECKS.keys
+        options.slice(*keys).each do |option, value|
+          next if value.is_a?(Time) || value.is_a?(Proc) || value.is_a?(Symbol) || (defined?(Date) and value.is_a?(Date))
+          raise ArgumentError, ":#{option} must be a time, a date, a symbol or a proc"
+        end
+      end
 
-  def validate_each(record, attr_name, value)
+      def validate_each(record, attr_name, value)
 
-    return if options[:allow_nil] && value.nil?
+        return if options[:allow_nil] && value.nil?
 
-    unless value
-      record.errors.add(attr_name, :not_a_date, :value => value, :default => options[:message])
-      return
-    end
+        unless value
+          record.errors.add(attr_name, :not_a_date, :value => value, :default => options[:message])
+          return
+        end
 
-    options.slice(*CHECKS.keys).each do |option, option_value|
-      option_value = option_value.call(record) if option_value.is_a?(Proc)
-      option_value = record.send(option_value) if option_value.is_a?(Symbol)
+        options.slice(*CHECKS.keys).each do |option, option_value|
+          option_value = option_value.call(record) if option_value.is_a?(Proc)
+          option_value = record.send(option_value) if option_value.is_a?(Symbol)
 
-      unless value.send(CHECKS[option], option_value)
-        record.errors.add(attr_name, option, :default => options[:message], :value => value, :date => option_value)
+          unless value.send(CHECKS[option], option_value)
+            record.errors.add(attr_name, option, :default => options[:message], :value => value, :date => option_value)
+          end
+        end      
       end
-    end      
+
+      module ClassMethods
+
+        def validates_date_of(*attr_names)
+          validates_with DateValidator, _merge_attributes(attr_names)
+        end
+
+      end
+
+    end
   end
 end

data/spec/date_validator_spec.rb

@@ -1,8 +1,60 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "DateValidator" do
-  it "should"
-  it "fails" do
-    fail "hey buddy, you should probably rename this file and start specing for real"
+
+  before(:each) do
+    TestRecord.reset_callbacks(:validate)
+  end
+
+  it "should check validity of the arguments" do
+    [3, "foo", 1..6].each do |wrong_argument|
+      begin
+        TestRecord.validates :expiration_date, :date => {:before => wrong_argument}
+        fail "should not accept a #{wrong_argument.class} as an option (only Time, Date, Symbol or Proc)"
+      rescue=>e
+        fail e unless e.is_a?(ArgumentError)
+      end
+    end
+  end
+
+  [:after, :before, :after_or_equal_to, :before_or_equal_to].each do |check|
+    [:valid,:invalid].each do |should_be|
+
+      model_date = case check
+        when :after then should_be == :valid ? Time.now + 21000 : Time.now - 1
+        when :before then should_be == :valid ? Time.now - 21000 : Time.now + 1
+        when :after_or_equal_to then should_be == :valid ? Time.now + 21000 : Time.now - 21000
+        when :before_or_equal_to then should_be == :valid ? Time.now - 21000 : Time.now + 21000
+      end
+
+      it "should ensure that an attribute is #{should_be} when #{should_be == :valid ? 'respecting' : 'offending' } the #{check} check" do
+        TestRecord.validates :expiration_date, :date => {:"#{check}" => Time.now}
+        model = TestRecord.new(model_date)
+        should_be == :valid ? model.should(be_valid, "an attribute should be valid when respecting the #{check} check") : model.should(be_invalid, "an attribute should be invalid when offending the #{check} check")
+      end
+
+    end
+  end
+
+  extra_types = [:proc, :symbol]
+  # extra_types.push(:date) if defined?(Date) and defined?(DateTime)
+
+  extra_types.each do |type|
+    it "should accept a #{type} as an argument to a check" do
+      case type
+        when :proc then
+          TestRecord.validates :expiration_date, :date => {:after => Proc.new{Time.now + 21000}}
+        when :symbol then
+          begin
+            TestRecord.send(:define_method, :min_date, lambda { Time.now + 21000 })
+            TestRecord.validates :expiration_date, :date => {:after => :min_date}
+          rescue=>e
+            fail "is not accepting a #{type} as an argument to a check"
+          end
+        # when :date then
+        #   TestRecord.validates :expiration_date, :date => {:after => Time.now.to_date}
+      end 
+    end
   end
+
 end

data/spec/spec.opts

@@ -0,0 +1,4 @@
+--colour
+--format progress
+--loadby mtime
+--reverse

data/spec/spec_helper.rb

@@ -1,15 +1,18 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'date_validator'
+
+require 'rubygems'
+require 'active_model'
+
+require 'lib/date_validator'
 require 'spec'
 require 'spec/autorun'
 
-require 'active_model'
-require 'date_validator'
 
 class TestRecord
   include ActiveModel::Validations
   attr_accessor :expiration_date
+
   def initialize(expiration_date)
     @expiration_date = expiration_date
   end

metadata

@@ -4,25 +4,40 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
+  - 2
   - 0
-  - 0
-  version: 0.0.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Oriol Gual
-- Josep Jaume Rey
 - "Josep M\xC2\xAA Bach"
+- Josep Jaume Rey
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-04-26 00:00:00 +02:00
+date: 2010-04-27 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: activemodel
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 3
+        - 0
+        - 0
+        - beta3
+        version: 3.0.0.beta3
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -30,7 +45,7 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id001
+  version_requirements: *id002
 description: A simple date validator for Rails 3. Currently supporting :after, :before, :after_or_equal_to and :before_or_equal_to options. Remarkable-friendly :)
 email: info@codegram.com
 executables: []
@@ -48,8 +63,10 @@ files:
 - Rakefile
 - VERSION
 - date_validator.gemspec
+- init.rb
 - lib/date_validator.rb
 - spec/date_validator_spec.rb
+- spec/spec.opts
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/codegram/date_validator