panko_serializer 0.7.4 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1cbaf86b0b95041f6f3387c8d82cc8ef1fa272549e50b5d3fdac2d13989f1a29
-  data.tar.gz: 41496c877bee39fa9fe7f136469ea260c1c60feeb25c6f95930b8c13a9055b3c
+  metadata.gz: e0377ad83b60ba60530ba87694837b265bfe3890806afeac84544c336351ff06
+  data.tar.gz: adbb80b08811b8b240e4af98214834e8876a11a267db58c8dad9accb90e3bee6
 SHA512:
-  metadata.gz: 2c30cbbde27a0ff4cead7b0763c1a76d0d179053e7d913ac81594eedb50defee858792d0893e19a42bd5b5ea71e6c5e4ed2cc3371a2d48d1dce4d53737a4d584
-  data.tar.gz: 0dd1443b07977c1eea6457016f4db43d88fcf857ea607bf9064b72485e4f7d78e0ffcf39fe1f9b83456c0477da3988ee6a392730bfe84565d266816484e01589
+  metadata.gz: e55156ac125c66c98f9099ddf2d37427e3dc81048bd0d94d97b98055ff2df0272ba65196b41d0410bcea271879593d6ad37c7ea39d6ecea48629438af75e55d1
+  data.tar.gz: a2a71b526addc0593bd6f33edf07cda15dfd46fe11f00342fe5b8bfbc13e0648c78da598d010e741c9fc03cd4543bcafea6d0c3a3fc8c35cd68a2188848860be

data/.github/workflows/docs.yml

@@ -26,7 +26,7 @@ jobs:
       run: npm install
 
     - name: Install SSH Client 🔑
-      uses: webfactory/ssh-agent@v0.2.0
+      uses: webfactory/ssh-agent@v0.4.1
       with:
         ssh-private-key: ${{ secrets.DEPLOY_KEY }}
 

data/.github/workflows/ruby.yml

@@ -9,8 +9,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ '2.5', '2.6', '2.7']
-        rails: ['5.2.0', '6.0.0', '6.1.0rc1']
+        ruby: [ '2.5', '2.6', '2.7', '3.0']
+        rails: ['5.2.0', '6.0.0', '6.1.0']
+        exclude:
+          - ruby: '3.0'
+            rails: '5.2.0'
 
     steps:
     - uses: actions/checkout@v2

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};
   }

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/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,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?
 
@@ -86,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.4"
+  VERSION = "0.7.5"
 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"
+  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.4
+  version: 0.7.5
 platform: ruby
 authors:
 - Yosi Attias
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-21 00:00:00.000000000 Z
+date: 2021-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -16,14 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.10.0
+        version: 3.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.10.0
+        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