oj_serializers 1.0.2 → 2.0.0

data/lib/oj_serializers/compat.rb

@@ -6,28 +6,13 @@ require 'active_model_serializers'
 # as well.
 class ActiveModel::Serializer
   # JsonStringEncoder: Used internally to write a single object to JSON.
-  #
-  # Returns nothing.
-  def self.write_one(writer, object, options)
-    writer.push_value(new(object, options))
+  def self.one(object, options = nil)
+    new(object, options)
   end
 
   # JsonStringEncoder: Used internally to write an array of objects to JSON.
-  #
-  # Returns nothing.
-  def self.write_many(writer, array, options)
-    writer.push_array
-    array.each do |object|
-      write_one(writer, object, options)
-    end
-    writer.pop
-  end
-
-  # JsonStringEncoder: Used internally to instantiate an Oj::StringWriter.
-  #
-  # Returns an Oj::StringWriter.
-  def self.new_json_writer
-    OjSerializers::Serializer.send(:new_json_writer)
+  def self.many(array, options = nil)
+    array.map { |object| new(object, options) }
   end
 end
 

data/lib/oj_serializers/controller_serialization.rb

@@ -20,10 +20,10 @@ module OjSerializers::ControllerSerialization
   #
   # which is more performant.
   %i[_render_option_json _render_with_renderer_json].each do |renderer_method|
-    define_method renderer_method do |resource, **options|
+    define_method renderer_method do |resource, options = {}|
       serializer_class = options[:serializer] || options[:each_serializer]
       if serializer_class && serializer_class < OjSerializers::Serializer
-        super(OjSerializers::JsonStringEncoder.encode_to_json(resource, options), options.except(:root, :serializer, :each_serializer))
+        super(OjSerializers::JsonStringEncoder.encode_to_json(resource, **options), options.except(:root, :serializer, :each_serializer))
       else
         super(resource, **options)
       end

data/lib/oj_serializers/json_string_encoder.rb

@@ -14,43 +14,27 @@ module OjSerializers::JsonStringEncoder
     # regardless of whether a serializer is specified or not.
     #
     # Returns a JSON string.
-    def encode_to_json(object, root: nil, serializer: nil, each_serializer: nil, **extras)
-      # NOTE: Serializers may override `new_json_writer` to modify the behavior.
-      writer = (serializer || each_serializer || OjSerializers::Serializer).send(:new_json_writer)
-
-      if root
-        writer.push_object
-        writer.push_key(root.to_s)
-      end
-
-      if serializer
-        serializer.write_one(writer, object, extras)
+    def encode_to_json(object, root: nil, serializer: nil, each_serializer: nil, **options)
+      result = if serializer
+        serializer.one(object, options)
       elsif each_serializer
-        each_serializer.write_many(writer, object, extras)
+        each_serializer.many(object, options)
       elsif object.is_a?(String)
-        return object unless root
-
-        writer.push_json(object)
+        OjSerializers::JsonValue.new(object)
       else
-        writer.push_value(object)
+        object
       end
-
-      writer.pop if root
-
-      writer.to_json
+      Oj.dump(root ? { root => result } : result)
     end
 
     if OjSerializers::Serializer::DEV_MODE
       alias actual_encode_to_json encode_to_json
       # Internal: Allows to detect misusage of the options during development.
-      def encode_to_json(object, root: nil, serializer: nil, each_serializer: nil, **extras)
-        if serializer && serializer < OjSerializers::Serializer
-          raise ArgumentError, 'You must use `each_serializer` when serializing collections' if object.respond_to?(:each)
-        end
-        if each_serializer && each_serializer < OjSerializers::Serializer
-          raise ArgumentError, 'You must use `serializer` when serializing a single object' unless object.respond_to?(:each)
-        end
-        actual_encode_to_json(object, root: root, serializer: serializer, each_serializer: each_serializer, **extras)
+      def encode_to_json(object, root: nil, serializer: nil, each_serializer: nil, **options)
+        raise ArgumentError, 'You must use `each_serializer` when serializing collections' if serializer && serializer < OjSerializers::Serializer && object.respond_to?(:map)
+        raise ArgumentError, 'You must use `serializer` when serializing a single object' if each_serializer && each_serializer < OjSerializers::Serializer && !object.respond_to?(:map)
+
+        actual_encode_to_json(object, root: root, serializer: serializer, each_serializer: each_serializer, **options)
       end
     end
   end