panko_serializer 0.7.0 → 0.7.5

data/ext/panko_serializer/attributes_writer/type_cast/type_cast.h

@@ -68,11 +68,10 @@ static struct _TypeCast type_casts[] = {
     {is_boolean_type, cast_boolean_type},
     {is_date_time_type, cast_date_time_type},
     {is_float_type, cast_float_type},
-    {is_json_type, cast_json_type},
 
     {NULL, NULL}};
 
-extern VALUE type_cast(VALUE type_metadata, VALUE value);
+extern VALUE type_cast(VALUE type_metadata, VALUE value, VALUE* isJson);
 void panko_init_type_cast(VALUE mPanko);
 
 // Introduced in ruby 2.4

data/ext/panko_serializer/panko_serializer.c

@@ -5,6 +5,7 @@
 static ID push_value_id;
 static ID push_array_id;
 static ID push_object_id;
+static ID push_json_id;
 static ID pop_id;
 
 static ID to_a_id;
@@ -12,8 +13,14 @@ 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);
+static VALUE SKIP = Qundef;
+
+void write_value(VALUE str_writer, VALUE key, VALUE value, VALUE isJson) {
+  if(isJson == Qtrue) {
+    rb_funcall(str_writer, push_json_id, 2, value, key);
+  } else {
+    rb_funcall(str_writer, push_value_id, 2, value, key);
+  }
 }
 
 void serialize_method_fields(VALUE object, VALUE str_writer,
@@ -35,8 +42,9 @@ void serialize_method_fields(VALUE object, VALUE str_writer,
     Attribute attribute = PANKO_ATTRIBUTE_READ(raw_attribute);
 
     volatile VALUE result = rb_funcall(serializer, attribute->name_id, 0);
-
-    write_value(str_writer, attribute->name_str, result);
+    if (result != SKIP) {
+        write_value(str_writer, attribute->name_str, result, Qfalse);
+    }
   }
 
   rb_ivar_set(serializer, object_id, Qnil);
@@ -44,8 +52,10 @@ void serialize_method_fields(VALUE object, VALUE str_writer,
 
 void serialize_fields(VALUE object, VALUE str_writer,
                       SerializationDescriptor descriptor) {
-  descriptor->attributes_writer.write_attributes(object, descriptor->attributes,
-                                                 write_value, str_writer);
+  descriptor->attributes_writer.write_attributes(object,
+                                                 descriptor->attributes,
+                                                 write_value,
+                                                 str_writer);
 
   serialize_method_fields(object, str_writer, descriptor);
 }
@@ -60,7 +70,7 @@ void serialize_has_one_associations(VALUE object, VALUE str_writer,
     volatile VALUE value = rb_funcall(object, association->name_id, 0);
 
     if (NIL_P(value)) {
-      write_value(str_writer, association->name_str, value);
+      write_value(str_writer, association->name_str, value, Qfalse);
     } else {
       serialize_object(association->name_str, value, str_writer,
                        association->descriptor);
@@ -78,7 +88,7 @@ void serialize_has_many_associations(VALUE object, VALUE str_writer,
     volatile VALUE value = rb_funcall(object, association->name_id, 0);
 
     if (NIL_P(value)) {
-      write_value(str_writer, association->name_str, value);
+      write_value(str_writer, association->name_str, value, Qfalse);
     } else {
       serialize_objects(association->name_str, value, str_writer,
                         association->descriptor);
@@ -146,6 +156,7 @@ void Init_panko_serializer() {
   push_value_id = rb_intern("push_value");
   push_array_id = rb_intern("push_array");
   push_object_id = rb_intern("push_object");
+  push_json_id = rb_intern("push_json");
   pop_id = rb_intern("pop");
   to_a_id = rb_intern("to_a");
   object_id = rb_intern("@object");
@@ -159,6 +170,10 @@ void Init_panko_serializer() {
   rb_define_singleton_method(mPanko, "serialize_objects", serialize_objects_api,
                              3);
 
+  VALUE mPankoSerializer = rb_const_get(mPanko, rb_intern("Serializer"));
+  SKIP = rb_const_get(mPankoSerializer, rb_intern("SKIP"));
+  rb_global_variable(&SKIP);
+
   panko_init_serialization_descriptor(mPanko);
   init_attributes_writer(mPanko);
   panko_init_type_cast(mPanko);

data/ext/panko_serializer/serialization_descriptor/association.c

@@ -77,6 +77,7 @@ VALUE association_decriptor_aset(VALUE self, VALUE descriptor) {
 
 void panko_init_association(VALUE mPanko) {
   cAssociation = rb_define_class_under(mPanko, "Association", rb_cObject);
+  rb_global_variable(&cAssociation);
 
   rb_define_module_function(cAssociation, "new", association_new, -1);
 

data/ext/panko_serializer/serialization_descriptor/attribute.c

@@ -85,6 +85,7 @@ void panko_init_attribute(VALUE mPanko) {
   attribute_aliases_id = rb_intern("attribute_aliases");
 
   cAttribute = rb_define_class_under(mPanko, "Attribute", rb_cObject);
+  rb_global_variable(&cAttribute);
 
   rb_define_module_function(cAttribute, "new", attribute_new, -1);
 

data/ext/panko_serializer/serialization_descriptor/serialization_descriptor.c

@@ -1,7 +1,5 @@
 #include "serialization_descriptor.h"
 
-VALUE cSerializationDescriptor;
-
 static ID object_id;
 static ID sc_id;
 
@@ -10,8 +8,8 @@ static void sd_free(SerializationDescriptor sd) {
     return;
   }
 
-  sd->serializer_type = Qnil;
   sd->serializer = Qnil;
+  sd->serializer_type = Qnil;
   sd->attributes = Qnil;
   sd->method_fields = Qnil;
   sd->has_one_associations = Qnil;
@@ -21,8 +19,8 @@ static void sd_free(SerializationDescriptor sd) {
 }
 
 void sd_mark(SerializationDescriptor data) {
-  rb_gc_mark(data->serializer_type);
   rb_gc_mark(data->serializer);
+  rb_gc_mark(data->serializer_type);
   rb_gc_mark(data->attributes);
   rb_gc_mark(data->method_fields);
   rb_gc_mark(data->has_one_associations);
@@ -30,7 +28,7 @@ void sd_mark(SerializationDescriptor data) {
   rb_gc_mark(data->aliases);
 }
 
-static VALUE sd_new(int argc, VALUE* argv, VALUE self) {
+static VALUE sd_alloc(VALUE klass) {
   SerializationDescriptor sd = ALLOC(struct _SerializationDescriptor);
 
   sd->serializer = Qnil;
@@ -43,7 +41,7 @@ static VALUE sd_new(int argc, VALUE* argv, VALUE self) {
 
   sd->attributes_writer = create_empty_attributes_writer();
 
-  return Data_Wrap_Struct(cSerializationDescriptor, sd_mark, sd_free, sd);
+  return Data_Wrap_Struct(klass, sd_mark, sd_free, sd);
 }
 
 SerializationDescriptor sd_read(VALUE descriptor) {
@@ -122,7 +120,7 @@ VALUE sd_type_set(VALUE self, VALUE type) {
   return Qnil;
 }
 
-VALUE sd_type_aref(VALUE self, VALUE type) {
+VALUE sd_type_aref(VALUE self) {
   SerializationDescriptor sd = (SerializationDescriptor)DATA_PTR(self);
   return sd->serializer_type;
 }
@@ -142,11 +140,10 @@ void panko_init_serialization_descriptor(VALUE mPanko) {
   object_id = rb_intern("@object");
   sc_id = rb_intern("@sc");
 
-  cSerializationDescriptor =
+  VALUE cSerializationDescriptor =
       rb_define_class_under(mPanko, "SerializationDescriptor", rb_cObject);
 
-  rb_define_module_function(cSerializationDescriptor, "new", sd_new, -1);
-
+  rb_define_alloc_func(cSerializationDescriptor, sd_alloc);
   rb_define_method(cSerializationDescriptor, "serializer=", sd_serializer_set,
                    1);
   rb_define_method(cSerializationDescriptor, "serializer", sd_serializer_ref,

data/lib/panko/association.rb

@@ -11,7 +11,7 @@ module Panko
     end
 
     def inspect
-      "<Panko::Attribute name=#{name_str.inspect}>"
+      "<Panko::Association name=#{name_str.inspect}>"
     end
   end
 end

data/lib/panko/object_writer.rb

@@ -33,6 +33,14 @@ class Panko::ObjectWriter
     @values.last[key] = value.as_json
   end
 
+  def push_json(value, key = nil)
+    if value.is_a?(String)
+      value = Oj.load(value) rescue nil
+    end
+
+    push_value(value, key)
+  end
+
   def pop
     result = @values.pop
 

data/lib/panko/response.rb

@@ -22,12 +22,13 @@ module Panko
       Panko::JsonValue.from(value)
     end
 
-    def self.array_serializer(data, serializer)
-      Panko::ArraySerializer.new(data, each_serializer: serializer)
+    def self.array_serializer(data, serializer, options = {})
+      merged_options = options.merge(each_serializer: serializer)
+      Panko::ArraySerializer.new(data, merged_options)
     end
 
-    def self.serializer(data, serializer)
-      json serializer.new.serialize_to_json(data)
+    def self.serializer(data, serializer, options = {})
+      json serializer.new(options).serialize_to_json(data)
     end
   end
 

data/lib/panko/serializer.rb

@@ -32,6 +32,8 @@ end
 
 module Panko
   class Serializer
+    SKIP = Object.new.freeze
+
     class << self
       def inherited(base)
         if _descriptor.nil?
@@ -63,6 +65,8 @@ module Panko
       end
 
       def method_added(method)
+        super(method)
+
         return if @_descriptor.nil?
 
         deleted_attr = @_descriptor.attributes.delete(method)
@@ -71,7 +75,7 @@ module Panko
 
       def has_one(name, options = {})
         serializer_const = options[:serializer]
-        serializer_const = Panko::SerializerResolver.resolve(name.to_s) if serializer_const.nil?
+        serializer_const = Panko::SerializerResolver.resolve(name.to_s, self) if serializer_const.nil?
 
         raise "Can't find serializer for #{self.name}.#{name} has_one relationship." if serializer_const.nil?
 
@@ -84,7 +88,7 @@ module Panko
 
       def has_many(name, options = {})
         serializer_const = options[:serializer] || options[:each_serializer]
-        serializer_const = Panko::SerializerResolver.resolve(name.to_s) if serializer_const.nil?
+        serializer_const = Panko::SerializerResolver.resolve(name.to_s, self) if serializer_const.nil?
 
         raise "Can't find serializer for #{self.name}.#{name} has_many relationship." if serializer_const.nil?
 

data/lib/panko/serializer_resolver.rb

@@ -1,25 +1,38 @@
 # frozen_string_literal: true
 
+require 'active_support/core_ext/string/inflections'
+require 'active_support/core_ext/module/introspection'
+
 class Panko::SerializerResolver
-  def self.resolve(name)
-    serializer_name = "#{name.singularize.camelize}Serializer"
-    serializer_const = safe_const_get(serializer_name)
+  class << self
+    def resolve(name, from)
+      serializer_const = nil
 
-    return nil if serializer_const.nil?
-    return nil unless is_serializer(serializer_const)
+      if namespace = namespace_for(from)
+        serializer_const = safe_serializer_get("#{namespace}::#{name.singularize.camelize}Serializer")
+      end
 
-    serializer_const
-  end
+      serializer_const ||= safe_serializer_get("#{name.singularize.camelize}Serializer")
+      serializer_const
+    end
 
-  private
+    private
 
-  def self.is_serializer(const)
-    const < Panko::Serializer
-  end
+    if Module.method_defined?(:module_parent_name)
+      def namespace_for(from)
+        from.module_parent_name
+      end
+    else
+      def namespace_for(from)
+        from.parent_name
+      end
+    end
 
-  def self.safe_const_get(name)
-    Object.const_get(name)
-  rescue NameError
-    nil
+    def safe_serializer_get(name)
+      const = Object.const_get(name)
+      const < Panko::Serializer ? const : nil
+    rescue NameError
+      nil
+    end
   end
 end

data/lib/panko/version.rb

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

data/panko_serializer.gemspec

@@ -11,17 +11,17 @@ Gem::Specification.new do |spec|
   spec.email         = ["yosy101@gmail.com"]
 
   spec.summary       = "High Performance JSON Serialization for ActiveRecord & Ruby Objects"
-  spec.homepage      = "https://yosiat.github.io/panko_serializer/"
+  spec.homepage      = "https://panko.dev"
   spec.license       = "MIT"
 
   spec.metadata = {
-    "bug_tracker_uri" => "https://github.com/yosiat/panko_serializer/issues",
-    "source_code_uri" => "https://github.com/yosiat/panko_serializer",
-    "documentation_uri" => "https://yosiat.github.io/panko_serializer/",
-    "changelog_uri" => "https://github.com/yosiat/panko_serializer/releases"
+    "bug_tracker_uri" => "https://github.com/panko-serializer/panko_serializer/issues",
+    "source_code_uri" => "https://github.com/panko-serializer/panko_serializer",
+    "documentation_uri" => "https://panko-serializer.github.io/panko_serializer/",
+    "changelog_uri" => "https://github.com/panko-serializer/panko_serializer/releases"
   }
 
-  spec.required_ruby_version = ">= 2.3.7"
+  spec.required_ruby_version = ">= 2.5.0"
 
   spec.files = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
@@ -30,5 +30,6 @@ Gem::Specification.new do |spec|
 
   spec.extensions << "ext/panko_serializer/extconf.rb"
 
-  spec.add_dependency "oj", "~> 3.9.0"
+  spec.add_dependency "oj", "~> 3.11.0"
+  spec.add_dependency "activesupport"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: panko_serializer
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.5
 platform: ruby
 authors:
 - Yosi Attias
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-08-26 00:00:00.000000000 Z
+date: 2021-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -16,15 +16,29 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.9.0
+        version: 3.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.9.0
-description: 
+        version: 3.11.0
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description:
 email:
 - yosy101@gmail.com
 executables: []
@@ -33,10 +47,11 @@ extensions:
 extra_rdoc_files: []
 files:
 - ".clang-format"
+- ".github/workflows/docs.yml"
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -59,14 +74,35 @@ files:
 - benchmarks/type_casts/bm_active_record.rb
 - benchmarks/type_casts/bm_panko.rb
 - benchmarks/type_casts/support.rb
+- docs/.DS_Store
 - docs/README.md
-- docs/associations.md
-- docs/attributes.md
-- docs/design-choices.md
-- docs/docpress.json
-- docs/getting-started.md
-- docs/performance.md
-- docs/response-bag.md
+- docs/core/Footer.js
+- docs/docs/associations.md
+- docs/docs/attributes.md
+- docs/docs/design-choices.md
+- docs/docs/getting-started.md
+- docs/docs/introduction.md
+- docs/docs/performance.md
+- docs/docs/response-bag.md
+- docs/i18n/en.json
+- docs/package-lock.json
+- docs/package.json
+- docs/sidebars.json
+- docs/siteConfig.js
+- docs/static/.DS_Store
+- docs/static/css/custom.css
+- docs/static/img/favicon.ico
+- docs/static/img/oss_logo.png
+- docs/static/img/undraw_code_review.svg
+- docs/static/img/undraw_monitor.svg
+- docs/static/img/undraw_note_list.svg
+- docs/static/img/undraw_online.svg
+- docs/static/img/undraw_open_source.svg
+- docs/static/img/undraw_operating_system.svg
+- docs/static/img/undraw_react.svg
+- docs/static/img/undraw_tweetstorm.svg
+- docs/static/img/undraw_youtube_tutorial.svg
+- docs/static/index.html
 - ext/panko_serializer/attributes_writer/active_record.c
 - ext/panko_serializer/attributes_writer/active_record.h
 - ext/panko_serializer/attributes_writer/attributes_writer.c
@@ -102,15 +138,15 @@ files:
 - lib/panko/version.rb
 - lib/panko_serializer.rb
 - panko_serializer.gemspec
-homepage: https://yosiat.github.io/panko_serializer/
+homepage: https://panko.dev
 licenses:
 - MIT
 metadata:
-  bug_tracker_uri: https://github.com/yosiat/panko_serializer/issues
-  source_code_uri: https://github.com/yosiat/panko_serializer
-  documentation_uri: https://yosiat.github.io/panko_serializer/
-  changelog_uri: https://github.com/yosiat/panko_serializer/releases
-post_install_message: 
+  bug_tracker_uri: https://github.com/panko-serializer/panko_serializer/issues
+  source_code_uri: https://github.com/panko-serializer/panko_serializer
+  documentation_uri: https://panko-serializer.github.io/panko_serializer/
+  changelog_uri: https://github.com/panko-serializer/panko_serializer/releases
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -118,15 +154,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.7
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: High Performance JSON Serialization for ActiveRecord & Ruby Objects
 test_files: []