nobrainer 0.40.0 → 0.42.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2be88d279ca6fb8c9c8698d25efe539c635949fa5d328034f9a30430e084d396
-  data.tar.gz: 4c5d8c072503e15d84198c9e1c33c293efdf3d4789784bbfe8420c7755cbc968
+  metadata.gz: 69052877b8fd9f2684f63a0bc7a917812fd771f793d55e7f5182149fc1346643
+  data.tar.gz: 33dbe632e862a31bb4ac95ab8015834947bd1207df3bbdfb921b742274d06517
 SHA512:
-  metadata.gz: 552bc01e727596b8060026e28dcd825cdce2152e3fbf7aa6ec128379bea7dc38b945938bfa79d82917e186d22477fded04127d6c565e4d2bc6e569b775bafc88
-  data.tar.gz: 9e52d7ffea00b58b0f80102e8d31b43c32d397082e30ccf3bb82e140565c0aec9ce853bf84d2ba204241076cd2e14523ac48670d9b55a8b12b918a08422f8072
+  metadata.gz: 102682b8e844b1fd574b3d29f386923bb4dfaee33e88e7da6c5615b4901d20023267cbd4e698bec34a94b77718ca04f251f8aebdfd8f74ef5837c637931dd206
+  data.tar.gz: 3cb7abcc47fd15d71abac788e7c5844229d30f532c01000d177d7c5b718848b48d2150cda32a1725ed7d0b68adbb775f4461805d9c2f4768104ba1320eb95d52

data/CHANGELOG.md

@@ -6,6 +6,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+
+## [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
+
+### Fixed
+- gemspec dependencies on activemodel and activesupport
+
 ## [0.40.0] - 2021-10-16
 ### Fixed
 - Ruby 3 compatibility
@@ -108,7 +124,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.40.0...HEAD
+[Unreleased]: https://github.com/nobrainerorm/nobrainer/compare/v0.42.0...HEAD
+[0.41.1]: 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
 [0.35.0]: https://github.com/nobrainerorm/nobrainer/compare/v0.34.1...v0.35.0

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

@@ -0,0 +1,304 @@
+# frozen_string_literal: true
+
+require 'active_support/core_ext/hash/indifferent_access'
+
+module NoBrainer
+  module Document
+    # Store gives you a way for storing hashes in a single field with accessors
+    # to the Hash keys.
+    # It is a portage of the ActiveRecord::Store which make gems using it
+    # compatible with NoBrainer.
+    #
+    # You can then declare accessors to this store that are then accessible just
+    # like any other attribute of the model. This is very helpful for easily
+    # exposing store keys to a form or elsewhere that's already built around
+    # just accessing attributes on the model.
+    #
+    # Every accessor comes with dirty tracking methods (+key_changed?+,
+    # +key_was+ and +key_change+).
+    #
+    # You can set custom coder to encode/decode your serialized attributes
+    # to/from different formats.
+    # JSON, YAML, Marshal are supported out of the box.
+    # Generally it can be any wrapper that provides +load+ and +dump+.
+    #
+    # NOTE: The {.store}[rdoc-ref:rdoc-ref:ClassMethods#store] method is here
+    # for compatibility reason, but you should use
+    # {.store_accessor}[rdoc-ref:ClassMethods#store_accessor] instead
+    # to generate the accessor methods.
+    # Be aware that these columns use a string keyed hash and do not allow
+    # access using a symbol.
+    #
+    # NOTE: The default validations with the exception of +uniqueness+ will work.
+    #
+    # Examples:
+    #
+    #   class User
+    #     include NoBrainer::Document
+    #
+    #     store :settings, accessors: [ :color, :homepage ], coder: JSON
+    #     store :parent, accessors: [ :name ], coder: JSON, prefix: true
+    #     store :spouse, accessors: [ :name ], coder: JSON, prefix: :partner
+    #     store :settings, accessors: [ :two_factor_auth ], suffix: true
+    #     store :settings, accessors: [ :login_retry ], suffix: :config
+    #   end
+    #
+    #   u = User.new(color: 'black', homepage: '37signals.com',
+    #                parent_name: 'Mary', partner_name: 'Lily')
+    #   u.color                          # Accessor stored attribute
+    #   u.parent_name                    # Accessor stored attribute with prefix
+    #   u.partner_name                   # Accessor stored attribute with custom prefix
+    #   u.two_factor_auth_settings       # Accessor stored attribute with suffix
+    #   u.login_retry_config             # Accessor stored attribute with custom suffix
+    #   u.settings[:country] = 'Denmark' # Any attribute, even if not specified with an accessor
+    #
+    #   # There is no difference between strings and symbols for accessing
+    #   # custom attributes
+    #   u.settings[:country]  # => 'Denmark'
+    #   u.settings['country'] # => 'Denmark'
+    #
+    #   # Dirty tracking
+    #   u.color = 'green'
+    #   u.color_changed? # => true
+    #   u.color_was # => 'black'
+    #   u.color_change # => ['black', 'red']
+    #
+    #   # Add additional accessors to an existing store through store_accessor
+    #   class SuperUser < User
+    #     store_accessor :settings, :privileges, :servants
+    #     store_accessor :parent, :birthday, prefix: true
+    #     store_accessor :settings, :secret_question, suffix: :config
+    #   end
+    #
+    # The stored attribute names can be retrieved using
+    # {.stored_attributes}[rdoc-ref:rdoc-ref:ClassMethods#stored_attributes].
+    #
+    #   User.stored_attributes[:settings]
+    #   #=> [:color, :homepage, :two_factor_auth, :login_retry]
+    #
+    # == Overwriting default accessors
+    #
+    # All stored values are automatically available through accessors on
+    # the NoBrainer Document object, but sometimes you want to specialize
+    # this behavior. This can be done by overwriting the default accessors
+    # (using the same name as the attribute) and calling <tt>super</tt>
+    # to actually change things.
+    #
+    #   class Song
+    #     include NoBrainer::Document
+    #
+    #     # Uses a stored integer to hold the volume adjustment of the song
+    #     store :settings, accessors: [:volume_adjustment]
+    #
+    #     def volume_adjustment=(decibels)
+    #       super(decibels.to_i)
+    #     end
+    #
+    #     def volume_adjustment
+    #       super.to_i
+    #     end
+    #   end
+    module Store
+      extend ActiveSupport::Concern
+
+      included do
+        class << self
+          attr_accessor :local_stored_attributes
+        end
+      end
+
+      module ClassMethods
+        def store(store_attribute, options = {})
+          store_accessor(store_attribute, options[:accessors], **options.slice(:prefix, :suffix)) if options.has_key? :accessors
+        end
+
+        def store_accessor(store_attribute, *keys, prefix: nil, suffix: nil)
+          keys = keys.flatten
+
+          accessor_prefix =
+            case prefix
+            when String, Symbol
+              "#{prefix}_"
+            when TrueClass
+              "#{store_attribute}_"
+            else
+              ""
+            end
+          accessor_suffix =
+            case suffix
+            when String, Symbol
+              "_#{suffix}"
+            when TrueClass
+              "_#{store_attribute}"
+            else
+              ""
+            end
+
+          field store_attribute, type: Hash, default: {} unless has_field?(store_attribute)
+
+          define_method("#{store_attribute}=") do |value|
+            super(value) if value.is_a?(Hash) || value.nil?
+          end
+
+          _store_accessors_module.module_eval do
+            keys.each do |key|
+              accessor_key = "#{accessor_prefix}#{key}#{accessor_suffix}"
+
+              define_method("#{accessor_key}=") do |value|
+                write_store_attribute(store_attribute, key, value)
+              end
+
+              define_method(accessor_key) do
+                read_store_attribute(store_attribute, key)
+              end
+
+              define_method("#{accessor_key}_changed?") do
+                return false unless __send__("#{store_attribute}_changed?")
+                prev_store, new_store = changes[store_attribute]
+                if NoBrainer.rails4?
+                  (prev_store && prev_store[key.to_s]) != (new_store && new_store[key.to_s])
+                else
+                  (prev_store && prev_store.dig(key)) != (new_store && new_store.dig(key))
+                end
+              end
+
+              define_method("#{accessor_key}_change") do
+                return unless __send__("#{store_attribute}_changed?")
+                prev_store, new_store = changes[store_attribute]
+                if NoBrainer.rails4?
+                  [(prev_store && prev_store[key.to_s]), (new_store && new_store[key.to_s])]
+                else
+                  [(prev_store && prev_store.dig(key)), (new_store && new_store.dig(key))]
+                end
+              end
+
+              define_method("#{accessor_key}_was") do
+                return unless __send__("#{store_attribute}_changed?")
+                prev_store, _new_store = changes[store_attribute]
+                if NoBrainer.rails4?
+                  (prev_store && prev_store[key.to_s])
+                else
+                  (prev_store && prev_store.dig(key))
+                end
+              end
+
+              # NoBrainer doesn't have `attribute_will_change!` so those methods
+              # can't be implemented yet.
+              # See https://github.com/NoBrainerORM/nobrainer/pull/190
+              #
+              # define_method("saved_change_to_#{accessor_key}?") do
+              #   return false unless __send__("saved_change_to_#{store_attribute}?")
+              #   prev_store, new_store = __send__("saved_change_to_#{store_attribute}")
+              #   prev_store&.dig(key) != new_store&.dig(key)
+              # end
+
+              # define_method("saved_change_to_#{accessor_key}") do
+              #   return unless __send__("saved_change_to_#{store_attribute}?")
+              #   prev_store, new_store = __send__("saved_change_to_#{store_attribute}")
+              #   [prev_store&.dig(key), new_store&.dig(key)]
+              # end
+
+              # define_method("#{accessor_key}_before_last_save") do
+              #   return unless __send__("saved_change_to_#{store_attribute}?")
+              #   prev_store, _new_store = __send__("saved_change_to_#{store_attribute}")
+              #   prev_store&.dig(key)
+              # end
+            end
+          end
+
+          # assign new store attribute and create new hash to ensure that each class in the hierarchy
+          # has its own hash of stored attributes.
+          self.local_stored_attributes ||= {}
+          self.local_stored_attributes[store_attribute] ||= []
+          self.local_stored_attributes[store_attribute] |= keys
+        end
+
+        def _store_accessors_module # :nodoc:
+          @_store_accessors_module ||= begin
+            mod = Module.new
+            include mod
+            mod
+          end
+        end
+
+        def stored_attributes
+          parent = superclass.respond_to?(:stored_attributes) ? superclass.stored_attributes : {}
+          if local_stored_attributes
+            parent.merge!(local_stored_attributes) { |k, a, b| a | b }
+          end
+          parent
+        end
+      end
+
+      private
+
+      def read_store_attribute(store_attribute, key) # :doc:
+        StringKeyedHashAccessor.read(self, store_attribute, key)
+      end
+
+      def write_store_attribute(store_attribute, key, value) # :doc:
+        StringKeyedHashAccessor.write(self, store_attribute, key, value)
+      end
+
+      class HashAccessor # :nodoc:
+        def self.read(object, attribute, key)
+          prepare(object, attribute)
+          object.public_send(attribute)[key]
+        end
+
+        def self.write(object, attribute, key, value)
+          prepare(object, attribute)
+          if value != read(object, attribute, key)
+            # "#{attribute}_will_change!" is not implemented in NoBrainer. See issue #190
+            # object.public_send :"#{attribute}_will_change!"
+            object.public_send(attribute)[key] = value
+          end
+        end
+
+        def self.prepare(object, attribute)
+          object.public_send :"#{attribute}=", {} unless object.send(attribute)
+        end
+      end
+
+      class StringKeyedHashAccessor < HashAccessor # :nodoc:
+        def self.read(object, attribute, key)
+          super object, attribute, key.to_s
+        end
+
+        def self.write(object, attribute, key, value)
+          super object, attribute, key.to_s, value
+        end
+      end
+
+      class IndifferentCoder # :nodoc:
+        def initialize(attr_name, coder_or_class_name)
+          @coder =
+            if coder_or_class_name.respond_to?(:load) && coder_or_class_name.respond_to?(:dump)
+              coder_or_class_name
+            else
+              NoBrainer::Document::Coders::YAMLColumn.new(attr_name, coder_or_class_name || Object)
+            end
+        end
+
+        def dump(obj)
+          @coder.dump self.class.as_indifferent_hash(obj)
+        end
+
+        def load(yaml)
+          self.class.as_indifferent_hash(@coder.load(yaml || ""))
+        end
+
+        def self.as_indifferent_hash(obj)
+          case obj
+          when ActiveSupport::HashWithIndifferentAccess
+            obj
+          when Hash
+            obj.with_indifferent_access
+          else
+            ActiveSupport::HashWithIndifferentAccess.new
+          end
+        end
+      end
+    end
+  end
+end

