dm-validations 0.9.5 → 0.9.6

data/Manifest.txt

@@ -25,6 +25,8 @@ lib/dm-validations/uniqueness_validator.rb
 lib/dm-validations/validation_errors.rb
 lib/dm-validations/version.rb
 lib/dm-validations/within_validator.rb
+lib/dm-validations/formats/url.rb
+lib/dm-validations/formats/email.rb
 spec/integration/absent_field_validator_spec.rb
 spec/integration/acceptance_validator_spec.rb
 spec/integration/auto_validate_spec.rb

data/Rakefile

@@ -53,7 +53,7 @@ end
 desc 'Run specifications'
 Spec::Rake::SpecTask.new(:spec) do |t|
   t.spec_opts << '--options' << 'spec/spec.opts' if File.exists?('spec/spec.opts')
-  t.spec_files = Pathname.glob(Pathname.new(__FILE__).dirname + 'spec/**/*_spec.rb')
+  t.spec_files = Pathname.glob((ROOT + 'spec/**/*_spec.rb').to_s)
 
   begin
     t.rcov = ENV.has_key?('NO_RCOV') ? ENV['NO_RCOV'] != 'true' : true

data/lib/dm-validations.rb

@@ -1,7 +1,7 @@
 require 'rubygems'
 require 'pathname'
 
-gem 'dm-core', '=0.9.5'
+gem 'dm-core', '=0.9.6'
 require 'dm-core'
 
 dir = Pathname(__FILE__).dirname.expand_path / 'dm-validations'

data/lib/dm-validations/format_validator.rb

@@ -2,6 +2,7 @@
 
 require 'pathname'
 require Pathname(__FILE__).dirname.expand_path + 'formats/email'
+require Pathname(__FILE__).dirname.expand_path + 'formats/url'
 
 module DataMapper
   module Validate
@@ -14,6 +15,7 @@ module DataMapper
 
       FORMATS = {}
       include DataMapper::Validate::Format::Email
+      include DataMapper::Validate::Format::Url
 
       def initialize(field_name, options = {}, &b)
         super(field_name, options)
@@ -66,6 +68,7 @@ module DataMapper
       #
       # @details [Pre-defined Formats]
       #   :email_address (format is specified in DataMapper::Validate::Format::Email)
+      #   :url (format is specified in DataMapper::Validate::Format::Url)
       #
       # @example [Usage]
       #   require 'dm-validations'

data/lib/dm-validations/formats/url.rb

@@ -0,0 +1,20 @@
+module DataMapper
+  module Validate
+    module Format
+      module Url
+
+        def self.included(base)
+          DataMapper::Validate::FormatValidator::FORMATS.merge!(
+            :url => [ Url, lambda { |field, value| '%s is not a valid URL'.t(value) }]
+          )
+        end
+
+        Url = begin
+          # Regex from http://www.igvita.com/2006/09/07/validating-url-in-ruby-on-rails/
+          /(^$)|(^(http|https):\/\/[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}(([0-9]{1,5})?\/.*)?$)/ix
+        end
+
+      end # module Url
+    end # module Format
+  end # module Validate
+end # module DataMapper

data/lib/dm-validations/generic_validator.rb

@@ -89,6 +89,7 @@ module DataMapper
       def ==(other)
         self.class == other.class &&
         self.field_name == other.field_name &&
+        self.class == other.class &&
         self.if_clause == other.if_clause &&
         self.unless_clause == other.unless_clause &&
         self.instance_variable_get(:@options) == other.instance_variable_get(:@options)

data/lib/dm-validations/primitive_validator.rb

@@ -26,7 +26,7 @@ module DataMapper
       protected
 
       def default_error(property)
-        "%s must be of type #{property.primitive.to_s}".t(Extlib::Inflection.humanize(@field_name))
+        "%s must be of type %s".t(Extlib::Inflection.humanize(@field_name), property.primitive)
       end
 
     end # class PrimitiveValidator

data/lib/dm-validations/required_field_validator.rb

@@ -33,8 +33,8 @@ module DataMapper
       end
 
       def default_error(property)
-        actual = boolean_type?(property) ? "nil" : "blank"
-        "%s must not be #{actual}".t(Extlib::Inflection.humanize(@field_name))
+        actual = boolean_type?(property) ? "nil".t : "blank".t
+        "%s must not be %s".t(Extlib::Inflection.humanize(@field_name), actual)
       end
 
       # Is +property+ a boolean property?

data/lib/dm-validations/version.rb

@@ -1,5 +1,5 @@
 module DataMapper
   module Validations
-    VERSION = "0.9.5"
+    VERSION = "0.9.6"
   end
 end

data/lib/dm-validations/within_validator.rb

@@ -17,19 +17,19 @@ module DataMapper
         includes = @options[:set].include?(target.send(field_name))
         return true if includes
 
+        field_name = Extlib::Inflection.humanize(@field_name)
         if @options[:set].is_a?(Range)
           if @options[:set].first != -n && @options[:set].last != n
-            message = "%s must be between #{@options[:set].first} and #{@options[:set].last}"
+            error_message = @options[:message] || "%s must be between %s and %s".t(field_name, @options[:set].first, @options[:set].last)
           elsif @options[:set].first == -n
-            message = "%s must be less than #{@options[:set].last}"
+            error_message = @options[:message] || "%s must be less than %s".t(field_name, @options[:set].last)
           elsif @options[:set].last == n
-            message = "%s must be greater than #{@options[:set].first}"
+            error_message = @options[:message] || "%s must be greater than %s".t(field_name, @options[:set].first)
           end
         else
