Add compatiblity with Rails5

Fixes #191

.gitignore

@@ -1,4 +1,5 @@
 Gemfile.lock
+gemfiles/*.lock
 *.swp
 .rbenv*
 todo

.travis.yml

@@ -1,6 +1,6 @@
 language: ruby
 rvm:
-  - 2.2
+  - 2.3.0
   - jruby-9
   - rbx-2
 before_install:
@@ -18,7 +18,10 @@ notifications:
     on_failure: change
 bundler_args: --without development
 script: bundle exec rspec spec
+gemfile:
+  - gemfiles/rails4.gemfile
+  - gemfiles/rails5.gemfile
 matrix:
   include:
-    - rvm: 2.2
+    - rvm: 2.3.0
       env: EM=1

Gemfile

@@ -0,0 +1 @@
+gemfiles/rails4.gemfile

gemfiles/nobrainer.gemspec

@@ -0,0 +1 @@
+../nobrainer.gemspec

gemfiles/rails4.gemfile

@@ -0,0 +1,14 @@
+source 'https://rubygems.org'
+gemspec
+
+gem 'rspec', '~> 3.0'
+gem 'timecop'
+gem 'eventmachine' if ENV['EM']
+
+gem "activesupport", "< 5.0.0"
+gem "activemodel",   "< 5.0.0"
+
+group :development do
+  gem 'pry'
+  gem 'simplecov', :require => false
+end

gemfiles/rails5.gemfile

@@ -0,0 +1,14 @@
+source 'https://rubygems.org'
+gemspec
+
+gem 'rspec', '~> 3.0'
+gem 'timecop'
+gem 'eventmachine' if ENV['EM']
+
+gem "activesupport",     ">= 5.0.0.beta2"
+gem "activemodel",       ">= 5.0.0.beta2"
+
+group :development do
+  gem 'pry'
+  gem 'simplecov', :require => false
+end

lib/no_brainer/document/callbacks.rb

@@ -1,11 +1,18 @@
 module NoBrainer::Document::Callbacks
   extend ActiveSupport::Concern
 
+  def self.define_callbacks_options(options={})
+    if ActiveSupport::Callbacks.respond_to?(:halt_and_display_warning_on_return_false)
+      ActiveSupport::Callbacks.halt_and_display_warning_on_return_false = false
+    end
+    NoBrainer.rails5? ? options : options.merge(:terminator => proc { false })
+  end
+
   included do
     extend ActiveModel::Callbacks
 
-    define_model_callbacks :initialize, :create, :update, :save, :destroy, :terminator => proc { false }
-    define_model_callbacks :find, :only => [:after], :terminator => proc { false }
+    define_model_callbacks :initialize, :create, :update, :save, :destroy, NoBrainer::Document::Callbacks.define_callbacks_options
+    define_model_callbacks :find, NoBrainer::Document::Callbacks.define_callbacks_options(:only => [:after])
   end
 
   def initialize(*args, &block)

lib/no_brainer/document/validation/core.rb

@@ -4,9 +4,8 @@ module NoBrainer::Document::Validation::Core
   include ActiveModel::Validations::Callbacks
 
   included do
-    # We don't want before_validation returning false to halt the chain.
-    define_callbacks :validation, :skip_after_callbacks_if_terminated => true,
-                     :scope => [:kind, :name], :terminator => proc { false }
+    define_callbacks :validation, NoBrainer::Document::Callbacks.define_callbacks_options(
+                       :skip_after_callbacks_if_terminated => true, :scope => [:kind, :name])
   end
 
   def valid?(context=nil, options={})

lib/nobrainer.rb

@@ -37,6 +37,10 @@ def jruby?
       RUBY_PLATFORM == 'java'
     end
 
+    def rails5?
+      Gem.loaded_specs['activesupport'].version >= Gem::Version.new('5.0.0.beta')
+    end
+
     def eager_load!
       # XXX This forces all the NoBrainer code to be loaded in memory.
       # Not to be confused with eager_load() that operates on documents.