modalfields 1.5.3 → 1.5.4

data/VERSION

@@ -1 +1 @@
-1.5.3
+1.5.4

data/lib/modalfields/modalfields.rb

@@ -80,7 +80,12 @@ module ModalFields
         blk[model, column_declaration]
       }
     end
-    # geric filter applied to all the fields (after a specific filter for the type, if there is one)
+    def field_migration(type, &blk)
+      ModalFields.migration_hooks[type.to_sym] = lambda{|model, column_declaration|
+        blk[model, column_declaration]
+      }
+    end
+    # generic filter applied to all the fields (after a specific filter for the type, if there is one)
     def all_fields(&blk)
       field_type :all_fields, &blk
     end
@@ -147,6 +152,7 @@ module ModalFields
 
   @show_primary_keys = false
   @hooks = {}
+  @migration_hooks = {}
   @definitions = {}
   @column_to_field_declaration_hook = nil
   @type_aliases = {}
@@ -158,7 +164,7 @@ module ModalFields
 
   class <<self
 
-    attr_reader :hooks, :definitions
+    attr_reader :hooks, :migration_hooks, :definitions
     # Define declaration of primary keys
     #   ModalFields.show_primary_keys = false # the default: do not show primary keys
     #   ModalFields.show_primary_keys = true  # always declare primary keys
@@ -261,7 +267,9 @@ module ModalFields
       up = ""
       down = ""
       dbmodels(dbmodel_options).each do |model, file|
-        new_fields, modified_fields, deleted_fields, deleted_model = diff(model)
+        new_fields, modified_fields, deleted_fields, deleted_model = diff(model).map{|fields|
+          fields.kind_of?(Array) ? fields.map{|f| migration_declaration(model, f)} : fields
+        }
         unless new_fields.empty? && modified_fields.empty? && deleted_fields.empty?
           up << "\n"
           down << "\n"
@@ -288,6 +296,7 @@ module ModalFields
             end
             modified_fields.each do |field|
               changed = model.fields_info.find{|f| f.name.to_sym==field.name.to_sym}
+              changed &&= migration_declaration(model, changed)
               up << "  change_column #{model.table_name.to_sym.inspect}, #{changed.name.inspect}, #{changed.type.inspect}"
               unless changed.attributes.empty?
                 up << ", " + changed.attributes.inspect.unwrap('{}')
@@ -355,6 +364,7 @@ module ModalFields
 
         assoc_cols = []
         association_fields.each do |assoc, cols|
+
           if options[:associations]
             if assoc.options[:polymorphic]
               foreign_table = :polymorphic
@@ -365,6 +375,7 @@ module ModalFields
           end
           Array(cols).each do |col|
             col = existing_fields.find{|f| f.name.to_s==col.to_s}
+            next unless col
             assoc_cols << col
             if options[:foreign_keys]
               yield :foreign_key, model.table_name, col.name, field_data(col, :assoc=>assoc)
@@ -405,6 +416,12 @@ module ModalFields
 
     private
 
+      def migration_declaration(model, field_declaration)
+        hook = ModalFields.migration_hooks[field_declaration.type.to_sym]
+        hook[model, field_declaration] if hook
+        field_declaration
+      end
+
       def field_data(field_info, options={})
         comments = options[:comments]
         extra = options[:extra]

data/modalfields.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "modalfields"
-  s.version = "1.5.3"
+  s.version = "1.5.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Javier Goizueta"]
-  s.date = "2012-10-24"
+  s.date = "2012-11-03"
   s.description = "ModelFields is a Rails plugin that adds fields declarations to your models."
   s.email = "jgoizueta@gmail.com"
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: modalfields
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 1.5.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-24 00:00:00.000000000 Z
+date: 2012-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: modalsettings
@@ -233,7 +233,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -498931734787340260
+      hash: 1579727335010119279
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: