migrant 0.1.5 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.2.0

data/lib/datatype/base.rb

@@ -3,7 +3,7 @@ module DataType
 
   class Base
     attr_accessor :aliases
-  
+
     # Pass the developer's ActiveRecord::Base structure and we'll
     # decide the best structure
     def initialize(options={})
@@ -12,25 +12,25 @@ module DataType
       @field = options.delete(:field)
       @aliases = options.delete(:was) || Array.new
     end
-    
+
     # Default is 'ye good ol varchar(255)
     def column
       {:type => :string}.merge(@options)
     end
-    
+
     def mock
       @value || self.class.default_mock
     end
-    
+
     def self.default_mock
       "Some string"
     end
-    
+
     # Decides if and how a column will be changed
     # Provide the details of a previously column, or simply nil to create a new column
-    def structure_changes_from(current_structure = nil)    
+    def structure_changes_from(current_structure = nil)
       new_structure = column
-    
+
       if current_structure
         # General RDBMS data loss scenarios
         raise DataType::DangerousMigration if (new_structure[:type] != :text && [:string, :text].include?(current_structure[:type]) && new_structure[:type] != current_structure[:type])
@@ -46,7 +46,7 @@ module DataType
         column
       end
     end
-    
+
     def self.migrant_data_type?; true; end
   end
 end
@@ -58,9 +58,9 @@ require 'datatype/date'
 require 'datatype/fixnum'
 require 'datatype/float'
 require 'datatype/foreign_key'
-require 'datatype/hash'
 require 'datatype/polymorphic'
 require 'datatype/range'
 require 'datatype/string'
 require 'datatype/symbol'
 require 'datatype/time'
+

data/lib/migrant/model_extensions.rb

@@ -4,29 +4,34 @@ module Migrant
     def structure(&block)
       # Using instance_*evil* to get the neater DSL on the models.
       # So, my_field in the structure block actually calls Migrant::Schema.my_field
-      
+
       if self.superclass == ActiveRecord::Base
         @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)
+        end
       else
         self.superclass.structure(&block) # For STI, cascade all fields onto the parent model
         @schema = InheritedSchema.new(self.superclass.schema)
+
       end
     end
-    
+
     # Same as defining a structure block, but with no attributes besides
     # relationships (such as in a many-to-many)
     def no_structure
       structure {}
     end
-    
+
     def mock(attributes={}, recursive=true)
       attribs = @schema.columns.reject { |column| column.is_a?(DataType::ForeignKey)}.collect { |name, data_type| [name, data_type.mock] }.flatten
 
       # Only recurse to one level, otherwise things get way too complicated
       if recursive
-        attribs += self.reflect_on_all_associations(:belongs_to).collect do |association| 
+        attribs += self.reflect_on_all_associations(:belongs_to).collect do |association|
                     begin
                       (association.klass.respond_to?(:mock))? [association.name, association.klass.mock({}, false)] : nil
                     rescue NameError; nil; end # User hasn't defined association, just skip it
@@ -36,3 +41,4 @@ module Migrant
     end
   end
 end
+

data/lib/migrant/schema.rb

@@ -9,23 +9,19 @@ module Migrant
   # into a schema on that model class by calling method_missing(my_field)
   # and deciding what the best schema type is for the user's requiredments
   class Schema
-    # Global scope resolution operators will make the Migrant DSL fucking useless
-    # So, I am doing this rather than inhering from SimpleObject, just live with it.
-  #  instance_methods.each { |m| raise 'fuckoff' if m == 'system' ; undef_method unless ['__send__', 'object_id'].include?(m) }
-
-    attr_accessor :indexes, :columns, :methods_to_alias
+    attr_accessor :indexes, :columns, :validations, :methods_to_alias
 
     def initialize
       @proxy = SchemaProxy.new(self)
       @columns = Hash.new
       @indexes = Array.new
+      @validations = Hash.new
       @methods_to_alias = Array.new
     end
 
     def define_structure(&block)
       # Runs method_missing on columns given in the model "structure" DSL
       @proxy.translate_fancy_dsl(&block) if block_given?
-#      self.instance_eval(&block) if block_given?
     end
 
     def add_associations(associations)
@@ -58,8 +54,17 @@ module Migrant
     def add_field(field, data_type = nil, options = {})
       data_type = DataType::String if data_type.nil?
 
+      # Fields that do special things go here.
+      if field == :timestamps
+        add_field(:updated_at, :datetime)
+        add_field(:created_at, :datetime)
+        return true
+      end
+
       # 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
@@ -112,7 +117,7 @@ module Migrant
 
     def method_missing(*args, &block)
       field = args.slice!(0)
-      data_type = args.slice!(0) unless args.first.nil?
+      data_type = args.slice!(0) unless args.first.nil? || args.first.respond_to?(:keys)
 
       @binding.add_field(field, data_type, args.extract_options!)
     end

data/migrant.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{migrant}
-  s.version = "0.1.5"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Pascal Houliston"]
@@ -30,7 +30,6 @@ Gem::Specification.new do |s|
     "lib/datatype/fixnum.rb",
     "lib/datatype/float.rb",
     "lib/datatype/foreign_key.rb",
-    "lib/datatype/hash.rb",
     "lib/datatype/polymorphic.rb",
     "lib/datatype/range.rb",
     "lib/datatype/string.rb",
@@ -83,12 +82,14 @@ Gem::Specification.new do |s|
     "test/rails_app/vendor/plugins/.gitkeep",
     "test/test_data_schema.rb",
     "test/test_migration_generator.rb",
+    "test/test_validations.rb",
     "test/verified_output/migrations/business_id.rb",
     "test/verified_output/migrations/create_business_categories.rb",
     "test/verified_output/migrations/create_businesses.rb",
     "test/verified_output/migrations/create_categories.rb",
     "test/verified_output/migrations/create_reviews.rb",
     "test/verified_output/migrations/create_users.rb",
+    "test/verified_output/migrations/created_at.rb",
     "test/verified_output/migrations/estimated_value_notes.rb",
     "test/verified_output/migrations/landline.rb"
   ]
@@ -123,12 +124,14 @@ Gem::Specification.new do |s|
     "test/rails_app/test/test_helper.rb",
     "test/test_data_schema.rb",
     "test/test_migration_generator.rb",
+    "test/test_validations.rb",
     "test/verified_output/migrations/business_id.rb",
     "test/verified_output/migrations/create_business_categories.rb",
     "test/verified_output/migrations/create_businesses.rb",
     "test/verified_output/migrations/create_categories.rb",
     "test/verified_output/migrations/create_reviews.rb",
     "test/verified_output/migrations/create_users.rb",
+    "test/verified_output/migrations/created_at.rb",
     "test/verified_output/migrations/estimated_value_notes.rb",
     "test/verified_output/migrations/landline.rb"
   ]

data/test/test_migration_generator.rb

@@ -4,7 +4,7 @@ require 'rake'
 def rake_migrate
    Dir.chdir(Rails.root.join('.')) do
         Rake::Task['db:migrate'].execute
-   end        
+   end
 end
 
 
@@ -15,13 +15,13 @@ class TestMigrationGenerator < Test::Unit::TestCase
         if migration_file.include?(template)
           correct = File.join(File.dirname(__FILE__), 'verified_output', 'migrations', template+'.rb')
           assert_equal(File.open(correct, 'r') { |r| r.read}.strip,
-                       File.open(migration_file, 'r') { |r| r.read}.strip, 
+                       File.open(migration_file, 'r') { |r| r.read}.strip,
                        "Generated migration #{migration_file} does not match template #{correct}")
           rake_migrate
           return
         end
     end
-    flunk "No migration could be found"            
+    flunk "No migration could be found"
   end
 
   context "The migration generator" do
@@ -35,7 +35,7 @@ class TestMigrationGenerator < Test::Unit::TestCase
       end
       rake_migrate
     end
-    
+
     should "generate a migration for new added fields" do
       Business.structure do
         estimated_value 5000.0
@@ -43,41 +43,48 @@ class TestMigrationGenerator < Test::Unit::TestCase
       end
       run_against_template('estimated_value_notes')
     end
-    
+
     should "generate a migration to alter existing columns where no data loss would occur" do
       Business.structure do
         landline :text
       end
-      
+
       run_against_template('landline')
     end
-    
+
     should "generate a migration to alter existing columns while adding a new table" do
       load File.join(File.dirname(__FILE__), 'additional_models', 'review.rb')
       User.belongs_to(:business) # To generate a business_id on a User
       User.no_structure # To force schema update
-      
+
       run_against_template('create_reviews')
       run_against_template('business_id')
     end
-    
+
+    should "generate created_at and updated_at when given the column timestamps" do
+      Business.structure do
+        timestamps
+      end
+      run_against_template('created_at')
+    end
+
     should "not change existing columns where data loss may occur" do
       Business.structure do
-        landline :integer # Was previously a string, which obviously may incur data loss      
+        landline :integer # Was previously a string, which obviously may incur data loss
       end
-      assert_equal(false, Migrant::MigrationGenerator.new.run, "MigrationGenerator ran a dangerous migration!")   
+      assert_equal(false, Migrant::MigrationGenerator.new.run, "MigrationGenerator ran a dangerous migration!")
       Business.structure do
         landline :text # Undo our bad for the next tests
-      end   
+      end
     end
-    
+
     should "exit immediately if there are pending migrations" do
      manual_migration = Rails.root.join("db/migrate/9999999999999999_my_new_migration.rb")
      File.open(manual_migration, 'w') { |f| f.write ' ' }
      assert_equal(false, Migrant::MigrationGenerator.new.run)
      File.delete(manual_migration)
     end
-    
+
     should "still create sequential migrations for the folks not using timestamps" do
       Business.structure do
         new_field_i_made_up
