modalfields 1.1.11 → 1.2.0

data/TODO

@@ -1,9 +1,5 @@
-type synonyms (timestamp, datetime)
-
 process specifiers (to add validations for required, etc.)(detect index modifications) decide what to do with multiple-column indices
 
-refactor into multiple files
-
 add extensible specifiers:
   ModalFields.specify do
     required do |model, column|
@@ -23,11 +19,3 @@ of extra attributes)
   status enum_field(:draft, :approved, :published), :required
 instead of
   status :enum_field, :required, :values=>[:draft, :approved, :published]
-
-Vendorized Installation:
-  Rails 2
-  script/plugin install git://github.com/jgoizueta/modalfields.git
-  Rails 3
-  rails plugin install git://github.com/jgoizueta/modalfields.git
-
-

data/VERSION

@@ -1 +1 @@
-1.1.11
+1.2.0

data/lib/modalfields/modalfields.rb

@@ -90,7 +90,7 @@ module ModalFields
 
   class DeclarationsDsl < DslBase
     def initialize(model)
-      @model = model.base_class
+      @model = model
     end
     def field(name, type, *args)
       declaration = FieldDeclaration.declare(name, type, *args)
@@ -113,16 +113,26 @@ module ModalFields
   end
 
   module FieldDeclarationClassMethods
-    def fields(&blk)
-      @fields_info ||= []
-      unless self.respond_to?(:fields_info)
-        self.instance_eval do
-          def fields_info
-            @fields_info
+    def fields(param=nil, &blk)
+      if param == :omitted
+        unless self.respond_to?(:fields_info)
+          self.instance_eval do
+            def fields_info
+              :omitted
+            end
           end
         end
+      else
+        @fields_info ||= []
+        unless self.respond_to?(:fields_info)
+          self.instance_eval do
+            def fields_info
+              @fields_info
+            end
+          end
+        end
+        DeclarationsDsl.new(self).instance_eval(&blk)
       end
-      DeclarationsDsl.new(self).instance_eval(&blk)
     end
   end
 
@@ -336,8 +346,11 @@ module ModalFields
         # 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|
+        submodels = model.send(:subclasses)
+        assocs = model.reflect_on_all_associations(:belongs_to) +
+                 submodels.map{|sc| sc.reflect_on_all_associations(:belongs_to)}.flatten
+        association_fields = assocs.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]
             t = r.options[:foreign_type]
@@ -357,7 +370,9 @@ module ModalFields
           pk_fields = pk_fields.select{|pk| pk=='id'}
         end
         if model.respond_to?(:fields_info)
-          declared_fields = model.fields_info
+          return [[]]*4 if model.fields_info==:omitted
+          declared_fields = model_fields_info(model)
+          declared_fields += submodels.map{|sc| Array(model_fields_info(sc))}.flatten
           indices = model.connection.indexes(model.table_name) # name, columns, unique, spatial
 
           existing_declared_fields = []
@@ -382,7 +397,7 @@ module ModalFields
             column = existing_declared_fields.detect{|f| f.name.to_s == field_declaration.name.to_s}
             identical = false
             column = map_column_to_field_declaration(column)
-            if field_declaration.type.to_sym == column.type.to_sym
+            if unified_type(field_declaration.type) == unified_type(column.type.to_sym)
               attrs = definitions[column.type.to_sym]
               attr_keys = attrs.keys
               decl_attrs = attr_keys.map{|a|
@@ -508,6 +523,20 @@ module ModalFields
         }
       end
 
+      TYPE_SYNONYMS = {
+        :timestamp => :datetime
+      }
+
+      def unified_type(type)
+        type &&= type.to_sym
+        TYPE_SYNONYMS[type] || type
+      end
+
+      def model_fields_info(model)
+        fields_info = model && model.respond_to?(:fields_info) && model.fields_info
+        fields_info.kind_of?(Array) ? fields_info : nil
+      end
+
     end
 
 

data/modalfields.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{modalfields}
-  s.version = "1.1.11"
+  s.name = "modalfields"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Javier Goizueta"]
-  s.date = %q{2012-09-04}
-  s.description = %q{ModelFields is a Rails plugin that adds fields declarations to your models.}
-  s.email = %q{jgoizueta@gmail.com}
+  s.date = "2012-09-04"
+  s.description = "ModelFields is a Rails plugin that adds fields declarations to your models."
+  s.email = "jgoizueta@gmail.com"
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc",
@@ -54,14 +54,13 @@ Gem::Specification.new do |s|
     "test/test_diff.rb",
     "test/test_update.rb"
   ]
-  s.homepage = %q{http://github.com/jgoizueta/modalfields}
+  s.homepage = "http://github.com/jgoizueta/modalfields"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Model annotator with Ruby (Hobo-like) syntax and hooks.}
+  s.rubygems_version = "1.8.23"
+  s.summary = "Model annotator with Ruby (Hobo-like) syntax and hooks."
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

metadata

@@ -1,159 +1,169 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: modalfields
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 1
-  - 11
-  version: 1.1.11
+version: !ruby/object:Gem::Version
+  version: 1.2.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Javier Goizueta
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-09-04 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-09-04 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 3
-        - 5
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.3.5
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.3.5
+- !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 3
-        - 5
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.3.5
   type: :runtime
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.3.5
+- !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 12
-        version: "3.12"
+      - !ruby/object:Gem::Version
+        version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.12'
+- !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        version: "1"
+      - !ruby/object:Gem::Version
+        version: '1'
   type: :development
   prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1'
+- !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 8
-        - 3
+      - !ruby/object:Gem::Version
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.8.3
+- !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: pg
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rails
-  requirement: &id009 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 3
-        - 0
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *id009
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.3.0
 description: ModelFields is a Rails plugin that adds fields declarations to your models.
 email: jgoizueta@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
 - TODO
-files: 
+files:
 - .document
 - Gemfile
 - Gemfile.lock
@@ -189,38 +199,32 @@ files:
 - test/schema.rb
 - test/test_diff.rb
 - test/test_update.rb
-has_rdoc: true
 homepage: http://github.com/jgoizueta/modalfields
-licenses: 
+licenses:
 - MIT
 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 
-      hash: 1020436365
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -2875707183532562244
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Model annotator with Ruby (Hobo-like) syntax and hooks.
 test_files: []
-