modalfields 1.1.5 → 1.1.6

data/VERSION

@@ -1 +1 @@
-1.1.4
+1.1.6

data/lib/modalfields/modalfields.rb

@@ -165,7 +165,7 @@ module ModalFields
     # changes can be easily reviewed.
     def update(modify=true)
       dbmodels.each do |model, file|
-        new_fields, modified_fields, deleted_fields = diff(model)
+        new_fields, modified_fields, deleted_fields, deleted_model = diff(model)
         unless new_fields.empty? && modified_fields.empty? && deleted_fields.empty?
           pre, start_fields, fields, end_fields, post = split_model_file(file)
           deleted_names = deleted_fields.map{|f| f.name.to_s}
@@ -199,10 +199,11 @@ module ModalFields
 
     def check
       dbmodels.each do |model, file|
-        new_fields, modified_fields, deleted_fields = diff(model)
+        new_fields, modified_fields, deleted_fields, deleted_model = diff(model)
         unless new_fields.empty? && modified_fields.empty? && deleted_fields.empty?
           rel_file = file.sub(/\A#{Rails.root}/,'')
           puts "#{model} (#{rel_file}):"
+          puts "  (deleted)" if deleted_model
           [['+',new_fields],['*',modified_fields],['-',deleted_fields]].each do |prefix, fields|
             puts fields.map{|field| "  #{prefix} #{field}"}*"\n" unless fields.empty?
             # TODO: report index differences
@@ -212,6 +213,71 @@ module ModalFields
       end
     end
 
+    def migration
+      up = ""
+      down = ""
+      dbmodels.each do |model, file|
+        new_fields, modified_fields, deleted_fields, deleted_model = diff(model)
+        unless new_fields.empty? && modified_fields.empty? && deleted_fields.empty?
+          up << "\n"
+          down << "\n"
+          rel_file = file.sub(/\A#{Rails.root}/,'')
+          if deleted_model && modified_fields.empty? && new_fields.empty?
+            up << "  create_table #{model.table_name.to_sym.inspect} do |t|\n"
+            deleted_fields.each do |field|
+              up << "    t.#{field.type} #{field.name.inspect}"
+              unless field.attributes.empty?
+                up << ", " + field.attributes.inspect.unwrap('{}')
+              end
+              up << "\n"
+            end
+            up << "  end\n"
+            down << " drop_table #{model.table_name.to_sym.inspect}\n"
+          else
+            deleted_fields.each do |field|
+              up << "  add_column #{model.table_name.to_sym.inspect}, #{field.name.inspect}, #{field.type.inspect}"
+              unless field.attributes.empty?
+                up << ", " + field.attributes.inspect.unwrap('{}')
+              end
+              up << "\n"
+              down << "  remove_column #{model.table_name.to_sym.inspect}, #{field.name.inspect}\n"
+            end
+            modified_fields.each do |field|
+              changed = model.fields_info.find{|f| f.name==field.name}
+              up << "  change_column #{model.table_name.to_sym.inspect}, #{changed.name.inspect}, #{changed.type.inspect}"
+              unless changed.attributes.empty?
+                up << ", " + changed.attributes.inspect.unwrap('{}')
+              end
+              up << "\n"
+              down << "  change_column #{model.table_name.to_sym.inspect}, #{field.name.inspect}, #{field.type.inspect}"
+              unless field.attributes.empty?
+                down << ", " + field.attributes.inspect.unwrap('{}')
+              end
+              down << "\n"
+            end
+            new_fields.each do |field|
+              up << "  remove_column #{model.table_name.to_sym.inspect}, #{field.name.inspect}\n"
+              down << "  add_column #{model.table_name.to_sym.inspect}, #{field.name.inspect}, #{field.type.inspect}"
+              unless field.attributes.empty?
+                down << ", " + field.attributes.inspect.unwrap('{}')
+              end
+              down << "\n"
+            end
+          end
+          # TODO: indices
+        end
+      end
+      unless up.blank?
+        puts "\n\# up:"
+        puts up
+      end
+      unless down.blank?
+        puts "\n\# down:"
+        puts down
+      end
+      puts ""
+    end
+
     def validate(declaration)
       definition = definitions[declaration.type.to_sym]
       raise "Field type #{declaration.type} not defined" unless definition
@@ -263,6 +329,7 @@ module ModalFields
       def diff(model)
         # model.columns will fail if the table does not exist
         existing_fields = model.columns rescue []
+        deleted_model = existing_fields.empty?
         # up to ActiveRecord 3.1 we had primary_key_name in AssociationReflection; not itis foreign_key
         association_fields = model.reflect_on_all_associations(:belongs_to).map{ |r|
           r.respond_to?(:primary_key_name) ? r.primary_key_name : r.foreign_key
@@ -337,7 +404,7 @@ module ModalFields
           end
           FieldDeclaration.new(f.name.to_sym, f.type.to_sym, [], attributes)
         }
-        [new_fields, modified_fields, deleted_fields]
+        [new_fields, modified_fields, deleted_fields, deleted_model]
       end
 
       # Break up the lines of a model definition file into sections delimited by the fields declaration.

data/lib/tasks/migration.rake

@@ -0,0 +1,6 @@
+namespace :fields do
+  desc "Show migration required to sync schema with field declarations"
+  task :migration=>:environment do
+    ModalFields.migration
+  end
+end

data/modalfields.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "modalfields"
-  s.version = "1.1.5"
+  s.version = "1.1.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Javier Goizueta"]
@@ -32,6 +32,7 @@ Gem::Specification.new do |s|
     "lib/modalfields/tasks.rb",
     "lib/tasks/check.rake",
     "lib/tasks/migrate.rake",
+    "lib/tasks/migration.rake",
     "lib/tasks/update.rake",
     "modalfields.gemspec",
     "test/create_database.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: modalfields
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -178,6 +178,7 @@ files:
 - lib/modalfields/tasks.rb
 - lib/tasks/check.rake
 - lib/tasks/migrate.rake
+- lib/tasks/migration.rake
 - lib/tasks/update.rake
 - modalfields.gemspec
 - test/create_database.rb
@@ -213,7 +214,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3314962331882742653
+      hash: 4589863407518218042
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: