migrant 1.1.1 → 1.1.2

data/.rvmrc

@@ -0,0 +1 @@
+rvm use 1.9.2

data/Gemfile

@@ -10,4 +10,5 @@ group :development do
   gem "turn"
   gem "sqlite3"
   gem "simplecov"
+  gem "terminal-table"
 end

data/Gemfile.lock

@@ -71,6 +71,7 @@ GEM
       simplecov-html (~> 0.4.0)
     simplecov-html (0.4.3)
     sqlite3 (1.3.3)
+    terminal-table (1.4.2)
     thor (0.14.6)
     thoughtbot-shoulda (2.11.1)
     treetop (1.4.9)
@@ -89,5 +90,6 @@ DEPENDENCIES
   rails (>= 3.0.0)
   simplecov
   sqlite3
+  terminal-table
   thoughtbot-shoulda
   turn

data/VERSION

@@ -1 +1 @@
-1.1.1
+1.1.2

data/lib/{datatype/base.rb → dsl/data_type.rb}

@@ -62,18 +62,24 @@ module DataType
 
     def self.migrant_data_type?; true; end
   end
+  
+ 
 end
 
-# And all the data types we offer...
-require 'datatype/boolean'
-require 'datatype/currency'
-require 'datatype/date'
-require 'datatype/fixnum'
-require 'datatype/float'
-require 'datatype/foreign_key'
-require 'datatype/polymorphic'
-require 'datatype/range'
-require 'datatype/string'
-require 'datatype/symbol'
-require 'datatype/time'
+require 'dsl/data_types/primitives'
+require 'dsl/data_types/semantic'
 
+# Add internal types used by Migrant
+module DataType
+  class Polymorphic < Base; end
+
+  class ForeignKey < Fixnum
+    def column
+      {:type => :integer}
+    end
+    
+    def self.default_mock
+      nil # Will get overridden later by ModelExtensions
+    end
+  end
+end

data/lib/dsl/data_types/primitives.rb

@@ -0,0 +1,106 @@
+module DataType
+  # Boolean
+  class TrueClass < Base
+    def column
+      {:type => :boolean}
+    end  
+    
+    def self.default_mock
+      true
+    end
+  end
+  
+  class FalseClass < TrueClass; end;
+  
+  # Datetime
+  class Date < Base
+    def column
+      {:type => :datetime}
+    end
+    
+    def self.default_mock
+      ::Time.now
+    end
+  end
+  
+  class Time < Date; end;  # No different to date type
+
+  # Integers
+  class Fixnum < Base
+    def column
+      {:type => :integer}.tap do |options|
+        options.merge!(:limit => @value.size) if @value > 2147483647 # 32-bit limit. Not checking size here because a 64-bit OS always has at least 8 byte size
+      end
+    end
+    
+    def self.default_mock
+      rand(999999).to_i
+    end
+  end  
+  
+  class Bignum < Fixnum
+    def column
+      {:type => :integer, :limit => ((@value.size > 8)? @value.size : 8) }
+    end
+  end
+  
+  class Float < Base
+    def column
+      {:type => :float}
+    end
+    
+    def self.default_mock
+      rand(100).to_f-55.0
+    end
+  end
+  
+  # Range (0..10)
+  class Range < Base
+    def column
+      definition = {:type => :integer}
+      definition[:limit] = @value.max.to_s.length if @value.respond_to?(:max)
+      definition
+    end
+  end
+  
+  # Strings
+  class String < Base
+    def initialize(options)
+      super(options)
+      @value ||= ''
+    end
+  
+    def column
+      if @value.match(/[\d,]+\.\d{2}$/)
+        return Currency.new(@options).column
+      else
+        return @value.match(/[\r\n\t]/)? { :type => :text }.merge(@options) : super
+      end
+    end
+    
+    def mock
+      @value || ((self.column[:type] == :text)? self.class.long_text_mock : self.class.default_mock )
+    end
+  end
+  
+  # Symbol (defaults, specified by user)
+  class Symbol < Base
+    def column
+      # Just construct whatever the user wants
+      {:type => @value || :string }.merge(@options)
+    end  
+    
+    def mock
+      case @value || :string
+        when :text then self.class.long_text_mock
+        when :string then self.class.short_text_mock
+        when :integer then Fixnum.default_mock
+        when :decimal, :float then Float.default_mock
+        when :datetime, :date then Date.default_mock
+      end
+    end
+  end
+  
+end
+  
+

data/lib/generators/templates/change_migration.erb

@@ -0,0 +1,22 @@
+class <%= @activity.camelize.gsub(/\s/, '') %> < ActiveRecord::Migration
+  def self.up
+  <% @added_columns.each do |field, options| %>
+    add_column :<%= @table_name %>, :<%= field %>, :<%= options.delete(:type) %><%= (options.blank?)? '': ", "+options.inspect[1..-2] %>
+  <% end -%>
+  <% @changed_columns.each do |field, options, old_options| %>
+    change_column :<%= @table_name %>, :<%= field %>, :<%= options.delete(:type) %><%= (options.blank?)? '': ", "+options.inspect[1..-2] %>
+  <% end -%>
+  <% @indexes.each do |index, options| %>
+    add_index :<%= @table_name %>, <%= index.inspect %>
+  <% end -%>
+  end
+  
+  def self.down
+  <% @added_columns.each do |field, options| %>
+    remove_column :<%= @table_name %>, :<%= field %>
+  <% end -%>
+  <% @changed_columns.each do |field, options, old_options| %>
+    change_column :<%= @table_name %>, :<%= field %>, :<%= old_options.delete(:type) %><%= (old_options.blank?)? '': ", "+old_options.inspect[1..-2] %>
+  <% end -%>
+  end
+end

data/lib/generators/templates/create_migration.erb

@@ -0,0 +1,16 @@
+class <%= @activity.camelize.gsub(/\s/, '') %> < ActiveRecord::Migration
+  def self.up
+    create_table :<%= @table_name %> do |t|
+      <% @columns.each do |field, options| %>
+      t.<%= options.delete(:type) %> :<%= field %><%= (options.blank?)? '': ", "+options.inspect[1..-2] %> 
+      <% end %>
+    end
+    <% @indexes.each do |index| %>
+    add_index :<%= @table_name %>, <%= index.inspect %>
+  	<% end -%>
+  end
+  
+  def self.down
+    drop_table :<%= @table_name %>
+  end
+end

data/lib/generators/templates/create_migration.rb

@@ -0,0 +1,16 @@
+class <%= @activity.camelize.gsub(/\s/, '') %> < ActiveRecord::Migration
+  def self.up
+    create_table :<%= @table_name %> do |t|
+      <% @columns.each do |field, options| %>
+      t.<%= options.delete(:type) %> :<%= field %><%= (options.blank?)? '': ", "+options.inspect[1..-2] %> 
+      <% end %>
+    end
+    <% @indexes.each do |index, options| %>
+    add_index :<%= @table_name %>, <%= index.inspect %>
+  	<% end -%>
+  end
+  
+  def self.down
+    drop_table :<%= @table_name %>
+  end
+end

data/lib/migrant/migration_generator.rb

@@ -1,3 +1,5 @@
+require 'erubis'
+
 module Migrant
   class MigrationGenerator
     TABS = '  ' # Tabs to spaces * 2
@@ -21,79 +23,52 @@ module Migrant
       ActiveRecord::Base.descendants.each do |model|
         next if model.schema.nil? || !model.schema.requires_migration? # Skips inherited schemas (such as models with STI)
         model.reset_column_information # db:migrate doesn't do this
-        model_schema = model.schema.column_migrations
+        @table_name = model.table_name
 
         if model.table_exists?
           # Structure ActiveRecord::Base's column information so we can compare it directly to the schema
           db_schema = Hash[*model.columns.collect {|c| [c.name.to_sym, Hash[*[:type, :limit].map { |type| [type, c.send(type)] }.flatten]  ] }.flatten]
-            changes = model.schema.columns.collect do |name, data_type|
-              begin
-                [name, data_type.structure_changes_from(db_schema[name])]
-              rescue DataType::DangerousMigration
-                puts "Cannot generate migration automatically for #{model.table_name}, this would involve possible data loss on column: #{name}\nOld structure: #{db_schema[name].inspect}. New structure: #{data_type.column.inspect}\nPlease create and run this migration yourself (with the appropriate data integrity checks)"
-                return false
-              end
-            end.reject { |change| change[1].nil? }
-            next if changes.blank?
-            changed_fields, added_fields = [], []
-
-            up_code = changes.collect do |field, options|
-              type = options.delete(:type)
-              arguments = (options.blank?)? "" : ", #{options.inspect[1..-2]}"
-
-              if db_schema[field]
-                 changed_fields << field
-                "change_column :#{model.table_name}, :#{field}, :#{type}#{arguments}"
-              else
-                added_fields << field
-                "add_column :#{model.table_name}, :#{field}, :#{type}#{arguments}"
-              end
-            end.join(NEWLINE+TABS)
-
-            activity = 'changed_'+model.table_name+[(added_fields.blank?)? nil : '_added_'+added_fields.join('_'), (changed_fields.blank?)? nil : '_modified_'+changed_fields.join('_')].compact.join('_and_')
-
-            down_code = changes.collect do |field, options|
-              if db_schema[field]
-                type = db_schema[field].delete(:type)
-                arguments = (db_schema[field].blank?)? "" : ", #{db_schema[field].inspect[1..-2]}"
-                "change_column :#{model.table_name}, :#{field}, :#{type}#{arguments}"
-              else
-                "remove_column :#{model.table_name}, :#{field}"
-              end
-            end.join(NEWLINE+TABS)
-
-            # For adapters that can report indexes, add as necessary
-            if ActiveRecord::Base.connection.respond_to?(:indexes)
-              current_indexes = ActiveRecord::Base.connection.indexes(model.table_name).collect { |index| (index.columns.length == 1)? index.columns.first.to_sym : index.columns.collect(&:to_sym) }
-              up_code += model.schema.indexes.uniq.collect do |index|
-                unless current_indexes.include?(index)
-                  NEWLINE+TABS+"add_index :#{model.table_name}, #{index.inspect}"
+          @changed_columns, @added_columns = [], []
+          model.schema.columns.to_a.sort { |a,b| a.to_s <=> b.to_s }.each do |field_name, data_type|
+            begin
+              if (options = data_type.structure_changes_from(db_schema[field_name]))
+                if db_schema[field_name]
+                  @changed_columns << [field_name, options, db_schema[field_name]]
+                else
+                  @added_columns << [field_name, options]
                 end
-              end.compact.join
+              end
+            rescue DataType::DangerousMigration
+              puts "Cannot generate migration automatically for #{model.table_name}, this would involve possible data loss on column: #{field_name}\nOld structure: #{db_schema[field_name].inspect}. New structure: #{data_type.column.inspect}\nPlease create and run this migration yourself (with the appropriate data integrity checks)"
+              return false
             end
+          end
+
+          # For adapters that can report indexes, add as necessary
+          if ActiveRecord::Base.connection.respond_to?(:indexes)
+            current_indexes = ActiveRecord::Base.connection.indexes(model.table_name).collect { |index| (index.columns.length == 1)? index.columns.first.to_sym : index.columns.collect(&:to_sym) }
+            @indexes = model.schema.indexes.uniq.reject { |index| current_indexes.include?(index) }.collect { |field_name| [field_name, {}]  }
+            # Don't spam the user with indexes that columns are being created with
+            @new_indexes = @indexes.reject { |index, options| @changed_columns.detect { |c| c.first == index } || @added_columns.detect { |c| c.first == index } }
+          end
+
+          next if @changed_columns.empty? && @added_columns.empty? && @indexes.empty? # Nothing to do for this table
+
+          # Example: changed_table_added_something_and_modified_something
+          @activity = 'changed_'+model.table_name+[['added', @added_columns], ['modified', @changed_columns], ['indexed', @new_indexes]].reject { |v| v[1].empty? }.collect { |v| "_#{v[0]}_"+v[1].collect(&:first).join('_') }.join('_and')
+          @activity = @activity.split('_')[0..2].join('_') if @activity.length >= 240 # Most filesystems will raise Errno::ENAMETOOLONG otherwise
+          
+          render('change_migration')
         else
-          activity = "create_#{model.table_name}"
-          up_code = "create_table :#{model.table_name} do |t|"+NEWLINE+model_schema.collect do |field, options|
-            type = options.delete(:type)
-            options.delete(:was) # Aliases not relevant when creating a new table
-            arguments = (options.blank?)? "" : ", #{options.inspect[1..-2]}"
-            (TABS*2)+"t.#{type} :#{field}#{arguments}"
-          end.join(NEWLINE)+NEWLINE+TABS+"end"
+          @activity = "create_#{model.table_name}"
+          @columns = model.schema.column_migrations
+          @indexes = model.schema.indexes
 
-          down_code = "drop_table :#{model.table_name}"
-          up_code   += NEWLINE+TABS+model.schema.indexes.collect { |fields| "add_index :#{model.table_name}, #{fields.inspect}"}.join(NEWLINE+TABS)
-        end
-
-        # Indexes
-         # down_code += NEWLINE+TABS+model.schema.indexes.collect { |fields| "remove_index :#{model.table_name}, #{fields.inspect}"}.join(NEWLINE+TABS)
-        begin
-          filename = "#{migrations_path}/#{next_migration_number}_#{activity}.rb"
-          File.open(filename, 'w') { |migration| migration.write(migration_template(activity, up_code, down_code)) }
-        rescue Errno::ENAMETOOLONG
-          activity = activity.split('_')[0..2].join('_')
-          filename = "#{migrations_path}/#{next_migration_number}_#{activity}.rb"
-          File.open(filename, 'w') { |migration| migration.write(migration_template(activity, up_code, down_code)) }
+          render("create_migration")
         end
+       
+        filename = "#{migrations_path}/#{next_migration_number}_#{@activity}.rb"
+        File.open(filename, 'w') { |migration| migration.write(@output) }
         puts "Wrote #{filename}..."
       end
       true
@@ -121,16 +96,8 @@ module Migrant
       end
     end
 
-    def migration_template(activity, up_code, down_code)
-      "class #{activity.camelize.gsub(/\s/, '')} < ActiveRecord::Migration
-  def self.up
-    #{up_code}
-  end
-  
-  def self.down
-    #{down_code}
-  end
-end"
+    def render(template_name)
+      @output = Erubis::Eruby.new(File.read(File.join(File.dirname(__FILE__), "../generators/templates/#{template_name}.erb"))).result(binding)
     end
   end
 end

data/lib/migrant/schema.rb

@@ -11,17 +11,17 @@ 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
-    attr_accessor :indexes, :columns, :validations, :methods_to_alias
+    attr_accessor :indexes, :columns, :validations
 
     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)
+      @validations = Hash.new
       # Runs method_missing on columns given in the model "structure" DSL
       @proxy.translate_fancy_dsl(&block) if block_given?
     end
@@ -56,7 +56,8 @@ module Migrant
 
     def add_field(field, data_type = nil, options = {})
       data_type = DataType::String if data_type.nil?
-
+      puts [":#{field}", "#{data_type}", "#{options.inspect}"].collect { |s| s.ljust(25) }.join if ENV['DEBUG']
+      
       # Fields that do special things go here.
       if field == :timestamps
         add_field(:updated_at, :datetime)
@@ -83,8 +84,8 @@ module Migrant
           @columns[field] = DataType::Base.new(options)
         end
       end
-      puts [":#{field}", "#{@columns[field].class}", "#{options.inspect}"].collect { |s| s.ljust(25) }.join if ENV['DEBUG']
     end
+
   end
 
   class InheritedSchema < Schema

data/lib/migrant.rb

@@ -1,6 +1,6 @@
 require 'active_support'
 require 'active_record'
-require 'datatype/base'
+require 'dsl/data_type'
 require 'migrant/schema'
 require 'migrant/model_extensions'
 require 'migrant/migration_generator'

data/migrant.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{migrant}
-  s.version = "1.1.1"
+  s.version = "1.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Pascal Houliston"]
-  s.date = %q{2011-04-01}
+  s.date = %q{2011-04-12}
   s.description = %q{Easier schema management for Rails that compliments your domain model.}
   s.email = %q{101pascal@gmail.com}
   s.extra_rdoc_files = [
@@ -17,26 +17,21 @@ Gem::Specification.new do |s|
     "README.rdoc"
   ]
   s.files = [
+    ".rvmrc",
     "Gemfile",
     "Gemfile.lock",
     "LICENSE",
     "README.rdoc",
     "Rakefile",
     "VERSION",
-    "lib/datatype/base.rb",
-    "lib/datatype/boolean.rb",
-    "lib/datatype/currency.rb",
-    "lib/datatype/date.rb",
-    "lib/datatype/fixnum.rb",
-    "lib/datatype/float.rb",
-    "lib/datatype/foreign_key.rb",
-    "lib/datatype/polymorphic.rb",
-    "lib/datatype/range.rb",
-    "lib/datatype/string.rb",
-    "lib/datatype/symbol.rb",
-    "lib/datatype/time.rb",
+    "lib/dsl/data_type.rb",
+    "lib/dsl/data_types/primitives.rb",
+    "lib/dsl/data_types/semantic.rb",
     "lib/generators/migrations.rb",
     "lib/generators/model.rb",
+    "lib/generators/templates/change_migration.erb",
+    "lib/generators/templates/create_migration.erb",
+    "lib/generators/templates/create_migration.rb",
     "lib/generators/templates/model.rb",
     "lib/migrant.rb",
     "lib/migrant/migration_generator.rb",
@@ -87,6 +82,7 @@ Gem::Specification.new do |s|
     "test/test_data_schema.rb",
     "test/test_migration_generator.rb",
     "test/test_validations.rb",
+    "test/test_zzz_performance.rb",
     "test/verified_output/migrations/business_id.rb",
     "test/verified_output/migrations/create_business_categories.rb",
     "test/verified_output/migrations/create_businesses.rb",
@@ -129,6 +125,7 @@ Gem::Specification.new do |s|
     "test/test_data_schema.rb",
     "test/test_migration_generator.rb",
     "test/test_validations.rb",
+    "test/test_zzz_performance.rb",
     "test/verified_output/migrations/business_id.rb",
     "test/verified_output/migrations/create_business_categories.rb",
     "test/verified_output/migrations/create_businesses.rb",
@@ -152,6 +149,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<turn>, [">= 0"])
       s.add_development_dependency(%q<sqlite3>, [">= 0"])
       s.add_development_dependency(%q<simplecov>, [">= 0"])
+      s.add_development_dependency(%q<terminal-table>, [">= 0"])
     else
       s.add_dependency(%q<rails>, [">= 3.0.0"])
       s.add_dependency(%q<faker>, [">= 0"])
@@ -161,6 +159,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<turn>, [">= 0"])
       s.add_dependency(%q<sqlite3>, [">= 0"])
       s.add_dependency(%q<simplecov>, [">= 0"])
+      s.add_dependency(%q<terminal-table>, [">= 0"])
     end
   else
     s.add_dependency(%q<rails>, [">= 3.0.0"])
@@ -171,6 +170,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<turn>, [">= 0"])
     s.add_dependency(%q<sqlite3>, [">= 0"])
     s.add_dependency(%q<simplecov>, [">= 0"])
+    s.add_dependency(%q<terminal-table>, [">= 0"])
   end
 end
 

data/test/helper.rb

@@ -17,14 +17,36 @@ require 'rubygems'
 require 'turn' # For nicer output
 require 'test/unit'
 require 'shoulda'
+require 'terminal-table/import'
 
 # Must be loaded before appropriate models so we get class method extensions
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 
-
 require 'migrant'
 
+class Profiler
+  @@results = {}
+
+  def self.run(name, &block)
+    start = Time.now.to_f
+    yield
+    @@results[name] ||= {:total => 0.0, :calls => 0}
+    @@results[name][:total] += Time.now.to_f - start 
+    @@results[name][:calls] += 1
+  end
+
+  def self.results
+    unless @@results.keys.empty?
+      results = table do |t|
+        t.headings = ['Name', 'Calls', 'Total (ms)', 'Average (ms)']
+        @@results.collect { |name, result| [name, result[:calls], (result[:total]*1000.0).round, (result[:total] / result[:calls] * 1000.0).round] }.each { |row| t << row }
+      end
+      puts results
+    end
+  end
+end
+
 # Reset database
 db_path = File.join(File.dirname(__FILE__), 'rails_app', 'db', 'test.sqlite3')
 File.delete(db_path) if File.exists?(db_path)
@@ -38,3 +60,4 @@ require File.join(File.dirname(__FILE__), 'rails_app', 'config', 'environment')
 
 class Test::Unit::TestCase
 end
+

data/test/rails_app/app/models/category.rb

@@ -5,5 +5,6 @@ class Category < ActiveRecord::Base
   structure do
     title :index => true # Default type is a good 'ol varchar(255)
     summary
+    serial_number 1234567891011121314
   end
 end

data/test/test_data_schema.rb

@@ -33,6 +33,10 @@ class TestDataSchema < Test::Unit::TestCase
     should "generate a smallint column when given a small range" do
       assert_schema(Business, :operating_days, :limit => 1, :type => :integer)
     end
+    
+    should "generate a large integer (size 8) for any bignum types" do
+      assert_schema(Category, :serial_number, :limit => 8, :type => :integer)
+    end
 
     should "generate a string column when given a sentence" do
       assert_schema(Business, :summary, :type => :string)

data/test/test_migration_generator.rb

@@ -7,10 +7,15 @@ def rake_migrate
    end
 end
 
-
 class TestMigrationGenerator < Test::Unit::TestCase
+  def generate_migrations
+    Profiler.run(:migration_generator) do
+      assert_equal true, Migrant::MigrationGenerator.new.run, "Migration Generator reported an error"
+    end    
+  end
+
   def run_against_template(template)
-    assert_equal true, Migrant::MigrationGenerator.new.run, "Migration Generator reported an error"
+    generate_migrations
     Dir.glob(File.join(File.dirname(__FILE__), 'rails_app', 'db' ,'migrate', '*.rb')).each do |migration_file|
         if migration_file.include?(template)
           to_test = File.open(migration_file, 'r') { |r| r.read}.strip
@@ -28,7 +33,7 @@ class TestMigrationGenerator < Test::Unit::TestCase
 
   context "The migration generator" do
     should "create migrations for all new tables" do
-      assert_equal true, Migrant::MigrationGenerator.new.run, "Migration Generator reported an error"
+      generate_migrations
       Dir.glob(File.join(File.dirname(__FILE__), 'rails_app', 'db' ,'migrate', '*.rb')).each do |migration_file|
          to_test = File.open(migration_file, 'r') { |r| r.read}.strip
          File.open(File.join(File.dirname(__FILE__), 'verified_output', 'migrations', migration_file.sub(/^.*\d+_/, '')), 'r') do |file|
@@ -95,7 +100,7 @@ class TestMigrationGenerator < Test::Unit::TestCase
       end
       # Remove migrations
       ActiveRecord::Base.timestamped_migrations = false
-      assert_equal true, Migrant::MigrationGenerator.new.run, "Migration Generator reported an error"
+      generate_migrations
       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,
@@ -115,7 +120,7 @@ class TestMigrationGenerator < Test::Unit::TestCase
       end
 
       BusinessCategory.belongs_to(:notaclass, :polymorphic => true)
-      assert_equal true, Migrant::MigrationGenerator.new.run, "Migration Generator reported an error"
+      generate_migrations
       rake_migrate
       BusinessCategory.reset_column_information
       BusinessCategory.mock!
@@ -144,7 +149,7 @@ class TestMigrationGenerator < Test::Unit::TestCase
       end
       
       BusinessCategory.belongs_to(:verylongclassthatissuretogenerateaverylargeoutputfilename, :polymorphic => true)
-      assert_equal true, Migrant::MigrationGenerator.new.run, "Migration Generator reported an error"
+      generate_migrations
       rake_migrate
     end
   end

data/test/test_zzz_performance.rb

@@ -0,0 +1,13 @@
+require 'helper'
+
+#SimpleProfiler.results
+
+class TestZZZPerformance < Test::Unit::TestCase
+  context "Performance" do
+  should "be within acceptable limits" do
+    # Just a utility test for printing profiler results
+    Profiler.results
+    assert true
+  end
+  end
+end

data/test/verified_output/migrations/created_at.rb

@@ -1,4 +1,4 @@
-class ChangedBusinessesAddedUpdatedAtCreatedAt < ActiveRecord::Migration
+class ChangedBusinessesAddedCreatedAtUpdatedAt < ActiveRecord::Migration
   def self.up
     add_column :businesses, :updated_at, :datetime
     add_column :businesses, :created_at, :datetime

metadata

@@ -2,7 +2,7 @@
 name: migrant
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors: 
 - Pascal Houliston
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-01 00:00:00 +02:00
+date: 2011-04-12 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -101,6 +101,17 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: terminal-table
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id009
 description: Easier schema management for Rails that compliments your domain model.
 email: 101pascal@gmail.com
 executables: []
@@ -111,26 +122,21 @@ extra_rdoc_files:
 - LICENSE
 - README.rdoc
 files: 
+- .rvmrc
 - Gemfile
 - Gemfile.lock
 - LICENSE
 - README.rdoc
 - Rakefile
 - VERSION
-- lib/datatype/base.rb
-- lib/datatype/boolean.rb
-- lib/datatype/currency.rb
-- lib/datatype/date.rb
-- lib/datatype/fixnum.rb
-- lib/datatype/float.rb
-- lib/datatype/foreign_key.rb
-- lib/datatype/polymorphic.rb
-- lib/datatype/range.rb
-- lib/datatype/string.rb
-- lib/datatype/symbol.rb
-- lib/datatype/time.rb
+- lib/dsl/data_type.rb
+- lib/dsl/data_types/primitives.rb
+- lib/dsl/data_types/semantic.rb
 - lib/generators/migrations.rb
 - lib/generators/model.rb
+- lib/generators/templates/change_migration.erb
+- lib/generators/templates/create_migration.erb
+- lib/generators/templates/create_migration.rb
 - lib/generators/templates/model.rb
 - lib/migrant.rb
 - lib/migrant/migration_generator.rb
@@ -181,6 +187,7 @@ files:
 - test/test_data_schema.rb
 - test/test_migration_generator.rb
 - test/test_validations.rb
+- test/test_zzz_performance.rb
 - test/verified_output/migrations/business_id.rb
 - test/verified_output/migrations/create_business_categories.rb
 - test/verified_output/migrations/create_businesses.rb
@@ -204,7 +211,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2795285372725483730
+      hash: 146286865
       segments: 
       - 0
       version: "0"
@@ -249,6 +256,7 @@ test_files:
 - test/test_data_schema.rb
 - test/test_migration_generator.rb
 - test/test_validations.rb
+- test/test_zzz_performance.rb
 - test/verified_output/migrations/business_id.rb
 - test/verified_output/migrations/create_business_categories.rb
 - test/verified_output/migrations/create_businesses.rb

data/lib/datatype/boolean.rb

@@ -1,15 +0,0 @@
-module DataType
-  class TrueClass < Base
-    def column
-      {:type => :boolean}
-    end  
-    
-    def self.default_mock
-      true
-    end
-  end
-  
-  class FalseClass < TrueClass; end;
-end
-  
-

data/lib/datatype/date.rb

@@ -1,13 +0,0 @@
-module DataType
-  class Date < Base
-    def column
-      {:type => :datetime}
-    end
-    
-    def self.default_mock
-      ::Time.now
-    end
-  end
-end
-  
-

data/lib/datatype/fixnum.rb

@@ -1,13 +0,0 @@
-module DataType
-  class Fixnum < Base
-    def column
-      {:type => :integer}.tap do |options|
-        options.merge!(:limit => @value.size) if @value > 2147483647 # 32-bit limit. Not checking size here because a 64-bit OS always has at least 8 byte size
-      end
-    end
-    
-    def self.default_mock
-      rand(999999).to_i
-    end
-  end
-end

data/lib/datatype/float.rb

@@ -1,11 +0,0 @@
-module DataType
-  class Float < Base
-    def column
-      {:type => :float}
-    end
-    
-    def self.default_mock
-      rand(100).to_f-55.0
-    end
-  end
-end

data/lib/datatype/foreign_key.rb

@@ -1,13 +0,0 @@
-module DataType
-  class ForeignKey < Base
-    def column
-      {:type => :integer}
-    end
-    
-    def self.default_mock
-      nil # Will get overridden later by ModelExtensions
-    end
-  end
-end
-  
-

data/lib/datatype/polymorphic.rb

@@ -1,8 +0,0 @@
-module DataType
-  class Polymorphic < Base
-    def mock
-      # Eek, can't mock an unknown type
-      nil
-    end
-  end
-end

data/lib/datatype/range.rb

@@ -1,9 +0,0 @@
-module DataType
-  class Range < Base
-    def column
-      definition = {:type => :integer}
-      definition[:limit] = @value.max.to_s.length if @value.respond_to?(:max)
-      definition
-    end
-  end
-end

data/lib/datatype/string.rb

@@ -1,22 +0,0 @@
-module DataType
-  class String < Base
-    def initialize(options)
-      super(options)
-      @value ||= ''
-    end
-  
-    def column
-      if @value.match(/[\d,]+\.\d{2}$/)
-        return Currency.new(@options).column
-      else
-        return @value.match(/[\r\n\t]/)? { :type => :text }.merge(@options) : super
-      end
-    end
-    
-    def mock
-      @value || ((self.column[:type] == :text)? self.class.long_text_mock : self.class.default_mock )
-    end
-  end
-end
-  
-

data/lib/datatype/symbol.rb

@@ -1,20 +0,0 @@
-module DataType
-  class Symbol < Base
-    def column
-      # Just construct whatever the user wants
-      {:type => @value || :string }.merge(@options)
-    end  
-    
-    def mock
-      case @value || :string
-        when :text then self.class.long_text_mock
-        when :string then self.class.short_text_mock
-        when :integer then Fixnum.default_mock
-        when :decimal, :float then Float.default_mock
-        when :datetime, :date then Date.default_mock
-      end
-    end
-  end
-end
-  
-

data/lib/datatype/time.rb

@@ -1,5 +0,0 @@
-module DataType
-  class Time < Date
-    # No different to date type
-  end
-end