dm-validations 0.10.2 → 1.0.0.rc1

data/.gitignore

@@ -0,0 +1,36 @@
+## MAC OS
+.DS_Store
+
+## TEXTMATE
+*.tmproj
+tmtags
+
+## EMACS
+*~
+\#*
+.\#*
+
+## VIM
+*.swp
+
+## Rubinius
+*.rbc
+
+## PROJECT::GENERAL
+*.gem
+coverage
+rdoc
+pkg
+tmp
+doc
+log
+.yardoc
+measurements
+
+## BUNDLER
+.bundle
+Gemfile.local
+Gemfile.lock
+
+## PROJECT::SPECIFIC
+spec/db/

data/Gemfile

@@ -0,0 +1,143 @@
+# If you're working on more than one datamapper gem at a time, then it's
+# recommended to create a local Gemfile and use this instead of the git
+# sources. This will make sure that you are  developing against your
+# other local datamapper sources that you currently work on. Gemfile.local
+# will behave identically to the standard Gemfile apart from the fact that
+# it fetches the datamapper gems from local paths. This means that you can use
+# the same environment variables, like ADAPTER(S) or PLUGIN(S) when running
+# bundle commands. Gemfile.local is added to .gitignore, so you don't need to
+# worry about accidentally checking local development paths into git.
+# In order to create a local Gemfile, all you need to do is run:
+#
+#   bundle exec rake local_gemfile
+#
+# This will give you a Gemfile.local file that points to your local clones of
+# the various datamapper gems. It's assumed that all datamapper repo clones
+# reside in the same directory. You can use the Gemfile.local like so for
+# running any bundle command:
+#
+#   BUNDLE_GEMFILE=Gemfile.local bundle foo
+#
+# You can also specify which adapter(s) should be part of the bundle by setting
+# an environment variable. This of course also works when using the Gemfile.local
+#
+#   bundle foo                        # dm-sqlite-adapter
+#   ADAPTER=mysql bundle foo          # dm-mysql-adapter
+#   ADAPTERS=sqlite,mysql bundle foo  # dm-sqlite-adapter and dm-mysql-adapter
+#
+# Of course you can also use the ADAPTER(S) variable when using the Gemfile.local
+# and running specs against selected adapters.
+#
+# For easily working with adapters supported on your machine, it's recommended
+# that you first install all adapters that you are planning to use or work on
+# by doing something like
+#
+#   ADAPTERS=sqlite,mysql,postgres bundle install
+#
+# This will clone the various repositories and make them available to bundler.
+# Once you have them installed you can easily switch between adapters for the
+# various development tasks. Running something like
+#
+#   ADAPTER=mysql bundle exec rake spec
+#
+# will make sure that the dm-mysql-adapter is part of the bundle, and will be used
+# when running the specs.
+#
+# You can also specify which plugin(s) should be part of the bundle by setting
+# an environment variable. This also works when using the Gemfile.local
+#
+#   bundle foo                                 # dm-migrations
+#   PLUGINS=dm-validations bundle foo          # dm-migrations and dm-validations
+#   PLUGINS=dm-validations,dm-types bundle foo # dm-migrations, dm-validations and dm-types
+#
+# Of course you can combine the PLUGIN(S) and ADAPTER(S) env vars to run specs
+# for certain adapter/plugin combinations.
+#
+# Finally, to speed up running specs and other tasks, it's recommended to run
+#
+#   bundle lock
+#
+# after running 'bundle install' for the first time. This will make 'bundle exec' run
+# a lot faster compared to the unlocked version. With an unlocked bundle you would
+# typically just run 'bundle install' from time to time to fetch the latest sources from
+# upstream. When you locked your bundle, you need to run
+#
+#   bundle install --relock
+#
+# to make sure to fetch the latest updates and then lock the bundle again. Gemfile.lock
+# is added to the .gitignore file, so you don't need to worry about accidentally checking
+# it into version control.
+
+source 'http://rubygems.org'
+
+DATAMAPPER = 'git://github.com/datamapper'
+DM_VERSION = '~> 1.0.0.rc1'
+
+group :runtime do # Runtime dependencies (as in the gemspec)
+
+  if ENV['EXTLIB']
+    gem 'extlib',        '~> 0.9.15',      :git => "#{DATAMAPPER}/extlib.git"
+  else
+    gem 'activesupport', '~> 3.0.0.beta3', :git => 'git://github.com/rails/rails.git', :require => nil
+  end
+
+  gem 'dm-core',        DM_VERSION, :git => "#{DATAMAPPER}/dm-core.git"
+
+end
+
+group(:development) do # Development dependencies (as in the gemspec)
+
+  gem 'dm-types',       DM_VERSION, :git => "#{DATAMAPPER}/dm-types.git"
+
+  gem 'rake',           '~> 0.8.7'
+  gem 'rspec',          '~> 1.3'
+  gem 'jeweler',        '~> 1.4'
+
+end
+
+group :quality do # These gems contain rake tasks that check the quality of the source code
+
+  gem 'metric_fu',      '~> 1.3'
+  gem 'rcov',           '~> 0.9.7'
+  gem 'reek',           '~> 1.2.7'
+  gem 'roodi',          '~> 2.1'
+  gem 'yard',           '~> 0.5'
+  gem 'yardstick',      '~> 0.1'
+
+end
+
+group :datamapper do # We need this because we want to pin these dependencies to their git master sources
+
+  adapters = ENV['ADAPTER'] || ENV['ADAPTERS']
+  adapters = adapters.to_s.gsub(',',' ').split(' ') - ['in_memory']
+
+  unless adapters.empty?
+
+    DO_VERSION     = '~> 0.10.2'
+    DM_DO_ADAPTERS = %w[sqlite postgres mysql oracle sqlserver]
+
+    gem 'data_objects',  DO_VERSION, :git => "#{DATAMAPPER}/do.git"
+
+    adapters.each do |adapter|
+      if DM_DO_ADAPTERS.any? { |dm_do_adapter| dm_do_adapter =~ /#{adapter}/  }
+        adapter = 'sqlite3' if adapter == 'sqlite'
+        gem "do_#{adapter}", DO_VERSION, :git => "#{DATAMAPPER}/do.git"
+      end
+    end
+
+    gem 'dm-do-adapter', DM_VERSION, :git => "#{DATAMAPPER}/dm-do-adapter.git"
+
+    adapters.each do |adapter|
+      gem "dm-#{adapter}-adapter", DM_VERSION, :git => "#{DATAMAPPER}/dm-#{adapter}-adapter.git"
+    end
+
+  end
+
+  plugins = ENV['PLUGINS'] || ENV['PLUGIN']
+  plugins = (plugins.to_s.gsub(',',' ').split(' ') + ['dm-migrations']).uniq
+
+  plugins.each do |plugin|
+    gem plugin, DM_VERSION, :git => "#{DATAMAPPER}/#{plugin}.git"
+  end
+
+end

data/README.rdoc

@@ -1,75 +1,41 @@
-This is a DataMapper plugin that provides validations for DataMapper model
-classes.
+This is a DataMapper plugin that provides validations for DataMapper model classes.
 
 == Setup
-DataMapper validation capabilities are automatically available for DataMapper
-resources when you require dm-validations' into your application. For
-pure Ruby classes, require 'dm-validations' and then include DataMapper::Validate
-module like so:
-
-class ProgrammingLanguage
-  #
-  # Behaviors
-  #
-
-  include ::DataMapper::Validate
-
-  #
-  # Accessors
-  #
-
-  attr_accessor :name, :allows_manual_memory_management, :allows_optional_parentheses
-
-  #
-  # Validations
-  #
-
-  validates_present :name
-  validates_with_method :ensure_allows_optional_parentheses,     :when => [:implementing_a_dsl]
-  validates_with_method :ensure_allows_manual_memory_management, :when => [:doing_system_programming]
-end
-
+DataMapper validation capabilities are automatically available for DataMapper resources when you require dm-validations' in your application. There is no need to manually include anything, every DataMapper::Resource will be able to handle validations once this gem got required.
 
 == Specifying Model Validations
-There are two primary ways to implement validations for your models:
-
-1) Placing validation methods with properties as params in your class
-   definitions like:
-   - validates_length :name
-   - validates_length [:name, :description]
 
-2) Using auto-validations, please see DataMapper::Validate::AutoValidate
+There are two primary ways to implement validations for your models
 
-An example class with validations declared:
+1) Placing validation methods with properties as params in your class
 
+  require 'dm-core'
   require 'dm-validations'
 
-  class Account
+  class ProgrammingLanguage
     include DataMapper::Resource
-
     property :name, String
-    validates_length :name
+    validates_presence_of :name
+  end
+
+2) Using auto-validations, please see DataMapper::Validations::AutoValidations. Note that not all validations that are provided via validation methods, are also available as autovalidation options. If they are available, they're functionally equivalent though.
+
+  class ProgrammingLanguage
+    include DataMapper::Resource
+    property :name, String, :required => true
   end
 
-See all of the DataMapper::Validate module's XYZValidator(s) to learn about the
-complete collections of validators available to you.
+See all of the DataMapper::Validate module's XYZValidator(s) to learn about the complete collections of validators available to you.
 
 == Validating
-DataMapper validations, when included, alter the default save/create/update
-process for a model.  Unless you specify a context the resource must be
-valid in the :default context before saving.
 
-You may manually validate a resource using the valid? method, which will
-return true if the resource is valid, and false if it is invalid.
+DataMapper validations, when included, alter the default save/create/update process for a model.  Unless you specify a context the resource must be valid in the :default context before saving.
 
-In addition to the valid? method, there is also an all_valid? method that
-recursively walks both the current object and its associated objects and returns
-its true/false result for the entire walk.
+You may manually validate a resource using the valid? method, which will return true if the resource is valid, and false if it is invalid.
 
 == Working with Validation Errors
-If your validators find errors in your model, they will populate the
-DataMapper::Validate::ValidationErrors object that is available through each of
-your models via calls to your model's errors method.
+
+If your validators find errors in your model, they will populate the DataMapper::Validations::ValidationErrors object that is available through each of your models via calls to your model's errors method.
 
 For example:
 
@@ -82,7 +48,7 @@ For example:
     end
   end
 
-See DataMapper::Validate::ValidationErrors for all you can do with your model's
+See DataMapper::Validations::ValidationErrors for all you can do with your model's
 errors method.
 
 == Contextual Validations
@@ -95,35 +61,32 @@ for publishing, exporting, importing and so on.
 
 Again, using our example for pure Ruby class validations:
 
-class ProgrammingLanguage
-  #
-  # Behaviors
-  #
+  class ProgrammingLanguage
 
-  include ::DataMapper::Validate
+    include DataMapper::Resource
 
-  #
-  # Accessors
-  #
+    property :name, String
 
-  attr_accessor :name, :allows_manual_memory_management, :allows_optional_parentheses
+    def ensure_allows_manual_memory_management
+      # ...
+    end
 
-  #
-  # Validations
-  #
+    def ensure_allows_optional_parentheses
+      # ...
+    end
 
-  validates_present :name
-  validates_with_method :ensure_allows_optional_parentheses,     :when => [:implementing_a_dsl]
-  validates_with_method :ensure_allows_manual_memory_management, :when => [:doing_system_programming]
-end
+    validates_presence_of :name
+    validates_with_method :ensure_allows_optional_parentheses,     :when => [:implementing_a_dsl]
+    validates_with_method :ensure_allows_manual_memory_management, :when => [:doing_system_programming]
+  end
 
 ProgrammingLanguage instance now use #valid? method with one of two context symbols:
 
-@ruby.valid?(:implementing_a_dsl)       # => true
-@ruby.valid?(:doing_system_programming) # => false
+  @ruby.valid?(:implementing_a_dsl)       # => true
+  @ruby.valid?(:doing_system_programming) # => false
 
-@c.valid?(:implementing_a_dsl)       # => false
-@c.valid?(:doing_system_programming) # => true
+  @c.valid?(:implementing_a_dsl)       # => false
+  @c.valid?(:doing_system_programming) # => true
 
 Each context causes different set of validations to be triggered. If you don't
 specify a context using :when, :on or :group options (they are all aliases and do
@@ -131,41 +94,28 @@ the same thing), default context name is :default. When you do model.valid? (wit
 specifying context explicitly), again, :default context is used. One validation
 can be used in two, three or five contexts if you like:
 
-class Book
-
-  #
-  # Behaviors
-  #
-
-  # this time it is a DM model
-  include ::DataMapper::Resource
-
-  #
-  # Accessors
-  #
+  class Book
 
-  property :id,           Serial
-  property :name,         String
+    include ::DataMapper::Resource
 
-  property :agreed_title, String
-  property :finished_toc, Boolean
+    property :id,           Serial
+    property :name,         String
 
-  #
-  # Validations
-  #
+    property :agreed_title, String
+    property :finished_toc, Boolean
 
-  # used in all contexts, including default
-  validates_present :name,         :when => [:default, :sending_to_print]
-  validates_present :agreed_title, :when => [:sending_to_print]
+    # used in all contexts, including default
+    validates_presence_of :name,         :when => [:default, :sending_to_print]
+    validates_presence_of :agreed_title, :when => [:sending_to_print]
 
-  validates_with_block :toc, :when => [:sending_to_print] do
-    if self.finished_toc
-      [true]
-    else
-      [false, "TOC must be finalized before you send a book to print"]
+    validates_with_block :toc, :when => [:sending_to_print] do
+      if self.finished_toc
+        [true]
+      else
+        [false, "TOC must be finalized before you send a book to print"]
+      end
     end
   end
-end
 
 In the example above, name is validated for presence in both :default context and
 :sending_to_print context, while TOC related block validation and title presence validation

data/Rakefile

@@ -15,10 +15,10 @@ begin
 
     gem.rubyforge_project = 'datamapper'
 
-    gem.add_dependency 'dm-core', '~> 0.10.2'
+    gem.add_dependency 'dm-core', '~> 1.0.0.rc1'
 
-    gem.add_development_dependency 'rspec', '~> 1.2.9'
-    gem.add_development_dependency 'yard',  '~> 0.4.0'
+    gem.add_development_dependency 'rspec',    '~> 1.3'
+    gem.add_development_dependency 'dm-types', '~> 1.0.0.rc1'
   end
 
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.10.2
+1.0.0.rc1