@@ -85,8 +92,8 @@ class TestMigrationGenerator < Test::Unit::TestCase
       # Remove migrations
       ActiveRecord::Base.timestamped_migrations = false
       assert_equal true, Migrant::MigrationGenerator.new.run, "Migration Generator reported an error"
-      ActiveRecord::Base.timestamped_migrations = true      
-      
+      ActiveRecord::Base.timestamped_migrations = true
+
       assert_equal(Dir.glob(File.join(File.dirname(__FILE__), 'rails_app', 'db' ,'migrate', '*.rb')).select { |migration_file| migration_file.include?('new_field_i_made_up') }.length,
                    1,
                    "Migration should have been generated (without a duplicate)")
@@ -98,7 +105,7 @@ class TestMigrationGenerator < Test::Unit::TestCase
         test_date_mockup DataType::Date
         test_float_mockup DataType::Float
         test_range_mockup DataType::Range
-        
+
       end
       BusinessCategory.belongs_to(:nonexistant_class, :polymorphic => true)
       assert_equal true, Migrant::MigrationGenerator.new.run, "Migration Generator reported an error"
@@ -111,4 +118,4 @@ class TestMigrationGenerator < Test::Unit::TestCase
 
   end
 end
- 
+

data/test/test_validations.rb

@@ -0,0 +1,34 @@
+require 'helper'
+
+class TestValidations < Test::Unit::TestCase
+  should "validate via ActiveRecord when the validates symbol is supplied" do
+    Business.structure do
+      website :string, :validates => :presence
+    end
+
+    business = Business.create
+    assert(business.errors.include?(:website), "Validation was not applied")
+  end
+
+  should "validate via ActiveRecord when the full validation hash is supplied" do
+    Category.structure do
+      summary :string, :validates => { :format => { :with => /Symphony\d/ } }
+    end
+
+    bad_category = Category.create
+    good_category = Category.create(:summary => "Symphony5")
+    assert(bad_category.errors.include?(:summary), "Validation was not applied")
+    assert(!good_category.errors.include?(:summary), "Validation options were incorrect")
+  end
+
+  should "validate via ActiveRecord when no field name is given" do
+    User.structure do
+      email :validates => :presence
+    end
+
+    user = User.create
+    assert(user.errors.include?(:email), "Validation was not applied")
+  end
+
+end
+

data/test/verified_output/migrations/created_at.rb

@@ -0,0 +1,11 @@
+class BusinessesModifyFieldsUpdatedAtCreatedAt < ActiveRecord::Migration
+  def self.up
+    add_column :businesses, :updated_at, :datetime
+    add_column :businesses, :created_at, :datetime
+  end
+  
+  def self.down
+    remove_column :businesses, :updated_at
+    remove_column :businesses, :created_at
+  end
+end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 5
-  version: 0.1.5
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Pascal Houliston
@@ -163,7 +163,6 @@ files:
 - lib/datatype/fixnum.rb
 - lib/datatype/float.rb
 - lib/datatype/foreign_key.rb
-- lib/datatype/hash.rb
 - lib/datatype/polymorphic.rb
 - lib/datatype/range.rb
 - lib/datatype/string.rb
@@ -216,12 +215,14 @@ files:
 - test/rails_app/vendor/plugins/.gitkeep
 - test/test_data_schema.rb
 - test/test_migration_generator.rb
+- test/test_validations.rb
 - test/verified_output/migrations/business_id.rb
 - test/verified_output/migrations/create_business_categories.rb
 - test/verified_output/migrations/create_businesses.rb
 - test/verified_output/migrations/create_categories.rb
 - test/verified_output/migrations/create_reviews.rb
 - test/verified_output/migrations/create_users.rb
+- test/verified_output/migrations/created_at.rb
 - test/verified_output/migrations/estimated_value_notes.rb
 - test/verified_output/migrations/landline.rb
 has_rdoc: true
@@ -238,7 +239,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -454091891
+      hash: -984502067
       segments: 
       - 0
       version: "0"
@@ -284,11 +285,13 @@ test_files:
 - test/rails_app/test/test_helper.rb
 - test/test_data_schema.rb
 - test/test_migration_generator.rb
+- test/test_validations.rb
 - test/verified_output/migrations/business_id.rb
 - test/verified_output/migrations/create_business_categories.rb
 - test/verified_output/migrations/create_businesses.rb
 - test/verified_output/migrations/create_categories.rb
 - test/verified_output/migrations/create_reviews.rb
 - test/verified_output/migrations/create_users.rb
+- test/verified_output/migrations/created_at.rb
 - test/verified_output/migrations/estimated_value_notes.rb
 - test/verified_output/migrations/landline.rb

data/lib/datatype/hash.rb

@@ -1,10 +0,0 @@
-module DataType
-  class Hash < Base
-    def column
-      @options = @value # Assign developer's options verbatim
-        super
-    end
-  end
-end
-  
-