dm-validations 0.9.7 → 0.9.8

data/History.txt

@@ -1 +1,5 @@
+=== 0.9.8 / 2008-12-07
 
+* 1 bug fix:
+
+  * Updated specs to test valididity of RFC2822 email addresses

data/Manifest.txt

@@ -46,3 +46,5 @@ spec/integration/validation_spec.rb
 spec/integration/within_validator_spec.rb
 spec/spec.opts
 spec/spec_helper.rb
+tasks/install.rb
+tasks/spec.rb

data/Rakefile

@@ -1,66 +1,25 @@
-require 'rubygems'
-require 'spec'
-require 'spec/rake/spectask'
 require 'pathname'
+require 'rubygems'
+
+ROOT    = Pathname(__FILE__).dirname.expand_path
+JRUBY   = RUBY_PLATFORM =~ /java/
+WINDOWS = Gem.win_platform?
+SUDO    = (WINDOWS || JRUBY) ? '' : ('sudo' unless ENV['SUDOLESS'])
 
-ROOT = Pathname(__FILE__).dirname.expand_path
 require ROOT + 'lib/dm-validations/version'
 
-AUTHOR = "Guy van den Berg"
-EMAIL  = "vandenberg.guy@gmail.com"
-GEM_NAME = "dm-validations"
+AUTHOR = 'Guy van den Berg'
+EMAIL  = 'vandenberg.guy [a] gmail [d] com'
+GEM_NAME = 'dm-validations'
 GEM_VERSION = DataMapper::Validations::VERSION
-GEM_DEPENDENCIES = [["dm-core", GEM_VERSION]]
-GEM_CLEAN = ["log", "pkg", "coverage"]
-GEM_EXTRAS = { :has_rdoc => true, :extra_rdoc_files => %w[ README.txt LICENSE TODO ] }
-
-PROJECT_NAME = "datamapper"
-PROJECT_URL  = "http://github.com/sam/dm-more/tree/master/dm-validations"
-PROJECT_DESCRIPTION = PROJECT_SUMMARY = "DataMapper plugin for performing validations on data models"
-
-require ROOT.parent + 'tasks/hoe'
-
-desc "Generate Documentation"
-rd = Rake::RDocTask.new do |rdoc|
-  rdoc.rdoc_dir = 'doc'
-  rdoc.title = "DataMapper Validations"
-  rdoc.options << '--line-numbers' << '--inline-source' << '--main' << 'README'
-  rdoc.rdoc_files.include(FileList[ 'lib/**/*.rb', 'README', 'LICENSE'])
-end
-
-task :default => [ :spec ]
-
-WIN32 = (RUBY_PLATFORM =~ /win32|mingw|cygwin/) rescue nil
-SUDO  = WIN32 ? '' : ('sudo' unless ENV['SUDOLESS'])
-
-desc "Install #{GEM_NAME} #{GEM_VERSION} (default ruby)"
-task :install => [ :package ] do
-  sh "#{SUDO} gem install --local pkg/#{GEM_NAME}-#{GEM_VERSION} --no-update-sources", :verbose => false
-end
-
-desc "Uninstall #{GEM_NAME} #{GEM_VERSION} (default ruby)"
-task :uninstall => [ :clobber ] do
-  sh "#{SUDO} gem uninstall #{GEM_NAME} -v#{GEM_VERSION} -I -x", :verbose => false
-end
-
-namespace :jruby do
-  desc "Install #{GEM_NAME} #{GEM_VERSION} with JRuby"
-  task :install => [ :package ] do
-    sh %{#{SUDO} jruby -S gem install --local pkg/#{GEM_NAME}-#{GEM_VERSION} --no-update-sources}, :verbose => false
-  end
-end
+GEM_DEPENDENCIES = [['dm-core', "~>#{GEM_VERSION}"]]
+GEM_CLEAN = %w[ log pkg coverage ]
+GEM_EXTRAS = { :has_rdoc => true, :extra_rdoc_files => %w[ README.txt LICENSE TODO History.txt ] }
 
-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((ROOT + 'spec/**/*_spec.rb').to_s)
+PROJECT_NAME = 'datamapper'
+PROJECT_URL  = "http://github.com/sam/dm-more/tree/master/#{GEM_NAME}"
+PROJECT_DESCRIPTION = PROJECT_SUMMARY = 'DataMapper plugin for performing validations on data models'
 
-  begin
-    t.rcov = ENV.has_key?('NO_RCOV') ? ENV['NO_RCOV'] != 'true' : true
-    t.rcov_opts << '--exclude' << 'spec'
-    t.rcov_opts << '--text-summary'
-    t.rcov_opts << '--sort' << 'coverage' << '--sort-reverse'
-  rescue Exception
-    # rcov not installed
-  end
+[ ROOT, ROOT.parent ].each do |dir|
+  Pathname.glob(dir.join('tasks/**/*.rb').to_s).each { |f| require f }
 end

data/TODO

@@ -13,4 +13,4 @@
 
  ---
  TODO tickets may also be found in the DataMapper Issue Tracker:
- http://wm.lighthouseapp.com/projects/4819-datamapper/overview
+ http://datamapper.lighthouseapp.com/

data/lib/dm-validations.rb

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

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

@@ -9,6 +9,7 @@ module DataMapper
           )
         end
 
+        # RFC2822 (No attribution reference available)
         EmailAddress = begin
             alpha = "a-zA-Z"
             digit = "0-9"

data/lib/dm-validations/version.rb

@@ -1,5 +1,5 @@
 module DataMapper
   module Validations
-    VERSION = "0.9.7"
+    VERSION = '0.9.8'
   end
 end

data/spec/integration/format_validator_spec.rb

@@ -43,42 +43,45 @@ describe DataMapper::Validate::FormatValidator do
     bol.should be_valid
   end
 
-  it 'should have a pre-defined e-mail format' do
-    bad = [ '-- guy --@example.com',    # spaces are invalid unless quoted
-            '[guy]@example.com',        # square brackets are invalid unless quoted
-            '.guy@example.com',         # local part cannot start with .
-            'guy@example 10:10',
-            'guy@ example dot com',
-            'guy'
-          ]
-
-    good = [
-            '+1~1+@example.com',
-            '{_guy_}@example.com',
-            '"[[ guy ]]"@example.com',
-            'guy."guy"@example.com',
-            'guy@localhost',
-            'guy@example.com',
-            'guy@example.co.uk',
-            'guy@example.co.za',
-            'guy@[187.223.45.119]',
-            'guy@123.com'
-           ]
-
-    bol = BillOfLading.new(valid_attributes.except(:email))
-    bol.should_not be_valid
-    bol.errors.on(:email).should include('Email has an invalid format')
+  describe "RFC2822 compatible email addresses" do
+    before do
+      @bol = BillOfLading.new(valid_attributes.except(:email))
+
+      @valid_email_addresses = [
+        '+1~1+@example.com',
+        '{_dave_}@example.com',
+        '"[[ dave ]]"@example.com',
+        'dave."dave"@example.com',
+        'test@localhost',
+        'test@example.com',
+        'test@example.co.uk',
+        'test@example.com.br',
+        '"J. P. \'s-Gravezande, a.k.a. The Hacker!"@example.com',
+        'me@[187.223.45.119]',
+        'someone@123.com',
+        'simon&garfunkel@songs.com'
+      ]
+
+      @invalid_email_addresses = [
+        '-- dave --@example.com',
+        '[dave]@example.com',
+        '.dave@example.com',
+        'Max@Job 3:14',
+        'Job@Book of Job',
+        'J. P. \'s-Gravezande, a.k.a. The Hacker!@example.com'
+      ]
+    end
 
-    bad.map do |e|
-      bol.email = e
-      bol.valid?
-      bol.errors.on(:email).should include('Email has an invalid format')
+    it "should match the RFC reference addresses" do
+      @valid_email_addresses.each do |email|
+        email.should =~ DataMapper::Validate::Format::Email::EmailAddress
+      end
     end
 
-    good.map do |e|
-      bol.email = e
-      bol.valid?
-      bol.errors.on(:email).should be_nil
+    it "should not be valid" do
+      @invalid_email_addresses.each do |email|
+        email.should_not =~ DataMapper::Validate::Format::Email::EmailAddress
+      end
     end
 
   end

data/spec/spec.opts

@@ -1,2 +1 @@
---format specdoc
 --colour

data/spec/spec_helper.rb

@@ -1,21 +1,20 @@
+require 'pathname'
 require 'rubygems'
+
+gem 'rspec', '~>1.1.11'
 require 'spec'
-require 'pathname'
+
 require Pathname(__FILE__).dirname.expand_path.parent + 'lib/dm-validations'
 
 def load_driver(name, default_uri)
   return false if ENV['ADAPTER'] != name.to_s
 
-  lib = "do_#{name}"
-
   begin
-    gem lib, '~>0.9.7'
-    require lib
     DataMapper.setup(name, ENV["#{name.to_s.upcase}_SPEC_URI"] || default_uri)
     DataMapper::Repository.adapters[:default] =  DataMapper::Repository.adapters[name]
     true
-  rescue Gem::LoadError => e
-    warn "Could not load #{lib}: #{e}"
+  rescue LoadError => e
+    warn "Could not load do_#{name}: #{e}"
     false
   end
 end

data/tasks/install.rb

@@ -0,0 +1,13 @@
+def sudo_gem(cmd)
+  sh "#{SUDO} #{RUBY} -S gem #{cmd}", :verbose => false
+end
+
+desc "Install #{GEM_NAME} #{GEM_VERSION}"
+task :install => [ :package ] do
+  sudo_gem "install --local pkg/#{GEM_NAME}-#{GEM_VERSION} --no-update-sources"
+end
+
+desc "Uninstall #{GEM_NAME} #{GEM_VERSION}"
+task :uninstall => [ :clobber ] do
+  sudo_gem "uninstall #{GEM_NAME} -v#{GEM_VERSION} -Ix"
+end

data/tasks/spec.rb

@@ -0,0 +1,25 @@
+begin
+  gem 'rspec', '~>1.1.11'
+  require 'spec'
+  require 'spec/rake/spectask'
+
+  task :default => [ :spec ]
+
+  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((ROOT + 'spec/**/*_spec.rb').to_s)
+
+    begin
+      gem 'rcov', '~>0.8'
+      t.rcov = JRUBY ? false : (ENV.has_key?('NO_RCOV') ? ENV['NO_RCOV'] != 'true' : true)
+      t.rcov_opts << '--exclude' << 'spec'
+      t.rcov_opts << '--text-summary'
+      t.rcov_opts << '--sort' << 'coverage' << '--sort-reverse'
+    rescue LoadError
+      # rcov not installed
+    end
+  end
+rescue LoadError
+  # rspec not installed
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dm-validations
 version: !ruby/object:Gem::Version 
-  version: 0.9.7
+  version: 0.9.8
 platform: ruby
 authors: 
 - Guy van den Berg
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-18 00:00:00 -08:00
+date: 2008-12-07 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -18,23 +18,13 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.9.7
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: hoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.8.2
+        version: 0.9.8
     version: 
 description: DataMapper plugin for performing validations on data models
 email: 
-- vandenberg.guy@gmail.com
+- vandenberg.guy [a] gmail [d] com
 executables: []
 
 extensions: []
@@ -43,6 +33,7 @@ extra_rdoc_files:
 - README.txt
 - LICENSE
 - TODO
+- History.txt
 files: 
 - History.txt
 - LICENSE
@@ -92,6 +83,8 @@ files:
 - spec/integration/within_validator_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
+- tasks/install.rb
+- tasks/spec.rb
 has_rdoc: true
 homepage: http://github.com/sam/dm-more/tree/master/dm-validations
 post_install_message: