nobrainer 0.34.0 → 0.40.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 6aeddbfcb32d5cd100bb92a6c05b6c6f5c45a15e
-  data.tar.gz: a6e70c12de29fe7154b19254220d52b7ad803e26
+SHA256:
+  metadata.gz: 2be88d279ca6fb8c9c8698d25efe539c635949fa5d328034f9a30430e084d396
+  data.tar.gz: 4c5d8c072503e15d84198c9e1c33c293efdf3d4789784bbfe8420c7755cbc968
 SHA512:
-  metadata.gz: 997850d56ff98737d2f1c0feb498fe2c4377ee90e33eee54aeb9d574fd11c289faae0e348906b0df1d11d9f03088c5fb51a7fce4a762811b8e8323acca1ddd0c
-  data.tar.gz: acb35bf857b08452f31618bd80b304d69f195dd94a3b42d066ce6e9957d87e5ceffd7988a272de406156a0c343c9a85ee99e094182b1705f38560b2efae71392
+  metadata.gz: 552bc01e727596b8060026e28dcd825cdce2152e3fbf7aa6ec128379bea7dc38b945938bfa79d82917e186d22477fded04127d6c565e4d2bc6e569b775bafc88
+  data.tar.gz: 9e52d7ffea00b58b0f80102e8d31b43c32d397082e30ccf3bb82e140565c0aec9ce853bf84d2ba204241076cd2e14523ac48670d9b55a8b12b918a08422f8072

data/CHANGELOG.md

