panko_serializer 0.7.7 → 0.8.0

data/ext/panko_serializer/attributes_writer/active_record.c

@@ -56,7 +56,7 @@ struct attributes init_context(VALUE obj) {
   if (RB_TYPE_P(attributes_container, T_HASH)) {
     attributes_ctx.attributes_hash = attributes_container;
   } else {
-    if(is_lazy_attributes_set_defined == false) {
+    if (is_lazy_attributes_set_defined == false) {
       volatile VALUE delegate_hash =
           rb_ivar_get(attributes_container, delegate_hash_id);
 
@@ -84,13 +84,13 @@ struct attributes init_context(VALUE obj) {
   return attributes_ctx;
 }
 
-VALUE read_attribute(struct attributes attributes_ctx, Attribute attribute, VALUE* isJson) {
+VALUE read_attribute(struct attributes attributes_ctx, Attribute attribute,
+                     volatile VALUE* isJson) {
   volatile VALUE member, value;
 
   member = attribute->name_str;
   value = Qnil;
 
-
   if (!NIL_P(attributes_ctx.attributes_hash)) {
     volatile VALUE attribute_metadata =
         rb_hash_aref(attributes_ctx.attributes_hash, member);
@@ -108,7 +108,6 @@ VALUE read_attribute(struct attributes attributes_ctx, Attribute attribute, VALU
     value = rb_hash_aref(attributes_ctx.values, member);
   }
 
-
   if (NIL_P(attribute->type) && !NIL_P(value)) {
     if (attributes_ctx.tryToReadFromAdditionalTypes == true) {
       attribute->type = rb_hash_aref(attributes_ctx.additional_types, member);
@@ -137,13 +136,14 @@ VALUE detect_active_model_changes(VALUE v) {
       rb_const_get_at(rb_cObject, rb_intern("ActiveModel"));
 
   is_lazy_attributes_set_defined =
-    rb_const_defined(active_model_type, rb_intern("LazyAttributeSet")) > 0;
+      rb_const_defined(active_model_type, rb_intern("LazyAttributeSet")) > 0;
 
   return Qundef;
 }
 
 void active_record_attributes_writer(VALUE obj, VALUE attributes,
-                                     EachAttributeFunc write_value, VALUE writer) {
+                                     EachAttributeFunc write_value,
+                                     VALUE writer) {
   if (type_detection_ran == false) {
     // If ActiveModel can't be found it will throw error
     int isErrored;

data/ext/panko_serializer/attributes_writer/active_record.h

@@ -8,8 +8,7 @@
 #include "serialization_descriptor/attribute.h"
 #include "type_cast/type_cast.h"
 
-extern void active_record_attributes_writer(VALUE object,
-                                            VALUE attributes,
+extern void active_record_attributes_writer(VALUE object, VALUE attributes,
                                             EachAttributeFunc func,
                                             VALUE writer);
 

data/ext/panko_serializer/attributes_writer/attributes_writer.c

@@ -24,18 +24,16 @@ AttributesWriter create_attributes_writer(VALUE object) {
   int isErrored;
   rb_protect(init_types, Qnil, &isErrored);
 
-
   if (ar_base_type != Qundef &&
       rb_obj_is_kind_of(object, ar_base_type) == Qtrue) {
-
-      return (AttributesWriter){
-          .object_type = ActiveRecord,
-          .write_attributes = active_record_attributes_writer};
+    return (AttributesWriter){
+        .object_type = ActiveRecord,
+        .write_attributes = active_record_attributes_writer};
   }
 
   if (!RB_SPECIAL_CONST_P(object) && BUILTIN_TYPE(object) == T_HASH) {
     return (AttributesWriter){.object_type = Hash,
-                            .write_attributes = hash_attributes_writer};
+                              .write_attributes = hash_attributes_writer};
   }
 
   return (AttributesWriter){.object_type = Plain,

data/ext/panko_serializer/attributes_writer/attributes_writer.h

@@ -4,10 +4,15 @@
 
 #include "active_record.h"
 #include "common.h"
-#include "plain.h"
 #include "hash.h"
+#include "plain.h"
 
-enum ObjectType { UnknownObjectType = 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/common.h

@@ -3,6 +3,7 @@
 #include "../serialization_descriptor/attribute.h"
 #include "ruby.h"
 
-typedef void (*EachAttributeFunc)(VALUE writer, VALUE name, VALUE value, VALUE isJson);
+typedef void (*EachAttributeFunc)(VALUE writer, VALUE name, VALUE value,
+                                  VALUE isJson);
 
 VALUE attr_name_for_serialization(Attribute attribute);

data/ext/panko_serializer/attributes_writer/hash.c

@@ -1,12 +1,13 @@
 #include "hash.h"
 
 void hash_attributes_writer(VALUE obj, VALUE attributes,
-                             EachAttributeFunc write_value, VALUE writer) {
+                            EachAttributeFunc write_value, VALUE writer) {
   long i;
   for (i = 0; i < RARRAY_LEN(attributes); i++) {
     volatile VALUE raw_attribute = RARRAY_AREF(attributes, i);
     Attribute attribute = attribute_read(raw_attribute);
 
-    write_value(writer, attr_name_for_serialization(attribute), rb_hash_aref(obj, attribute->name_str), Qfalse);
+    write_value(writer, attr_name_for_serialization(attribute),
+                rb_hash_aref(obj, attribute->name_str), Qfalse);
   }
 }

data/ext/panko_serializer/attributes_writer/hash.h

@@ -3,7 +3,5 @@
 #include "common.h"
 #include "ruby.h"
 
-void hash_attributes_writer(VALUE obj,
-                             VALUE attributes,
-                             EachAttributeFunc func,
-                             VALUE writer);
+void hash_attributes_writer(VALUE obj, VALUE attributes, EachAttributeFunc func,
+                            VALUE writer);

data/ext/panko_serializer/attributes_writer/plain.c

@@ -7,6 +7,7 @@ void plain_attributes_writer(VALUE obj, VALUE attributes,
     volatile VALUE raw_attribute = RARRAY_AREF(attributes, i);
     Attribute attribute = attribute_read(raw_attribute);
 
-    write_value(writer, attr_name_for_serialization(attribute), rb_funcall(obj, attribute->name_id, 0), Qfalse);
+    write_value(writer, attr_name_for_serialization(attribute),
+                rb_funcall(obj, attribute->name_id, 0), Qfalse);
   }
 }

data/ext/panko_serializer/attributes_writer/plain.h

@@ -3,7 +3,5 @@
 #include "common.h"
 #include "ruby.h"
 
-void plain_attributes_writer(VALUE obj,
-                             VALUE attributes,
-                             EachAttributeFunc func,
-                             VALUE writer);
+void plain_attributes_writer(VALUE obj, VALUE attributes,
+                             EachAttributeFunc func, VALUE writer);

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

@@ -1,4 +1,5 @@
 #include "type_cast.h"
+
 #include "time_conversion.h"
 
 ID deserialize_from_db_id = 0;
@@ -212,7 +213,6 @@ bool is_json_type(VALUE type_klass) {
           (ar_json_type != Qundef && type_klass == ar_json_type));
 }
 
-
 bool is_boolean_type(VALUE type_klass) { return type_klass == ar_boolean_type; }
 
 VALUE cast_boolean_type(VALUE value) {
@@ -276,26 +276,27 @@ VALUE cast_date_time_type(VALUE value) {
 
 VALUE rescue_func() { return Qfalse; }
 
-VALUE parse_json(VALUE value) { return rb_funcall(oj_type, oj_sc_parse_id, 2, rb_cObject, value); }
+VALUE parse_json(VALUE value) {
+  return rb_funcall(oj_type, oj_sc_parse_id, 2, rb_cObject, value);
+}
 
 VALUE is_json_value(VALUE value) {
   if (!RB_TYPE_P(value, T_STRING)) {
     return value;
   }
 
-
-  if(RSTRING_LEN(value) == 0) {
+  if (RSTRING_LEN(value) == 0) {
     return Qfalse;
   }
 
   volatile VALUE result =
       rb_rescue2(parse_json, value, rescue_func, Qundef, oj_parseerror_type, 0);
 
-  if(NIL_P(result)) {
+  if (NIL_P(result)) {
     return Qtrue;
   }
 
-  if(result == Qfalse) {
+  if (result == Qfalse) {
     return Qfalse;
   }
 
@@ -303,7 +304,7 @@ VALUE is_json_value(VALUE value) {
   return Qfalse;
 }
 
-VALUE type_cast(VALUE type_metadata, VALUE value, VALUE* isJson) {
+VALUE type_cast(VALUE type_metadata, VALUE value, volatile VALUE* isJson) {
   if (value == Qnil || value == Qundef) {
     return value;
   }
@@ -323,8 +324,8 @@ VALUE type_cast(VALUE type_metadata, VALUE value, VALUE* isJson) {
     }
   }
 
-  if(is_json_type(type_klass)) {
-    if(is_json_value(value) == Qfalse) {
+  if (is_json_type(type_klass)) {
+    if (is_json_value(value) == Qfalse) {
       return Qnil;
     }
     *isJson = Qtrue;
@@ -357,7 +358,6 @@ void panko_init_type_cast(VALUE mPanko) {
   oj_parseerror_type = rb_const_get_at(oj_type, rb_intern("ParseError"));
   oj_sc_parse_id = rb_intern("sc_parse");
 
-
   // TODO: pass 3 arguments here
   rb_define_singleton_method(mPanko, "_type_cast", public_type_cast, -1);
 

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

@@ -33,7 +33,7 @@ typedef VALUE (*TypeCastFunc)(VALUE value);
 typedef struct _TypeCast {
   TypeMatchFunc canCast;
   TypeCastFunc typeCast;
-} * TypeCast;
+}* TypeCast;
 
 // ActiveRecord::Type::String
 // ActiveRecord::Type::Text
@@ -71,11 +71,11 @@ static struct _TypeCast type_casts[] = {
 
     {NULL, NULL}};
 
-extern VALUE type_cast(VALUE type_metadata, VALUE value, VALUE* isJson);
+extern VALUE type_cast(VALUE type_metadata, VALUE value,
+                       volatile VALUE* isJson);
 void panko_init_type_cast(VALUE mPanko);
 
 // Introduced in ruby 2.4
 #ifndef RB_INTEGER_TYPE_P
-# define RB_INTEGER_TYPE_P(obj) (RB_FIXNUM_P(obj) || RB_TYPE_P(obj, T_BIGNUM))
+#define RB_INTEGER_TYPE_P(obj) (RB_FIXNUM_P(obj) || RB_TYPE_P(obj, T_BIGNUM))
 #endif
-

data/ext/panko_serializer/common.h

@@ -2,10 +2,8 @@
 
 #include <ruby.h>
 
-
 #define PANKO_SAFE_HASH_SIZE(hash) \
   (hash == Qnil || hash == Qundef) ? 0 : RHASH_SIZE(hash)
 
 #define PANKO_EMPTY_HASH(hash) \
   (hash == Qnil || hash == Qundef) ? 1 : (RHASH_SIZE(hash) == 0)
-

data/ext/panko_serializer/panko_serializer.c

@@ -1,7 +1,7 @@
-#include <ruby.h>
-
 #include "panko_serializer.h"
 
+#include <ruby.h>
+
 static ID push_value_id;
 static ID push_array_id;
 static ID push_object_id;
@@ -16,7 +16,7 @@ static ID serialization_context_id;
 static VALUE SKIP = Qundef;
 
 void write_value(VALUE str_writer, VALUE key, VALUE value, VALUE isJson) {
-  if(isJson == Qtrue) {
+  if (isJson == Qtrue) {
     rb_funcall(str_writer, push_json_id, 2, value, key);
   } else {
     rb_funcall(str_writer, push_value_id, 2, value, key);
@@ -29,7 +29,7 @@ void serialize_method_fields(VALUE object, VALUE str_writer,
     return;
   }
 
-  volatile VALUE method_fields, serializer;
+  volatile VALUE method_fields, serializer, key;
   long i;
 
   method_fields = descriptor->method_fields;
@@ -43,7 +43,8 @@ void serialize_method_fields(VALUE object, VALUE str_writer,
 
     volatile VALUE result = rb_funcall(serializer, attribute->name_id, 0);
     if (result != SKIP) {
-        write_value(str_writer, attribute->name_str, result, Qfalse);
+      key = attr_name_for_serialization(attribute);
+      write_value(str_writer, key, result, Qfalse);
     }
   }
 
@@ -52,10 +53,8 @@ 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);
 }

data/ext/panko_serializer/serialization_descriptor/association.c

@@ -31,11 +31,12 @@ void association_mark(Association data) {
 }
 
 static VALUE association_new(int argc, VALUE* argv, VALUE self) {
-  Association association = ALLOC(struct _Association);
+  Association association;
 
   Check_Type(argv[0], T_SYMBOL);
   Check_Type(argv[1], T_STRING);
 
+  association = ALLOC(struct _Association);
   association->name_sym = argv[0];
   association->name_str = argv[1];
   association->rb_descriptor = argv[2];
@@ -77,6 +78,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_undef_alloc_func(cAssociation);
   rb_global_variable(&cAssociation);
 
   rb_define_module_function(cAssociation, "new", association_new, -1);

data/ext/panko_serializer/serialization_descriptor/association.h

@@ -12,7 +12,7 @@ typedef struct _Association {
 
   VALUE rb_descriptor;
   SerializationDescriptor descriptor;
-} * Association;
+}* Association;
 
 Association association_read(VALUE association);
 void panko_init_association(VALUE mPanko);

data/ext/panko_serializer/serialization_descriptor/attribute.c

@@ -26,13 +26,14 @@ void attribute_mark(Attribute data) {
 }
 
 static VALUE attribute_new(int argc, VALUE* argv, VALUE self) {
-  Attribute attribute = ALLOC(struct _Attribute);
+  Attribute attribute;
 
   Check_Type(argv[0], T_STRING);
   if (argv[1] != Qnil) {
     Check_Type(argv[1], T_STRING);
   }
 
+  attribute = ALLOC(struct _Attribute);
   attribute->name_str = argv[0];
   attribute->name_id = rb_intern_str(attribute->name_str);
   attribute->alias_name = argv[1];
@@ -85,6 +86,7 @@ void panko_init_attribute(VALUE mPanko) {
   attribute_aliases_id = rb_intern("attribute_aliases");
 
   cAttribute = rb_define_class_under(mPanko, "Attribute", rb_cObject);
+  rb_undef_alloc_func(cAttribute);
   rb_global_variable(&cAttribute);
 
   rb_define_module_function(cAttribute, "new", attribute_new, -1);

data/ext/panko_serializer/serialization_descriptor/attribute.h

@@ -16,12 +16,12 @@ typedef struct _Attribute {
    */
   VALUE type;
   VALUE record_class;
-} * Attribute;
+}* Attribute;
 
 Attribute attribute_read(VALUE attribute);
 void attribute_try_invalidate(Attribute attribute, VALUE new_record_class);
 void panko_init_attribute(VALUE mPanko);
 
-#define PANKO_ATTRIBUTE_READ(attribute) (Attribute)DATA_PTR(attribute)
+#define PANKO_ATTRIBUTE_READ(attribute) (Attribute) DATA_PTR(attribute)
 
 #endif

data/ext/panko_serializer/serialization_descriptor/serialization_descriptor.h

@@ -19,7 +19,7 @@ typedef struct _SerializationDescriptor {
   VALUE has_many_associations;
 
   AttributesWriter attributes_writer;
-} * SerializationDescriptor;
+}* SerializationDescriptor;
 
 SerializationDescriptor sd_read(VALUE descriptor);
 

data/lib/panko/attribute.rb

@@ -7,9 +7,9 @@ module Panko
       Attribute.new(name.to_s, alias_name)
     end
 
-    def ==(attr)
-      return name.to_sym == attr if attr.is_a? Symbol
-      return name == attr.name && alias_name == attr.alias_name if attr.is_a? Panko::Attribute
+    def ==(other)
+      return name.to_sym == other if other.is_a? Symbol
+      return name == other.name && alias_name == other.alias_name if other.is_a? Panko::Attribute
 
       super
     end
@@ -18,8 +18,8 @@ module Panko
       name.to_sym.hash
     end
 
-    def eql?(attr)
-      self.==(attr)
+    def eql?(other)
+      self.==(other)
     end
 
     def inspect

data/lib/panko/object_writer.rb

@@ -35,7 +35,11 @@ class Panko::ObjectWriter
 
   def push_json(value, key = nil)
     if value.is_a?(String)
-      value = Oj.load(value) rescue nil
+      value = begin
+        Oj.load(value)
+      rescue
+        nil
+      end
     end
 
     push_value(value, key)

data/lib/panko/response.rb

@@ -75,9 +75,9 @@ module Panko
 
     def write_value(writer, value, key = nil)
       if value.is_a?(Panko::ArraySerializer) ||
-         value.is_a?(Panko::Serializer) ||
-         value.is_a?(Panko::Response) ||
-         value.is_a?(Panko::JsonValue)
+          value.is_a?(Panko::Serializer) ||
+          value.is_a?(Panko::Response) ||
+          value.is_a?(Panko::JsonValue)
         writer.push_json(value.to_json, key)
       else
         writer.push_value(value, key)

data/lib/panko/serialization_descriptor.rb

@@ -74,7 +74,7 @@ module Panko
       unless has_many_associations.empty?
         self.has_many_associations = apply_association_filters(
           has_many_associations,
-          { attributes: attributes_only_filters, associations: associations_only_filters },
+          {attributes: attributes_only_filters, associations: associations_only_filters},
           attributes: attributes_except_filters, associations: associations_except_filters
         )
       end
@@ -82,7 +82,7 @@ module Panko
       unless has_one_associations.empty?
         self.has_one_associations = apply_association_filters(
           has_one_associations,
-          { attributes: attributes_only_filters, associations: associations_only_filters },
+          {attributes: attributes_only_filters, associations: associations_only_filters},
           attributes: attributes_except_filters, associations: associations_except_filters
         )
       end

data/lib/panko/serializer.rb

@@ -70,12 +70,12 @@ module Panko
         return if @_descriptor.nil?
 
         deleted_attr = @_descriptor.attributes.delete(method)
-        @_descriptor.method_fields << Attribute.create(method) unless deleted_attr.nil?
+        @_descriptor.method_fields << Attribute.create(deleted_attr.name, alias_name: deleted_attr.alias_name) unless deleted_attr.nil?
       end
 
       def has_one(name, options = {})
         serializer_const = options[:serializer]
-        if serializer_const.kind_of?(String)
+        if serializer_const.is_a?(String)
           serializer_const = Panko::SerializerResolver.resolve(serializer_const, self)
         end
         serializer_const ||= Panko::SerializerResolver.resolve(name.to_s, self)
@@ -91,7 +91,7 @@ module Panko
 
       def has_many(name, options = {})
         serializer_const = options[:serializer] || options[:each_serializer]
-        if serializer_const.kind_of?(String)
+        if serializer_const.is_a?(String)
           serializer_const = Panko::SerializerResolver.resolve(serializer_const, self)
         end
         serializer_const ||= Panko::SerializerResolver.resolve(name.to_s, self)

data/lib/panko/serializer_resolver.rb

@@ -1,14 +1,16 @@
 # frozen_string_literal: true
 
-require 'active_support/core_ext/string/inflections'
-require 'active_support/core_ext/module/introspection'
+require "active_support/core_ext/string/inflections"
+require "active_support/core_ext/module/introspection"
 
 class Panko::SerializerResolver
   class << self
     def resolve(name, from)
       serializer_const = nil
 
-      if namespace = namespace_for(from)
+      namespace = namespace_for(from)
+
+      if namespace.present?
         serializer_const = safe_serializer_get("#{namespace}::#{name.singularize.camelize}Serializer")
       end
 
@@ -31,7 +33,7 @@ class Panko::SerializerResolver
 
     def safe_serializer_get(name)
       const = Object.const_get(name)
-      const < Panko::Serializer ? const : nil
+      (const < Panko::Serializer) ? const : nil
     rescue NameError
       nil
     end

data/lib/panko/version.rb

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

data/panko_serializer.gemspec

@@ -5,14 +5,14 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "panko/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = "panko_serializer"
-  spec.version       = Panko::VERSION
-  spec.authors       = ["Yosi Attias"]
-  spec.email         = ["yosy101@gmail.com"]
+  spec.name = "panko_serializer"
+  spec.version = Panko::VERSION
+  spec.authors = ["Yosi Attias"]
+  spec.email = ["yosy101@gmail.com"]
 
-  spec.summary       = "High Performance JSON Serialization for ActiveRecord & Ruby Objects"
-  spec.homepage      = "https://panko.dev"
-  spec.license       = "MIT"
+  spec.summary = "High Performance JSON Serialization for ActiveRecord & Ruby Objects"
+  spec.homepage = "https://panko.dev"
+  spec.license = "MIT"
 
   spec.metadata = {
     "bug_tracker_uri" => "https://github.com/panko-serializer/panko_serializer/issues",
@@ -30,6 +30,6 @@ Gem::Specification.new do |spec|
 
   spec.extensions << "ext/panko_serializer/extconf.rb"
 
-  spec.add_dependency "oj", '> 3.11.0', '< 4.0.0'
+  spec.add_dependency "oj", "> 3.11.0", "< 4.0.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.7
+  version: 0.8.0
 platform: ruby
 authors:
 - Yosi Attias
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-04 00:00:00.000000000 Z
+date: 2023-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -54,10 +54,12 @@ extra_rdoc_files: []
 files:
 - ".clang-format"
 - ".github/workflows/docs.yml"
+- ".github/workflows/lint.yml"
 - ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
+- ".standard.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -167,7 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.4.6
 signing_key:
 specification_version: 4
 summary: High Performance JSON Serialization for ActiveRecord & Ruby Objects