consistency_fail 0.1.1 → 0.2.0

data/README.md

@@ -21,8 +21,6 @@ database-level enforcement is lacking there as well.
 
 ## Limitations
 
-Currently only Rails 2.x is supported. Rails 3 support is coming soon.
-
 consistency\_fail depends on being able to find all your `ActiveRecord::Base`
 subclasses with some `$LOAD_PATH` trickery. If any models are in a path either
 not on your project's load path or in a path that doesn't include the word
@@ -42,6 +40,7 @@ or simply beam in happiness at your application's perfect record for
 
 ## Coming Soon
 
+* Handling validates\_uniqueness\_of calls scoped to an association (not a column)
 * Rails 3 support
 * Super-fail mode that monkey-patches explosions into your naughty models
 

data/consistency_fail.gemspec

@@ -20,8 +20,7 @@ consistency_fail will find your missing unique indexes, so you can add them and
 stop ignoring the C in ACID.
 EOF
 
-  s.add_dependency "validation_reflection", "~>0.3.8"
-  s.add_development_dependency "activerecord", "~>2.3"
+  s.add_development_dependency "activerecord", "~>3.0"
   s.add_development_dependency "rspec"
 
   s.files         = `git ls-files`.split("\n")

data/lib/consistency_fail/introspectors/validates_uniqueness_of.rb

@@ -1,20 +1,21 @@
-require 'validation_reflection'
 require 'consistency_fail/index'
 
 module ConsistencyFail
   module Introspectors
     class ValidatesUniquenessOf
       def instances(model)
-        model.reflect_on_all_validations.select do |v|
-          v.macro == :validates_uniqueness_of
+        model.validators.select do |v|
+          v.class == ActiveRecord::Validations::UniquenessValidator
         end
       end
 
       def desired_indexes(model)
         instances(model).map do |v|
-          scoped_columns = v.options[:scope] || []
-          ConsistencyFail::Index.new(model.table_name, [v.name, *scoped_columns])
-        end
+          v.attributes.map do |attribute|
+            scoped_columns = v.options[:scope] || []
+            ConsistencyFail::Index.new(model.table_name, [attribute, *scoped_columns])
+          end
+        end.flatten
       end
       private :desired_indexes
 

data/lib/consistency_fail/version.rb

@@ -1,3 +1,3 @@
 module ConsistencyFail
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/spec/introspectors/validates_uniqueness_of_spec.rb

@@ -9,23 +9,23 @@ describe ConsistencyFail::Introspectors::ValidatesUniquenessOf do
   describe "instances of validates_uniqueness_of" do
     it "finds none" do
       model = fake_ar_model("User")
-      model.stub!(:reflect_on_all_validations).and_return([])
+      model.stub!(:validators).and_return([])
 
       subject.instances(model).should == []
     end
 
     it "finds one" do
       model = fake_ar_model("User")
-      validation = double("validation", :macro => :validates_uniqueness_of)
-      model.stub!(:reflect_on_all_validations).and_return([validation])
+      validation = double("validation", :class => ActiveRecord::Validations::UniquenessValidator)
+      model.stub!(:validators).and_return([validation])
 
       subject.instances(model).should == [validation]
     end
 
     it "finds other validations, but not uniqueness" do
       model = fake_ar_model("User")
-      validation = double("validation", :macro => :validates_format_of)
-      model.stub!(:reflect_on_all_validations).and_return([validation])
+      validation = double("validation", :class => ActiveModel::Validations::FormatValidator)
+      model.stub!(:validators).and_return([validation])
 
       subject.instances(model).should == []
     end
@@ -33,14 +33,14 @@ describe ConsistencyFail::Introspectors::ValidatesUniquenessOf do
 
   describe "finding missing indexes" do
     before do
-      @validation = double("validation", :macro => :validates_uniqueness_of)
+      @validation = double("validation", :class => ActiveRecord::Validations::UniquenessValidator)
       @model = fake_ar_model("User", :table_exists? => true,
                                      :table_name => "users",
-                                     :reflect_on_all_validations => [@validation])
+                                     :validators => [@validation])
     end
 
     it "finds one" do
-      @validation.stub!(:name => :email, :options => {})
+      @validation.stub!(:attributes => [:email], :options => {})
       @model.stub_chain(:connection, :indexes).with("users").and_return([])
 
       indexes = subject.missing_indexes(@model)
@@ -48,23 +48,32 @@ describe ConsistencyFail::Introspectors::ValidatesUniquenessOf do
     end
 
     it "finds one where the validation has scoped columns" do
-      @validation.stub!(:name => :city, :options => {:scope => [:email, :state]})
+      @validation.stub!(:attributes => [:city], :options => {:scope => [:email, :state]})
       @model.stub_chain(:connection, :indexes).with("users").and_return([])
 
       indexes = subject.missing_indexes(@model)
       indexes.should == [ConsistencyFail::Index.new("users", ["city", "email", "state"])]
     end
 
-    it "sorts the scoped columns" do
-      @validation.stub!(:name => :email, :options => {:scope => [:city, :state]})
+    it "leaves the columns in the given order" do
+      @validation.stub!(:attributes => [:email], :options => {:scope => [:city, :state]})
       @model.stub_chain(:connection, :indexes).with("users").and_return([])
 
       indexes = subject.missing_indexes(@model)
       indexes.should == [ConsistencyFail::Index.new("users", ["email", "city", "state"])]
     end
 
+    it "finds two where there are multiple attributes" do
+      @validation.stub!(:attributes => [:email, :name], :options => {:scope => [:city, :state]})
+      @model.stub_chain(:connection, :indexes).with("users").and_return([])
+
+      indexes = subject.missing_indexes(@model)
+      indexes.should == [ConsistencyFail::Index.new("users", ["email", "city", "state"]),
+                         ConsistencyFail::Index.new("users", ["name", "city", "state"])]
+    end
+
     it "finds none when they're already in place" do
-      @validation.stub!(:name => :email, :options => {})
+      @validation.stub!(:attributes => [:email], :options => {})
       index = fake_index_on(["email"], :unique => true)
       @model.stub_chain(:connection, :indexes).with("users").
              and_return([index])
@@ -73,7 +82,7 @@ describe ConsistencyFail::Introspectors::ValidatesUniquenessOf do
     end
 
     it "finds none when indexes are there but in a different order" do
-      @validation.stub!(:name => :email, :options => {:scope => [:city, :state]})
+      @validation.stub!(:attributes => [:email], :options => {:scope => [:city, :state]})
       index = fake_index_on(["state", "email", "city"], :unique => true)
       @model.stub_chain(:connection, :indexes).with("users").
              and_return([index])

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: consistency_fail
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
-  - 1
-  version: 0.1.1
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Colin Jones
@@ -15,44 +15,28 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-17 00:00:00 -05:00
+date: 2011-06-10 00:00:00 -05:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: validation_reflection
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        - 3
-        - 8
-        version: 0.3.8
-  type: :runtime
-  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: activerecord
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 5
+        hash: 7
         segments: 
-        - 2
         - 3
-        version: "2.3"
+        - 0
+        version: "3.0"
   type: :development
-  version_requirements: *id002
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -62,7 +46,7 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id003
+  version_requirements: *id002
 description: |
   With more than one application server, validates_uniqueness_of becomes a lie.
   Two app servers -> two requests -> two near-simultaneous uniqueness checks ->