panko_serializer 0.4.4 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b82a221e5207cf94860579c3ae74a5a31b51a50667785f83c6d9311160096792
-  data.tar.gz: e8177737c068e142e2273fdfe70cb367a2b22fe841d4e3c49a63817f59383b25
+  metadata.gz: 5d2e6523f47bf65ff0dca7931267fc0d0402ac68f4490ff643eeafa589b8249d
+  data.tar.gz: 9fd3025b410b6ed6a29206ae02d868300b7b4fcc458987aaaeadb2117466bad3
 SHA512:
-  metadata.gz: 78f1c9ae160336f9d950d2bab9796a1b124674cc4a0e8a2e41b000b38689e4093aa3783d63e64547598e23914c2e7156921f052409efc645d0d46e06d4daddba
-  data.tar.gz: 44d99088e0afad8264c599026df2584d1df58b8c243540001b05f77b4caef9f110cf71b17bf08b15dfe525ef5bb9671125fefe822b5bffc4542e6ab8887e716d
+  metadata.gz: 64cb44e5e8b0dd3406eb720b34aff1eea7bd29f51e7f62a9b98d79690f76d4d4d1f645754f75b5efc880bca313a646cb52aeda667968f6917216bdb311ad8efd
+  data.tar.gz: 40ffe87725181f27edbeaf5e023c09b70ef836c20fdd8ab018c70ee59d0df42a5ae9c370d9eeb67e215be6404cb3c4c0f826f33ea6b6c6db0a162cac66c12c45

data/ext/panko_serializer/panko_serializer.c

@@ -9,6 +9,9 @@ static ID pop_id;
 
 static ID to_a_id;
 
+static ID object_id;
+static ID serialization_context_id;
+
 void write_value(VALUE str_writer, VALUE key, VALUE value) {
   rb_funcall(str_writer, push_value_id, 2, value, key);
 }
@@ -24,8 +27,8 @@ void serialize_method_fields(VALUE subject,
     return;
   }
 
-  serializer = sd_build_serializer(descriptor);
-  sd_apply_serializer_config(descriptor, serializer, subject);
+  serializer = descriptor->serializer;
+  rb_ivar_set(serializer, object_id, subject);
 
   for (i = 0; i < RARRAY_LEN(method_fields); i++) {
     volatile VALUE attribute_name = RARRAY_AREF(method_fields, i);
@@ -34,6 +37,8 @@ void serialize_method_fields(VALUE subject,
 
     write_value(str_writer, rb_sym2str(attribute_name), result);
   }
+
+  rb_ivar_set(serializer, object_id, Qnil);
 }
 
 void serialize_fields(VALUE subject,
@@ -155,6 +160,9 @@ void Init_panko_serializer() {
   push_object_id = rb_intern("push_object");
   pop_id = rb_intern("pop");
   to_a_id = rb_intern("to_a");
+  object_id = rb_intern("@object");
+  serialization_context_id = rb_intern("@serialization_context");
+
 
   VALUE mPanko = rb_define_module("Panko");
 

data/ext/panko_serializer/serialization_descriptor/serialization_descriptor.c

@@ -3,8 +3,8 @@
 VALUE cSerializationDescriptor;
 
 static ID context_id;
-static ID scope_id;
 static ID object_id;
+static ID sc_id;
 
 static void sd_free(SerializationDescriptor sd) {
   if (!sd) {
@@ -18,9 +18,6 @@ static void sd_free(SerializationDescriptor sd) {
   sd->has_one_associations = Qnil;
   sd->has_many_associations = Qnil;
   sd->aliases = Qnil;
-  sd->context = Qnil;
-  sd->scope = Qnil;
-
   xfree(sd);
 }
 
@@ -32,8 +29,6 @@ void sd_mark(SerializationDescriptor data) {
   rb_gc_mark(data->has_one_associations);
   rb_gc_mark(data->has_many_associations);
   rb_gc_mark(data->aliases);
-  rb_gc_mark(data->context);
-  rb_gc_mark(data->scope);
 }
 
 static VALUE sd_new(int argc, VALUE* argv, VALUE self) {
@@ -46,8 +41,6 @@ static VALUE sd_new(int argc, VALUE* argv, VALUE self) {
   sd->has_one_associations = Qnil;
   sd->has_many_associations = Qnil;
   sd->aliases = Qnil;
-  sd->context = Qnil;
-  sd->scope = Qnil;
 
   sd->attributes_writer = create_empty_attributes_writer();
 
@@ -66,14 +59,6 @@ void sd_set_writer(SerializationDescriptor sd, VALUE subject) {
   sd->attributes_writer = create_attributes_writer(subject);
 }
 
-VALUE sd_build_serializer(SerializationDescriptor sd) {
-  if (sd->serializer == Qnil) {
-    VALUE args[0];
-    sd->serializer = rb_class_new_instance(0, args, sd->serializer_type);
-  }
-
-  return sd->serializer;
-}
 
 VALUE sd_serializer_set(VALUE self, VALUE serializer) {
   SerializationDescriptor sd = (SerializationDescriptor)DATA_PTR(self);
@@ -88,18 +73,6 @@ VALUE sd_serializer_ref(VALUE self) {
   return sd->serializer;
 }
 
-void sd_apply_serializer_config(SerializationDescriptor descriptor,
-                                VALUE serializer,
-                                VALUE object) {
-  rb_ivar_set(serializer, object_id, object);
-  if (descriptor->context != Qnil && descriptor->context != Qundef) {
-    rb_ivar_set(serializer, context_id, descriptor->context);
-  }
-
-  if (descriptor->scope != Qnil && descriptor->scope != Qundef) {
-    rb_ivar_set(serializer, scope_id, descriptor->scope);
-  }
-}
 VALUE sd_attributes_set(VALUE self, VALUE attributes) {
   SerializationDescriptor sd = (SerializationDescriptor)DATA_PTR(self);
 
@@ -173,22 +146,9 @@ VALUE public_sd_build_serializer(VALUE self) {
   return sd_build_serializer(sd);
 }
 
-VALUE sd_context_set(VALUE self, VALUE context) {
-  SerializationDescriptor sd = (SerializationDescriptor)DATA_PTR(self);
-  sd->context = context;
-  return Qnil;
-}
-
-VALUE sd_scope_set(VALUE self, VALUE scope) {
-  SerializationDescriptor sd = (SerializationDescriptor)DATA_PTR(self);
-  sd->scope = scope;
-  return Qnil;
-}
-
 void panko_init_serialization_descriptor(VALUE mPanko) {
   object_id = rb_intern("@object");
-  context_id = rb_intern("@context");
-  scope_id = rb_intern("@scope");
+  sc_id = rb_intern("@sc");
 
   cSerializationDescriptor =
       rb_define_class_under(mPanko, "SerializationDescriptor", rb_cObject);
@@ -225,9 +185,4 @@ void panko_init_serialization_descriptor(VALUE mPanko) {
 
   rb_define_method(cSerializationDescriptor, "aliases=", sd_aliases_set, 1);
   rb_define_method(cSerializationDescriptor, "aliases", sd_aliases_aref, 0);
-
-  rb_define_method(cSerializationDescriptor, "scope=", sd_scope_set, 1);
-  rb_define_method(cSerializationDescriptor, "context=", sd_context_set, 1);
-  rb_define_method(cSerializationDescriptor, "build_serializer",
-                   public_sd_build_serializer, 0);
 }

data/ext/panko_serializer/serialization_descriptor/serialization_descriptor.h

@@ -18,8 +18,6 @@ typedef struct _SerializationDescriptor {
   VALUE has_one_associations;
   VALUE has_many_associations;
 
-  VALUE context;
-  VALUE scope;
   AttributesWriter attributes_writer;
 } * SerializationDescriptor;
 
@@ -27,10 +25,6 @@ SerializationDescriptor sd_read(VALUE descriptor);
 
 void sd_mark(SerializationDescriptor data);
 
-VALUE sd_build_serializer(SerializationDescriptor descriptor);
-void sd_apply_serializer_config(SerializationDescriptor descriptor,
-                                VALUE serializer,
-                                VALUE object);
 void sd_set_writer(SerializationDescriptor sd, VALUE subject);
 
 void panko_init_serialization_descriptor(VALUE mPanko);

data/lib/panko/array_serializer.rb

@@ -22,8 +22,10 @@ Please pass valid each_serializer to ArraySerializer, for example:
         scope: options[:scope]
       }
 
-      @descriptor = Panko::SerializationDescriptor.build(@each_serializer, serializer_options)
-      @context = options[:context]
+      @serialization_context = if options.key?(:context) || options.key?(:scope)
+                                 SerializationContext.new(options[:context], options[:scope])
+                               end
+      @descriptor = Panko::SerializationDescriptor.build(@each_serializer, serializer_options, @serialization_context)
     end
 
     def to_json
@@ -41,6 +43,7 @@ Please pass valid each_serializer to ArraySerializer, for example:
     def serialize_to_json(subjects)
       writer = Oj::StringWriter.new(mode: :rails)
       Panko.serialize_subjects(subjects.to_a, writer, @descriptor)
+      @descriptor.set_serialization_context(nil) if @serialization_context.present?
       writer.to_s
     end
   end

data/lib/panko/serialization_descriptor.rb

@@ -6,15 +6,15 @@ module Panko
     # Creates new description and apply the options
     # on the new descriptor
     #
-    def self.build(serializer, options = {})
+    def self.build(serializer, options = {}, serialization_context = nil)
       backend = Panko::SerializationDescriptor.duplicate(serializer._descriptor)
 
       options.merge! serializer.filters_for(options[:context], options[:scope]) if serializer.respond_to? :filters_for
 
-      backend.context = options[:context]
-      backend.scope = options[:scope]
       backend.apply_filters(options)
 
+      backend.set_serialization_context(serialization_context)
+
       backend
     end
 
@@ -30,18 +30,26 @@ module Panko
       backend.attributes = descriptor.attributes.dup
 
       backend.method_fields = descriptor.method_fields.dup
-
-      backend.serializer = descriptor.serializer.reset unless descriptor.serializer.nil?
+      backend.serializer = descriptor.type.new(_skip_init: true)
 
       backend.has_many_associations = descriptor.has_many_associations.dup
       backend.has_one_associations = descriptor.has_one_associations.dup
 
-      backend.context = nil
-      backend.scope = nil
-
       backend
     end
 
+    def set_serialization_context(context)
+      serializer.instance_variable_set :@serialization_context, context if !method_fields.empty? && serializer.present?
+
+      has_many_associations.each do |assoc|
+        assoc.descriptor.set_serialization_context context
+      end
+
+      has_one_associations.each do |assoc|
+        assoc.descriptor.set_serialization_context context
+      end
+    end
+
     #
     # Applies attributes and association filters
     #

data/lib/panko/serializer.rb

@@ -3,6 +3,15 @@
 require_relative "serialization_descriptor"
 require "oj"
 
+class SerializationContext
+  attr_accessor :context, :scope
+
+  def initialize(context, scope)
+    @context = context
+    @scope = scope
+  end
+end
+
 module Panko
   class Serializer
     class << self
@@ -69,12 +78,25 @@ module Panko
     end
 
     def initialize(options = {})
-      @descriptor = Panko::SerializationDescriptor.build(self.class, options)
-      @context = options[:context]
-      @scope = options[:scope]
+      # this "_skip_init" trick is so I can create serializers from serialization descriptor
+      return if options[:_skip_init]
+
+      @serialization_context = if options.key?(:context) || options.key?(:scope)
+                                 SerializationContext.new(options[:context], options[:scope])
+                               end
+
+      @descriptor = Panko::SerializationDescriptor.build(self.class, options, @serialization_context)
+    end
+
+    def context
+      @serialization_context.context
+    end
+
+    def scope
+      @serialization_context.scope
     end
 
-    attr_reader :object, :context, :scope
+    attr_reader :object
 
     def serialize(object)
       Oj.load(serialize_to_json(object))
@@ -83,15 +105,9 @@ module Panko
     def serialize_to_json(object)
       writer = Oj::StringWriter.new(mode: :rails)
       Panko.serialize_subject(object, writer, @descriptor)
-      writer.to_s
-    end
-
-    def reset
-      @object = nil
-      @context = nil
-      @scope = nil
 
-      self
+      @descriptor.set_serialization_context(nil) if @serialization_context.present?
+      writer.to_s
     end
   end
 end

data/lib/panko/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Panko
-  VERSION = "0.4.4"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: panko_serializer
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.5.0
 platform: ruby
 authors:
 - Yosi Attias
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-23 00:00:00.000000000 Z
+date: 2018-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj