oj_serializers 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1a6edc7a526ccc3e6edd655070c28a9c54f2fd38646aaf36bf4db0b58363f36
-  data.tar.gz: 5a2541b9005c35d1f4c68a0dc142691b35199c78e0e134f6cc44ad0cd6a3a8bc
+  metadata.gz: f9532d127e357231931f57cda2531743fe4064d0f9e0371cb2aac81a39dedb35
+  data.tar.gz: 8465a8f1f8e39fb48cd07a6c6156ff744f7e094a2985e01a1a13445957f2b3f0
 SHA512:
-  metadata.gz: 4ee1d2c5e850cd14548dbf1219056f61b25be85a55a83107bc6cf695b991cb52bb54605c45c88aed18e3573e53c72f22bbedbfa7a2bd066e10a17d71a1e25bd1
-  data.tar.gz: f8454069164b46838efecc9652e5a56fa816a07e47e7ad1983be49147c469f2c58bcdb67ab54ebb59bbcdd381abe0ee7ff7240ca282f310e581fc8dc0a275a0f
+  metadata.gz: 176c981929972198d8cbaf9548cc9238b60f51010fbd33415a70c25ed8f167885e8cfa494820cc668a03eb9cf96664bb40ba4b2cc69efc4e229763e621aa7190
+  data.tar.gz: d0d7ea0e5fc50b993b7439e50be0c59f6da26c23ac542c69838b5c145197d598186ae162ce9bc82711942b8e94631acb99acfe4739e04b1e25e28e1f6b70f260

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## Oj Serializers 2.0.3 (2023-04-19)
+
+### Features ✨
+
+- [Allow `key` and `unless` in AMS-compat mode](https://github.com/ElMassimo/oj_serializers/commit/5050710e199651cc2c0e9d9d6395f2c2ac9b1875)
+
+### Fixes 🐞
+
+- [Allow using `active_model_serializers` in associations](https://github.com/ElMassimo/oj_serializers/commit/501ed4014b564e6f103d2f52d15832fe6706d6a8)
+
 ## Oj Serializers 2.0.2 (2023-04-02)
 
 ### Features ✨

data/README.md

@@ -31,6 +31,7 @@ Faster JSON serializers for Ruby, built on top of the powerful [`oj`][oj] librar
 [Discussion]: https://github.com/ElMassimo/oj_serializers/discussions
 [TypeScript]: https://www.typescriptlang.org/
 [types_from_serializers]: https://github.com/ElMassimo/types_from_serializers
+[inheritance]: https://github.com/ElMassimo/types_from_serializers/blob/main/playground/vanilla/app/serializers/song_with_videos_serializer.rb#L1
 
 ## Why? 🤔
 
@@ -400,7 +401,7 @@ As a result, it's posible to easily detect mismatches between the backend and th
 
 ### Composing serializers 🧱
 
-There are three options to compose serializers: inheritance, mixins, and `flat_one`.
+There are three options to [compose serializers](https://github.com/ElMassimo/oj_serializers/discussions/10#discussioncomment-5523921): [inheritance], mixins, and `flat_one`.
 
 Use `flat_one` to include all attributes from a different serializer:
 
@@ -416,6 +417,8 @@ class AttachmentSerializer < BaseSerializer
 end
 ```
 
+Think of it as `has_one` without a "root", all the attributes are added directly.
+
 <details>
   <summary>Example Output</summary>
 

data/lib/oj_serializers/compat.rb

@@ -14,7 +14,53 @@ class ActiveModel::Serializer
   def self.many(array, options = nil)
     array.map { |object| new(object, options) }
   end
+
+  # OjSerializer: Used internally to write a single object association in :hash mode.
+  #
+  # Returns nothing.
+  def self.one_as_hash(object)
+    new(object)
+  end
+
+  # OjSerializer: Used internally to write an association in :hash mode.
+  #
+  # Returns nothing.
+  def self.many_as_hash(array)
+    array.map { |object| new(object) }
+  end
+
+  # OjSerializer: Used internally to write a single object association in :json mode.
+  #
+  # Returns nothing.
+  def self.write_one(writer, object)
+    writer.push_value(new(object))
+  end
+
+  # OjSerializer: Used internally to write an association in :json mode.
+  #
+  # Returns nothing.
+  def self.write_many(writer, array)
+    writer.push_array
+    array.each do |object|
+      write_one(writer, object)
+    end
+    writer.pop
+  end
+
+  module OjOptionsCompat
+    def add_attribute(value_from, key: nil, **options)
+      options[:as] ||= key if key
+
+      if (unless_proc = options.delete(:unless))
+        options[:if] = -> { !instance_exec(&unless_proc) }
+      end
+
+      super(value_from, **options)
+    end
+  end
 end
 
 require 'oj_serializers'
 require 'oj_serializers/sugar'
+
+Oj::Serializer.singleton_class.prepend(ActiveModel::Serializer::OjOptionsCompat)

data/lib/oj_serializers/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module OjSerializers
-  VERSION = '2.0.2'
+  VERSION = '2.0.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj_serializers
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Maximo Mussini
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-02 00:00:00.000000000 Z
+date: 2023-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -68,7 +68,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
 summary: A lighter JSON serializer for Ruby Objects in Rails. Easily migrate away