-          message = "%s must be one of [#{ @options[:set].join(', ')}]"
+          error_message = "%s must be one of [%s]".t(field_name, @options[:set].join(', '))
         end
 
-        error_message = @options[:message] || message.t(Extlib::Inflection.humanize(@field_name))
         add_error(target, error_message , @field_name)
         return false
       end

data/spec/integration/format_validator_spec.rb

@@ -10,6 +10,7 @@ describe DataMapper::Validate::FormatValidator do
       property :doc_no,   String, :auto_validation => false
       property :email,    String, :auto_validation => false
       property :username, String, :auto_validation => false
+      property :url,      String, :auto_validation => false
 
       # this is a trivial example
       validates_format :doc_no, :with => lambda { |code|
@@ -17,13 +18,14 @@ describe DataMapper::Validate::FormatValidator do
       }
 
       validates_format :email, :as => :email_address
+      validates_format :url, :as => :url
 
       validates_format :username, :with => /[a-z]/, :message => 'Username must have at least one letter', :allow_nil => true
     end
   end
 
   def valid_attributes
-    { :id => 1, :doc_no => 'A1234', :email => 'user@example.com' }
+    { :id => 1, :doc_no => 'A1234', :email => 'user@example.com', :url => 'http://example.com' }
   end
 
   it 'should validate the format of a value on an instance of a resource' do
@@ -81,6 +83,38 @@ describe DataMapper::Validate::FormatValidator do
 
   end
 
+  it 'should have a pre-defined URL format' do
+    bad = [ 'http:// example.com',
+            'ftp://example.com',
+            'http://.com',
+            'http://',
+            'test',
+            '...'
+          ]
+
+    good = [
+            'http://example.com',
+            'http://www.example.com',
+           ]
+
+    bol = BillOfLading.new(valid_attributes.except(:url))
+    bol.should_not be_valid
+    bol.errors.on(:url).should include('Url has an invalid format')
+
+    bad.map do |e|
+      bol.url = e
+      bol.valid?
+      bol.errors.on(:url).should include('Url has an invalid format')
+    end
+
+    good.map do |e|
+      bol.url = e
+      bol.valid?
+      bol.errors.on(:url).should be_nil
+    end
+
+  end
+
   describe 'with a regexp' do
     before do
       @bol = BillOfLading.new(valid_attributes)

data/spec/integration/generic_validator_spec.rb

@@ -1,9 +1,17 @@
 require 'pathname'
 require Pathname(__FILE__).dirname.expand_path.parent + 'spec_helper'
 
-describe DataMapper::Validate::GenericValidator do
-  it "should have specs" do
-    pending
-    # FIXME do something, add specs
+module DataMapper
+  module Validate
+    describe DataMapper::Validate::GenericValidator do
+      describe "#==" do
+        it "should return true if types and fields are equal" do
+          RequiredFieldValidator.new(:name).should == RequiredFieldValidator.new(:name)
+        end
+        it "should return false of types differ" do
+          RequiredFieldValidator.new(:name).should_not == UniquenessValidator.new(:name)
+        end
+      end
+    end
   end
 end

data/spec/integration/primitive_validator_spec.rb

@@ -12,8 +12,6 @@ end
 describe DataMapper::Validate::PrimitiveValidator do
   it "should validate a property to check for the type" do
     b = Monica.new
-    p b.valid?
-    p b.errors
     b.should be_valid
 
     b.birth_date = 'ABC'

data/spec/integration/validation_spec.rb

@@ -12,6 +12,18 @@ describe DataMapper::Validate do
     end
   end
 
+  describe '#validations' do
+      it 'should support more different validations of a different type' do
+          number_of_validators_before = Yacht.validators.contexts[:default].length
+            class Yacht
+                validates_is_unique :name
+            end
+          number_of_validators_after = Yacht.validators.contexts[:default].length
+          (number_of_validators_after - number_of_validators_before).should == 1
+      end
+
+  end
+
   it 'should respond to save' do
     Yacht.new.should respond_to(:save)
   end

data/spec/integration/within_validator_spec.rb

@@ -21,7 +21,7 @@ describe DataMapper::Validate::WithinValidator do
       validates_within :between, :set => (10..20)
     end
 
-    class Reciever
+    class Receiver
       include DataMapper::Resource
       property :id, Integer, :serial => true
       property :holder, String, :auto_validation => false, :default => 'foo'
@@ -48,7 +48,7 @@ describe DataMapper::Validate::WithinValidator do
   end
 
   it "should validate a value by its default" do
-    tel = Reciever.new
+    tel = Receiver.new
     tel.should be_valid
   end
 end

data/spec/spec_helper.rb

@@ -9,7 +9,7 @@ def load_driver(name, default_uri)
   lib = "do_#{name}"
 
   begin
-    gem lib, '=0.9.5'
+    gem lib, '>=0.9.5'
     require lib
     DataMapper.setup(name, ENV["#{name.to_s.upcase}_SPEC_URI"] || default_uri)
     DataMapper::Repository.adapters[:default] =  DataMapper::Repository.adapters[name]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dm-validations
 version: !ruby/object:Gem::Version 
-  version: 0.9.5
+  version: 0.9.6
 platform: ruby
 authors: 
 - Guy van den Berg
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-26 00:00:00 -05:00
+date: 2008-10-12 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.5
+        version: 0.9.6
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
@@ -71,6 +71,7 @@ files:
 - lib/dm-validations/validation_errors.rb
 - lib/dm-validations/version.rb
 - lib/dm-validations/within_validator.rb
+- lib/dm-validations/formats/url.rb
 - spec/integration/absent_field_validator_spec.rb
 - spec/integration/acceptance_validator_spec.rb
 - spec/integration/auto_validate_spec.rb