nobrainer 0.41.0 → 0.43.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 477e66e4e3380775847ce79e706f50a04134e7e87002b31aa0ca33c9e164d9d7
-  data.tar.gz: b303bbb3dc6a45df84f39edd2cce6d26af27000939c56be05e8f036c0ad11e76
+  metadata.gz: ea5237da296873c106bd564c6ca6e62674dd63bf3e1214e8542c3097bb978c82
+  data.tar.gz: bc02529b83bc6cb8fac1d1895fc3ae927220f6f497a4c4c921e41786b41d3a1a
 SHA512:
-  metadata.gz: f1f883d15467994b72aabddbb61adcadd7095a5220f89ad1b4d8e58cf6927cfb7a99e0e1443fc24d7edf37bf4a24c24e95d0bc99c47d39281b0e56c73ee549b0
-  data.tar.gz: '04592d9c64732b25089dccd897ad451cd2f71b12a96a93532604768c9c40c1757e6f2b528792976f8be054e376d0a3a4541ca3a3aa7de60014a7e88d97e10453'
+  metadata.gz: 8aa09bfe2bfc6948258d43d6e9ffc16261ea718da79aabfe2b012ead4b69a42fb0fc5d8d30e6a26a0a1880210ae7f0d342ef0911f3193fa91235e07edb87f509
+  data.tar.gz: 999c029ba2e70dd0fd4f458f091c25bbc493d4be0a181e09ae66871a0f6d43bfab005088d509c509cd6cf58bc3528daf72b296a7e02e589d1d23a59b1502c09d

data/CHANGELOG.md

@@ -7,6 +7,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 
 
+## [0.43.0] - 2022-06-16
+### Added
+- Implements polymorphic associations
+
+## [0.42.0] - 2022-06-15
+### Added
+- Add support for partial compound index queries
+
+## [0.41.1] - 2022-03-21
+### Fixed
+- Removing table_config duplicates after a runtime exception (caspiano)
+
 ## [0.41.0] - 2021-10-17
 ### Added
 - ActiveRecord `store_accessor` helper method
@@ -116,7 +128,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Locks: bug fix: allow small timeouts in lock()
 - Fix reentrant lock counter on steals
 
-[Unreleased]: https://github.com/nobrainerorm/nobrainer/compare/v0.41.0...HEAD
+[Unreleased]: https://github.com/nobrainerorm/nobrainer/compare/v0.43.0...HEAD
+[0.43.0]: https://github.com/nobrainerorm/nobrainer/compare/v0.42.0...v0.43.0
+[0.42.0]: https://github.com/nobrainerorm/nobrainer/compare/v0.41.1...v0.42.0
+[0.41.1]: https://github.com/nobrainerorm/nobrainer/compare/v0.41.0...v0.41.1
 [0.41.0]: https://github.com/nobrainerorm/nobrainer/compare/v0.40.0...v0.41.0
 [0.40.0]: https://github.com/nobrainerorm/nobrainer/compare/v0.36.0...v0.40.0
 [0.36.0]: https://github.com/nobrainerorm/nobrainer/compare/v0.35.0...v0.36.0

data/lib/no_brainer/criteria/join.rb

@@ -16,6 +16,7 @@ module NoBrainer::Criteria::Join
         association = model.association_metadata[k.to_sym]
         raise "`#{k}' must be an association on `#{model}'" unless association
         raise "join() does not support through associations" if association.options[:through]
+        raise "join() does not support polymorphic associations" if association.options[:polymorphic]
 
         criteria = association.base_criteria
         criteria = case v

data/lib/no_brainer/criteria/where.rb

@@ -399,12 +399,45 @@ module NoBrainer::Criteria::Where
       get_usable_indexes(:kind => :compound, :geo => false, :multi => false).each do |index|
         indexed_clauses = index.what.map { |field| clauses[[field]] }
         next unless indexed_clauses.all? { |c| c.try(:compatible_with_index?, index) }
-
         return IndexStrategy.new(self, ast, indexed_clauses, index, :get_all, [indexed_clauses.map(&:value)])
       end
       return nil
     end
 
+    def find_strategy_compound_partial
+      clauses = get_candidate_clauses(:eq, :between).map { |c| [c.key_path, c] }.to_h
+      return nil unless clauses.present?
+
+      get_usable_indexes(:kind => :compound, :geo => false, :multi => false).each do |index|
+        indexed_clauses = index.what.map { |field| clauses[[field]] }
+        partial_clauses = indexed_clauses.compact
+        pad = indexed_clauses.length - partial_clauses.length
+        if partial_clauses.any? && partial_clauses.all? { |c| c.try(:compatible_with_index?, index) }
+          # can only use partial compound index if:
+          #   * index contains all clause fields
+          next unless (clauses.values & partial_clauses) == clauses.values
+          #   * all clause fields come first in the indexed clauses (unused indexed fields are at the end)
+          next unless indexed_clauses.last(pad).all?(&:nil?)
+          #   * all clause fields are :eq, except the last (which may be :between)
+          next unless partial_clauses[0..-2].all? { |c|  c.op == :eq }
+
+          # use range query to cover unused index fields
+          left_bound  = partial_clauses.map(&:value)
+          right_bound = partial_clauses.map(&:value)
+          if (clause = partial_clauses[-1]).op == :between
+            left_bound[-1] = clause.value.min
+            right_bound[-1] = clause.value.max
+          end
+          if pad > 0
+            left_bound.append *Array.new(pad, RethinkDB::RQL.new.minval)
+            right_bound.append *Array.new(pad, RethinkDB::RQL.new.maxval)
+          end
+          return IndexStrategy.new(self, ast, partial_clauses, index, :between, [left_bound, right_bound], :left_bound => :closed, :right_bound => :closed)
+        end
+      end
+      nil
+    end
+
     def find_strategy_hidden_between
       clauses = get_candidate_clauses(:gt, :ge, :lt, :le).group_by(&:key_path)
       return nil unless clauses.present?
@@ -454,7 +487,7 @@ module NoBrainer::Criteria::Where
     def find_strategy
       return nil unless ast.try(:clauses).present? && !criteria.without_index?
       case ast.op
-      when :and then find_strategy_compound || find_strategy_canonical || find_strategy_hidden_between
+      when :and then find_strategy_compound || find_strategy_compound_partial || find_strategy_canonical || find_strategy_hidden_between
       when :or  then find_strategy_union
       end
     end

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

@@ -2,8 +2,11 @@ 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, :uniq, :unique]
+    VALID_OPTIONS = %i[
+      primary_key foreign_key foreign_type class_name foreign_key_store_as
+      index validates required uniq unique polymorphic
+    ]
+
     include NoBrainer::Document::Association::Core::Metadata
     include NoBrainer::Document::Association::EagerLoader::Generic
 
@@ -11,6 +14,12 @@ class NoBrainer::Document::Association::BelongsTo
       options[:foreign_key].try(:to_sym) || :"#{target_name}_#{primary_key}"
     end
 
+    def foreign_type
+      return nil unless options[:polymorphic]
+
+      options[:foreign_type].try(:to_sym) || (:"#{target_name}_type")
+    end
+
     def primary_key
       # We default the primary_key to `:id' and not `target_model.pk_name',
       # because we don't want to require the target_model to be already loaded.
@@ -30,12 +39,22 @@ class NoBrainer::Document::Association::BelongsTo
       end
     end
 
-    def target_model
-      get_model_by_name(options[:class_name] || target_name.to_s.camelize)
+    def target_model(target_class = nil)
+      return if options[:polymorphic] && target_class.nil?
+
+      model_name = if options[:polymorphic]
+                     target_class
+                   else
+                     options[:class_name] || target_name.to_s.camelize
+                   end
+
+      get_model_by_name(model_name)
     end
 
-    def base_criteria
-      target_model.without_ordering
+    def base_criteria(target_class = nil)
+      model = target_model(target_class)
+
+      model ? model.without_ordering : nil
     end
 
     def hook
@@ -47,6 +66,11 @@ class NoBrainer::Document::Association::BelongsTo
         raise "Cannot declare `#{target_name}' in #{owner_model}: the foreign_key `#{foreign_key}' is already used"
       end
 
+      if options[:polymorphic] && options[:class_name]
+        raise 'You cannot set class_name on a polymorphic belongs_to'
+      end
+
+      owner_model.field(foreign_type) if options[:polymorphic]
       owner_model.field(foreign_key, :store_as => options[:foreign_key_store_as], :index => options[:index])
 
       unless options[:validates] == false
@@ -85,6 +109,7 @@ class NoBrainer::Document::Association::BelongsTo
     end
 
     def eager_load_owner_key;  foreign_key; end
+    def eager_load_owner_type; foreign_type; end
     def eager_load_target_key; primary_key; end
   end
 
@@ -97,6 +122,17 @@ class NoBrainer::Document::Association::BelongsTo
     @target_container = nil
   end
 
+  def polymorphic_read
+    return target if loaded?
+
+    target_class = owner.read_attribute(foreign_type)
+    fk = owner.read_attribute(foreign_key)
+
+    if target_class && fk
+      preload(base_criteria(target_class).where(primary_key => fk).first)
+    end
+  end
+
   def read
     return target if loaded?
 
@@ -105,6 +141,12 @@ class NoBrainer::Document::Association::BelongsTo
     end
   end
 
+  def polymorphic_write(target)
+    owner.write_attribute(foreign_key, target.try(primary_key))
+    owner.write_attribute(foreign_type, target.root_class.name)
+    preload(target)
+  end
+
   def write(target)
     assert_target_type(target)
     owner.write_attribute(foreign_key, target.try(primary_key))

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

@@ -33,8 +33,8 @@ module NoBrainer::Document::Association::Core
 
     def hook
       options.assert_valid_keys(*self.class.const_get(:VALID_OPTIONS))
-      delegate("#{target_name}=", :write)
-      delegate("#{target_name}", :read)
+      delegate("#{target_name}=", "#{'polymorphic_' if options[:polymorphic]}write".to_sym)
+      delegate("#{target_name}", "#{'polymorphic_' if options[:polymorphic]}read".to_sym)
     end
 
     def add_callback_for(what)
@@ -62,7 +62,8 @@ module NoBrainer::Document::Association::Core
 
   included { attr_accessor :metadata, :owner }
 
-  delegate :primary_key, :foreign_key, :target_name, :target_model, :base_criteria, :to => :metadata
+  delegate :primary_key, :foreign_key, :foreign_type, :target_name,
+           :target_model, :base_criteria, :to => :metadata
 
   def initialize(metadata, owner)
     @metadata, @owner = metadata, owner

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module NoBrainer::Document::Association::EagerLoader
   extend self
 
@@ -5,11 +7,22 @@ module NoBrainer::Document::Association::EagerLoader
     # Used in associations to declare generic eager loading capabilities
     # The association should implement loaded?, preload,
     # eager_load_owner_key and eager_load_target_key.
-    def eager_load(docs, additional_criteria=nil)
+    def eager_load(docs, additional_criteria = nil)
       owner_key  = eager_load_owner_key
+      owner_type = eager_load_owner_type
       target_key = eager_load_target_key
 
-      criteria = base_criteria
+      if is_a?(NoBrainer::Document::Association::BelongsTo::Metadata) && owner_type
+        target_class = docs.first.__send__(owner_type)
+
+        if docs.detect { |doc| doc.__send__(owner_type) != target_class }
+          raise NoBrainer::Error::PolymorphicAssociationWithDifferentTypes,
+                "The documents to be eager loaded doesn't have the same " \
+                'type, which is not supported'
+        end
+      end
+
+      criteria = target_class ? base_criteria(target_class) : base_criteria
       criteria = criteria.merge(additional_criteria) if additional_criteria
 
       unloaded_docs = docs.reject { |doc| doc.associations[self].loaded? }

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

@@ -2,12 +2,20 @@ class NoBrainer::Document::Association::HasMany
   include NoBrainer::Document::Association::Core
 
   class Metadata
-    VALID_OPTIONS = [:primary_key, :foreign_key, :class_name, :dependent, :scope]
+    VALID_OPTIONS = [:primary_key, :foreign_key, :class_name, :dependent, :scope,
+                     :as]
     include NoBrainer::Document::Association::Core::Metadata
     include NoBrainer::Document::Association::EagerLoader::Generic
 
     def foreign_key
-      options[:foreign_key].try(:to_sym) || :"#{owner_model.name.split('::').last.underscore}_#{primary_key}"
+      return options[:foreign_key].try(:to_sym) if options.key?(:foreign_key)
+      return :"#{options[:as]}_#{primary_key}" if options[:as]
+
+      :"#{owner_model.name.split('::').last.underscore}_#{primary_key}"
+    end
+
+    def foreign_type
+      options[:foreign_type].try(:to_sym) || (options[:as] && :"#{options[:as]}_type")
     end
 
     def primary_key
@@ -30,9 +38,9 @@ class NoBrainer::Document::Association::HasMany
       # caching is hard (rails console reload, etc.).
       target_model.association_metadata.values.select do |assoc|
         assoc.is_a?(NoBrainer::Document::Association::BelongsTo::Metadata) and
-        assoc.foreign_key == self.foreign_key                              and
-        assoc.primary_key == self.primary_key                              and
-        assoc.target_model.root_class == owner_model.root_class
+        assoc.foreign_key == foreign_key                                   and
+        assoc.primary_key == primary_key                                   and
+        assoc.target_model(target_model).root_class == owner_model.root_class
       end
     end
 
@@ -46,7 +54,7 @@ class NoBrainer::Document::Association::HasMany
 
       if options[:dependent]
         unless [:destroy, :delete, :nullify, :restrict, nil].include?(options[:dependent])
-          raise "Invalid dependent option: `#{options[:dependent].inspect}'. " +
+          raise "Invalid dependent option: `#{options[:dependent].inspect}'. " \
                 "Valid options are: :destroy, :delete, :nullify, or :restrict"
         end
         add_callback_for(:before_destroy)
@@ -54,12 +62,22 @@ class NoBrainer::Document::Association::HasMany
     end
 
     def eager_load_owner_key;  primary_key; end
+    def eager_load_owner_type; foreign_type; end
     def eager_load_target_key; foreign_key; end
   end
 
   def target_criteria
-    @target_criteria ||= base_criteria.where(foreign_key => owner.__send__(primary_key))
-                                      .after_find(set_inverse_proc)
+    @target_criteria ||= begin
+      query_criteria = { foreign_key => owner.__send__(primary_key) }
+
+      if metadata.options[:as]
+        query_criteria = query_criteria.merge(
+          foreign_type => owner.root_class.name
+        )
+      end
+
+      base_criteria.where(query_criteria).after_find(set_inverse_proc)
+    end
   end
 
   def read

data/lib/no_brainer/error.rb

@@ -1,19 +1,21 @@
+# frozen_string_literal: true
+
 module NoBrainer::Error
-  class Connection              < RuntimeError; end
-  class DocumentNotFound        < RuntimeError; end
-  class DocumentNotPersisted    < RuntimeError; end
-  class ChildrenExist           < RuntimeError; end
-  class CannotUseIndex          < RuntimeError; end
-  class MissingIndex            < RuntimeError; end
-  class AssociationNotPersisted < RuntimeError; end
-  class ReadonlyField           < RuntimeError; end
-  class MissingAttribute        < RuntimeError; end
-  class UnknownAttribute        < RuntimeError; end
-  class AtomicBlock             < RuntimeError; end
-  class LostLock                < RuntimeError; end
-  class LockInvalidOp           < RuntimeError; end
-  class LockUnavailable         < RuntimeError; end
-  class InvalidPolymorphicType  < RuntimeError; end
+  class AssociationNotPersisted                   < RuntimeError; end
+  class AtomicBlock                               < RuntimeError; end
+  class ChildrenExist                             < RuntimeError; end
+  class Connection                                < RuntimeError; end
+  class DocumentNotFound                          < RuntimeError; end
+  class DocumentNotPersisted                      < RuntimeError; end
+  class InvalidPolymorphicType                    < RuntimeError; end
+  class LockInvalidOp                             < RuntimeError; end
+  class LostLock                                  < RuntimeError; end
+  class LockUnavailable                           < RuntimeError; end
+  class MissingAttribute                          < RuntimeError; end
+  class MissingIndex                              < RuntimeError; end
+  class PolymorphicAssociationWithDifferentTypes  < RuntimeError; end
+  class ReadonlyField                             < RuntimeError; end
+  class UnknownAttribute                          < RuntimeError; end
 
   class DocumentInvalid < RuntimeError
     attr_accessor :instance

data/lib/no_brainer/query_runner/table_on_demand.rb

@@ -29,9 +29,13 @@ class NoBrainer::QueryRunner::TableOnDemand < NoBrainer::QueryRunner::Middleware
     env[:last_auto_create_table] = [db_name, table_name]
 
     create_options = model.table_create_options
-
-    NoBrainer.run(:db => db_name) do |r|
-      r.table_create(table_name, create_options.reject { |k,_| k.in? [:name, :write_acks] })
+    begin
+      NoBrainer.run(:db => db_name) do |r|
+        r.table_create(table_name, create_options.reject { |k,_| k.in? [:name, :write_acks] })
+      end
+    rescue RuntimeError => e
+      # We might have raced with another table create
+      raise unless e.message =~ /Table `#{db_name}\.#{table_name}` already exists/
     end
 
     # Prevent duplicate table errors on a cluster.
@@ -49,8 +53,5 @@ class NoBrainer::QueryRunner::TableOnDemand < NoBrainer::QueryRunner::Middleware
         r.table(table_name).config().update(:write_acks => create_options[:write_acks])
       end
     end
-  rescue RuntimeError => e
-    # We might have raced with another table create
-    raise unless e.message =~ /Table `#{db_name}\.#{table_name}` already exists/
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nobrainer
 version: !ruby/object:Gem::Version
-  version: 0.41.0
+  version: 0.43.0
 platform: ruby
 authors:
 - Nicolas Viennot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-17 00:00:00.000000000 Z
+date: 2022-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -242,7 +242,11 @@ files:
 homepage: http://nobrainer.io
 licenses:
 - LGPL-3.0-only
-metadata: {}
+metadata:
+  allowed_push_host: https://rubygems.org
+  homepage_uri: http://nobrainer.io
+  source_code_uri: https://github.com/NoBrainerORM/nobrainer
+  changelog_uri: https://github.com/NoBrainerORM/nobrainer/blob/master/CHANGELOG.md
 post_install_message: 
 rdoc_options: []
 require_paths: