modalfields 1.1.7 → 1.1.8

data/VERSION

@@ -1 +1 @@
-1.1.7
+1.1.8

data/lib/modalfields/modalfields.rb

@@ -332,7 +332,14 @@ module ModalFields
         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
+          cols = [r.respond_to?(:primary_key_name) ? r.primary_key_name : r.foreign_key]
+          if r.options[:polymorphic]
+            t = r.options[:foreign_type]
+            t ||= r.foreign_type if r.respond_to?(:foreign_type)
+            t ||= cols.first.sub(/_id\Z/,'_type')
+            cols <<  t
+          end
+          cols
         }.flatten.map(&:to_s)
         pk_fields = Array(model.primary_key).map(&:to_s)
         case show_primary_keys

data/modalfields.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "modalfields"
-  s.version = "1.1.7"
+  s.version = "1.1.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Javier Goizueta"]
-  s.date = "2012-05-24"
+  s.date = "2012-06-12"
   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.1.7
+  version: 1.1.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-24 00:00:00.000000000 Z
+date: 2012-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -214,7 +214,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3599470511198925273
+      hash: -3427872664158124025
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: