Merge branch 'plainprogrammer-feature-mongoid4'

.travis.yml

@@ -3,12 +3,10 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
+  - 2.1.0
+  - 2.1.1
+  - 2.1.2
   - jruby-19mode
-  - rbx-19mode
-gemfile:
-  - Gemfile
-notifications:
-  recipients:
-    - nicholas@bruning.com.au
+
 services:
   - mongodb

lib/mongoid/enum.rb

@@ -26,7 +26,7 @@ module Mongoid
         end
 
         values.each do |value|
-          scope value, where(field_name => value)
+          scope value, ->{ where(field_name => value) }
 
           if multiple
             class_eval "def #{value}?() self.#{field_name}.include?(:#{value}) end"

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_dependency "mongoid", "~>3.1"
+  spec.add_runtime_dependency "mongoid", "~> 4.0"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"