consistency_fail 0.2.1 → 0.2.2

data/README.md

@@ -25,7 +25,10 @@ For Rails 3:
 
 For Rails 2.3:
 
-    gem install consistency_fail -v=0.1.0
+    gem install consistency_fail -v=0.1.1
+
+Or, even better if you're using bundler, add it to your Gemfile, with the
+appropriate version number for your Rails version.
 
 ## Limitations
 
@@ -61,6 +64,11 @@ Gemfile, or by some other mechanism.
 This mega-fail mode is nice to have if you have a large team and want to ensure
 that new models or validations/associations follow the rules.
 
+If you're using the `Enforcer`, depending on your project, you may need to 
+delay the initializer until later, so that model files can be loaded only once
+gem dependencies have been satisfied. One possible way is to move the code above 
+to the end of `environment.rb` or to the more specific `config/environment/*` files.
+
 ## License
 
 Released under the MIT License. See the LICENSE file for further details.

data/lib/consistency_fail/introspectors/has_one.rb

@@ -18,9 +18,14 @@ module ConsistencyFail
       private :desired_indexes
 
       def missing_indexes(model)
-        existing_indexes = TableData.new.unique_indexes(model)
+        desired = desired_indexes(model)
 
-        desired_indexes(model).reject do |index|
+        existing_indexes = desired.inject([]) do |acc, d|
+          # TODO: This assumes the models share a database. Need to make that configurable somehow.
+          acc += TableData.new.unique_indexes_by_table(model.connection, d.table_name)
+        end
+
+        desired.reject do |index|
           existing_indexes.include?(index)
         end
       end

data/lib/consistency_fail/introspectors/table_data.rb

@@ -6,9 +6,13 @@ module ConsistencyFail
       def unique_indexes(model)
         return [] if !model.table_exists?
 
-        ar_indexes = model.connection.indexes(model.table_name).select(&:unique)
+        unique_indexes_by_table(model.connection, model.table_name)
+      end
+
+      def unique_indexes_by_table(connection, table_name)
+        ar_indexes = connection.indexes(table_name).select(&:unique)
         ar_indexes.map do |index|
-          ConsistencyFail::Index.new(model.table_name, index.columns)
+          ConsistencyFail::Index.new(table_name, index.columns)
         end
       end
     end

data/lib/consistency_fail/models.rb

@@ -24,13 +24,7 @@ module ConsistencyFail
     end
 
     def all
-      models = []
-      ObjectSpace.each_object do |o|
-        models << o if o.class == Class &&
-                       o.ancestors.include?(ActiveRecord::Base) &&
-                       o != ActiveRecord::Base
-      end
-      models.sort_by(&:name)
+      ActiveRecord::Base.send(:descendants).sort_by(&:name)
     end
 
   end

data/lib/consistency_fail/version.rb

@@ -1,3 +1,3 @@
 module ConsistencyFail
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/spec/introspectors/has_one_spec.rb

@@ -42,7 +42,7 @@ describe ConsistencyFail::Introspectors::HasOne do
 
     it "finds one" do
       @association.stub!(:table_name => :addresses, :primary_key_name => "user_id")
-      @model.stub_chain(:connection, :indexes).with("users").and_return([])
+      @model.stub_chain(:connection, :indexes).with("addresses").and_return([])
 
       indexes = subject.missing_indexes(@model)
       indexes.should == [ConsistencyFail::Index.new("addresses", ["user_id"])]
@@ -51,7 +51,12 @@ describe ConsistencyFail::Introspectors::HasOne do
     it "finds none when they're already in place" do
       @association.stub!(:table_name => :addresses, :primary_key_name => "user_id")
       index = ConsistencyFail::Index.new("addresses", ["user_id"])
-      ConsistencyFail::Introspectors::TableData.stub_chain(:new, :unique_indexes).
+
+      fake_connection = double("connection")
+      @model.stub_chain(:connection).and_return(fake_connection)
+
+      ConsistencyFail::Introspectors::TableData.stub_chain(:new, :unique_indexes_by_table).
+        with(fake_connection, "addresses").
         and_return([index])
 
       subject.missing_indexes(@model).should == []

data/spec/models_spec.rb

@@ -32,24 +32,12 @@ describe ConsistencyFail::Models do
   end
 
   it "gets all models" do
-    model_a = double("model_a",
-                     :ancestors => [ActiveRecord::Base],
-                     :class => Class,
-                     :name => "ModelA")
-    model_b = double("model_b",
-                     :ancestors => [ActiveRecord::Base],
-                     :class => Class,
-                     :name => "ModelB")
-    model_c = double("model_c",
-                     :ancestors => [ActiveRecord::Base],
-                     :class => ActiveRecord::Base,
-                     :name => "ModelC")
-
-    ObjectSpace.stub(:each_object).
-                and_yield(model_c).
-                and_yield(model_b).
-                and_yield(model_a)
-
-    models([]).all.should == [model_a, model_b]
+    model_a = double(:name => "animal")
+    model_b = double(:name => "cat")
+    model_c = double(:name => "beach_ball")
+
+    ActiveRecord::Base.stub(:send).with(:descendants).and_return([model_a, model_b, model_c])
+
+    models([]).all.should == [model_a, model_c, model_b]
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: consistency_fail
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Colin Jones
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-17 00:00:00 -05:00
-default_executable: 
+date: 2012-01-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
@@ -92,7 +91,6 @@ files:
 - spec/models_spec.rb
 - spec/reporter_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/trptcolin/consistency_fail
 licenses: []
 
@@ -122,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: A tool to detect missing unique indexes