nobrainer 0.31.0 → 0.32.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 657fd4dc2ef9b4dd9383ea99fa14b99d386e19ad
-  data.tar.gz: 63b01fce35c08ffed01ff23496a5cc7eb394e1ab
+  metadata.gz: 28eb4dcb91f5c381ec20a21ed37d01992a3d6eb7
+  data.tar.gz: 395bfd26595f42e290805ebb9ebfa82dda89b99a
 SHA512:
-  metadata.gz: fc92ed2d5c2cbdfee45b3f32504090412820b205f1cdd45f3deca3ed5a98754c23ffafef30f32c2aa2fe3b96d7cecd4a88165a7d014a7c3205efebe81c016501
-  data.tar.gz: 45428c47e16c508b1845314d01221b749b14588ee20c0ca76b9cf981216f6c1728fccd396072c3935eded21491d78596ccc76167f59cb0fbbff7fbfd4ca5fda1
+  metadata.gz: 390139f43cf843350f0c345f42b15dfef87174961123376643d193dfd0265975daf4c2b3979f6497b605d4ed08175570df76e96e907a01ab3ed8168e71d27253
+  data.tar.gz: 5fb98fd5f37020b9bda60837a0e86d1f761953a5b0c0220a1e22e79d2f823419a39a927e1c6592791bd6e90111c1cc9bf1f33c48137a01cd6d33e40fb545792a

data/README.md

@@ -1,6 +1,8 @@
 NoBrainer
 ===========
 
+[![Join the chat at https://gitter.im/nviennot/nobrainer](https://badges.gitter.im/nviennot/nobrainer.svg)](https://gitter.im/nviennot/nobrainer?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+
 NoBrainer is a Ruby ORM for [RethinkDB](http://www.rethinkdb.com/).
 
 The documentation can be found on [http://nobrainer.io](http://nobrainer.io).

data/lib/no_brainer/criteria/order_by.rb

@@ -24,6 +24,8 @@ module NoBrainer::Criteria::OrderBy
                               :reversed_ordering => false)
   end
 
+  alias_method :order, :order_by
+
   def without_ordering
     chain(:ordering_mode => :disabled)
   end

data/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)

data/lib/no_brainer/document/criteria.rb

@@ -16,7 +16,7 @@ module NoBrainer::Document::Criteria
     delegate :to_rql,                        # Core
              :raw,                           # Raw
              :limit, :offset, :skip,         # Limit
-             :order_by, :reverse_order, :without_ordering, :order_by_indexed?, :order_by_index_name, # OrderBy
+             :order_by, :order, :reverse_order, :without_ordering, :order_by_indexed?, :order_by_index_name, # OrderBy
              :unscoped,                      # Scope
              :_where, :where, :where_indexed?, :where_index_name, :where_index_type, # Where
              :with_index, :without_index, :used_index, # Index

data/lib/no_brainer/document/dirty.rb

@@ -61,6 +61,11 @@ module NoBrainer::Document::Dirty
     end
   end
 
+  def attribute_will_change!(*)
+    # Provided for comatibility. See issue #190
+    :not_implemented_in_no_brainer_see_issue_190
+  end
+
   def _read_attribute(name)
     super.tap do |value|
       # This take care of string/arrays/hashes that could change without going

data/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={})

data/lib/no_brainer/railtie.rb

@@ -26,7 +26,7 @@ class NoBrainer::Railtie < Rails::Railtie
   config.after_initialize do
     NoBrainer::Config.configure unless NoBrainer::Config.configured?
 
-    ActionDispatch::Reloader.to_prepare do
+    (NoBrainer.rails5? ? ActiveSupport::Reloader : ActionDispatch::Reloader).to_prepare do
       NoBrainer::Loader.cleanup
     end
   end

data/lib/nobrainer.rb

@@ -37,6 +37,10 @@ module NoBrainer
       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.

data/lib/rails/generators/nobrainer/install_generator.rb

@@ -37,9 +37,12 @@ module NoBrainer::Generators
       (Dir['config/environments/*'] + ['config/application.rb']).each do |config_file|
         comment_lines(config_file, /active_record/)
       end
-      remove_file('config/database.yml')
-    end
 
+      (Dir['config/**/*active_record*.rb'] +
+       Dir['app/models/application_record.rb'] +
+       ['config/database.yml'])
+      .each { |f| remove_file(f) }
+    end
 
     def copy_initializer
       template('nobrainer.rb', 'config/initializers/nobrainer.rb')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nobrainer
 version: !ruby/object:Gem::Version
-  version: 0.31.0
+  version: 0.32.0
 platform: ruby
 authors:
 - Nicolas Viennot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-07 00:00:00.000000000 Z
+date: 2016-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rethinkdb