migrant 0.2.2 → 0.2.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    migrant (0.2.1)
+    migrant (0.2.2)
       migrant
       rails
 

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/lib/migrant/model_extensions.rb

@@ -9,9 +9,13 @@ module Migrant
         @schema ||= Schema.new
         @schema.add_associations(self.reflect_on_all_associations)
         @schema.define_structure(&block)
-        @schema.validations.each do |field, validation|
-          validation = (validation.class == Hash)? validation : { validation => true }
-          self.validates(field, validation)
+        
+        @schema.validations.each do |field, validation_options|
+          validations = (validation_options.class == Array)? validation_options : [validation_options]
+          validations.each do |validation|
+            validation = (validation.class == Hash)? validation : { validation => true }
+            self.validates(field, validation)
+          end
         end
       else
         self.superclass.structure(&block) # For STI, cascade all fields onto the parent model

data/lib/migrant/schema.rb

@@ -64,7 +64,6 @@ module Migrant
       # Add index if explicitly asked
       @indexes << field if options.delete(:index) || data_type.class.to_s == 'Hash' && data_type.delete(:index)
       @validations[field] = options.delete(:validates) if options[:validates]
-
       options.merge!(:field => field)
 
       # Matches: description DataType::Paragraph, :index => true

data/migrant.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{migrant}
-  s.version = "0.2.2"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Pascal Houliston"]
-  s.date = %q{2011-01-24}
+  s.date = %q{2011-02-14}
   s.description = %q{Migrant gives you a super-clean DSL to describe your ActiveRecord models (somewhat similar to DataMapper) and generates all your migrations for you so you can spend more time coding the stuff that counts!}
   s.email = %q{101pascal@gmail.com}
   s.extra_rdoc_files = [
@@ -163,6 +163,13 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<turn>, [">= 0"])
       s.add_development_dependency(%q<sqlite3-ruby>, [">= 0"])
       s.add_development_dependency(%q<simplecov>, [">= 0"])
+      s.add_development_dependency(%q<bundler>, [">= 0"])
+      s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 0"])
+      s.add_development_dependency(%q<ansi>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
+      s.add_development_dependency(%q<turn>, [">= 0"])
+      s.add_development_dependency(%q<sqlite3-ruby>, [">= 0"])
+      s.add_development_dependency(%q<simplecov>, [">= 0"])
       s.add_runtime_dependency(%q<rails>, [">= 0"])
     else
       s.add_dependency(%q<migrant>, [">= 0"])
@@ -187,6 +194,13 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<turn>, [">= 0"])
       s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
       s.add_dependency(%q<simplecov>, [">= 0"])
+      s.add_dependency(%q<bundler>, [">= 0"])
+      s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
+      s.add_dependency(%q<ansi>, [">= 0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<turn>, [">= 0"])
+      s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
+      s.add_dependency(%q<simplecov>, [">= 0"])
       s.add_dependency(%q<rails>, [">= 0"])
     end
   else
@@ -212,6 +226,13 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<turn>, [">= 0"])
     s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
     s.add_dependency(%q<simplecov>, [">= 0"])
+    s.add_dependency(%q<bundler>, [">= 0"])
+    s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
+    s.add_dependency(%q<ansi>, [">= 0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<turn>, [">= 0"])
+    s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
+    s.add_dependency(%q<simplecov>, [">= 0"])
     s.add_dependency(%q<rails>, [">= 0"])
   end
 end

data/test/test_validations.rb

@@ -29,6 +29,21 @@ class TestValidations < Test::Unit::TestCase
     user = User.create
     assert(user.errors.include?(:email), "Validation was not applied")
   end
+  
+  should "validate multiple validations via ActiveRecord when an array is given" do
+    Review.structure do
+      name "ABCD", :validates => [:presence, {:length => {:maximum => 4}}]
+    end    
+    
+    not_present = Review.create
+    too_long = Review.create(:name => "Textthatistoolong")
+    correct = Review.create(:name => "ABC")
+    
+    assert(not_present.errors.include?(:name), "primary validation was not applied")
+    assert(too_long.errors.include?(:name), "secondary validation was not applied")
+    assert(!correct.errors.include?(:name), "validation for a correct model failed")
+    
+  end
 
 end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Pascal Houliston
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-24 00:00:00 +02:00
+date: 2011-02-14 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -304,7 +304,7 @@ dependencies:
   prerelease: false
   version_requirements: *id022
 - !ruby/object:Gem::Dependency 
-  name: rails
+  name: bundler
   requirement: &id023 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -313,9 +313,100 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: *id023
+- !ruby/object:Gem::Dependency 
+  name: thoughtbot-shoulda
+  requirement: &id024 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id024
+- !ruby/object:Gem::Dependency 
+  name: ansi
+  requirement: &id025 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id025
+- !ruby/object:Gem::Dependency 
+  name: jeweler
+  requirement: &id026 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id026
+- !ruby/object:Gem::Dependency 
+  name: turn
+  requirement: &id027 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id027
+- !ruby/object:Gem::Dependency 
+  name: sqlite3-ruby
+  requirement: &id028 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id028
+- !ruby/object:Gem::Dependency 
+  name: simplecov
+  requirement: &id029 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id029
+- !ruby/object:Gem::Dependency 
+  name: rails
+  requirement: &id030 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id030
 description: Migrant gives you a super-clean DSL to describe your ActiveRecord models (somewhat similar to DataMapper) and generates all your migrations for you so you can spend more time coding the stuff that counts!
 email: 101pascal@gmail.com
 executables: []
@@ -415,7 +506,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 466332659
+      hash: -1035077551
       segments: 
       - 0
       version: "0"