From 011433b3eee82021f187520769adb44ba12326fd Mon Sep 17 00:00:00 2001
From: James Thompson <jamest@readyproject.com>
Date: Sun, 10 Nov 2013 09:19:45 -0700
Subject: [PATCH 1/6] Updated build configuration.

---
 .travis.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f8d671b..2c8baec 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,8 +7,10 @@ rvm:
   - rbx-19mode
 gemfile:
   - Gemfile
-notifications:
-  recipients:
-    - nicholas@bruning.com.au
+  - Mongoid4.gemfile
 services:
   - mongodb
+branches:
+  only:
+    - master
+    - feature-mongoid4

From 8c0f386b3aa65862a6d7d1529fe0b143d937358a Mon Sep 17 00:00:00 2001
From: James Thompson <jamest@readyproject.com>
Date: Sun, 10 Nov 2013 09:20:16 -0700
Subject: [PATCH 2/6] Added custom gemfile for Mongoid 4 and updated Gemspec to
 allow for Mongoid 4.

---
 Mongoid4.gemfile     | 6 ++++++
 mongoid-enum.gemspec | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 Mongoid4.gemfile

diff --git a/Mongoid4.gemfile b/Mongoid4.gemfile
new file mode 100644
index 0000000..43739ec
--- /dev/null
+++ b/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
diff --git a/mongoid-enum.gemspec b/mongoid-enum.gemspec
index e710cf5..19be000 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_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"

From 40ffdbd864826eef958d5df54346dcbbc2c9d946 Mon Sep 17 00:00:00 2001
From: James Thompson <jamest@readyproject.com>
Date: Sun, 10 Nov 2013 09:32:21 -0700
Subject: [PATCH 3/6] Added Mongoid4.gemfile.lock to ignore list.

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index d87d4be..6dc8f75 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@
 .config
 .yardoc
 Gemfile.lock
+Mongoid4.gemfile.lock
 InstalledFiles
 _yardoc
 coverage

From 6dbc5a459f8057d2b19bec1bd971577eb2834ae4 Mon Sep 17 00:00:00 2001
From: James Thompson <jamest@thereadyproject.com>
Date: Mon, 10 Feb 2014 11:03:27 -0700
Subject: [PATCH 4/6] Wrapped scope condition in proc.

---
 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 bf9117a..981b337 100644
--- a/lib/mongoid/enum.rb
+++ b/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"

From db0901e6f1c43c01b7372b2710c5f1e22d7e1ddd Mon Sep 17 00:00:00 2001
From: Nicholas Bruning <nicholas@bruning.com.au>
Date: Sat, 12 Jul 2014 12:39:22 +1000
Subject: [PATCH 5/6] Removed RBX from travis matrix

---
 .travis.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 2c8baec..24e9c53 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,8 +3,11 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
+  - 2.1.0
+  - 2.1.1
+  - 2.1.2
   - jruby-19mode
-  - rbx-19mode
+
 gemfile:
   - Gemfile
   - Mongoid4.gemfile

From 7e62ee3e06e74f4b6bfc0bf15505e087bb181003 Mon Sep 17 00:00:00 2001
From: Nicholas Bruning <nicholas@bruning.com.au>
Date: Sat, 12 Jul 2014 13:19:02 +1000
Subject: [PATCH 6/6] Updated gitignore, travis build matrix and cleaned up
 gemspecs

---
 .gitignore           | 1 -
 .travis.yml          | 7 -------
 Mongoid4.gemfile     | 6 ------
 mongoid-enum.gemspec | 2 +-
 4 files changed, 1 insertion(+), 15 deletions(-)
 delete mode 100644 Mongoid4.gemfile

diff --git a/.gitignore b/.gitignore
index 6dc8f75..d87d4be 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,6 @@
 .config
 .yardoc
 Gemfile.lock
-Mongoid4.gemfile.lock
 InstalledFiles
 _yardoc
 coverage
diff --git a/.travis.yml b/.travis.yml
index 24e9c53..6a850d7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,12 +8,5 @@ rvm:
   - 2.1.2
   - jruby-19mode
 
-gemfile:
-  - Gemfile
-  - Mongoid4.gemfile
 services:
   - mongodb
-branches:
-  only:
-    - master
-    - feature-mongoid4
diff --git a/Mongoid4.gemfile b/Mongoid4.gemfile
deleted file mode 100644
index 43739ec..0000000
--- a/Mongoid4.gemfile
+++ /dev/null
@@ -1,6 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'mongoid', '~> 4.0.0', github: 'mongoid/mongoid'
-
-# Specify your gem's dependencies in mongoid-enum.gemspec
-gemspec
diff --git a/mongoid-enum.gemspec b/mongoid-enum.gemspec
index 19be000..df33d51 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", ["> 3.0", "< 4.1"]
+  spec.add_runtime_dependency "mongoid", "~> 4.0"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"