@@ -0,0 +1,147 @@
+# 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.40.0] - 2021-10-16
+### Fixed
+- Ruby 3 compatibility
+- Test Ruby 3 + Rails 7 alpha2 on Travis CI
+
+## [0.36.0] - 2021-08-08
+### Added
+- Array and TypedArray types for validation and serialization
+
+## [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.40.0...HEAD
+[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
+[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/connection.rb

@@ -19,8 +19,8 @@ class NoBrainer::Connection
       end
 
       {
-        :user     => uri.user && URI.decode(uri.user),
-        :password => uri.password && URI.decode(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(/^\//, ''),

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

@@ -33,8 +33,12 @@ module NoBrainer::Document::Association::EagerLoader
   def eager_load_association(docs, association_name, criteria=nil)
     docs = docs.compact
     return [] if docs.empty?
-    meta = docs.first.root_class.association_metadata
-    association = meta[association_name.to_sym] || meta[association_name.to_s.singularize.to_sym]
+
+    meta = docs.first.class.association_metadata
+    root_meta = docs.first.root_class.association_metadata
+    association = meta[association_name.to_sym] || root_meta[association_name.to_sym] ||
+      meta[association_name.to_s.singularize.to_sym] || root_meta[association_name.to_s.singularize.to_sym]
+
     raise "Unknown association #{association_name}" unless association
     association.eager_load(docs, criteria)
   end

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

@@ -0,0 +1,90 @@
+require 'active_support/core_ext/array/wrap'
+
+module NoBrainer
+  class Array < ::Array
+    # delegate cast to each array element
+    def self.nobrainer_cast_user_to_model(values)
+      ::Array.wrap(values).map do |value|
+        if value.class.respond_to?(:nobrainer_cast_user_to_model)
+          value.class.nobrainer_cast_user_to_model(value)
+        else
+          value
+        end
+      end
+    end
+
+    # delegate cast to each array element
+    def self.nobrainer_cast_model_to_db(values)
+      ::Array.wrap(values).map do |value|
+        if value.class.respond_to?(:nobrainer_cast_model_to_db)
+          value.class.nobrainer_cast_model_to_db(value)
+        else
+          value
+        end
+      end
+    end
+
+    # delegate cast to each array element
+    def self.nobrainer_cast_db_to_model(values)
+      ::Array.wrap(values).map do |value|
+        if value.class.respond_to?(:nobrainer_cast_db_to_model)
+          value.class.nobrainer_cast_db_to_model(method, value)
+        else
+          value
+        end
+      end
+    end
+
+    # convenience method to create a TypedArray
+    def self.of(object_type = nil, **options)
+      NoBrainer::TypedArray.of(object_type, **options)
+    end
+  end
+
+  class TypedArray < Array
+    def self.of(object_type, allow_nil: false)
+      NoBrainer::Document::Types.load_type_extensions(object_type)
+      ::Class.new(TypedArray) do
+        define_singleton_method(:object_type) { object_type }
+        define_singleton_method(:allow_nil?) { allow_nil }
+      end
+    end
+
+    def self.name
+      str = String.new "Array"
+      str += "(#{object_type.name})"  if respond_to?(:object_type)
+      str
+    end
+
+    # delegate cast methods to object_type cast methods, if defined
+    def self.nobrainer_cast_user_to_model(values)
+      cast_type = object_type.respond_to?(:nobrainer_cast_user_to_model) && object_type
+      values = ::Array.wrap(values).map do |value|
+        value = cast_type.nobrainer_cast_user_to_model(value)  if cast_type
+        unless (value.nil? && allow_nil?) || value.is_a?(object_type)
+          raise NoBrainer::Error::InvalidType, type: object_type.name, value: value
+        end
+        value
+      end
+      new(values)
+    end
+
+    def self.nobrainer_cast_model_to_db(values)
+      values = ::Array.wrap(values)
+      if object_type.respond_to?(:nobrainer_cast_model_to_db)
+        values.map { |value| object_type.nobrainer_cast_model_to_db(value) }
+      else
+        values
+      end
+    end
+
+    def self.nobrainer_cast_db_to_model(values)
+      values = ::Array.wrap(values)
+      if object_type.respond_to?(:nobrainer_cast_db_to_model)
+        values.map { |value| object_type.nobrainer_cast_db_to_model(value) }
+      else
+        values
+      end
+    end
+  end
+end

data/lib/no_brainer/document/types.rb

@@ -1,12 +1,15 @@
 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
     return unless @pending_type_errors
     @pending_type_errors.each do |name, error|
-      errors.add(name, :invalid_type, error.error)
+      errors.add(name, :invalid_type, **error.error)
     end
   end
 
@@ -59,6 +62,11 @@ module NoBrainer::Document::Types
     end
 
     def field(attr, options={})
+      if (type = options[:type]).is_a?(::Array)
+        raise ArgumentError, "Expected Array type to have single element, got #{types.inspect}" unless type.length == 1
+        options[:type] = NoBrainer::TypedArray.of(type.first)
+      end
+
       super
 
       type = options[:type]
@@ -105,14 +113,12 @@ module NoBrainer::Document::Types
     end
   end
 
-  %w(binary boolean text geo enum).each do |type|
+  %w(array binary boolean text geo enum).each do |type|
     require File.join(File.dirname(__FILE__), 'types', type)
     const_set(type.camelize, NoBrainer.const_get(type.camelize))
   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/validation/not_null.rb

@@ -9,7 +9,7 @@ module NoBrainer::Document::Validation::NotNull
 
   class NotNullValidator < ActiveModel::EachValidator
     def validate_each(doc, attr, value)
-      doc.errors.add(attr, :undefined, options) if value.nil?
+      doc.errors.add(attr, :undefined, **options) if value.nil?
     end
   end
 end

data/lib/no_brainer/document/validation/uniqueness.rb

@@ -74,7 +74,7 @@ module NoBrainer::Document::Validation::Uniqueness
       criteria = self.model.unscoped.where(attr => value)
       criteria = apply_scopes(criteria, doc)
       criteria = exclude_doc(criteria, doc) if doc.persisted?
-      doc.errors.add(attr, :taken, options.except(:scope).merge(:value => value)) unless criteria.empty?
+      doc.errors.add(attr, :taken, **options.except(:scope).merge(:value => value)) unless criteria.empty?
     rescue NoBrainer::Error::InvalidType
       # We can't run the uniqueness validator: where() won't accept bad types
       # and we have some values that don't have the right type.

data/lib/no_brainer/error.rb

@@ -51,7 +51,7 @@ module NoBrainer::Error
       value = self.value
       mock = model.allocate
       mock.singleton_class.send(:define_method, :read_attribute_for_validation) { |_| value }
-      mock.errors.add(attr_name, :invalid_type, error)
+      mock.errors.add(attr_name, :invalid_type, **error)
       mock.errors.full_messages.first
     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/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
 

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: nobrainer
 version: !ruby/object:Gem::Version
-  version: 0.34.0
+  version: 0.40.0
 platform: ruby
 authors:
 - Nicolas Viennot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-16 00:00:00.000000000 Z
+date: 2021-10-16 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.3.0
+        version: 4.1.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 4.1.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.2'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -31,6 +37,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.1.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -38,34 +47,43 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.1.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.2'
 - !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
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.5'
   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::Version
+        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: symbol_decoration
   requirement: !ruby/object:Gem::Requirement
@@ -80,13 +98,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
@@ -152,6 +172,7 @@ files:
 - lib/no_brainer/document/table_config/synchronizer.rb
 - lib/no_brainer/document/timestamps.rb
 - lib/no_brainer/document/types.rb
+- lib/no_brainer/document/types/array.rb
 - lib/no_brainer/document/types/binary.rb
 - lib/no_brainer/document/types/boolean.rb
 - lib/no_brainer/document/types/date.rb
@@ -219,7 +240,7 @@ files:
 - lib/rails/generators/templates/nobrainer.rb
 homepage: http://nobrainer.io
 licenses:
-- LGPLv3
+- LGPL-3.0-only
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -236,9 +257,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.3
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
-summary: ORM for RethinkDB
+summary: A Ruby ORM for RethinkDB
 test_files: []