migrant 1.3.0 → 1.3.1

data/.travis.yml

@@ -0,0 +1,7 @@
+language: ruby
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - rbx-18mode
+  - ree

data/README.rdoc

@@ -1,12 +1,13 @@
 = Migrant
+{<img src="https://secure.travis-ci.org/pascalh1011/migrant.png" />}[http://travis-ci.org/pascalh1011/migrant]
 
 == Summary
 
-Migrant gives you a clean DSL to describe your model schema (somewhat similar to DataMapper)
-that generates your migrations for you and enables you to spend more time on describing your domain
+Migrant gives you a clean DSL to describe your model schema (somewhat similar to DataMapper).
+It generates your migrations for you so you can spend more time describing your domain
 model cleanly and less time managing your database layer.
 
-You'll also get a handy .mock method to instantiate a filled in model for testing or debugging purposes.
+You'll also get a handy .mock method to instantiate a filled-in model for testing or debugging.
 
 == Getting Started
 
@@ -14,9 +15,9 @@ In your Gemfile:
 
   gem "migrant"
   
-Rails: 3.0+ (Sorry folks, no plans for Rails 2 support)
-Ruby: Tested with 1.8.7 MRI, 1.9.2 MRI, and Rubinius 1.2.1 
-Adapters: Tested with SQLite3, MySQL, MySQL2, Pg. Should work with any AR adapter in theory.
+* Rails: 3.0+ (Sorry folks, no plans for Rails 2 support)
+* Ruby: Tested with 1.8.7 MRI, 1.9.2 MRI, and Rubinius 1.2.1 
+* Adapters: Tested with SQLite3, MySQL, MySQL2, Pg. Should work with any AR adapter in theory.
 
 == Jumping right in
 
@@ -105,7 +106,7 @@ These will call ActiveRecord::Base.serialize for you so don't do it again yourse
   
 == Want more examples?
 
-Check out the test models in test/rails_app/app/models/*
+Check out the test models in +test/rails_app/app/models/*+
 
 == Model Generator
 
@@ -125,12 +126,6 @@ Simply run rake db:upgrade or rails generate migrations to get the required migr
 * Changing column types
 * Rollbacks for all the above
 
-== What won't
-
-These actions won't be performed (because we don't want to hurt your data):
-
-* Changing column types where data loss may occur (e.g. varchar -> int)
-
 == Getting a mock of your model
 
   > rails console
@@ -194,7 +189,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 Please be sure to install all the development dependencies via Bundler, then to run tests do:
 
-> rake test
+  > rake test
 
-Simplecov reports will be generated for each run, if it's not at 100% line coverage, something's wrong!
+Simplecov reports will be generated for each run. If it's not at 100% line coverage, something's wrong!
 

data/VERSION

@@ -1 +1 @@
-1.3.0
+1.3.1

data/lib/dsl/data_type.rb

@@ -1,8 +1,6 @@
 require 'faker'
 
 module DataType
-  class DangerousMigration < Exception; end;
-
   class Base
     attr_accessor :aliases
 
@@ -59,8 +57,6 @@ module DataType
      
       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])
-
         if new_structure[:limit] && current_structure[:limit].to_i != new_structure[:limit].to_i ||
            new_structure[:type] != current_structure[:type]
            column
@@ -72,10 +68,12 @@ module DataType
       end
     end
 
+    def dangerous_migration_from?(current_structure = nil)
+      current_structure && (column[:type] != :text && [:string, :text].include?(current_structure[:type]) && column[:type] != current_structure[:type])
+    end
+
     def self.migrant_data_type?; true; end
   end
-  
- 
 end
 
 require 'dsl/data_types/primitives'

data/lib/migrant/migration_generator.rb

@@ -26,6 +26,9 @@ module Migrant
         end
       end
 
+      # Rails 3.2+ caches table (non) existence so this needs to be cleared before we start
+      ActiveRecord::Base.connection.schema_cache.clear! if ActiveRecord::Base.connection.respond_to?(:schema_cache)
+
       ActiveRecord::Base.descendants.select { |model| model.schema && model.schema.requires_migration? }.each do |model|
         model.reset_column_information # db:migrate doesn't do this
         @table_name = model.table_name
@@ -35,17 +38,15 @@ module Migrant
           # 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]
           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]
-                  change_column(field_name, options, db_schema[field_name])
-                else
-                  add_column(field_name, options)
-                end
+            if data_type.dangerous_migration_from?(db_schema[field_name]) && 
+               ask_user("#{model}: '#{field_name}': Converting from ActiveRecord type #{db_schema[field_name][:type]} to #{data_type.column[:type]} could cause data loss. Continue?", %W{Yes No}, true) == "No"
+              log "Aborting dangerous action on #{field_name}."
+            elsif (options = data_type.structure_changes_from(db_schema[field_name]))
+              if db_schema[field_name]
+                change_column(field_name, options, db_schema[field_name])
+              else
+                add_column(field_name, options)
               end
-            rescue DataType::DangerousMigration
-              log "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)", :error
-              return false
             end
           end
           
@@ -57,10 +58,11 @@ module Migrant
                 when 'Move' then
                   target = ask_user("Move '#{removed_field_name}' to:", @columns[:added].collect(&:first))
                   target_column = model.schema.columns[target]
-                  begin
+
+                  unless target_column.dangerous_migration_from?(db_schema[removed_field_name])
                     target_column.structure_changes_from(db_schema[removed_field_name])
                     move_column(removed_field_name, target, db_schema[removed_field_name], target_column)
-                  rescue DataType::DangerousMigration
+                  else
                     case ask_user("Unable to safely move '#{removed_field_name}' to '#{target}'. Keep the original column for now?", %W{Yes No}, true)
                       when 'No' then delete_column(removed_field_name, db_schema[removed_field_name])
                     end
@@ -89,7 +91,7 @@ module Migrant
           # Example: changed_table_added_something_and_modified_something
           @activity = 'changed_'+model.table_name+[['added', @columns[:added]], ['modified', @columns[:changed]], ['deleted', destroyed_columns], 
           ['moved', @columns[:transferred]], ['renamed', @columns[:renamed]], ['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
+          @activity = @activity.split('_')[0..2].join('_')+'_with_multiple_changes' if @activity.length >= 240 # Most filesystems will raise Errno::ENAMETOOLONG otherwise
           
           render('change_migration')
         else

data/migrant.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Pascal Houliston"]
   s.date = %q{2011-05-23}
-  s.description = %q{Easier schema management for Rails that compliments your domain model.}
+  s.description = %q{Easier schema management for Rails that complements your domain model.}
   s.email = %q{101pascal@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/pascalh1011/migrant}
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.5.2}
-  s.summary = %q{All the fun of ActiveRecord, without writing your migrations, and a dash of mocking.}
+  s.summary = %q{All the fun of ActiveRecord without writing your migrations, and with a dash of mocking.}
 
   s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 0"])
   s.add_development_dependency(%q<minitest>, [">= 1.6.0"])

data/test/helper.rb

@@ -61,7 +61,7 @@ Dir.glob(File.join(File.dirname(__FILE__), 'rails_app', 'db', 'migrate', '*')).e
  File.delete(file)
 end
 
-require File.join(File.dirname(__FILE__), 'rails_app', 'config', 'environment')
+#require File.join(File.dirname(__FILE__), 'rails_app', 'config', 'environment')
 
 class Test::Unit::TestCase
 end

data/test/test_migration_generator.rb

@@ -28,7 +28,16 @@ class TestMigrationGenerator < Test::Unit::TestCase
           return
         end
     end
-    flunk "No migration could be found"
+    flunk "No migration could be found like '#{template}'"
+  end
+
+  def any_template_match?(template)
+    Dir.glob(File.join(File.dirname(__FILE__), 'rails_app', 'db' ,'migrate', '*.rb')).each do |migration_file|
+      if migration_file.include?(template)
+        return true
+      end
+    end
+    false
   end
   
   def delete_last_migration
@@ -81,11 +90,14 @@ class TestMigrationGenerator < Test::Unit::TestCase
       run_against_template('created_at')
     end
 
-    should "not change existing columns where data loss may occur" do
+    should "prompt the user to confirm changing existing columns where data loss may occur" do
+      STDIN._mock_responses('N')
+
       Business.structure do
         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!")
+      Migrant::MigrationGenerator.new.run
+      assert(any_template_match?('modified_landline'), 'Ignored a request not to generate a dangerous migration!')
       Business.structure do
         landline :text # Undo our bad for the next tests
       end
@@ -161,20 +173,6 @@ class TestMigrationGenerator < Test::Unit::TestCase
     end
     
     
-    should "remove extraneous text from a filename too large for the operating system" do
-      BusinessCategory.structure do
-        a_very_very_long_field_indeed_far_too_long_for_any_good_use_really true
-        a_very_very_long_field_indeed_far_too_long_for_any_good_use_really_2 true
-        a_very_very_long_field_indeed_far_too_long_for_any_good_use_really_3 true
-      end
-      
-      BusinessCategory.belongs_to(:verylongclassthatissuretogenerateaverylargeoutputfilename)
-      generate_migrations
-      delete_last_migration # Can't actually test migration because the index name is too long!
-#      BusinessCategory.schema.undo_structure_column(:verylongclassthatissuretogenerateaverylargeoutputfilename_id)
-      BusinessCategory.reset_structure!
-    end
-
     should "remove columns when requested and confirmed by the user" do
       Chameleon.structure 
       Chameleon.reset_structure!

metadata

@@ -1,172 +1,170 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: migrant
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 1.3.1
   prerelease: 
-  version: 1.3.0
 platform: ruby
-authors: 
+authors:
 - Pascal Houliston
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-05-23 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-05-23 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: thoughtbot-shoulda
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &74513810 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: minitest
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *74513810
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: &74513520 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.6.0
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: ansi
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *74513520
+- !ruby/object:Gem::Dependency
+  name: ansi
+  requirement: &74513240 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: turn
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *74513240
+- !ruby/object:Gem::Dependency
+  name: turn
+  requirement: &74512790 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: sqlite3
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *74512790
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: &74512220 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: simplecov
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *74512220
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: &74511770 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: terminal-table
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *74511770
+- !ruby/object:Gem::Dependency
+  name: terminal-table
+  requirement: &74511520 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: term-ansicolor
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *74511520
+- !ruby/object:Gem::Dependency
+  name: term-ansicolor
+  requirement: &74511130 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: *74511130
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &74510740 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.8.7
   type: :development
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: simplecov
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: *74510740
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: &74510150 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: rails
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: *74510150
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: &74509790 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
-  version_requirements: *id011
-- !ruby/object:Gem::Dependency 
-  name: faker
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  version_requirements: *74509790
+- !ruby/object:Gem::Dependency
+  name: faker
+  requirement: &74509550 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id012
-- !ruby/object:Gem::Dependency 
-  name: term-ansicolor
   prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  version_requirements: *74509550
+- !ruby/object:Gem::Dependency
+  name: term-ansicolor
+  requirement: &74509240 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id013
-description: Easier schema management for Rails that compliments your domain model.
+  prerelease: false
+  version_requirements: *74509240
+description: Easier schema management for Rails that complements your domain model.
 email: 101pascal@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.rdoc
-files: 
+files:
 - .gitignore
 - .rvmrc
+- .travis.yml
 - Gemfile
 - LICENSE
 - README.rdoc
@@ -249,30 +247,27 @@ files:
 - test/verified_output/migrations/renamed_old_spots.rb
 homepage: http://github.com/pascalh1011/migrant
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.8.16
 signing_key: 
 specification_version: 3
-summary: All the fun of ActiveRecord, without writing your migrations, and a dash of mocking.
+summary: All the fun of ActiveRecord without writing your migrations, and with a dash
+  of mocking.
 test_files: []
-