data/lib/no_brainer/document.rb

@@ -7,7 +7,7 @@ module NoBrainer::Document
   autoload_and_include :Core, :TableConfig, :InjectionLayer, :Attributes, :Readonly,
                        :Persistance, :Callbacks, :Validation, :Types, :Dirty, :PrimaryKey,
                        :Association, :Serialization, :Criteria, :Polymorphic, :Index, :Aliases,
-                       :MissingAttributes, :LazyFetch, :AtomicOps, :VirtualAttributes
+                       :MissingAttributes, :LazyFetch, :AtomicOps, :VirtualAttributes, :Store
 
   autoload :DynamicAttributes, :Timestamps
 

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

data/lib/nobrainer.rb

@@ -37,6 +37,10 @@ module NoBrainer
       RUBY_PLATFORM == 'java'
     end
 
+    def rails4?
+      Gem.loaded_specs['activesupport'].version >= Gem::Version.new('4.0.0')
+    end
+
     def rails5?
       Gem.loaded_specs['activesupport'].version >= Gem::Version.new('5.0.0.beta')
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nobrainer
 version: !ruby/object:Gem::Version
-  version: 0.40.0
+  version: 0.42.0
 platform: ruby
 authors:
 - Nicolas Viennot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-16 00:00:00.000000000 Z
+date: 2022-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -19,7 +19,7 @@ dependencies:
         version: 4.1.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: 4.1.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '8'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -39,7 +39,7 @@ dependencies:
         version: 4.1.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,7 +49,7 @@ dependencies:
         version: 4.1.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '8'
 - !ruby/object:Gem::Dependency
   name: middleware
   requirement: !ruby/object:Gem::Requirement
@@ -168,6 +168,7 @@ files:
 - lib/no_brainer/document/primary_key/generator.rb
 - lib/no_brainer/document/readonly.rb
 - lib/no_brainer/document/serialization.rb
+- lib/no_brainer/document/store.rb
 - lib/no_brainer/document/table_config.rb
 - lib/no_brainer/document/table_config/synchronizer.rb
 - lib/no_brainer/document/timestamps.rb
@@ -241,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: