remarkable_date_validator 0.4.0 → 0.4.1

data/README.rdoc

@@ -1,6 +1,6 @@
 = remarkable_date_validator
 
-Remarkable matchers for date_validator!
+Remarkable matchers for date_validator! (a date validator for Rails 3: http://github.com/codegram/date_validator/)
 
 Easy peasy. Add gemcutter sources:
 
@@ -26,9 +26,7 @@ Enjoy!
 * Make your feature addition or bug fix.
 * Add tests for it. This is important so I don't break it in a
   future version unintentionally.
-* Commit, do not mess with rakefile, version, or history.
-  (if you want to have your own version, that is fine but
-   bump version in a commit by itself I can ignore when I pull)
+* Commit, do not mess with rakefile, version, or history. (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
 * Send me a pull request. Bonus points for topic branches.
 
 == Copyright

data/Rakefile

@@ -13,6 +13,9 @@ begin
 
     gem.add_dependency "remarkable", '>=4.0.0.alpha1'
     gem.add_dependency 'remarkable_activemodel', '>=4.0.0.alpha1'
+    gem.add_dependency 'date_validator', '>=0.4'
+    gem.add_development_dependency 'active_record', '>=3.0.0.beta3'
+    gem.add_development_dependency 'rspec'
 
   end
   Jeweler::GemcutterTasks.new
@@ -20,6 +23,12 @@ rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
 end
 
+require 'spec/rake/spectask'
+Spec::Rake::SpecTask.new(:spec) do |spec|
+  spec.libs << 'lib' << 'spec'
+  spec.spec_files = FileList['spec/**/*_spec.rb']
+end
+
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|
   if File.exist?('VERSION')

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.4.1

data/lib/remarkable_date_validator/validate_date_of_matcher.rb

@@ -47,7 +47,7 @@ module Remarkable
           #
           def after_maximum?
             @maximum_values.each do |key, value|
-              return false, :date => value unless bad?(value + 1.day, default_message_for(key))
+              return false, :date => value unless bad?(value + 5.days, default_message_for(key))
             end
             true
           end
@@ -57,7 +57,7 @@ module Remarkable
           #
           def before_minimum?
             @minimum_values.each do |key, value|
-              return false, :date => value unless bad?(value - 1.day, default_message_for(key))
+              return false, :date => value unless bad?(value - 5.days, default_message_for(key))
             end
             true
           end

data/remarkable_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{remarkable_date_validator}
-  s.version = "0.4.0"
+  s.version = "0.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Oriol Gual", "Josep M\302\252 Bach", "Josep Jaume Rey"]
-  s.date = %q{2010-04-27}
+  s.date = %q{2010-05-14}
   s.description = %q{Remarkable matchers for date_validator}
   s.email = %q{info@codegram.com}
   s.extra_rdoc_files = [
@@ -27,14 +27,21 @@ Gem::Specification.new do |s|
      "lib/en.yml",
      "lib/remarkable_date_validator.rb",
      "lib/remarkable_date_validator/validate_date_of_matcher.rb",
-     "lib/validate_date_of_matcher.rb",
-     "remarkable_date_validator.gemspec"
+     "remarkable_date_validator.gemspec",
+     "spec/model_builder.rb",
+     "spec/remarkable_date_validator_spec.rb",
+     "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/codegram/remarkable_date_validator}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.6}
   s.summary = %q{Remarkable matchers for date_validator}
+  s.test_files = [
+    "spec/model_builder.rb",
+     "spec/remarkable_date_validator_spec.rb",
+     "spec/spec_helper.rb"
+  ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
@@ -43,12 +50,22 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<remarkable>, [">= 4.0.0.alpha1"])
       s.add_runtime_dependency(%q<remarkable_activemodel>, [">= 4.0.0.alpha1"])
+      s.add_runtime_dependency(%q<date_validator>, [">= 0.4"])
+      s.add_development_dependency(%q<active_record>, [">= 3.0.0.beta3"])
+      s.add_development_dependency(%q<rspec>, [">= 0"])
     else
       s.add_dependency(%q<remarkable>, [">= 4.0.0.alpha1"])
       s.add_dependency(%q<remarkable_activemodel>, [">= 4.0.0.alpha1"])
+      s.add_dependency(%q<date_validator>, [">= 0.4"])
+      s.add_dependency(%q<active_record>, [">= 3.0.0.beta3"])
+      s.add_dependency(%q<rspec>, [">= 0"])
     end
   else
     s.add_dependency(%q<remarkable>, [">= 4.0.0.alpha1"])
     s.add_dependency(%q<remarkable_activemodel>, [">= 4.0.0.alpha1"])
+    s.add_dependency(%q<date_validator>, [">= 0.4"])
+    s.add_dependency(%q<active_record>, [">= 3.0.0.beta3"])
+    s.add_dependency(%q<rspec>, [">= 0"])
   end
 end
+

data/spec/model_builder.rb

@@ -0,0 +1,100 @@
+# This is based on Remarkable based on Shoulda model builder for Test::Unit.
+#
+module ModelBuilder
+  def self.included(base)
+    return unless base.name =~ /^Spec/
+
+    base.class_eval do
+      after(:each) do
+        if @defined_constants
+          @defined_constants.each do |class_name| 
+            Object.send(:remove_const, class_name)
+          end
+        end
+
+        if @created_tables
+          @created_tables.each do |table_name|
+            ActiveRecord::Base.connection.execute("DROP TABLE IF EXISTS #{table_name}")
+          end
+        end
+      end
+    end
+
+    base.extend ClassMethods
+  end
+
+  def create_table(table_name, &block)
+    connection = ActiveRecord::Base.connection
+
+    begin
+      connection.execute("DROP TABLE IF EXISTS #{table_name}")
+      connection.create_table(table_name, &block)
+      @created_tables ||= []
+      @created_tables << table_name
+      connection
+    rescue Exception => e
+      connection.execute("DROP TABLE IF EXISTS #{table_name}")
+      raise e
+    end
+  end
+
+  def define_constant(class_name, base, &block)
+    class_name = class_name.to_s.camelize
+
+    klass = Class.new(base)
+    Object.const_set(class_name, klass)
+
+    klass.class_eval(&block) if block_given?
+
+    @defined_constants ||= []
+    @defined_constants << class_name
+
+    klass
+  end
+
+  def define_model_class(class_name, &block)
+    define_constant(class_name, ActiveRecord::Base, &block)
+  end
+
+  def define_model(name, columns = {}, &block)
+    class_name = name.to_s.pluralize.classify
+    table_name = class_name.tableize
+
+    table = columns.delete(:table) || lambda {|table|
+      columns.each do |name, type|
+        table.column name, *type
+      end
+    }
+
+    create_table(table_name, &table)
+
+    klass    = define_model_class(class_name, &block)
+    instance = klass.new
+
+    self.class.subject { instance } if self.class.respond_to?(:subject)
+    instance
+  end
+
+  module ClassMethods
+    # This is a macro to run validations of boolean optionals such as :allow_nil
+    # and :allow_blank. This macro tests all scenarios. The specs must have a
+    # define_and_validate method defined.
+    #
+    def create_optional_boolean_specs(optional, base, options={})
+      base.describe "with #{optional} option" do
+        it { should define_and_validate(options.merge(optional => true)).send(optional)            }
+        it { should define_and_validate(options.merge(optional => false)).send(optional, false)    }
+        it { should_not define_and_validate(options.merge(optional => true)).send(optional, false) }
+        it { should_not define_and_validate(options.merge(optional => false)).send(optional)       }
+      end
+    end
+
+    def create_message_specs(base)
+      base.describe "with message option" do
+        it { should define_and_validate(:message => 'valid_message').message('valid_message') }
+        it { should_not define_and_validate(:message => 'not_valid').message('valid_message') }
+      end
+    end
+  end
+
+end

data/spec/remarkable_date_validator_spec.rb

@@ -0,0 +1,27 @@
+require File.join(File.dirname(__FILE__), "spec_helper.rb")
+
+require 'date_validator'
+
+create_table "test_records" do end
+
+define_model('TestRecord', :name => :string, :expiration_date => :date)
+
+describe Remarkable::ActiveModel::Matchers::ValidateDateOfMatcher do
+  before :each do
+    TestRecord.reset_callbacks(:validate)
+    @model = TestRecord.new
+  end
+
+  describe "validate_date_of" do
+
+    [:after, :before, :after_or_equal_to, :before_or_equal_to].each do |check|
+
+      it "should validate that an attribute expects to be #{check} a date" do
+        TestRecord.validates :expiration_date, :date => {:"#{check}" => Time.now}
+        validate_date_of(:expiration_date, :"#{check}" => Time.now).matches?(@model).should be_true
+      end
+
+    end
+    
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,30 @@
+require 'rubygems'
+
+RAILS_ENV = "test"
+RAILS_VERSION = ENV['RAILS_VERSION'] || '3.0.0.beta3'
+
+# gem 'activesupport', RAILS_VERSION
+# require 'active_support'
+ 
+gem 'activerecord', RAILS_VERSION
+require 'active_record'
+
+ActiveRecord::Base.establish_connection(
+  :adapter => 'sqlite3',
+  :database => ':memory:'
+)
+
+
+gem 'remarkable', '>=4.0.0.alpha1'
+gem 'remarkable_activemodel', '>=4.0.0.alpha1'
+gem 'remarkable_activerecord', '>=4.0.0.alpha1'
+
+require 'remarkable_activemodel'
+require 'remarkable_activerecord'
+
+dir = File.dirname(__FILE__)
+require File.join(dir, "..", "lib", "remarkable_date_validator")
+require File.join(dir, "model_builder")
+include ModelBuilder
+
+Remarkable.include_matchers!(Remarkable::ActiveModel, Rspec::Core::ExampleGroup)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 0
-  version: 0.4.0
+  - 1
+  version: 0.4.1
 platform: ruby
 authors: 
 - Oriol Gual
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-27 00:00:00 +02:00
+date: 2010-05-14 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -49,6 +49,46 @@ dependencies:
         version: 4.0.0.alpha1
   type: :runtime
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: date_validator
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 4
+        version: "0.4"
+  type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: active_record
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 3
+        - 0
+        - 0
+        - beta3
+        version: 3.0.0.beta3
+  type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id005
 description: Remarkable matchers for date_validator
 email: info@codegram.com
 executables: []
@@ -69,8 +109,10 @@ files:
 - lib/en.yml
 - lib/remarkable_date_validator.rb
 - lib/remarkable_date_validator/validate_date_of_matcher.rb
-- lib/validate_date_of_matcher.rb
 - remarkable_date_validator.gemspec
+- spec/model_builder.rb
+- spec/remarkable_date_validator_spec.rb
+- spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/codegram/remarkable_date_validator
 licenses: []
@@ -101,5 +143,7 @@ rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Remarkable matchers for date_validator
-test_files: []
-
+test_files: 
+- spec/model_builder.rb
+- spec/remarkable_date_validator_spec.rb
+- spec/spec_helper.rb

data/lib/validate_date_of_matcher.rb

@@ -1,112 +0,0 @@
-module Remarkable
-  module ActiveModel
-    module Matchers
-      class ValidateDateOfMatcher < Remarkable::ActiveModel::Base #:nodoc:
-        arguments :collection => :attributes, :as => :attribute
-
-        optional :after_or_equal_to, :after,
-                 :before_or_equal_to, :before, :message
-
-        optional :allow_nil, :default => true
-
-        collection_assertions :only_date_values?, :allow_nil?,
-                              :before_minimum?, :after_maximum?
-
-        # Before assertions, we rearrange the values.
-        #
-        # Notice that :before gives a maximum value while :after given
-        # a minimum value.
-        #
-        before_assert do
-          @maximum_values = {}
-          @minimum_values = {}
-
-          if value = @options[:before]
-            @maximum_values[:before] = value - 1.day
-          elsif value = @options[:after]
-            @minimum_values[:after] = value + 1.day
-          elsif value = @options[:before_or_equal_to]
-            @maximum_values[:before_or_equal_to] = value
-          elsif value = @options[:after_or_equal_to]
-            @minimum_values[:after_or_equal_to] = value
-          end
-        end
-
-        private
-
-          def allow_nil?
-            super(default_message_for(:not_a_date))
-          end
-
-          def only_date_values?
-            bad?("abcd", default_message_for(:not_a_date))
-          end
-
-          # Check after_maximum? for before and
-          # before_or_equal_to options.
-          #
-          def after_maximum?
-            @maximum_values.each do |key, value|
-              return false, :date => value unless bad?(value + 1.day, default_message_for(key))
-            end
-            true
-          end
-
-          # Check before_minimum? for after and
-          # after_or_equal_to options.
-          #
-          def before_minimum?
-            @minimum_values.each do |key, value|
-              return false, :date => value unless bad?(value - 1.day, default_message_for(key))
-            end
-            true
-          end
-
-          # Returns the default message for each key (:after, :before, ...).
-          # If the user provided a message, we use it, otherwise we should use
-          # the given key as message.
-          #
-          # For example, a default_message_for(:after), if none is provided, will be
-          # :after. So we have create :after_message in the options hash, that when
-          # called later, will return :after.
-          #
-          def default_message_for(key)
-            if @options[:message]
-              :message
-            else
-              @options[:"#{key}_message"] = key
-              :"#{key}_message"
-            end
-          end
-      end
-
-      # Ensures that the given attributes accepts only Time, Date, Symbol or Proc objects.
-      #
-      # == Options
-      #
-      # * <tt>:before</tt> - when supplied, checks if attributes are only valid when before given value
-      # * <tt>:after</tt> - when supplied, checks if attributes are only valid when after given value
-      # * <tt>:before_or_equal_to</tt> - when supplied, checks if attributes are only valid when before or equal to given value
-      # * <tt>:after_or_equal_to</tt> - when supplied, checks if attributes are only valid when after or equal to given value
-      # * <tt>:message</tt> - value the test expects to find in <tt>errors[:attribute]</tt>.
-      #   Regexp, string or symbol. Default = <tt>I18n.translate('activerecord.errors.messages.not_a_date')</tt>
-      #
-      # == Examples
-      #
-      #   it { should validate_date_of(:expiration_date, :after => Time.now) }
-      #   it { should validate_date_of(:expiration_date, :before => Time.now) }
-      #
-      #   should_validate_date_of :bought_at, :checked_at
-      #   should_validate_date_of :bought_at, :after => Time.now
-      #
-      #   should_validate_date_of :bought_at do |m|
-      #     m.after = Time.now
-      #   end
-      #
-      def validate_date_of(*attributes, &block)
-        ValidateDateOfMatcher.new(*attributes, &block).spec(self)
-      end
-
-    end
-  end
-end