valhammer 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9465d328d445632ab2a2607b8cac901393548f32
-  data.tar.gz: d55c0bd7a8175139e6ad219a11ee8deacb04a92e
+  metadata.gz: 6ea291bcc9bb1f0c3931b9f5f83b8837f75be21e
+  data.tar.gz: 508cdc21ee92a31b986f5dbc9c6d449f5948355a
 SHA512:
-  metadata.gz: 4d957f2d9ffbd8bb863de67b61fdd4e169c96e879c0e1439d0ddb6566f9a3806ba11a35b6419bbaeb2c9a255310670f2da3738fa18e4483e895d0da119711d51
-  data.tar.gz: 8073eb0f3aa152003e81b1f76d5fdd19f6eba9d5d1c9b4e48967bce9175287750769c3a30b91e1be94c6c5ffee0034a6efdcb479bdcf01c8ae04997461c7d6f2
+  metadata.gz: 15ccdb15b5890eecf69712db5dd761562389294bbb18eee58aaf76f5a15a7b6ffb73fe50c21fe89974c13ed4e5493f8ceb736c03fc351e34806b6a2f525df9d3
+  data.tar.gz: e73bcfc221876e783226d08f9ce828ccb15783b4147df604f89c3259ed9d8f279d54f4b0716f7076c0cce20274d4436f9434f08d3eaf47ec1305728ce2fb1545

data/Guardfile

@@ -4,13 +4,13 @@ guard :bundler do
 end
 
 guard :rspec, cmd: 'bundle exec rspec' do
-  watch(/^spec\/.+_spec\.rb$/)
-  watch(/^lib\/(.+)\.rb$/) { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$}) { |m| "spec/lib/#{m[1]}_spec.rb" }
   watch('spec/spec_helper.rb') { 'spec' }
   watch(%r{spec/(db|dummy)/.*\.rb}) { 'spec' }
 end
 
 guard :rubocop do
   watch(/.+\.rb$/)
-  watch(/(?:.+\/)?\.rubocop\.yml$/) { |m| File.dirname(m[0]) }
+  watch(%r{(?:.+/)?\.rubocop\.yml$}) { |m| File.dirname(m[0]) }
 end

data/lib/valhammer/validations.rb

@@ -77,6 +77,8 @@ module Valhammer
     def valhammer_numeric(validations, column, opts)
       return unless opts[:numericality]
 
+      return if defined_enums.key?(column.name)
+
       case column.type
       when :integer
         validations[:numericality] = { only_integer: true,

data/lib/valhammer/version.rb

@@ -1,3 +1,3 @@
 module Valhammer
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

data/spec/db/schema.rb

@@ -9,6 +9,7 @@ ActiveRecord::Schema.define(version: 0) do
     t.integer :age, null: true, default: nil
     t.decimal :gpa, null: false, default: 3.0
     t.integer :socialness, null: false, default: 5
+    t.integer :sex, null: false, default: 0
     t.boolean :injected, null: false, default: false
 
     t.timestamps null: false

data/spec/dummy/app/models/resource.rb

@@ -1,5 +1,7 @@
 class Resource < ActiveRecord::Base
   belongs_to :organisation
 
+  enum sex: [:mail, :female]
+
   valhammer
 end

data/spec/lib/valhammer/validations_spec.rb

@@ -115,6 +115,10 @@ RSpec.describe Valhammer::Validations do
           .to include(a_validator_for(:socialness, :numericality, opts))
       end
     end
+
+    context 'when used as enum' do
+      it { is_expected.not_to include(a_validator_for(:sex, :numericality)) }
+    end
   end
 
   context 'with a numeric column' do

data/valhammer.gemspec

@@ -14,8 +14,8 @@ Gem::Specification.new do |spec|
   spec.license       = 'Apache-2.0'
 
   spec.files         = `git ls-files -z`.split("\x0")
-  spec.executables   = spec.files.grep(/^bin\//) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(/^(test|spec|features)\//)
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
   spec.add_dependency 'activerecord', '~> 4.1'

metadata

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