nullalign 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5af4ac1d6d4cfd1977ef54a3f0474dbce25f9fea
-  data.tar.gz: bad6def07e87ca11b13fac642d6f937314143f45
+  metadata.gz: 1af15eca93e06667b2a429e1c853c03c101a9425
+  data.tar.gz: 3ba414cae84fceaf9ff1e66f65322eb3e6b153bc
 SHA512:
-  metadata.gz: d26458bc42d5646822a211380a7f558a1d99027423cf307df635bc90f7669278d49a9e79ae0cc2388c96a3fcbd9cd94fd3f73917210be8399328077e4a114623
-  data.tar.gz: '091cdc67b563263fdf6e04a1fc56037f4bc26fdc1bc1c59c4a6cee2ef0704fcbeff6d818108bc854db6be6947a892701a18cfe2fbfa5999a1d222924fca6ebad'
+  metadata.gz: cb64c015c7b25c0c070d97157df4b5d027b77170884bafe5d15bfb2cbdae3f5a144be744ed4a7a750e0106da661e303a1c32f4a0c8f0f224cb08fe2cb9f91034
+  data.tar.gz: 46e03a6c9c628434afbbdf27f2be293eaa4ed7b68ceb146f14fa97f7b94b9e98ccbde3fff140ba73c35f7bc319064e6e6641937746d61e11d74aa2faaebb9ce6

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## v0.0.2 Oct 23 2017
+* Skip conditional validations
+
 ## v0.0.1 Sep 28 2017
 
 * Initial release

data/README.md

@@ -47,6 +47,17 @@ or pull request if so!
 To disable nullalign, I could add a thing that checks column comments for a string
 like 'nonullalign' if people think that would be useful.  Just let me know.
 
