panko_serializer 0.7.4 → 0.7.7

data/docs/package.json

@@ -9,6 +9,6 @@
     "rename-version": "docusaurus-rename-version"
   },
   "devDependencies": {
-    "docusaurus": "^1.14.4"
+    "docusaurus": "^1.14.7"
   }
 }

data/ext/panko_serializer/attributes_writer/attributes_writer.c

@@ -2,7 +2,6 @@
 
 static bool types_initialized = false;
 static VALUE ar_base_type = Qundef;
-static VALUE hash_type = Qundef;
 
 VALUE init_types(VALUE v) {
   if (types_initialized == true) {
@@ -15,8 +14,7 @@ VALUE init_types(VALUE v) {
       rb_const_get_at(rb_cObject, rb_intern("ActiveRecord"));
 
   ar_base_type = rb_const_get_at(ar_type, rb_intern("Base"));
-
-  hash_type = rb_const_get_at(rb_cObject, rb_intern("Hash"));
+  rb_global_variable(&ar_base_type);
 
   return Qundef;
 }
@@ -35,7 +33,7 @@ AttributesWriter create_attributes_writer(VALUE object) {
           .write_attributes = active_record_attributes_writer};
   }
 
-  if (rb_obj_is_kind_of(object, hash_type) == Qtrue) {
+  if (!RB_SPECIAL_CONST_P(object) && BUILTIN_TYPE(object) == T_HASH) {
     return (AttributesWriter){.object_type = Hash,
                             .write_attributes = hash_attributes_writer};
   }
@@ -50,7 +48,7 @@ void empty_write_attributes(VALUE obj, VALUE attributes, EachAttributeFunc func,
                             VALUE writer) {}
 
 AttributesWriter create_empty_attributes_writer() {
-  return (AttributesWriter){.object_type = Unknown,
+  return (AttributesWriter){.object_type = UnknownObjectType,
                             .write_attributes = empty_write_attributes};
 }
 

data/ext/panko_serializer/attributes_writer/attributes_writer.h

@@ -7,7 +7,7 @@
 #include "plain.h"
 #include "hash.h"
 
-enum ObjectType { Unknown = 0, ActiveRecord = 1, Plain = 2, Hash = 3 };
+enum ObjectType { UnknownObjectType = 0, ActiveRecord = 1, Plain = 2, Hash = 3 };
 
 typedef struct _AttributesWriter {
   enum ObjectType object_type;

data/ext/panko_serializer/attributes_writer/type_cast/type_cast.c

@@ -362,4 +362,20 @@ void panko_init_type_cast(VALUE mPanko) {
   rb_define_singleton_method(mPanko, "_type_cast", public_type_cast, -1);
 
   panko_init_time(mPanko);
+
+  rb_global_variable(&oj_type);
+  rb_global_variable(&oj_parseerror_type);
+  rb_global_variable(&ar_string_type);
+  rb_global_variable(&ar_text_type);
+  rb_global_variable(&ar_float_type);
+  rb_global_variable(&ar_integer_type);
+  rb_global_variable(&ar_boolean_type);
+  rb_global_variable(&ar_date_time_type);
+  rb_global_variable(&ar_time_zone_converter);
+  rb_global_variable(&ar_json_type);
+  rb_global_variable(&ar_pg_integer_type);
+  rb_global_variable(&ar_pg_float_type);
+  rb_global_variable(&ar_pg_uuid_type);
+  rb_global_variable(&ar_pg_json_type);
+  rb_global_variable(&ar_pg_date_time_type);
 }

data/ext/panko_serializer/panko_serializer.c

@@ -13,6 +13,8 @@ static ID to_a_id;
 static ID object_id;
 static ID serialization_context_id;
 
+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);
@@ -40,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, Qfalse);
+    if (result != SKIP) {
+        write_value(str_writer, attribute->name_str, result, Qfalse);
+    }
   }
 
   rb_ivar_set(serializer, object_id, Qnil);
@@ -167,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

@@ -49,7 +49,7 @@ SerializationDescriptor sd_read(VALUE descriptor) {
 }
 
 void sd_set_writer(SerializationDescriptor sd, VALUE object) {
-  if (sd->attributes_writer.object_type != Unknown) {
+  if (sd->attributes_writer.object_type != UnknownObjectType) {
     return;
   }
 

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?
@@ -73,7 +75,10 @@ module Panko
 
       def has_one(name, options = {})
         serializer_const = options[:serializer]
-        serializer_const = Panko::SerializerResolver.resolve(name.to_s) if serializer_const.nil?
+        if serializer_const.kind_of?(String)
+          serializer_const = Panko::SerializerResolver.resolve(serializer_const, self)
+        end
+        serializer_const ||= Panko::SerializerResolver.resolve(name.to_s, self)
 
         raise "Can't find serializer for #{self.name}.#{name} has_one relationship." if serializer_const.nil?
 
@@ -86,7 +91,10 @@ 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?
+        if serializer_const.kind_of?(String)
+          serializer_const = Panko::SerializerResolver.resolve(serializer_const, self)
+        end
+        serializer_const ||= Panko::SerializerResolver.resolve(name.to_s, self)
 
         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,39 @@
 # 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 ||= safe_serializer_get(name)
+      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.4"
+  VERSION = "0.7.7"
 end

data/panko_serializer.gemspec

@@ -30,5 +30,6 @@ Gem::Specification.new do |spec|
 
   spec.extensions << "ext/panko_serializer/extconf.rb"
 
-  spec.add_dependency "oj", "~> 3.10.0"
+  spec.add_dependency "oj", '> 3.11.0', '< 4.0.0'
+  spec.add_dependency "activesupport"
 end

metadata

@@ -1,29 +1,49 @@
 --- !ruby/object:Gem::Specification
 name: panko_serializer
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.7.7
 platform: ruby
 authors:
 - Yosi Attias
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-21 00:00:00.000000000 Z
+date: 2022-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: 3.10.0
+        version: 3.11.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: 3.11.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 4.0.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: 3.10.0
+        version: '0'
 description:
 email:
 - yosy101@gmail.com