nobrainer 0.35.0 → 0.36.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6d7ce930d1fba4a7c3e3f6368c7a9650c0a298ae1bd46517097284591ae1a22
-  data.tar.gz: 6d9cc4350f77a229f779acc0d88f4893f146b0fd0028f9a214c29da9e4f5e70a
+  metadata.gz: 61c15de4e6f0d6ede87a2db309ff25a79d36d61befdfcd280815925d0f66bb68
+  data.tar.gz: f1516356fe4f53577a744dfacca6a8143d98844aee540e8c0290950113bedd88
 SHA512:
-  metadata.gz: fcb9ef68e4ce874a89761465e0b9861182feb526665cfd08a19be7019a8a0e5f716e6fdd3d940648a42fe1fe1f2e1bba277291778a3752e06c21e67bb94163d3
-  data.tar.gz: fa9b10e21bfd4a987821f365e840c95b6314f5bbaf32efeebe0810f9d8157fe6b0f4f9607ab1931d278f2d22beb24442b0ed2f1115e360a7f82aa8ad3c5a111b
+  metadata.gz: 3fabd4ff40209300d3630cee18bd27115d77f6c157b6d9f910ac93896ef11487f1cf1cb116fb7a98ef356e3c78033412c05ddf06d60ed473b753a26a9aab4ab2
+  data.tar.gz: 9d3299f45f30001d6856ea015b15c19a9f5b7ec5642337c3416da160468deb5f00b5714f54eb3837b0af716c1a61fc817963280830bffa6b09bf15775624590f

data/CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 
 
+## [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
@@ -100,7 +104,8 @@ 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.35.0...HEAD
+[Unreleased]: https://github.com/nobrainerorm/nobrainer/compare/v0.36.0...HEAD
+[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

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

@@ -62,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]
@@ -108,7 +113,7 @@ 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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nobrainer
 version: !ruby/object:Gem::Version
-  version: 0.35.0
+  version: 0.36.0
 platform: ruby
 authors:
 - Nicolas Viennot
@@ -154,6 +154,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