dm-validations 0.9.6 → 0.9.7

data/Manifest.txt

@@ -14,6 +14,7 @@ lib/dm-validations/contextual_validators.rb
 lib/dm-validations/custom_validator.rb
 lib/dm-validations/format_validator.rb
 lib/dm-validations/formats/email.rb
+lib/dm-validations/formats/url.rb
 lib/dm-validations/generic_validator.rb
 lib/dm-validations/length_validator.rb
 lib/dm-validations/method_validator.rb
@@ -25,8 +26,6 @@ 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/lib/dm-validations.rb

@@ -1,7 +1,7 @@
 require 'rubygems'
 require 'pathname'
 
-gem 'dm-core', '=0.9.6'
+gem 'dm-core', '~>0.9.7'
 require 'dm-core'
 
 dir = Pathname(__FILE__).dirname.expand_path / 'dm-validations'
@@ -32,16 +32,15 @@ module DataMapper
 
     def self.included(model)
       model.class_eval <<-EOS, __FILE__, __LINE__
-        if method_defined?(:save) && !method_defined?(:save!)
-          alias save! save
-          alias save  save_with_validations
+        if method_defined?(:save)
+          before :save, :check_validations
         end
 
         class << self
           def create(attributes = {}, context = :default)
             resource = new(attributes)
             return resource unless resource.valid?(context)
-            resource.save
+            resource.save!
             resource
           end
 
@@ -54,12 +53,17 @@ module DataMapper
       EOS
     end
 
-    # Validate the resource before saving. Use #save! to save
-    # the record without validations.
+    # Ensures the object is valid for the context provided, and otherwise
+    # throws :halt and returns false.
+    #
+    def check_validations(context = :default)
+      throw(:halt, false) unless context.nil? || valid?(context)
+    end
+
+    # Calls save with a context of nil, thus skipping validations.
     #
-    def save_with_validations(context = :default)
-      return false unless valid?(context)
-      save!
+    def save!
+      save(nil)
     end
 
     # Return the ValidationErrors

data/lib/dm-validations/version.rb

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

data/spec/integration/contextual_validators_spec.rb

@@ -20,9 +20,7 @@ describe DataMapper::Validate::ContextualValidators do
   end
 
   it "should raise an exception if you provide an invalid context to save" do
-
     lambda { Kayak.new.save(:invalid_context) }.should raise_error
-    lambda { Kayak.new.save(nil) }.should raise_error
     lambda { Kayak.new.save(false) }.should raise_error
   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.7'
     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.6
+  version: 0.9.7
 platform: ruby
 authors: 
 - Guy van den Berg
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-12 00:00:00 -06:00
+date: 2008-11-18 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.6
+        version: 0.9.7
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.7.0
+        version: 1.8.2
     version: 
 description: DataMapper plugin for performing validations on data models
 email: 
@@ -60,6 +60,7 @@ files:
 - lib/dm-validations/custom_validator.rb
 - lib/dm-validations/format_validator.rb
 - lib/dm-validations/formats/email.rb
+- lib/dm-validations/formats/url.rb
 - lib/dm-validations/generic_validator.rb
 - lib/dm-validations/length_validator.rb
 - lib/dm-validations/method_validator.rb
@@ -71,7 +72,6 @@ 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
@@ -115,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: datamapper
-rubygems_version: 1.2.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: DataMapper plugin for performing validations on data models