dm-validations 0.10.1 → 0.10.2

data/spec/integration/automatic_validation/custom_messages_for_inferred_validation_spec.rb

@@ -6,7 +6,7 @@ describe 'Inferred validations' do
     custom_boat = Class.new do
       include DataMapper::Resource
       property :id,   DataMapper::Types::Serial
-      property :name, String,  :nullable => false, :message => "This boat must have name"
+      property :name, String,  :required => true, :message => "This boat must have name"
     end
     boat = custom_boat.new
     boat.should_not be_valid
@@ -17,7 +17,7 @@ describe 'Inferred validations' do
     custom_boat = Class.new do
       include DataMapper::Resource
       property :id,   DataMapper::Types::Serial
-      property :name, String,  :nullable => false, :length => 5..20, :format => /^[a-z]+$/,
+      property :name, String,  :required => true, :length => 5..20, :format => /^[a-z]+$/,
                :messages => {
                  :presence => "This boat must have name",
                  :length => "Name must have at least 4 and at most 20 chars",

data/spec/integration/automatic_validation/disabling_inferred_validation_spec.rb

@@ -7,8 +7,8 @@ describe "A class with inferred validations disabled for all properties with an
       include DataMapper::Resource
 
       property :id,   DataMapper::Types::Serial,                      :auto_validation => false
-      property :name, String,                     :nullable => false, :auto_validation => false
-      property :bool, DataMapper::Types::Boolean, :nullable => false, :auto_validation => false
+      property :name, String,                     :required => true, :auto_validation => false
+      property :bool, DataMapper::Types::Boolean, :required => true, :auto_validation => false
     end
 
     @model = @klass.new
@@ -27,8 +27,8 @@ describe "A class with inferred validations disabled for all properties with a b
 
       without_auto_validations do
         property :id,   DataMapper::Types::Serial
-        property :name, String,                     :nullable => false
-        property :bool, DataMapper::Types::Boolean, :nullable => false
+        property :name, String,                     :required => true
+        property :bool, DataMapper::Types::Boolean, :required => true
       end
     end
 

data/spec/integration/automatic_validation/inferred_boolean_properties_validation_spec.rb

@@ -33,7 +33,7 @@ end
 
 
 
-describe "A model with a non-nullable Boolean property" do
+describe "A model with a required Boolean property" do
   before :all do
     @model = HasNotNullableBoolean.new(:id => 1)
   end
@@ -69,7 +69,7 @@ end
 
 
 
-describe "A model with a non-nullable paranoid Boolean property" do
+describe "A model with a required paranoid Boolean property" do
   before :all do
     @model = HasNotNullableParanoidBoolean.new(:id => 1)
   end

data/spec/integration/automatic_validation/inferred_float_property_validation_spec.rb

@@ -5,6 +5,8 @@ require 'integration/automatic_validation/spec_helper'
 { :float => Float, :big_decimal => BigDecimal }.each do |column, type|
   describe "#{type} property" do
     before :all do
+      SailBoat.auto_migrate!
+
       @model = SailBoat.new(:id => 1)
     end
 

data/spec/integration/automatic_validation/inferred_format_validation_spec.rb

@@ -1,8 +1,10 @@
 require 'spec_helper'
 require 'integration/automatic_validation/spec_helper'
 
-describe SailBoat, "with a :format option on a property" do
+describe 'SailBoat', "with a :format option on a property" do
   before :all do
+    SailBoat.auto_migrate!
+
     @model = SailBoat.new
     @model.should be_valid_for_format_test
   end

data/spec/integration/automatic_validation/inferred_integer_properties_validation_spec.rb

@@ -3,6 +3,8 @@ require 'integration/automatic_validation/spec_helper'
 
 describe "A model with an Integer property" do
   before :all do
+    SailBoat.auto_migrate!
+
     @model = SailBoat.new
   end
 

data/spec/integration/automatic_validation/inferred_length_validation_spec.rb

@@ -1,8 +1,10 @@
 require 'spec_helper'
 require 'integration/automatic_validation/spec_helper'
 
-describe SailBoat do
+describe 'SailBoat' do
   before :all do
+    SailBoat.auto_migrate!
+
     @model      = SailBoat.new(:id => 1)
     @model.should be_valid_for_length_test_1
   end
@@ -78,8 +80,10 @@ end
 
 
 
-describe DataMapper::Validate::Fixtures::SmsMessage do
+describe 'DataMapper::Validate::Fixtures::SmsMessage' do
   before :all do
+    DataMapper::Validate::Fixtures::SmsMessage.auto_migrate!
+
     @model = DataMapper::Validate::Fixtures::SmsMessage.new(:id => 10)
   end
 

data/spec/integration/automatic_validation/inferred_presence_validation_spec.rb

@@ -1,8 +1,10 @@
 require 'spec_helper'
 require 'integration/automatic_validation/spec_helper'
 
-describe SailBoat do
+describe 'SailBoat' do
   before :all do
+    SailBoat.auto_migrate!
+
     @model      = SailBoat.new(:id => 1)
     @model.name = 'Float'
     @model.should be_valid_for_presence_test
@@ -13,7 +15,7 @@ describe SailBoat do
       @model.name = nil
     end
 
-    # has validates_is_present for name thanks to :nullable => false
+    # has validates_is_present for name thanks to :required => true
     it "is invalid" do
       @model.should_not be_valid_for_presence_test
       @model.errors.on(:name).should == [ 'Name must not be blank' ]
@@ -23,8 +25,10 @@ end
 
 
 
-describe SailBoat do
+describe 'SailBoat' do
   before :all do
+    SailBoat.auto_migrate!
+
     @model      = SailBoat.new(:id => 1)
     @model.name = 'Float'
     @model.should be_valid_for_presence_test
@@ -35,7 +39,7 @@ describe SailBoat do
       # no op
     end
 
-    # has validates_is_present for name thanks to :nullable => false
+    # has validates_is_present for name thanks to :required => true
     it_should_behave_like "valid model"
   end
 end

data/spec/integration/automatic_validation/inferred_primitive_validation_spec.rb

@@ -1,8 +1,10 @@
 require 'spec_helper'
 require 'integration/automatic_validation/spec_helper'
 
-describe SailBoat do
+describe 'SailBoat' do
   before :all do
+    SailBoat.auto_migrate!
+
     @model = SailBoat.new(:id => 1)
     @model.should be_valid_for_primitive_test
   end

data/spec/integration/automatic_validation/spec_helper.rb

@@ -26,13 +26,13 @@ class SailBoat
   # use Serial in real world apps
   property :id,            Integer,    :key => true, :min => 1, :max => 10
 
-  property :name,          String,                                :nullable => false,     :validates       => :presence_test
+  property :name,          String,                                :required => true,     :validates       => :presence_test
   property :description,   String,     :length => 10,                                     :validates       => :length_test_1
   property :notes,         String,     :length => 2..10,                                  :validates       => :length_test_2
   property :no_validation, String,                                                        :auto_validation => false
-  property :salesman,      String,                                :nullable => false,     :validates       => [:multi_context_1, :multi_context_2]
+  property :salesman,      String,                                :required => true,     :validates       => [:multi_context_1, :multi_context_2]
   property :code,          String,     :format => Proc.new { |code| code =~ /A\d{4}\z/ }, :validates       => :format_test
-  property :allow_nil,     String,     :length => 5..10,          :nullable => true,      :validates       => :nil_test
+  property :allow_nil,     String,     :length => 5..10,          :required => false,      :validates       => :nil_test
   property :build_date,    Date,                                                          :validates       => :primitive_test
   property :float,         Float,      :precision => 2, :scale => 1
   property :big_decimal,   BigDecimal, :precision => 2, :scale => 1
@@ -46,7 +46,7 @@ class HasNullableBoolean
   # this one is not Serial intentionally
   # use Serial in real world apps
   property :id,   Integer, :key => true
-  property :bool, Boolean # :nullable => true by default
+  property :bool, Boolean # :required => false by default
 
   include TypecastBypassSetter
 end
@@ -57,7 +57,7 @@ class HasNotNullableBoolean
   # this one is not Serial intentionally
   # use Serial in real world apps
   property :id,   Integer, :key => true
-  property :bool, Boolean, :nullable => false
+  property :bool, Boolean, :required => true
 
   include TypecastBypassSetter
 end
@@ -68,7 +68,7 @@ class HasNotNullableParanoidBoolean
   # this one is not Serial intentionally
   # use Serial in real world apps
   property :id,   Integer,         :key => true
-  property :bool, ParanoidBoolean, :nullable => false
+  property :bool, ParanoidBoolean, :required => true
 
   include TypecastBypassSetter
 end

data/spec/integration/block_validator/block_validator_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'integration/block_validator/spec_helper'
 
-describe DataMapper::Validate::Fixtures::G3Concert do
+describe 'DataMapper::Validate::Fixtures::G3Concert' do
   before :all do
     @model = DataMapper::Validate::Fixtures::G3Concert.new(:year => 2004, :participants => "Joe Satriani, Steve Vai, Yngwie Malmsteen", :city => "Denver")
     @model.should be_valid

data/spec/integration/conditional_validation/if_condition_spec.rb

@@ -1,8 +1,10 @@
 require 'spec_helper'
 require 'integration/conditional_validation/spec_helper'
 
-describe DataMapper::Validate::Fixtures::UDPPacket do
+describe 'DataMapper::Validate::Fixtures::UDPPacket' do
   before :all do
+    DataMapper::Validate::Fixtures::UDPPacket.auto_migrate!
+
     @model = DataMapper::Validate::Fixtures::UDPPacket.new
   end
 

data/spec/integration/confirmation_validator/confirmation_validator_spec.rb

@@ -15,8 +15,10 @@ describe "reservation with mismatched seats number", :shared => true do
 end
 
 
-describe DataMapper::Validate::Fixtures::Reservation do
+describe 'DataMapper::Validate::Fixtures::Reservation' do
   before :all do
+    DataMapper::Validate::Fixtures::Reservation.auto_migrate!
+
     @model = DataMapper::Validate::Fixtures::Reservation.new(:person_name                  => "Tyler Durden",
                                                              :person_name_confirmation     => "Tyler Durden",
                                                              :number_of_seats              => 2,

data/spec/integration/datamapper_models/association_validation_spec.rb

@@ -1,7 +1,10 @@
 require 'spec_helper'
 
-describe DataMapper::Validate::Fixtures::Product do
+describe 'DataMapper::Validate::Fixtures::Product' do
   before :all do
+    DataMapper::Validate::Fixtures::ProductCompany.auto_migrate!
+    DataMapper::Validate::Fixtures::Product.auto_migrate!
+
     @parent = DataMapper::Validate::Fixtures::ProductCompany.create(:title => "Apple", :flagship_product => "Macintosh")
     @parent.should be_valid
 

data/spec/integration/datamapper_models/inheritance_spec.rb

@@ -1,7 +1,9 @@
 require 'spec_helper'
 
-describe DataMapper::Validate::Fixtures::ServiceCompany do
+describe 'DataMapper::Validate::Fixtures::ServiceCompany' do
   before :all do
+    DataMapper::Validate::Fixtures::ServiceCompany.auto_migrate!
+
     @model = DataMapper::Validate::Fixtures::ServiceCompany.new(:title => "Monsters, Inc.", :area_of_expertise => "Little children's nightmares")
     @model.valid?
   end
@@ -33,8 +35,10 @@ end
 
 
 
-describe DataMapper::Validate::Fixtures::ProductCompany do
+describe 'DataMapper::Validate::Fixtures::ProductCompany' do
   before :all do
+    DataMapper::Validate::Fixtures::ProductCompany.auto_migrate!
+
     @model = DataMapper::Validate::Fixtures::ProductCompany.new(:title => "Apple", :flagship_product => "Macintosh")
     @model.valid?
   end

data/spec/integration/duplicated_validations/duplicated_validations_spec.rb

@@ -3,8 +3,10 @@
 require 'spec_helper'
 require 'integration/duplicated_validations/spec_helper'
 
-describe DataMapper::Validate::Fixtures::Page do
+describe 'DataMapper::Validate::Fixtures::Page' do
   before :all do
+    DataMapper::Validate::Fixtures::Page.auto_migrate!
+
     @model = DataMapper::Validate::Fixtures::Page.new(:id => 1024)
   end
 

data/spec/integration/format_validator/email_format_validator_spec.rb

@@ -1,7 +1,11 @@
 require 'spec_helper'
 require 'integration/format_validator/spec_helper'
 
-describe DataMapper::Validate::Fixtures::BillOfLading do
+describe 'DataMapper::Validate::Fixtures::BillOfLading' do
+  before :all do
+    DataMapper::Validate::Fixtures::BillOfLading.auto_migrate!
+  end
+
   def valid_attributes
     { :id => 1, :doc_no => 'A1234', :email => 'user@example.com', :url => 'http://example.com' }
   end

data/spec/integration/format_validator/format_validator_spec.rb

@@ -1,7 +1,11 @@
 require 'spec_helper'
 require 'integration/format_validator/spec_helper'
 
-describe DataMapper::Validate::Fixtures::BillOfLading do
+describe 'DataMapper::Validate::Fixtures::BillOfLading' do
+  before :all do
+    DataMapper::Validate::Fixtures::BillOfLading.auto_migrate!
+  end
+
   def valid_attributes
     { :id => 1, :doc_no => 'A1234', :email => 'user@example.com', :url => 'http://example.com' }
   end

data/spec/integration/format_validator/regexp_validator_spec.rb

@@ -1,7 +1,11 @@
 require 'spec_helper'
 require 'integration/format_validator/spec_helper'
 
-describe DataMapper::Validate::Fixtures::BillOfLading do
+describe 'DataMapper::Validate::Fixtures::BillOfLading' do
+  before :all do
+    DataMapper::Validate::Fixtures::BillOfLading.auto_migrate!
+  end
+
   def valid_attributes
     { :id => 1, :doc_no => 'A1234', :email => 'user@example.com', :url => 'http://example.com' }
   end

data/spec/integration/format_validator/url_format_validator_spec.rb

@@ -1,7 +1,11 @@
 require 'spec_helper'
 require 'integration/format_validator/spec_helper'
 
-describe DataMapper::Validate::Fixtures::BillOfLading do
+describe 'DataMapper::Validate::Fixtures::BillOfLading' do
+  before :all do
+    DataMapper::Validate::Fixtures::BillOfLading.auto_migrate!
+  end
+
   def valid_attributes
     { :id => 1, :doc_no => 'A1234', :email => 'user@example.com', :url => 'http://example.com' }
   end
@@ -26,7 +30,7 @@ describe DataMapper::Validate::Fixtures::BillOfLading do
         @model.errors.on(:url).should == [ 'Url has an invalid format' ]
       end
     end
-  end # each
+  end
 
 
   [ 'http://apple.com',
@@ -59,5 +63,5 @@ describe DataMapper::Validate::Fixtures::BillOfLading do
 
      it_should_behave_like "valid model"
    end
- end # each
-end # describe DataMapper::Validate::Fixtures::BillOfLading
+ end
+end

data/spec/integration/length_validator/default_value_spec.rb

@@ -1,9 +1,11 @@
 require 'spec_helper'
 require 'integration/length_validator/spec_helper'
 
-describe ::DataMapper::Validate::Fixtures::BoatDock do
+describe 'DataMapper::Validate::Fixtures::BoatDock' do
   before :all do
-    @model = ::DataMapper::Validate::Fixtures::BoatDock.new
+    DataMapper::Validate::Fixtures::BoatDock.auto_migrate!
+
+    @model = DataMapper::Validate::Fixtures::BoatDock.new
   end
 
   describe "with default values that are valid" do

data/spec/integration/length_validator/equality_spec.rb

@@ -10,8 +10,10 @@ describe "entity with wrong destination MAC address length", :shared => true do
 end
 
 
-describe DataMapper::Validate::Fixtures::EthernetFrame do
+describe 'DataMapper::Validate::Fixtures::EthernetFrame' do
   before :all do
+    DataMapper::Validate::Fixtures::EthernetFrame.auto_migrate!
+
     @model = DataMapper::Validate::Fixtures::EthernetFrame.valid_instance
     @model.link_support_fragmentation = false
   end

data/spec/integration/length_validator/error_message_spec.rb

@@ -1,8 +1,10 @@
 require 'spec_helper'
 require 'integration/length_validator/spec_helper'
 
-describe DataMapper::Validate::Fixtures::Jabberwock do
+describe 'DataMapper::Validate::Fixtures::Jabberwock' do
   before :all do
+    DataMapper::Validate::Fixtures::Jabberwock.auto_migrate!
+
     @model = DataMapper::Validate::Fixtures::Jabberwock.new
   end
 

data/spec/integration/length_validator/maximum_spec.rb

@@ -7,8 +7,10 @@ describe "barcode with invalid code length", :shared => true do
   end
 end
 
-describe ::DataMapper::Validate::Fixtures::Barcode do
+describe 'DataMapper::Validate::Fixtures::Barcode' do
   before :all do
+    DataMapper::Validate::Fixtures::Barcode.auto_migrate!
+
     @model = DataMapper::Validate::Fixtures::Barcode.valid_instance
   end
 

data/spec/integration/length_validator/minimum_spec.rb

@@ -7,8 +7,10 @@ describe "entity with a name shorter than 2 characters", :shared => true do
   end
 end
 
-describe ::DataMapper::Validate::Fixtures::Mittelschnauzer do
+describe 'DataMapper::Validate::Fixtures::Mittelschnauzer' do
   before :all do
+    DataMapper::Validate::Fixtures::Mittelschnauzer.auto_migrate!
+
     @model = DataMapper::Validate::Fixtures::Mittelschnauzer.valid_instance
   end
 

data/spec/integration/length_validator/range_spec.rb

@@ -1,8 +1,10 @@
 require 'spec_helper'
 require 'integration/length_validator/spec_helper'
 
-describe DataMapper::Validate::Fixtures::EthernetFrame do
+describe 'DataMapper::Validate::Fixtures::EthernetFrame' do
   before :all do
+    DataMapper::Validate::Fixtures::EthernetFrame.auto_migrate!
+
     @model = DataMapper::Validate::Fixtures::EthernetFrame.valid_instance
     @model.link_support_fragmentation = false
   end