valhammer 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7bbc167cf3bd0b5da8157c01558742ba809d6efb
-  data.tar.gz: 0e478898f5ce6d7f5338e03e0010d72179e4e06c
+  metadata.gz: db1cabb3ee1b18be9f92f9853620457505b28313
+  data.tar.gz: 7f793f56fd7cc961824d3239bad6a0ad05cf05b9
 SHA512:
-  metadata.gz: d166959c57a0f15af70b4cedf85c51a8a41f676bb9fb9f8e656c1d00b7816a1685cd6b540343dce5619ed7238a5b37a7550f10a6c39014c0aee7cc6f5d59f8ec
-  data.tar.gz: c135af6ebcfa1d6d9a1a8dca65f11f90ac37d6bff1ca0cf9deb223523f01a218af3244eebb706e42cb6390bf22675ed6d10ede83b6c0cb1cbe4594aded4e9570
+  metadata.gz: e173041be8467d80bbb59a922bfb08c3c46ed8028c80ec36ae24d59019c99d360247859872cb2c5d8c8d9069188b692610bf8a4674434b61dbb17ef23380ea30
+  data.tar.gz: 1cd7c99c9d11dbcd3f43810c0be4f650d74b08764afb4c400a4872d6e0fce61a9a1ce9d8434b42f3cfcd89856dde43f4671a2313e706017a0086ed0d941f21b4

data/lib/valhammer/validations.rb

@@ -9,7 +9,7 @@ module Valhammer
     private_constant :VALHAMMER_DEFAULT_OPTS, :VALHAMMER_EXCLUDED_FIELDS
 
     def valhammer(opts = {})
-      @valhammer_indexes ||= connection.indexes(table_name)
+      @valhammer_indexes = connection.indexes(table_name)
       opts = VALHAMMER_DEFAULT_OPTS.merge(opts)
       columns_hash.each do |name, column|
         valhammer_validate(name, column, opts)
@@ -56,7 +56,7 @@ module Valhammer
     def valhammer_inclusion(validations, column, opts)
       return unless opts[:inclusion] && column.type == :boolean
 
-      validations[:inclusion] = { in: [false, true], allow_nil: column.null }
+      validations[:inclusion] = { in: [false, true], allow_nil: true }
     end
 
     def valhammer_unique(validations, column, opts)
@@ -69,7 +69,9 @@ module Valhammer
       return unless unique_keys.one?
 
       scope = unique_keys.first.columns[0..-2]
-      validations[:uniqueness] = scope.empty? ? true : { scope: scope }
+
+      opts = validations[:uniqueness] = { allow_nil: true }
+      opts[:scope] = scope if scope.any?
     end
 
     def valhammer_numeric(validations, column, opts)
@@ -78,10 +80,10 @@ module Valhammer
       case column.type
       when :integer
         validations[:numericality] = { only_integer: true,
-                                       allow_nil: column.null }
+                                       allow_nil: true }
       when :decimal
         validations[:numericality] = { only_integer: false,
-                                       allow_nil: column.null }
+                                       allow_nil: true }
       end
     end
 

data/lib/valhammer/version.rb

@@ -1,3 +1,3 @@
 module Valhammer
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/spec/lib/valhammer/validations_spec.rb

@@ -38,7 +38,7 @@ RSpec.describe Valhammer::Validations do
   end
 
   context 'with a non-nullable boolean' do
-    let(:opts) { { in: [false, true], allow_nil: false } }
+    let(:opts) { { in: [false, true], allow_nil: true } }
 
     it { is_expected.to include(a_validator_for(:injected, :inclusion, opts)) }
   end
@@ -88,7 +88,9 @@ RSpec.describe Valhammer::Validations do
   context 'with a composite unique index' do
     subject { Capability.validators }
 
-    let(:opts) { { scope: ['organisation_id'], case_sensitive: true } }
+    let(:opts) do
+      { scope: ['organisation_id'], case_sensitive: true, allow_nil: true }
+    end
     it { is_expected.to include(a_validator_for(:name, :uniqueness, opts)) }
   end
 
@@ -101,13 +103,14 @@ RSpec.describe Valhammer::Validations do
   end
 
   context 'with an integer column' do
-    context 'with allow_nil' do
+    context 'with a nullable column' do
       let(:opts) { { only_integer: true, allow_nil: true } }
       it { is_expected.to include(a_validator_for(:age, :numericality, opts)) }
     end
-    context 'without allow_nil' do
-      let(:opts) { { only_integer: true, allow_nil: false } }
-      it 'sets allow_nil to false for socialness' do
+
+    context 'with a non-nullable column' do
+      let(:opts) { { only_integer: true, allow_nil: true } }
+      it 'allows a nil value in the numericality validator' do
         expect(subject)
           .to include(a_validator_for(:socialness, :numericality, opts))
       end
@@ -115,7 +118,7 @@ RSpec.describe Valhammer::Validations do
   end
 
   context 'with a numeric column' do
-    let(:opts) { { only_integer: false, allow_nil: false } }
+    let(:opts) { { only_integer: false, allow_nil: true } }
     it { is_expected.to include(a_validator_for(:gpa, :numericality, opts)) }
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: valhammer
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Shaun Mangelsdorf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-02 00:00:00.000000000 Z
+date: 2015-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord