modalfields 1.4.5 → 1.4.6

data/VERSION

@@ -1 +1 @@
-1.4.5
+1.4.6

data/lib/modalfields/modalfields.rb

@@ -370,8 +370,9 @@ module ModalFields
         end
         existing_fields -= assoc_cols
 
+        has_fields_info = model.respond_to?(:fields_info) && model.fields_info != :omitted
         fields = Array(fields).reject{|line, name, comment| name.blank?}
-        if model.respond_to?(:fields_info)
+        if has_fields_info
           field_order = model.fields_info.map(&:name).map(&:to_s) & existing_fields.map(&:name)
         else
           field_order = []
@@ -380,7 +381,7 @@ module ModalFields
           field_order += existing_fields.map(&:name).reject{|name| field_order.include?(name.to_s)}
         end
         field_comments = Hash[fields.map{|line, name, comment| [name,comment]}]
-        field_extras = Hash[ model.fields_info.map{|fi| [fi.name.to_s,fi.attributes]}]
+        field_extras = has_fields_info ? Hash[ model.fields_info.map{|fi| [fi.name.to_s,fi.attributes]}] : {}
         field_order.each do |field_name|
           field_info = existing_fields.find{|f| f.name.to_s==field_name}
           field_comment = field_comments[field_name]
@@ -731,7 +732,7 @@ module ModalFields
         existing_fields = model.columns rescue []
         assocs = model.reflect_on_all_associations(:belongs_to) +
                  submodels.map{|sc| sc.reflect_on_all_associations(:belongs_to)}.flatten
-        association_fields = assocs.map{ |r|
+        association_fields = assocs.uniq.map{ |r|
           # up to ActiveRecord 3.1 we had primary_key_name in AssociationReflection; now it's foreign_key
           cols = [r.respond_to?(:primary_key_name) ? r.primary_key_name : r.foreign_key]
           if r.options[:polymorphic]

data/lib/tasks/csv.rake

@@ -16,7 +16,7 @@ namespace :fields do
     CSV.open(fn, 'w', *options) do |csv|
         csv << %w{table column pk assoc foreign sql_type type attributes extra comments}
         ModalFields.report(
-          :primary_keys=>true, :foreing_keys=>true,
+          :primary_keys=>true, :foreign_keys=>true,
           :undeclared_fields=>true) do |kind, table, name, data|
             row_data = [table, name, kind==:primary_key]
             if kind==:foreign_key

data/modalfields.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "modalfields"
-  s.version = "1.4.5"
+  s.version = "1.4.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Javier Goizueta"]
-  s.date = "2012-09-26"
+  s.date = "2012-10-15"
   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.4.5
+  version: 1.4.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-26 00:00:00.000000000 Z
+date: 2012-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: modalsettings
@@ -232,7 +232,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -744716552947708725
+      hash: -4428809271904174224
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: