nobrainer 0.30.0 → 0.34.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ebe188d50e06d6ef907cdf043560143e3bd7d703
-  data.tar.gz: 15b1580f27a66b6670386cc117b4767f930e67c7
+SHA256:
+  metadata.gz: ad996bff8cfeced8ef2da26c7b989d24138bb5e4c9a7aa53738cd2cbdfdd907c
+  data.tar.gz: a24979230bc5d9deeb4dfbee4f353de22a61037dddff0e97521a8d72380db9af
 SHA512:
-  metadata.gz: ff9b387f2045109c33efb88d36273325edf34573acb134bbb94d3d2e04c1efd6fdf65b761739eac61c185309cfa9deba5a07987fdf56becf3d78308b300838b9
-  data.tar.gz: acb0f33b44d27ac25599352b0d568dd563e13a81da91b0dfef6cf72596a1500026e739f2cc64c63e22edc72ddb57ee3b61a70acf72c139cd502f0b1d95e78c9b
+  metadata.gz: c3fbe68aa20b186aaca5b5981c476754a9f3cb7e238d09db17340a348f983d48518e34927064cd124640b5dd47564406893613b2a39487b90712e7e02a5bcd58
+  data.tar.gz: 34106b6e8c1be3260dc8e6356c0658deaabff758818def9aafead00445c2ffcb8b93f8c6b261b4d1d6555d0e5dae0f8c97aad1e123c583933b79eda283849791

data/CHANGELOG.md

@@ -0,0 +1,129 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [Unreleased]
+
+## [0.34.1] - 2021-02-18
+### Fixed
+- Defining attributes at class level (Rails 6.1 compatibity)
+- Ruby 2.7 support
+
+## [0.34.0] - 2019-10-15
+### Added
+- Rails 6 support
+- Support for the nonvoting_replica_tags table option
+
+## [0.33.0] - 2016-11-27
+### Added
+- Allow a run_options to be configured globally
+- Support for username and password authentication
+
+### Changed
+- Use URI.decode() for user and password in the RethinkDB URL
+- Also comment active_record lines in the config/initializers/*.rb on gem installation
+- Removed .unscoped when fetching belongs_to associations
+- update_all() operates without ordering
+- has_many dependent refactoring
+- Default logger should be STDERR if the rails logger is not initialized
+- Locking: changes lock key type from string to text in order to support more than 255 characters keys by default, the key type needs to be Text.
+- field type for rql_function to :text 
+
+### Fixed
+- Model reloading with Rails5
+- Rails 5 Strong Parameters: Strong parameters are not a Hash anymore in Rails 5, but support transforming into a hash
+
+## [0.32.0] - 2016-06-05
+### Added
+- Compatiblity with Rails5
+- order() as an alias of order_by()
+- Provide attribute_will_change!() for compatibility
+
+### Changed
+- Comments more active_record related configs during install
+
+### Fixed
+- Rails 5 deprecation: Using ActiveSupport::Reloader instead of ActionDispatch::Reloader to be ready when Rails 5 hits
+- config syntax
+
+### Removed
+- JRuby and Rbx in travis-ci
+
+## [0.31.0] - 2016-02-07
+### Added
+- Allow belongs_to association names to be used in upsert params
+- `uniq` shorthand for the belongs_to association
+- Allow self-referential belongs_to
+- Prevent double loading of the same model
+- Use index for where(XXX.defined => true)
+- Guard against bad virtual attribute expressions
+- Allow non existing attributes to be lazy fetched
+- Added back update_attributes()
+
+### Fixed
+- Fix join on keys that are undefined
+
+### Changed
+- where() leverages the association translation abstraction
+- Primary keys time offset should operate on fixed timezone
+
+### Removed
+- Removing locking around sync_table_config
+
+## [0.30.0] - 2015-10-03
+### Added
+- Add rbx-2 to .travis.yml
+- Add the virtual attribute feature
+- Lock: Allow find() to get locks by key
+- Locks: Allow default expire/timeout values to be passed in new()
+- NoBrainer::ReentrantLock implementation
+- Allow compound indexes to be declared with an implicit name
+- Allow polymorphic queries with first_or_create under certain conditions
+
+### Changed
+- Prevent first_or_create() to accept block with arguments
+
+### Fixed
+- Fix rails issue with tests and profiler
+- Fix where() .include modifier with type checking
+- Virtual attribute option fix
+- Discard documents when join() encounter a nil join key
+- Locks: bug fix: allow small timeouts in lock()
+- Fix reentrant lock counter on steals
+
+[Unreleased]: https://github.com/nobrainerorm/nobrainer/compare/v0.34.1...HEAD
+[0.34.1]: https://github.com/nobrainerorm/nobrainer/compare/v0.34.0...v0.34.1
+[0.34.0]: https://github.com/nobrainerorm/nobrainer/compare/v0.33.0...v0.34.0
+[0.33.0]: https://github.com/nobrainerorm/nobrainer/compare/v0.32.0...v0.33.0
+[0.32.0]: https://github.com/nobrainerorm/nobrainer/compare/v0.31.0...v0.32.0
+[0.31.0]: https://github.com/nobrainerorm/nobrainer/compare/v0.30.0...v0.31.0
+[0.30.0]: https://github.com/nobrainerorm/nobrainer/compare/v0.29.0...v0.30.0
+[0.29.0]: https://github.com/nobrainerorm/nobrainer/compare/0.28.0...0.29.0
+[0.28.0]: https://github.com/nobrainerorm/nobrainer/compare/0.27.0...0.28.0
+[0.27.0]: https://github.com/nobrainerorm/nobrainer/compare/0.26.0...0.27.0
+[0.26.0]: https://github.com/nobrainerorm/nobrainer/compare/0.25.1...0.26.0
+[0.25.1]: https://github.com/nobrainerorm/nobrainer/compare/0.25.0...0.25.1
+[0.25.0]: https://github.com/nobrainerorm/nobrainer/compare/0.24.0...0.25.0
+[0.24.0]: https://github.com/nobrainerorm/nobrainer/compare/0.23.0...0.24.0
+[0.23.0]: https://github.com/nobrainerorm/nobrainer/compare/0.22.0...0.23.0
+[0.22.0]: https://github.com/nobrainerorm/nobrainer/compare/0.21.0...0.22.0
+[0.21.0]: https://github.com/nobrainerorm/nobrainer/compare/0.20.0...0.21.0
+[0.20.0]: https://github.com/nobrainerorm/nobrainer/compare/0.19.0...0.20.0
+[0.19.0]: https://github.com/nobrainerorm/nobrainer/compare/0.18.1...0.19.0
+[0.18.1]: https://github.com/nobrainerorm/nobrainer/compare/0.18.0...0.18.1
+[0.18.0]: https://github.com/nobrainerorm/nobrainer/compare/0.17.0...0.18.0
+[0.17.0]: https://github.com/nobrainerorm/nobrainer/compare/0.16.0...0.17.0
+[0.16.0]: https://github.com/nobrainerorm/nobrainer/compare/0.15.0...0.16.0
+[0.15.0]: https://github.com/nobrainerorm/nobrainer/compare/0.14.0...0.15.0
+[0.15.0]: https://github.com/nobrainerorm/nobrainer/compare/0.14.0...0.15.0
+[0.14.0]: https://github.com/nobrainerorm/nobrainer/compare/0.13.1...0.14.0
+[0.13.1]: https://github.com/nobrainerorm/nobrainer/compare/0.13.0...0.13.1
+[0.13.0]: https://github.com/nobrainerorm/nobrainer/compare/0.12.0...0.13.0
+[0.12.0]: https://github.com/nobrainerorm/nobrainer/compare/0.11.0...0.12.0
+[0.11.0]: https://github.com/nobrainerorm/nobrainer/compare/0.10.0...0.11.0
+[0.10.0]: https://github.com/nobrainerorm/nobrainer/compare/0.9.1...0.10.0
+[0.9.1]: https://github.com/nobrainerorm/nobrainer/compare/0.9.0...0.9.1
+[0.9.0]: https://github.com/nobrainerorm/nobrainer/compare/0.8.0...0.9.0
+[0.8.0]: https://github.com/nobrainerorm/nobrainer/releases/tag/0.8.0

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/config.rb

@@ -10,9 +10,10 @@ module NoBrainer::Config
     :logger                 => { :default => ->{ default_logger } },
     :colorize_logger        => { :default => ->{ true }, :valid_values => [true, false] },
     :warn_on_active_record  => { :default => ->{ true }, :valid_values => [true, false] },
-    :durability             => { :default => ->{ default_durability }, :valid_values => [:hard, :soft] },
+    :durability             => { :default => ->{ nil } }, # legacy
     :table_options          => { :default => ->{ {:shards => 1, :replicas => 1, :write_acks => :majority} },
-                                 :valid_keys => [:shards, :replicas, :primary_replica_tag, :write_acks, :durability] },
+                                 :valid_keys => [:durability, :shards, :replicas, :primary_replica_tag, :nonvoting_replica_tags, :write_acks] },
+    :run_options            => { :default => ->{ {:durability => default_durability} } },
     :max_string_length      => { :default => ->{ 255 } },
     :user_timezone          => { :default => ->{ :local }, :valid_values => [:unchanged, :utc, :local] },
     :db_timezone            => { :default => ->{ :utc }, :valid_values => [:unchanged, :utc, :local] },
@@ -51,6 +52,10 @@ module NoBrainer::Config
       @geo_options = value.try(:symbolize_keys)
     end
 
+    def run_options=(value)
+      @run_options = value.try(:symbolize_keys)
+    end
+
     def assert_valid_options
       SETTINGS.each do |k,v|
         assert_value_in(k, v[:valid_values]) if v[:valid_values]
@@ -102,7 +107,10 @@ module NoBrainer::Config
     end
 
     def default_app_name
-      defined?(Rails) ? Rails.application.class.parent_name.underscore.presence : nil rescue nil
+      return unless defined?(Rails)
+      NoBrainer.rails6? ?
+        Rails.application.class.module_parent_name.underscore.presence :
+        Rails.application.class.parent_name.underscore.presence rescue nil
     end
 
     def default_environment
@@ -119,9 +127,10 @@ module NoBrainer::Config
       db ||= "#{self.app_name}_#{self.environment}" if self.app_name && self.environment
       host = ENV['RETHINKDB_HOST'] || ENV['RDB_HOST'] || 'localhost'
       port = ENV['RETHINKDB_PORT'] || ENV['RDB_PORT']
-      auth = ENV['RETHINKDB_AUTH'] || ENV['RDB_AUTH']
+      user = ENV['RETHINKDB_USER'] || ENV['RDB_USER']
+      pass = ENV['RETHINKDB_PASSWORD'] || ENV['RDB_PASSWORD'] || ENV['RETHINKDB_AUTH'] || ENV['RDB_AUTH']
       url = ENV['RETHINKDB_URL'] || ENV['RDB_URL']
-      url ||= "rethinkdb://#{":#{auth}@" if auth}#{host}#{":#{port}" if port}/#{db}" if db
+      url ||= "rethinkdb://#{"#{user}:#{pass}@" if (user || pass)}#{host}#{":#{port}" if port}/#{db}" if db
       url
     end
 
@@ -133,7 +142,8 @@ module NoBrainer::Config
     end
 
     def default_logger
-      defined?(Rails.logger) ? Rails.logger : Logger.new(STDERR).tap { |l| l.level = Logger::WARN }
+      (Rails.logger if defined?(Rails.logger)) ||
+         Logger.new(STDERR).tap { |l| l.level = Logger::WARN }
     end
 
     def default_durability

data/lib/no_brainer/connection.rb

@@ -18,7 +18,9 @@ class NoBrainer::Connection
           "Invalid URI. Expecting something like rethinkdb://host:port/database. Got #{uri}"
       end
 
-      { :auth_key => uri.password,
+      {
+        :user     => uri.user && CGI.unescape(uri.user),
+        :password => uri.password && CGI.unescape(uri.password),
         :host     => uri.host,
         :port     => uri.port || 28015,
         :db       => uri.path.gsub(/^\//, ''),
@@ -27,7 +29,7 @@ class NoBrainer::Connection
   end
 
   def uri
-    "rethinkdb://#{'****@' if parsed_uri[:auth_key]}#{parsed_uri[:host]}:#{parsed_uri[:port]}/#{parsed_uri[:db]}"
+    "rethinkdb://#{'****@' if parsed_uri[:password]}#{parsed_uri[:host]}:#{parsed_uri[:port]}/#{parsed_uri[:db]}"
   end
 
   def raw
@@ -45,6 +47,6 @@ class NoBrainer::Connection
   end
 
   def current_db
-    NoBrainer.current_run_options.try(:[], :db) || default_db
+    NoBrainer.current_run_options[:db] || default_db
   end
 end

data/lib/no_brainer/criteria/first_or_create.rb

@@ -20,7 +20,10 @@ module NoBrainer::Criteria::FirstOrCreate
   private
 
   def _upsert(attrs, save_options)
-    attrs = attrs.symbolize_keys
+    # Note: we don't do a full cast of user_to_cast because where() takes care
+    # of it. We just need to locate a suitable uniqueness validator, for which
+    # we just need to translate keys.
+    attrs = Hash[attrs.map { |k,v| model.association_user_to_model_cast(k.to_sym, v) }]
     unique_keys = get_model_unique_fields.detect { |keys| keys & attrs.keys == keys }
     return where(attrs.slice(*unique_keys)).__send__(:_first_or_create, attrs, save_options) if unique_keys
 

data/lib/no_brainer/criteria/join.rb

@@ -36,6 +36,7 @@ module NoBrainer::Criteria::Join
 
   def _instantiate_model(attrs, options={})
     return super unless @options[:join] && !raw?
+    return super if attrs.nil?
 
     associated_instances = join_ast.map do |association, criteria|
       [association, criteria.send(:_instantiate_model, attrs.delete(association.target_name.to_s))]
@@ -53,7 +54,7 @@ module NoBrainer::Criteria::Join
     join_ast.reduce(super) do |rql, (association, criteria)|
       rql.concat_map do |doc|
         key = doc[association.eager_load_owner_key]
-        RethinkDB::RQL.new.branch(key.eq(nil), [],
+        RethinkDB::RQL.new.branch(key.default(nil).eq(nil), [],
           criteria.where(association.eager_load_target_key => key).to_rql.map do |assoc_doc|
             doc.merge(association.target_name => assoc_doc)
         end)

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/criteria/update.rb

@@ -16,6 +16,6 @@ module NoBrainer::Criteria::Update
     # can't use without_distinct when passed a block as the operation may be
     # performed many times, which might not be idempotent.
     clause = block ? self : without_distinct
-    run { clause.without_plucking.to_rql.__send__(type, *args, &block) }
+    run { clause.without_plucking.without_ordering.to_rql.__send__(type, *args, &block) }
   end
 end

data/lib/no_brainer/criteria/virtual_attributes.rb

@@ -8,7 +8,14 @@ module NoBrainer::Criteria::VirtualAttributes
       rql = rql.map do |_doc|
         model.virtual_fields.reduce(_doc) do |doc, field|
           field_rql = model.fields[field][:virtual].call(doc, RethinkDB::RQL.new)
-          field_rql.nil? ? doc : doc.merge(field => field_rql)
+          if field_rql.nil?
+            doc
+          else
+            unless field_rql.is_a?(RethinkDB::RQL)
+              raise "The virtual attribute `#{model}.#{field}' should return a RQL expression"
+            end
+            doc.merge(field => field_rql)
+          end
         end
       end
     end

data/lib/no_brainer/criteria/where.rb

@@ -150,69 +150,57 @@ module NoBrainer::Criteria::Where
       raise "Incorrect use of `#{op}' and `#{key_modifier}'" if key_modifier != :scalar
     end
 
-    def association
-      return nil if key_path.size > 1
-      @association ||= [model.association_metadata[key_path.first]]
-      @association.first
-    end
-
     def cast_value(value)
       return value if casted_values
 
-      case association
-      when NoBrainer::Document::Association::BelongsTo::Metadata
-        target_model = association.target_model
-        unless value.is_a?(target_model)
-          opts = { :model => model, :attr_name => key_path.first, :type => target_model, :value => value }
-          raise NoBrainer::Error::InvalidType.new(opts)
-        end
-        value.pk_value
-      else
-        case op
-        when :defined, :undefined then NoBrainer::Boolean.nobrainer_cast_user_to_model(value)
-        when :intersects
-          raise "Use a geo object with `intersects`" unless value.is_a?(NoBrainer::Geo::Base)
-          value
-        when :near
-          # TODO enforce key is a geo type
-          case value
-          when Hash
-            options = NoBrainer::Geo::Base.normalize_geo_options(value)
-
-            options[:radius] = options.delete(:max_distance) if options[:max_distance]
-            options[:radius] = options.delete(:max_dist) if options[:max_dist]
-            options[:center] = options.delete(:point) if options[:point]
-
-            unless options[:circle]
-              unless options[:center] && options[:radius]
-                raise "`near' takes something like {:center => P, :radius => d}"
-              end
-              { :circle => NoBrainer::Geo::Circle.new(options), :max_results => options[:max_results] }
+      case op
+      when :defined, :undefined then NoBrainer::Boolean.nobrainer_cast_user_to_model(value)
+      when :intersects
+        raise "Use a geo object with `intersects`" unless value.is_a?(NoBrainer::Geo::Base)
+        value
+      when :near
+        # TODO enforce key is a geo type
+        case value
+        when Hash
+          options = NoBrainer::Geo::Base.normalize_geo_options(value)
+
+          options[:radius] = options.delete(:max_distance) if options[:max_distance]
+          options[:radius] = options.delete(:max_dist) if options[:max_dist]
+          options[:center] = options.delete(:point) if options[:point]
+
+          unless options[:circle]
+            unless options[:center] && options[:radius]
+              raise "`near' takes something like {:center => P, :radius => d}"
             end
-          when NoBrainer::Geo::Circle then { :circle => value }
-          else raise "Incorrect use of `near': rvalue must be a hash or a circle"
+            { :circle => NoBrainer::Geo::Circle.new(options), :max_results => options[:max_results] }
           end
-        else
-          # 1) Box value in array if we have an any/all modifier
-          # 2) Box value in hash if we have a nested query.
-          box_value = key_modifier.in?([:any, :all]) || op == :include
-          value = [value] if box_value
-          value_hash = key_path.reverse.reduce(value) { |v,k| {k => v} }
-          value = model.cast_user_to_db_for(*value_hash.first)
-          value = key_path[1..-1].reduce(value) { |h,k| h[k] }
-          value = value.first if box_value
-          value
+        when NoBrainer::Geo::Circle then { :circle => value }
+        else raise "Incorrect use of `near': rvalue must be a hash or a circle"
         end
+      else
+        # 1) Box value in array if we have an any/all modifier
+        # 2) Box value in hash if we have a nested query.
+        box_value = key_modifier.in?([:any, :all]) || op == :include
+        value = [value] if box_value
+        k_v = key_path.reverse.reduce(value) { |v,k| {k => v} }.first
+        k_v = model.association_user_to_model_cast(*k_v)
+        value = model.cast_user_to_db_for(*k_v)
+        value = key_path[1..-1].reduce(value) { |h,k| h[k] }
+        value = value.first if box_value
+        value
       end
     end
 
-    def cast_key_path(key)
-      return key if casted_values
+    def cast_key_path(key_path)
+      return key_path if casted_values
 
-      case association
-      when NoBrainer::Document::Association::BelongsTo::Metadata then [association.foreign_key]
-      else model.ensure_valid_key!(key_path.first); key_path
+      if key_path.size == 1
+        k, _v = model.association_user_to_model_cast(key_path.first, nil)
+        key_path = [k]
       end
+
+      model.ensure_valid_key!(key_path.first)
+      key_path
     end
   end
 
@@ -365,7 +353,7 @@ module NoBrainer::Criteria::Where
     end
 
     def find_strategy_canonical
-      clauses = get_candidate_clauses(:eq, :in, :between, :near, :intersects)
+      clauses = get_candidate_clauses(:eq, :in, :between, :near, :intersects, :defined)
       return nil unless clauses.present?
 
       usable_indexes = Hash[get_usable_indexes.map { |i| [[i.name], i] }]
@@ -384,6 +372,11 @@ module NoBrainer::Criteria::Where
             [:get_nearest, circle.center.to_rql, circle.options.merge(options)]
           when :eq      then [:get_all, [clause.value]]
           when :in      then [:get_all, clause.value]
+          when :defined then
+            next unless clause.value == true
+            next unless clause.key_modifier == :scalar && index.multi == false
+            [:between, [RethinkDB::RQL.new.minval, RethinkDB::RQL.new.maxval],
+             :left_bound => :open, :right_bound => :open]
           when :between then [:between, [clause.value.min, clause.value.max],
                               :left_bound => :closed, :right_bound => :closed]
         end

data/lib/no_brainer/document/association.rb

@@ -21,6 +21,14 @@ module NoBrainer::Document::Association
       super
     end
 
+    def association_user_to_model_cast(k,v)
+      association = association_metadata[k]
+      case association
+      when NoBrainer::Document::Association::BelongsTo::Metadata then association.cast_attr(k,v)
+      else [k,v]
+      end
+    end
+
     METHODS.each do |association|
       define_method(association) do |target, options={}|
         target = target.to_sym

data/lib/no_brainer/document/association/belongs_to.rb

@@ -2,7 +2,8 @@ class NoBrainer::Document::Association::BelongsTo
   include NoBrainer::Document::Association::Core
 
   class Metadata
-    VALID_OPTIONS = [:primary_key, :foreign_key, :class_name, :foreign_key_store_as, :index, :validates, :required]
+    VALID_OPTIONS = [:primary_key, :foreign_key, :class_name, :foreign_key_store_as,
+                     :index, :validates, :required, :uniq, :unique]
     include NoBrainer::Document::Association::Core::Metadata
     include NoBrainer::Document::Association::EagerLoader::Generic
 
@@ -34,7 +35,7 @@ class NoBrainer::Document::Association::BelongsTo
     end
 
     def base_criteria
-      target_model.without_ordering.unscoped
+      target_model.without_ordering
     end
 
     def hook
@@ -51,12 +52,17 @@ class NoBrainer::Document::Association::BelongsTo
       unless options[:validates] == false
         owner_model.validates(target_name, options[:validates]) if options[:validates]
 
+        uniq = options[:uniq] || options[:unique]
+        if uniq
+          owner_model.validates(foreign_key, :uniqueness => uniq)
+        end
+
         if options[:required]
           owner_model.validates(target_name, :presence => options[:required])
         else
-          # Always validate the validity of the foreign_key if not nil.
+          # Always validate the foreign_key if not nil.
           owner_model.validates_each(foreign_key) do |doc, attr, value|
-            if !value.nil? && doc.read_attribute_for_validation(target_name).nil?
+            if !value.nil? && value != doc.pk_value && doc.read_attribute_for_validation(target_name).nil?
               doc.errors.add(attr, :invalid_foreign_key, :target_model => target_model, :primary_key => primary_key)
             end
           end
@@ -68,6 +74,16 @@ class NoBrainer::Document::Association::BelongsTo
       add_callback_for(:after_validation)
     end
 
+    def cast_attr(k, v)
+      case v
+      when target_model then [foreign_key, v.__send__(primary_key)]
+      when nil          then [foreign_key, nil]
+      else
+        opts = { :model => owner_model, :attr_name => k, :type => target_model, :value => v }
+        raise NoBrainer::Error::InvalidType.new(opts)
+      end
+    end
+
     def eager_load_owner_key;  foreign_key; end
     def eager_load_target_key; primary_key; end
   end
@@ -109,7 +125,7 @@ class NoBrainer::Document::Association::BelongsTo
   end
 
   def after_validation_callback
-    if loaded? && target && !target.persisted?
+    if loaded? && target && !target.persisted? && target != owner
       raise NoBrainer::Error::AssociationNotPersisted.new("#{target_name} must be saved first")
     end
   end

data/lib/no_brainer/document/association/core.rb

@@ -51,7 +51,8 @@ module NoBrainer::Document::Association::Core
       return model_name if model_name.is_a?(Module)
 
       model_name = model_name.to_s
-      current_module = @owner_model.parent
+      current_module = NoBrainer.rails6? ? @owner_model.module_parent : @owner_model.parent
+
       return model_name.constantize if current_module == Object
       return model_name.constantize if model_name =~ /^::/
       return model_name.constantize if !current_module.const_defined?(model_name)

data/lib/no_brainer/document/association/has_many.rb

@@ -97,13 +97,16 @@ class NoBrainer::Document::Association::HasMany
     ->(target){ set_inverses_of([target]) if target.is_a?(NoBrainer::Document) }
   end
 
+  def dependent_criteria
+    target_criteria.unscoped
+  end
+
   def before_destroy_callback
-    criteria = target_criteria.unscoped.without_cache
     case metadata.options[:dependent]
-    when :destroy  then criteria.destroy_all
-    when :delete   then criteria.delete_all
-    when :nullify  then criteria.update_all(foreign_key => nil)
-    when :restrict then raise NoBrainer::Error::ChildrenExist unless criteria.count.zero?
+    when :destroy  then dependent_criteria.destroy_all
+    when :delete   then dependent_criteria.delete_all
+    when :nullify  then dependent_criteria.update_all(foreign_key => nil)
+    when :restrict then raise NoBrainer::Error::ChildrenExist unless dependent_criteria.empty?
     end
   end
 end

data/lib/no_brainer/document/attributes.rb

@@ -70,6 +70,7 @@ module NoBrainer::Document::Attributes
   end
 
   def assign_attributes(attrs, options={})
+    attrs = attrs.to_h if !attrs.is_a?(Hash) && attrs.respond_to?(:to_h)
     raise ArgumentError, "To assign attributes, please pass a hash instead of `#{attrs.class}'" unless attrs.is_a?(Hash)
 
     if options[:pristine]

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/core.rb

@@ -9,7 +9,16 @@ module NoBrainer::Document::Core
     extend ActiveModel::Naming
     extend ActiveModel::Translation
 
-    NoBrainer::Document::Core._all << self unless name =~ /^NoBrainer::/
+    unless name =~ /^NoBrainer::/
+      if NoBrainer::Document::Core._all.map(&:name).include?(name)
+        raise "Fatal: The model `#{name}' is already registered and partially loaded.\n" +
+              "This may happen when an exception occured while loading the model definitions\n" +
+              "(e.g. calling a missing class method on another model, having circular dependencies).\n" +
+              "In this situation, ActiveSupport autoloader may retry loading the model.\n" +
+              "Try moving all class methods declaration at the top of the model."
+      end
+      NoBrainer::Document::Core._all << self
+    end
   end
 
   def self.all(options={})

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/index/meta_store.rb

@@ -10,7 +10,7 @@ class NoBrainer::Document::Index::MetaStore
 
   field :table_name,   :type => String, :required => true
   field :index_name,   :type => String, :required => true
-  field :rql_function, :type => String, :required => true
+  field :rql_function, :type => Text,   :required => true
 
   def rql_function=(value)
     super(JSON.dump(value))

data/lib/no_brainer/document/lazy_fetch.rb

@@ -49,6 +49,7 @@ module NoBrainer::Document::LazyFetch
             raise e unless attr.in?(@lazy_fetch)
             reload(:pluck => attr, :keep_ivars => true)
             @lazy_fetch.delete(attr)
+            clear_missing_field(attr)
             retry
           end
         end

data/lib/no_brainer/document/persistance.rb

@@ -112,6 +112,7 @@ module NoBrainer::Document::Persistance
   def update(*args)
     update?(*args)
   end
+  alias_method :update_attributes, :update # for API compat like devise
 
   def delete
     unless @destroyed

data/lib/no_brainer/document/primary_key/generator.rb

@@ -3,7 +3,7 @@ module NoBrainer::Document::PrimaryKey::Generator
 
   BASE_TABLE = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz".freeze
 
-  TIME_OFFSET = Time.parse('2014-01-01').to_i
+  TIME_OFFSET = Time.utc(2014, 01, 01).to_i
 
   # 30 bits timestamp with 1s resolution -> We overflow in year 2048. Good enough.
   # Math.log(Time.parse('2048-01-01').to_f - TIME_OFFSET)/Math.log(2) = 29.999

data/lib/no_brainer/document/table_config.rb

@@ -6,7 +6,7 @@ module NoBrainer::Document::TableConfig
 
   autoload :Synchronizer
 
-  VALID_TABLE_CONFIG_OPTIONS = [:name, :durability, :shards, :replicas, :primary_replica_tag, :write_acks]
+  VALID_TABLE_CONFIG_OPTIONS = [:name, :durability, :shards, :replicas, :primary_replica_tag, :nonvoting_replica_tags, :write_acks]
 
   included do
     cattr_accessor :table_config_options, :instance_accessor => false
@@ -78,7 +78,7 @@ module NoBrainer::Document::TableConfig
     def sync_table_config(options={})
       c = table_create_options
       table_config.update!(c.slice(:durability, :primary_key, :write_acks))
-      NoBrainer.run { rql_table.reconfigure(c.slice(:shards, :replicas, :primary_replica_tag)) }
+      NoBrainer.run { rql_table.reconfigure(c.slice(:shards, :replicas, :primary_replica_tag, :nonvoting_replica_tags)) }
       true
     end
 

data/lib/no_brainer/document/table_config/synchronizer.rb

@@ -4,12 +4,7 @@ class NoBrainer::Document::TableConfig::Synchronizer
   end
 
   def sync_table_config(options={})
-    # XXX A bit funny since we might touch the lock table...
-    lock = NoBrainer::Lock.new('nobrainer:sync_table_config')
-
-    lock.synchronize do
-      @models.each(&:sync_table_config)
-    end
+    @models.each(&:sync_table_config)
 
     unless options[:wait] == false
       # Waiting on all models due to possible races

data/lib/no_brainer/document/types.rb

@@ -1,6 +1,9 @@
 module NoBrainer::Document::Types
   extend ActiveSupport::Concern
 
+  mattr_accessor :loaded_extensions
+  self.loaded_extensions = Set.new
+
   included { before_validation :add_type_errors }
 
   def add_type_errors
@@ -111,8 +114,6 @@ module NoBrainer::Document::Types
   end
 
   class << self
-    mattr_accessor :loaded_extensions
-    self.loaded_extensions = Set.new
     def load_type_extensions(model)
       unless loaded_extensions.include?(model)
         begin

data/lib/no_brainer/document/types/geo.rb

@@ -1 +1 @@
-# Look in lib/no_brainer/geo.rb instead
+# Look in lib/no_brainer/geo/*.rb instead

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/lock.rb

@@ -8,7 +8,7 @@ class NoBrainer::Lock
   # Since PKs are limited to 127 characters, we can't use the user's key as a PK
   # as it could be arbitrarily long.
   field :key_hash,       :type => String, :primary_key => true, :default => ->{ Digest::SHA1.base64digest(key.to_s) }
-  field :key,            :type => String
+  field :key,            :type => Text
   field :instance_token, :type => String, :default => ->{ get_new_instance_token }
   field :expires_at,     :type => Time
 
@@ -27,6 +27,7 @@ class NoBrainer::Lock
       @default_options = options.slice(:expire, :timeout)
       options.delete(:expire); options.delete(:timeout);
 
+      key = key.to_s if key.is_a?(Symbol)
       super(options.merge(:key => key))
       raise ArgumentError unless valid?
     end

data/lib/no_brainer/query_runner/reconnect.rb

@@ -16,7 +16,8 @@ class NoBrainer::QueryRunner::Reconnect < NoBrainer::QueryRunner::Middleware
     when RethinkDB::RqlError
       e.message =~ /lost contact/ ||
       e.message =~ /(P|p)rimary .* not available/||
-      e.message =~ /Connection.*closed/
+      e.message =~ /Connection.*closed/ ||
+      e.message =~ /Connection.*refused/
     else
       false
     end

data/lib/no_brainer/query_runner/run_options.rb

@@ -10,7 +10,10 @@ class NoBrainer::QueryRunner::RunOptions < NoBrainer::QueryRunner::Middleware
   end
 
   def self.current_run_options
-    Thread.current[:nobrainer_run_with] || {}
+    options = NoBrainer::Config.run_options
+    options = options.merge(:durability => NoBrainer::Config.durability) if NoBrainer::Config.durability
+    options = options.merge(Thread.current[:nobrainer_run_with]) if Thread.current[:nobrainer_run_with]
+    options
   end
 
   def self.run_with(options={}, &block)
@@ -29,17 +32,9 @@ class NoBrainer::QueryRunner::RunOptions < NoBrainer::QueryRunner::Middleware
   end
 
   def call(env)
-    options = env[:options].symbolize_keys
-    options = self.class.current_run_options.merge(options)
-
-    if NoBrainer::Config.durability.to_s != 'hard'
-      options[:durability] ||= NoBrainer::Config.durability
-    end
-
-    options[:db] = options[:db].to_s if options[:db]
-    if options[:db].blank? || options[:db] == NoBrainer.default_db
-      options.delete(:db)
-    end
+    options = self.class.current_run_options
+    options = options.merge(env[:options].symbolize_keys)
+    options = prune_default_run_options(options)
 
     env[:criteria] = options.delete(:criteria)
 
@@ -52,4 +47,14 @@ class NoBrainer::QueryRunner::RunOptions < NoBrainer::QueryRunner::Middleware
     env[:options] = options
     @runner.call(env)
   end
+
+  def prune_default_run_options(options)
+    options = options.dup
+    options.delete(:durability) if options[:durability].to_s == 'hard'
+
+    options[:db] = options[:db].to_s if options[:db]
+    options.delete(:db) if options[:db].blank? || options[:db] == NoBrainer.default_db
+
+    options
+  end
 end

data/lib/no_brainer/query_runner/table_on_demand.rb

@@ -34,6 +34,16 @@ class NoBrainer::QueryRunner::TableOnDemand < NoBrainer::QueryRunner::Middleware
       r.table_create(table_name, create_options.reject { |k,_| k.in? [:name, :write_acks] })
     end
 
+    # Prevent duplicate table errors on a cluster.
+    # Workaround from https://github.com/rethinkdb/rethinkdb/issues/4898#issuecomment-270267740
+    NoBrainer.run(:db => 'rethinkdb') do |r|
+      r.table('table_config')
+       .filter({db: db_name, name: table_name})
+       .order_by('id')
+       .slice(1)
+       .delete
+    end
+
     if create_options[:write_acks] && create_options[:write_acks] != 'single'
       NoBrainer.run(:db => db_name) do |r|
         r.table(table_name).config().update(:write_acks => create_options[:write_acks])

data/lib/no_brainer/railtie.rb

@@ -26,8 +26,10 @@ class NoBrainer::Railtie < Rails::Railtie
   config.after_initialize do
     NoBrainer::Config.configure unless NoBrainer::Config.configured?
 
-    ActionDispatch::Reloader.to_prepare do
-      NoBrainer::Loader.cleanup
+    if NoBrainer.rails5?
+      ActiveSupport::Reloader.before_class_unload { NoBrainer::Loader.cleanup }
+    else
+      ActionDispatch::Reloader.to_prepare { NoBrainer::Loader.cleanup }
     end
   end
 

data/lib/no_brainer/system/table_config.rb

@@ -7,4 +7,5 @@ class NoBrainer::System::TableConfig
   field :primary_key
   field :shards
   field :write_acks
+  field :indexes
 end

data/lib/nobrainer.rb

@@ -37,6 +37,14 @@ module NoBrainer
       RUBY_PLATFORM == 'java'
     end
 
+    def rails5?
+      Gem.loaded_specs['activesupport'].version >= Gem::Version.new('5.0.0.beta')
+    end
+
+    def rails6?
+      Gem.loaded_specs['activesupport'].version >= Gem::Version.new('6.0.0')
+    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

@@ -34,12 +34,17 @@ module NoBrainer::Generators
     end
 
     def remove_active_record
-      (Dir['config/environments/*'] + ['config/application.rb']).each do |config_file|
+      (Dir['config/environments/*'] +
+       Dir['config/initializers/*'] +
+       ['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')

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

@@ -13,9 +13,8 @@ NoBrainer.configure do |config|
   # The default is to use localhost, with a database name matching the
   # application name and the environment.
   # NoBrainer also reads environment variables when defined:
-  # * RETHINKDB_URL, RDB_URL
-  # * RETHINKDB_HOST, RETHINKDB_PORT, RETHINKDB_DB, RETHINKDB_AUTH
-  # * RDB_HOST, RDB_PORT, RDB_DB, RDB_AUTH
+  # * RDB_URL, RDB_USER, RDB_PASSWORD, RDB_HOST, RDB_PORT, RDB_DB
+  # * All the above, but with RETHINKDB instead of RDB
   # config.rethinkdb_urls = [config.default_rethinkdb_url]
 
   # ssl_options may be set to {:ca_certs => '/path/to/ca.crt'} to establish
@@ -43,9 +42,10 @@ NoBrainer.configure do |config|
   # You can turn off the warning if you want to use both.
   # config.warn_on_active_record = true
 
-  # Configures the durability for database writes.
-  # The default is :soft for development or test environment, otherwise :hard.
-  # config.durability = config.default_durability
+  # Configures the run options passed to r.run() when executing queries.
+  # The options are listed in the RethinkDB run() documentation.
+  # The default durability is :soft for development or test environments, otherwise :hard.
+  # config.run_options = { :durability => config.default_durability }
 
   # Configures the default table configuration options. These values are
   # reflected to the database when running `rake nobrainer:sync_schema'.
@@ -56,17 +56,17 @@ NoBrainer.configure do |config|
   # config.max_string_length = 255
 
   # user_timezone can be configured with :utc, :local, or :unchanged.
-  # When reading an attribute from a model which type is Time, the timezone
-  # of that time is translated according to this setting.
+  # When reading a Time attribute from a model, the timezone of that attribute
+  # is set according to the following setting.
   # config.user_timezone = :local
 
   # db_timezone can be configured with :utc, :local, or :unchanged.
-  # When writting to the database, the timezone of Time attributes are
-  # translated according to this setting.
+  # When writing a Time attribute into the database, the timezone of that
+  # attribute is set according to the following setting.
   # config.db_timezone = :utc
 
   # Default options used when compiling geo queries.
-  # config.geo_options => { :geo_system => 'WGS84', :unit => 'm' }
+  # config.geo_options = { :geo_system => 'WGS84', :unit => 'm' }
 
   # Configures which mechanism to use in order to perform non-racy uniqueness
   # validations. More about this behavior in the Distributed Locks section.
@@ -90,7 +90,7 @@ NoBrainer.configure do |config|
   # generated without conflicts.
   # config.machine_id = config.default_machine_id
 
-  # Criteria cache elements. For example, the result of a has_many association
+  # Criteria cache documents. For example, the result of a has_many association
   # is cached. The per criteria cache is disabled if it grows too big to avoid
   # out of memory issues.
   # config.criteria_cache_max_entries = 10_000

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: nobrainer
 version: !ruby/object:Gem::Version
-  version: 0.30.0
+  version: 0.34.1
 platform: ruby
 authors:
 - Nicolas Viennot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-03 00:00:00.000000000 Z
+date: 2021-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rethinkdb
+  name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 4.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 4.1.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -39,33 +39,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 4.1.0
 - !ruby/object:Gem::Dependency
-  name: activemodel
+  name: middleware
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
-  name: middleware
+  name: rethinkdb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: symbol_decoration
   requirement: !ruby/object:Gem::Requirement
@@ -80,13 +80,15 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
-description: ORM for RethinkDB
+description: The goal of NoBrainer is to provide a similar interface compared to ActiveRecord
+  and Mongoid to build data models on top of RethinkDB while providing precise semantics.
 email:
 - nicolas@viennot.biz
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
 - LICENSE
 - README.md
 - lib/no_brainer/autoload.rb
@@ -236,10 +238,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
-summary: ORM for RethinkDB
+summary: A Ruby ORM for RethinkDB
 test_files: []
-has_rdoc: false