Merge branch 'feature-mongoid4' of git://github.com/plainprogrammer/mongoid-enum into plainprogrammer-feature-mongoid4

Author: thetron

.gitignore

@@ -4,6 +4,7 @@
 .config
 .yardoc
 Gemfile.lock
+Mongoid4.gemfile.lock
 InstalledFiles
 _yardoc
 coverage

.travis.yml

@@ -7,8 +7,10 @@ rvm:
   - rbx-19mode
 gemfile:
   - Gemfile
-notifications:
-  recipients:
-    - [email protected]
+  - Mongoid4.gemfile
 services:
   - mongodb
+branches:
+  only:
+    - master
+    - feature-mongoid4

Mongoid4.gemfile

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+gem 'mongoid', '~> 4.0.0', github: 'mongoid/mongoid'
+
+# Specify your gem's dependencies in mongoid-enum.gemspec
+gemspec

lib/mongoid/enum.rb

@@ -26,7 +26,7 @@ def enum(name, values, options = {})
         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", ["> 3.0", "< 4.1"]
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"