From 85f8881b8a9ad3b988daa5ff97c4cc8cb1405a54 Mon Sep 17 00:00:00 2001 From: Alexander Kravets Date: Wed, 18 May 2016 15:45:30 +0300 Subject: [PATCH 1/3] Fix validate option for non multiples --- lib/mongoid/enum.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/mongoid/enum.rb b/lib/mongoid/enum.rb index 20dc37e..03d3cf0 100644 --- a/lib/mongoid/enum.rb +++ b/lib/mongoid/enum.rb @@ -44,7 +44,7 @@ def create_validations(field_name, values, options) if options[:multiple] && options[:validate] validates field_name, :'mongoid/enum/validators/multiple' => { :in => values.map(&:to_sym), :allow_nil => !options[:required] } #FIXME: Shouldn't this be `elsif options[:validate]` ??? - elsif validate + elsif options[:validate] validates field_name, :inclusion => {:in => values.map(&:to_sym)}, :allow_nil => !options[:required] end end From 667556e8f2e7a2b148ee75aa046acceec969a6c6 Mon Sep 17 00:00:00 2001 From: Alexander Kravets Date: Wed, 18 May 2016 15:46:38 +0300 Subject: [PATCH 2/3] Version bump --- lib/mongoid/enum/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/mongoid/enum/version.rb b/lib/mongoid/enum/version.rb index 0067529..30257fc 100644 --- a/lib/mongoid/enum/version.rb +++ b/lib/mongoid/enum/version.rb @@ -1,5 +1,5 @@ module Mongoid module Enum - VERSION = "0.4.0" + VERSION = "0.4.1" end end From d0bf9a1a44903c1e3ea229ee92d47234e0c8ba64 Mon Sep 17 00:00:00 2001 From: DenisPopov15 Date: Thu, 3 Nov 2016 00:01:06 +0200 Subject: [PATCH 3/3] Allow use with mongoid 6 --- mongoid-enum.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mongoid-enum.gemspec b/mongoid-enum.gemspec index bd9465d..5e94b5f 100644 --- a/mongoid-enum.gemspec +++ b/mongoid-enum.gemspec @@ -18,7 +18,7 @@ Gem::Specification.new do |spec| spec.test_files = spec.files.grep(%r{^(test|spec|features)/}) spec.require_paths = ["lib"] - spec.add_runtime_dependency "mongoid", "~> 5.0" + spec.add_runtime_dependency "mongoid", ">= 5.0" spec.add_development_dependency "bundler", "~> 1.3" spec.add_development_dependency "rake"