modalfields 1.1.1 → 1.1.2

data/VERSION

@@ -1 +1 @@
-1.1.1
+1.1.2

data/lib/modalfields/modalfields.rb

@@ -263,7 +263,10 @@ module ModalFields
       def diff(model)
         # model.columns will fail if the table does not exist
         existing_fields = model.columns rescue []
-        association_fields = model.reflect_on_all_associations(:belongs_to).map(&:primary_key_name).flatten.map(&:to_s)
+        # 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
+        }.flatten.map(&:to_s)
         pk_fields = Array(model.primary_key).map(&:to_s)
         case show_primary_keys
         when true
@@ -300,11 +303,11 @@ module ModalFields
               attr_keys = attrs.keys
               decl_attrs = attr_keys.map{|a|
                 v = field_declaration.attributes[a]
-                v==attrs[a] ? nil : v
+                v==attrs[a] ? nil : (v==false ? nil : v)
               }
               col_attrs = attr_keys.map{|a|
                 v = column.attributes[a]
-                v==attrs[a] ? nil : v
+                v==attrs[a] ? nil : (v==false ? nil : v)
               }
               if decl_attrs == col_attrs
                 identical=true

data/modalfields.gemspec

@@ -0,0 +1,98 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = "modalfields"
+  s.version = "1.1.2"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Javier Goizueta"]
+  s.date = "2012-04-24"
+  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",
+    "TODO"
+  ]
+  s.files = [
+    ".document",
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE.txt",
+    "README.rdoc",
+    "Rakefile",
+    "TODO",
+    "VERSION",
+    "lib/modalfields.rb",
+    "lib/modalfields/modalfields.rb",
+    "lib/modalfields/standardfields.rb",
+    "lib/modalfields/tasks.rb",
+    "lib/tasks/check.rake",
+    "lib/tasks/migrate.rake",
+    "lib/tasks/update.rake",
+    "modalfields.gemspec",
+    "test/create_database.rb",
+    "test/database.yml",
+    "test/helper.rb",
+    "test/model_cases/bare/after/author.rb",
+    "test/model_cases/bare/after/book.rb",
+    "test/model_cases/bare/before/author.rb",
+    "test/model_cases/bare/before/book.rb",
+    "test/model_cases/clean/after/author.rb",
+    "test/model_cases/clean/after/book.rb",
+    "test/model_cases/clean/before/author.rb",
+    "test/model_cases/clean/before/book.rb",
+    "test/model_cases/dirty/after/author.rb",
+    "test/model_cases/dirty/after/book.rb",
+    "test/model_cases/dirty/before/author.rb",
+    "test/model_cases/dirty/before/book.rb",
+    "test/schema.rb",
+    "test/test_diff.rb",
+    "test/test_update.rb"
+  ]
+  s.homepage = "http://github.com/jgoizueta/modalfields"
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.21"
+  s.summary = "Model annotator with Ruby (Hobo-like) syntax and hooks."
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<activesupport>, [">= 2.3.5"])
+      s.add_runtime_dependency(%q<activerecord>, [">= 2.3.5"])
+      s.add_development_dependency(%q<shoulda>, [">= 0"])
+      s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
+      s.add_development_dependency(%q<bundler>, ["~> 1"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.8.3"])
+      s.add_development_dependency(%q<sqlite3>, [">= 0"])
+      s.add_development_dependency(%q<pg>, [">= 0"])
+      s.add_runtime_dependency(%q<rails>, [">= 2.3.0"])
+    else
+      s.add_dependency(%q<activesupport>, [">= 2.3.5"])
+      s.add_dependency(%q<activerecord>, [">= 2.3.5"])
+      s.add_dependency(%q<shoulda>, [">= 0"])
+      s.add_dependency(%q<rdoc>, ["~> 3.12"])
+      s.add_dependency(%q<bundler>, ["~> 1"])
+      s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
+      s.add_dependency(%q<sqlite3>, [">= 0"])
+      s.add_dependency(%q<pg>, [">= 0"])
+      s.add_dependency(%q<rails>, [">= 2.3.0"])
+    end
+  else
+    s.add_dependency(%q<activesupport>, [">= 2.3.5"])
+    s.add_dependency(%q<activerecord>, [">= 2.3.5"])
+    s.add_dependency(%q<shoulda>, [">= 0"])
+    s.add_dependency(%q<rdoc>, ["~> 3.12"])
+    s.add_dependency(%q<bundler>, ["~> 1"])
+    s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
+    s.add_dependency(%q<sqlite3>, [">= 0"])
+    s.add_dependency(%q<pg>, [">= 0"])
+    s.add_dependency(%q<rails>, [">= 2.3.0"])
+  end
+end
+

data/test/helper.rb

@@ -24,21 +24,24 @@ end
 
 ENV['RAILS_ENV'] = 'test'
 ENV['RAILS_ROOT'] ||= File.dirname(__FILE__) # + '/../../../..'
- 
+
 # require File.expand_path(File.join(ENV['RAILS_ROOT'], 'config/environment.rb'))
 
 module Rails
   def self.root
     ENV['RAILS_ROOT']
   end
+  def version
+    ActiveRecord::VERSION::STRING
+  end
 end
- 
+
 def load_schema
   config = YAML::load(IO.read(File.dirname(__FILE__) + '/database.yml')).with_indifferent_access
   ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + "/debug.log")
- 
+
   db_adapter = ENV['DB']
- 
+
   # no db passed, try one of these fine config-free DBs before bombing.
   db_adapter ||=
     begin
@@ -47,15 +50,16 @@ def load_schema
       'sqlite3'
       rescue MissingSourceFile
     end
- 
+
   if db_adapter.nil?
     raise "No DB Adapter selected. Pass the DB= option to pick one, or install Sqlite3."
   end
-  
+
   require File.dirname(__FILE__) + '/create_database'
   create_database config[db_adapter]
-  
+
   ActiveRecord::Base.establish_connection(config[db_adapter])
   load(File.dirname(__FILE__) + "/schema.rb")
-  require File.dirname(__FILE__) + '/../rails/init'
+  require File.dirname(__FILE__) + '/../lib/modalfields'
+  ModalFields.enable
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: modalfields
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-18 00:00:00.000000000 Z
+date: 2012-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -179,6 +179,7 @@ files:
 - lib/tasks/check.rake
 - lib/tasks/migrate.rake
 - lib/tasks/update.rake
+- modalfields.gemspec
 - test/create_database.rb
 - test/database.yml
 - test/helper.rb
@@ -212,7 +213,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -737536039734340939
+      hash: 913054434622430133
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: