nobrainer 0.32.0 → 0.35.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 28eb4dcb91f5c381ec20a21ed37d01992a3d6eb7
-  data.tar.gz: 395bfd26595f42e290805ebb9ebfa82dda89b99a
+SHA256:
+  metadata.gz: c6d7ce930d1fba4a7c3e3f6368c7a9650c0a298ae1bd46517097284591ae1a22
+  data.tar.gz: 6d9cc4350f77a229f779acc0d88f4893f146b0fd0028f9a214c29da9e4f5e70a
 SHA512:
-  metadata.gz: 390139f43cf843350f0c345f42b15dfef87174961123376643d193dfd0265975daf4c2b3979f6497b605d4ed08175570df76e96e907a01ab3ed8168e71d27253
-  data.tar.gz: 5fb98fd5f37020b9bda60837a0e86d1f761953a5b0c0220a1e22e79d2f823419a39a927e1c6592791bd6e90111c1cc9bf1f33c48137a01cd6d33e40fb545792a
+  metadata.gz: fcb9ef68e4ce874a89761465e0b9861182feb526665cfd08a19be7019a8a0e5f716e6fdd3d940648a42fe1fe1f2e1bba277291778a3752e06c21e67bb94163d3
+  data.tar.gz: fa9b10e21bfd4a987821f365e840c95b6314f5bbaf32efeebe0810f9d8157fe6b0f4f9607ab1931d278f2d22beb24442b0ed2f1115e360a7f82aa8ad3c5a111b

data/CHANGELOG.md

@@ -0,0 +1,137 @@
+# 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.35.0] - 2021-08-08
+### Added
+- Dockerfile, docker-compose and Earthfile
+- Test Ruby 3 + Rails 6 on Travis CI
+- Implements the ReQL `during` command
+
+## [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.35.0...HEAD
+[0.35.0]: https://github.com/nobrainerorm/nobrainer/compare/v0.34.1...v0.35.0
+[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/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/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/where.rb

@@ -104,6 +104,7 @@ module NoBrainer::Criteria::Where
         when :between then [key_modifier, op, (cast_value(value.min)..cast_value(value.max))]
         when :include then ensure_scalar_for(op); [:any, :eq, cast_value(value)]
         when :defined, :undefined then ensure_scalar_for(op); [key_modifier, op, cast_value(value)]
+        when :during then [key_modifier, op, [cast_value(value.first), cast_value(value.last)]]
         else [key_modifier, op, cast_value(value)]
       end
       BinaryOperator.new(new_key_path, new_key_modifier, new_op, new_value, model, true)
@@ -132,6 +133,7 @@ module NoBrainer::Criteria::Where
       when :between    then (lvalue >= value.min) & (lvalue <= value.max)
       when :in         then RethinkDB::RQL.new.expr(value).contains(lvalue)
       when :intersects then lvalue.intersects(value.to_rql)
+      when :during     then lvalue.during(value.first, value.last)
       when :near
         # XXX options[:max_results] is not used, seems to be a workaround of rethinkdb index implementation.
         circle = value[:circle]
@@ -244,6 +246,7 @@ module NoBrainer::Criteria::Where
     when Symbol::Decoration
       case clause.args.size
       when 1 then parse_clause_stub(clause, clause.args.first, options)
+      when 2 then parse_clause_stub(clause, clause.args, options)
       else raise "Invalid argument: #{clause}"
       end
     else raise "Invalid clause: #{clause}"
@@ -263,6 +266,11 @@ module NoBrainer::Criteria::Where
       else instantiate_binary_op(key.to_sym, :eq, value, options)
       end
     when Symbol::Decoration then
+      # The :eq operator can have only one arg
+      if key.decorator == :eq && value.is_a?(Array) && value.size > 1
+        raise "Invalid key: #{key}"
+      end
+
       case key.decorator
       when :any, :all, :not then instantiate_binary_op(key, :eq, value, options)
       when :gte then instantiate_binary_op(key.symbol, :ge, value, options)

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

@@ -35,7 +35,7 @@ class NoBrainer::Document::Association::BelongsTo
     end
 
     def base_criteria
-      target_model.without_ordering.unscoped
+      target_model.without_ordering
     end
 
     def hook

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/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/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/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/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/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?
 
-    (NoBrainer.rails5? ? ActiveSupport::Reloader : 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/symbol_decoration.rb

@@ -1,5 +1,5 @@
 module NoBrainer::SymbolDecoration
-  NON_CHAINABLE_OPERATORS = %w(in eq gt ge gte lt le lte defined undefined near intersects include).map(&:to_sym)
+  NON_CHAINABLE_OPERATORS = %w(in eq gt ge gte lt le lte defined undefined near intersects include during).map(&:to_sym)
   CHAINABLE_OPERATORS = %w(not any all).map(&:to_sym)
   OPERATORS = CHAINABLE_OPERATORS + NON_CHAINABLE_OPERATORS
 

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

@@ -41,6 +41,10 @@ module NoBrainer
       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,7 +34,9 @@ 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
 

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.32.0
+  version: 0.35.0
 platform: ruby
 authors:
 - Nicolas Viennot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-05 00:00:00.000000000 Z
+date: 2021-09-09 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.5.1
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
-summary: ORM for RethinkDB
+summary: A Ruby ORM for RethinkDB
 test_files: []
-has_rdoc: false