data/dm-validations.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dm-validations}
-  s.version = "0.10.2"
+  s.version = "1.0.0.rc1"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Guy van den Berg"]
-  s.date = %q{2009-12-11}
+  s.date = %q{2010-05-19}
   s.description = %q{Library for performing validations on DM models and pure Ruby object}
   s.email = %q{vandenberg.guy [a] gmail [d] com}
   s.extra_rdoc_files = [
@@ -17,7 +17,9 @@ Gem::Specification.new do |s|
      "README.rdoc"
   ]
   s.files = [
-    "LICENSE",
+    ".gitignore",
+     "Gemfile",
+     "LICENSE",
      "README.rdoc",
      "Rakefile",
      "VERSION",
@@ -154,6 +156,7 @@ Gem::Specification.new do |s|
      "spec/unit/validation_errors/emptiness_spec.rb",
      "spec/unit/validation_errors/enumerable_spec.rb",
      "tasks/ci.rake",
+     "tasks/local_gemfile.rake",
      "tasks/metrics.rake",
      "tasks/spec.rake",
      "tasks/yard.rake",
@@ -163,26 +166,135 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{datamapper}
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{Library for performing validations on DM models and pure Ruby object}
+  s.test_files = [
+    "spec/fixtures/barcode.rb",
+     "spec/fixtures/basketball_court.rb",
+     "spec/fixtures/basketball_player.rb",
+     "spec/fixtures/beta_tester_account.rb",
+     "spec/fixtures/bill_of_landing.rb",
+     "spec/fixtures/boat_dock.rb",
+     "spec/fixtures/city.rb",
+     "spec/fixtures/company.rb",
+     "spec/fixtures/corporate_world.rb",
+     "spec/fixtures/country.rb",
+     "spec/fixtures/currency.rb",
+     "spec/fixtures/ethernet_frame.rb",
+     "spec/fixtures/event.rb",
+     "spec/fixtures/g3_concert.rb",
+     "spec/fixtures/jabberwock.rb",
+     "spec/fixtures/kayak.rb",
+     "spec/fixtures/lernean_hydra.rb",
+     "spec/fixtures/mathematical_function.rb",
+     "spec/fixtures/memory_object.rb",
+     "spec/fixtures/mittelschnauzer.rb",
+     "spec/fixtures/motor_launch.rb",
+     "spec/fixtures/page.rb",
+     "spec/fixtures/phone_number.rb",
+     "spec/fixtures/pirogue.rb",
+     "spec/fixtures/programming_language.rb",
+     "spec/fixtures/reservation.rb",
+     "spec/fixtures/scm_operation.rb",
+     "spec/fixtures/sms_message.rb",
+     "spec/fixtures/udp_packet.rb",
+     "spec/integration/absent_field_validator/absent_field_validator_spec.rb",
+     "spec/integration/absent_field_validator/spec_helper.rb",
+     "spec/integration/acceptance_validator/acceptance_validator_spec.rb",
+     "spec/integration/acceptance_validator/spec_helper.rb",
+     "spec/integration/automatic_validation/custom_messages_for_inferred_validation_spec.rb",
+     "spec/integration/automatic_validation/disabling_inferred_validation_spec.rb",
+     "spec/integration/automatic_validation/inferred_boolean_properties_validation_spec.rb",
+     "spec/integration/automatic_validation/inferred_float_property_validation_spec.rb",
+     "spec/integration/automatic_validation/inferred_format_validation_spec.rb",
+     "spec/integration/automatic_validation/inferred_integer_properties_validation_spec.rb",
+     "spec/integration/automatic_validation/inferred_length_validation_spec.rb",
+     "spec/integration/automatic_validation/inferred_presence_validation_spec.rb",
+     "spec/integration/automatic_validation/inferred_primitive_validation_spec.rb",
+     "spec/integration/automatic_validation/inferred_within_validation_spec.rb",
+     "spec/integration/automatic_validation/spec_helper.rb",
+     "spec/integration/block_validator/block_validator_spec.rb",
+     "spec/integration/block_validator/spec_helper.rb",
+     "spec/integration/conditional_validation/if_condition_spec.rb",
+     "spec/integration/conditional_validation/spec_helper.rb",
+     "spec/integration/confirmation_validator/confirmation_validator_spec.rb",
+     "spec/integration/confirmation_validator/spec_helper.rb",
+     "spec/integration/datamapper_models/association_validation_spec.rb",
+     "spec/integration/datamapper_models/inheritance_spec.rb",
+     "spec/integration/duplicated_validations/duplicated_validations_spec.rb",
+     "spec/integration/duplicated_validations/spec_helper.rb",
+     "spec/integration/format_validator/email_format_validator_spec.rb",
+     "spec/integration/format_validator/format_validator_spec.rb",
+     "spec/integration/format_validator/regexp_validator_spec.rb",
+     "spec/integration/format_validator/spec_helper.rb",
+     "spec/integration/format_validator/url_format_validator_spec.rb",
+     "spec/integration/length_validator/default_value_spec.rb",
+     "spec/integration/length_validator/equality_spec.rb",
+     "spec/integration/length_validator/error_message_spec.rb",
+     "spec/integration/length_validator/maximum_spec.rb",
+     "spec/integration/length_validator/minimum_spec.rb",
+     "spec/integration/length_validator/range_spec.rb",
+     "spec/integration/length_validator/spec_helper.rb",
+     "spec/integration/method_validator/method_validator_spec.rb",
+     "spec/integration/method_validator/spec_helper.rb",
+     "spec/integration/numeric_validator/equality_with_float_type_spec.rb",
+     "spec/integration/numeric_validator/equality_with_integer_type_spec.rb",
+     "spec/integration/numeric_validator/float_type_spec.rb",
+     "spec/integration/numeric_validator/gt_with_float_type_spec.rb",
+     "spec/integration/numeric_validator/gte_with_float_type_spec.rb",
+     "spec/integration/numeric_validator/integer_only_true_spec.rb",
+     "spec/integration/numeric_validator/integer_type_spec.rb",
+     "spec/integration/numeric_validator/lt_with_float_type_spec.rb",
+     "spec/integration/numeric_validator/lte_with_float_type_spec.rb",
+     "spec/integration/numeric_validator/spec_helper.rb",
+     "spec/integration/primitive_validator/primitive_validator_spec.rb",
+     "spec/integration/primitive_validator/spec_helper.rb",
+     "spec/integration/pure_ruby_objects/plain_old_ruby_object_validation_spec.rb",
+     "spec/integration/required_field_validator/association_spec.rb",
+     "spec/integration/required_field_validator/boolean_type_value_spec.rb",
+     "spec/integration/required_field_validator/date_type_value_spec.rb",
+     "spec/integration/required_field_validator/datetime_type_value_spec.rb",
+     "spec/integration/required_field_validator/float_type_value_spec.rb",
+     "spec/integration/required_field_validator/integer_type_value_spec.rb",
+     "spec/integration/required_field_validator/plain_old_ruby_object_spec.rb",
+     "spec/integration/required_field_validator/shared_examples.rb",
+     "spec/integration/required_field_validator/spec_helper.rb",
+     "spec/integration/required_field_validator/string_type_value_spec.rb",
+     "spec/integration/required_field_validator/text_type_value_spec.rb",
+     "spec/integration/shared/default_validation_context.rb",
+     "spec/integration/shared/valid_and_invalid_model.rb",
+     "spec/integration/uniqueness_validator/spec_helper.rb",
+     "spec/integration/uniqueness_validator/uniqueness_validator_spec.rb",
+     "spec/integration/within_validator/spec_helper.rb",
+     "spec/integration/within_validator/within_validator_spec.rb",
+     "spec/public/resource_spec.rb",
+     "spec/spec_helper.rb",
+     "spec/unit/contextual_validators/emptiness_spec.rb",
+     "spec/unit/contextual_validators/execution_spec.rb",
+     "spec/unit/contextual_validators/spec_helper.rb",
+     "spec/unit/generic_validator/equality_operator_spec.rb",
+     "spec/unit/validation_errors/adding_spec.rb",
+     "spec/unit/validation_errors/emptiness_spec.rb",
+     "spec/unit/validation_errors/enumerable_spec.rb"
+  ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<dm-core>, ["~> 0.10.2"])
-      s.add_development_dependency(%q<rspec>, ["~> 1.2.9"])
-      s.add_development_dependency(%q<yard>, ["~> 0.4.0"])
+      s.add_runtime_dependency(%q<dm-core>, ["~> 1.0.0.rc1"])
+      s.add_development_dependency(%q<rspec>, ["~> 1.3"])
+      s.add_development_dependency(%q<dm-types>, ["~> 1.0.0.rc1"])
     else
-      s.add_dependency(%q<dm-core>, ["~> 0.10.2"])
-      s.add_dependency(%q<rspec>, ["~> 1.2.9"])
-      s.add_dependency(%q<yard>, ["~> 0.4.0"])
+      s.add_dependency(%q<dm-core>, ["~> 1.0.0.rc1"])
+      s.add_dependency(%q<rspec>, ["~> 1.3"])
+      s.add_dependency(%q<dm-types>, ["~> 1.0.0.rc1"])
     end
   else
-    s.add_dependency(%q<dm-core>, ["~> 0.10.2"])
-    s.add_dependency(%q<rspec>, ["~> 1.2.9"])
-    s.add_dependency(%q<yard>, ["~> 0.4.0"])
+    s.add_dependency(%q<dm-core>, ["~> 1.0.0.rc1"])
+    s.add_dependency(%q<rspec>, ["~> 1.3"])
+    s.add_dependency(%q<dm-types>, ["~> 1.0.0.rc1"])
   end
 end