+## Contributors
+
+* [Tom Copeland](https://thomasleecopeland.com) - author
+* [Woongcheol Yang](https://github.com/woongy) - support for conditional validations
+
+## Tests
+
+You can run the tests with:
+
+    bundle exec rspec
+
 ## License
 
 Released under the MIT License. See the LICENSE file for further details.

data/lib/nullalign/introspectors/validates_presence_of.rb

@@ -5,7 +5,7 @@ module Nullalign
     class ValidatesPresenceOf
       def instances(model)
         model.validators.select do |v|
-          v.class == ActiveRecord::Validations::PresenceValidator
+          v.class == ActiveRecord::Validations::PresenceValidator && (v.options.keys & %i(on if unless)).empty?
         end
       end
 

data/lib/nullalign/version.rb

@@ -1,3 +1,3 @@
 module Nullalign
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/nullalign.gemspec

@@ -16,7 +16,7 @@ non-null constraint to go with it.
 EOF
   s.license = "MIT"
 
-  s.add_development_dependency "activerecord", "~>3.0"
+  s.add_development_dependency "activerecord", "~>4.0"
   s.add_development_dependency "sqlite3", "~>1.3"
   s.add_development_dependency "rspec", "~>3.2"
 

data/spec/introspectors/table_data_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe Nullalign::Introspectors::TableData do
+  
+  describe "finding nonnull constraints" do
+    it "finds none when the table does not exist" do
+      expect(subject.nonnull_constraints(Nonexistent)).to be_empty
+    end
+
+    it "gets one" do
+      expect(
+        Nullalign::Introspectors::TableData.new.nonnull_constraints_by_table(
+          CorrectAccount,
+          CorrectAccount.table_name
+        )[1].column
+      ).to eq "email"
+    end
+  end
+end

data/spec/introspectors/validates_presence_of_spec.rb

@@ -0,0 +1,36 @@
+require 'spec_helper'
+
+describe Nullalign::Introspectors::ValidatesPresenceOf do
+
+  describe "finding missing nonnull constraints" do
+    it "finds one" do
+      indexes = subject.missing_nonnull_constraints(WrongAccount)
+
+      expect(indexes).to eq([
+        Nullalign::NonnullConstraint.new(
+          WrongAccount,
+          WrongAccount.table_name,
+          "email"
+        )
+      ])
+    end
+
+    it "finds none when they're already in place" do
+      expect(subject.missing_nonnull_constraints(CorrectAccount)).to be_empty
+    end
+
+    it 'finds none if there is an if condition' do
+      expect(subject.missing_nonnull_constraints(WithIfAccount)).to be_empty
+    end
+
+    it 'finds none if there is an on condition' do
+      expect(subject.missing_nonnull_constraints(WithOnAccount)).to be_empty
+    end
+
+    it 'finds none if there is an unless condition' do
+      expect(subject.missing_nonnull_constraints(WithUnlessAccount)).to be_empty
+    end
+
+  end
+
+end

data/spec/models_spec.rb

@@ -37,14 +37,13 @@ describe Nullalign::Models do
   end
 
   it "gets all models" do
-    # TODO fails, but why?
-    # model_a = double(:name => "animal")
-    # model_b = double(:name => "cat")
-    # model_c = double(:name => "beach_ball")
-    #
-    # allow(ActiveRecord::Base).to receive(:send).with(:descendants).and_return([model_a, model_b, model_c])
-    #
-    # expect(models([]).all).to eq([model_a, model_c, model_b])
+    model_a = double(:name => "animal")
+    model_b = double(:name => "cat")
+    model_c = double(:name => "beach_ball")
+
+    allow(ActiveRecord::Base).to receive(:descendants).and_return([model_a, model_b, model_c])
+
+    expect(models([]).all).to eq([model_a, model_c, model_b])
   end
   
 end

data/spec/nonnull_constraint_spec.rb

@@ -0,0 +1,53 @@
+describe Nullalign::NonnullConstraint do
+
+  let(:nonnull_constraint) do
+    Nullalign::NonnullConstraint.new(
+      CorrectAccount,
+      CorrectAccount.table_name,
+      "city"
+    )
+  end
+
+  describe "value objectiness" do
+    it "holds onto model, table name, and columns" do
+      expect(nonnull_constraint.model).to eq(CorrectAccount)
+      expect(nonnull_constraint.table_name).to eq("correct_accounts")
+      expect(nonnull_constraint.column).to eq(
+        "city"
+      )
+    end
+  end
+
+  describe "equality test" do
+    it "passes when everything matches" do
+      expect(nonnull_constraint).to eq(
+        Nullalign::NonnullConstraint.new(
+          "CorrectAccount".constantize,
+          "correct_accounts",
+          "city"
+        )
+      )
+    end
+
+    it "fails when tables are different" do
+      expect(nonnull_constraint).not_to eq(
+        Nullalign::NonnullConstraint.new(
+          NewCorrectAccount,
+          NewCorrectAccount.table_name,
+          "city"
+        )
+      )
+    end
+
+    it "fails when columns are different" do
+      expect(nonnull_constraint).not_to eq(
+        Nullalign::NonnullConstraint.new(
+          CorrectAccount,
+          NewCorrectAccount.table_name,
+          "city"
+        )
+      )
+    end
+  end
+
+end

data/spec/reporter_spec.rb

@@ -0,0 +1,27 @@
+describe Nullalign::Reporter do
+
+  context "validates_presence_of" do
+    it "says everything's good" do
+      expect {
+        subject.report_validates_presence_problems([])
+      }.to output(/Hooray!/).to_stdout
+    end
+
+    it "shows a missing constraint on a single model" do
+      missing_constraints = [
+        Nullalign::NonnullConstraint.new(
+          WrongAccount,
+          WrongAccount.table_name,
+          "email"
+        )
+      ]
+
+      expect {
+        subject.report_validates_presence_problems(
+          WrongAccount => missing_constraints
+        )
+      }.to output(/wrong_accounts:\s+email/).to_stdout
+    end
+  end
+
+end

data/spec/support/models/with_if_account.rb

@@ -0,0 +1,5 @@
+class WithIfAccount < ActiveRecord::Base
+
+  validates :email, presence: true, if: -> { rand > 0.5 }
+
+end

data/spec/support/models/with_on_account.rb

@@ -0,0 +1,5 @@
+class WithOnAccount < ActiveRecord::Base
+
+  validates :email, presence: true, on: -> { rand > 0.5 }
+
+end

data/spec/support/models/with_unless_account.rb

@@ -0,0 +1,5 @@
+class WithUnlessAccount < ActiveRecord::Base
+
+  validates :email, presence: true, unless: -> { rand > 0.5 }
+
+end

data/spec/support/schema.rb

@@ -11,6 +11,21 @@ ActiveRecord::Schema.define(version: 0) do
     t.timestamps
   end
 
+  create_table :with_if_accounts do |t|
+    t.string :email
+    t.timestamps
+  end
+
+  create_table :with_on_accounts do |t|
+    t.string :email
+    t.timestamps
+  end
+
+  create_table :with_unless_accounts do |t|
+    t.string :email
+    t.timestamps
+  end
+
   execute 'CREATE VIEW new_correct_people AS '\
           'SELECT * FROM correct_people '\
           'WHERE created_at = updated_at'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nullalign
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Tom Copeland
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-28 00:00:00.000000000 Z
+date: 2017-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -80,12 +80,19 @@ files:
 - lib/nullalign/reporters/validates_presence_of.rb
 - lib/nullalign/version.rb
 - nullalign.gemspec
+- spec/introspectors/table_data_spec.rb
+- spec/introspectors/validates_presence_of_spec.rb
 - spec/models_spec.rb
+- spec/nonnull_constraint_spec.rb
+- spec/reporter_spec.rb
 - spec/spec_helper.rb
 - spec/support/active_record.rb
 - spec/support/models/correct_account.rb
 - spec/support/models/new_correct_account.rb
 - spec/support/models/nonexistent.rb
+- spec/support/models/with_if_account.rb
+- spec/support/models/with_on_account.rb
+- spec/support/models/with_unless_account.rb
 - spec/support/models/wrong_account.rb
 - spec/support/schema.rb
 homepage: http://github.com/tcopeland/nullalign
@@ -113,11 +120,18 @@ signing_key:
 specification_version: 4
 summary: A tool to detect missing non-null constraints
 test_files:
+- spec/introspectors/table_data_spec.rb
+- spec/introspectors/validates_presence_of_spec.rb
 - spec/models_spec.rb
+- spec/nonnull_constraint_spec.rb
+- spec/reporter_spec.rb
 - spec/spec_helper.rb
 - spec/support/active_record.rb
 - spec/support/models/correct_account.rb
 - spec/support/models/new_correct_account.rb
 - spec/support/models/nonexistent.rb
+- spec/support/models/with_if_account.rb
+- spec/support/models/with_on_account.rb
+- spec/support/models/with_unless_account.rb
 - spec/support/models/wrong_account.rb
 - spec/support/schema.rb