panko_serializer 0.5.7 → 0.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96a545d7b57282012eb4f6b46dce52c0d83ade0e5347e209b8295a013456dfd1
-  data.tar.gz: 3df74cf0eecd66def3ba52856de5080563f52295dd6587cbf8a0dfeada32cf74
+  metadata.gz: 11d34f852df4549ddac00e8b819614590029039893f34668c4c53e180fae5c0a
+  data.tar.gz: '059527e3089c3aae05a625c36498909d069d3c42047cd1cf02332fd07002c778'
 SHA512:
-  metadata.gz: e8dfe71a1409eb33a2c0153251da2edd9a98f9781c4f30cfb572276c371516a2d5a672e921023c5eef1ed4778832a3f8ad87b644d042f6c883fcd17a58c7b439
-  data.tar.gz: 0b50a663a527f5355736bd973ae38c475ee28c15b6e262f70c21399241cedd870eb665b15a2e921615b45ed2b77cecc08dd17ff6d56f3c0b91f396400d31406f
+  metadata.gz: 2e6b2c7cf88f00caa1d7704817b08084580b1da232582fdeb9f754f96f3ae2d3333d9162d88ce030510fdfda6b468b61022d895a32021813e72267d03116a121
+  data.tar.gz: f78e9ac7c556dd7693918e4937fd820d22199c807c2f44d8379eb9e2fd4f1a0b9db73fdb8d6ada606923c353c51046fd4f274799853f52b7ac6f1f9a1129af5e

data/.clang-format

@@ -1,148 +1,3 @@
 ---
 Language:        Cpp
-# BasedOnStyle:  Chromium
-AccessModifierOffset: -1
-AlignAfterOpenBracket: Align
-AlignConsecutiveAssignments: false
-AlignConsecutiveDeclarations: false
-AlignEscapedNewlines: Left
-AlignOperands:   true
-AlignTrailingComments: true
-AllowAllParametersOfDeclarationOnNextLine: false
-AllowShortBlocksOnASingleLine: false
-AllowShortCaseLabelsOnASingleLine: false
-AllowShortFunctionsOnASingleLine: Inline
-AllowShortIfStatementsOnASingleLine: false
-AllowShortLoopsOnASingleLine: false
-AlwaysBreakAfterDefinitionReturnType: None
-AlwaysBreakAfterReturnType: None
-AlwaysBreakBeforeMultilineStrings: true
-AlwaysBreakTemplateDeclarations: Yes
-BinPackArguments: true
-BinPackParameters: false
-BraceWrapping:   
-  AfterClass:      false
-  AfterControlStatement: false
-  AfterEnum:       false
-  AfterFunction:   false
-  AfterNamespace:  false
-  AfterObjCDeclaration: false
-  AfterStruct:     false
-  AfterUnion:      false
-  AfterExternBlock: false
-  BeforeCatch:     false
-  BeforeElse:      false
-  IndentBraces:    false
-  SplitEmptyFunction: true
-  SplitEmptyRecord: true
-  SplitEmptyNamespace: true
-BreakBeforeBinaryOperators: None
-BreakBeforeBraces: Attach
-BreakBeforeInheritanceComma: false
-BreakInheritanceList: BeforeColon
-BreakBeforeTernaryOperators: true
-BreakConstructorInitializersBeforeComma: false
-BreakConstructorInitializers: BeforeColon
-BreakAfterJavaFieldAnnotations: false
-BreakStringLiterals: true
-ColumnLimit:     80
-CommentPragmas:  '^ IWYU pragma:'
-CompactNamespaces: false
-ConstructorInitializerAllOnOneLineOrOnePerLine: true
-ConstructorInitializerIndentWidth: 4
-ContinuationIndentWidth: 4
-Cpp11BracedListStyle: true
-DerivePointerAlignment: false
-DisableFormat:   false
-ExperimentalAutoDetectBinPacking: false
-FixNamespaceComments: true
-ForEachMacros:   
-  - foreach
-  - Q_FOREACH
-  - BOOST_FOREACH
-IncludeBlocks:   Preserve
-IncludeCategories: 
-  - Regex:           '^<ext/.*\.h>'
-    Priority:        2
-  - Regex:           '^<.*\.h>'
-    Priority:        1
-  - Regex:           '^<.*'
-    Priority:        2
-  - Regex:           '.*'
-    Priority:        3
-IncludeIsMainRegex: '([-_](test|unittest))?$'
-IndentCaseLabels: true
-IndentPPDirectives: None
-IndentWidth:     2
-IndentWrappedFunctionNames: false
-JavaScriptQuotes: Leave
-JavaScriptWrapImports: true
-KeepEmptyLinesAtTheStartOfBlocks: false
-MacroBlockBegin: ''
-MacroBlockEnd:   ''
-MaxEmptyLinesToKeep: 1
-NamespaceIndentation: None
-ObjCBinPackProtocolList: Never
-ObjCBlockIndentWidth: 2
-ObjCSpaceAfterProperty: false
-ObjCSpaceBeforeProtocolList: true
-PenaltyBreakAssignment: 2
-PenaltyBreakBeforeFirstCallParameter: 1
-PenaltyBreakComment: 300
-PenaltyBreakFirstLessLess: 120
-PenaltyBreakString: 1000
-PenaltyBreakTemplateDeclaration: 10
-PenaltyExcessCharacter: 1000000
-PenaltyReturnTypeOnItsOwnLine: 200
-PointerAlignment: Left
-RawStringFormats: 
-  - Language:        Cpp
-    Delimiters:      
-      - cc
-      - CC
-      - cpp
-      - Cpp
-      - CPP
-      - 'c++'
-      - 'C++'
-    CanonicalDelimiter: ''
-    BasedOnStyle:    google
-  - Language:        TextProto
-    Delimiters:      
-      - pb
-      - PB
-      - proto
-      - PROTO
-    EnclosingFunctions: 
-      - EqualsProto
-      - EquivToProto
-      - PARSE_PARTIAL_TEXT_PROTO
-      - PARSE_TEST_PROTO
-      - PARSE_TEXT_PROTO
-      - ParseTextOrDie
-      - ParseTextProtoOrDie
-    CanonicalDelimiter: ''
-    BasedOnStyle:    google
-ReflowComments:  true
-SortIncludes:    true
-SortUsingDeclarations: true
-SpaceAfterCStyleCast: false
-SpaceAfterTemplateKeyword: true
-SpaceBeforeAssignmentOperators: true
-SpaceBeforeCpp11BracedList: false
-SpaceBeforeCtorInitializerColon: true
-SpaceBeforeInheritanceColon: true
-SpaceBeforeParens: ControlStatements
-SpaceBeforeRangeBasedForLoopColon: true
-SpaceInEmptyParentheses: false
-SpacesBeforeTrailingComments: 2
-SpacesInAngles:  false
-SpacesInContainerLiterals: true
-SpacesInCStyleCastParentheses: false
-SpacesInParentheses: false
-SpacesInSquareBrackets: false
-Standard:        Auto
-TabWidth:        8
-UseTab:          Never
-...
-
+BasedOnStyle:  Google

data/.travis.yml

@@ -2,11 +2,8 @@ sudo: false
 cache: bundler
 language: ruby
 rvm:
-  - 2.5.1
-  - ruby-head
-matrix:
-  allow_failures:
-    - rvm: ruby-head
+  - 2.5.3
+  - 2.6.0
 
 env:
   global:
@@ -27,5 +24,4 @@ after_success:
 env:
   matrix:
   - "RAILS_VERSION=4.2.0"
-  - "RAILS_VERSION=5.1.0"
   - "RAILS_VERSION=5.2.0"

data/README.md

@@ -1,6 +1,6 @@
 # Panko
 
-[![Build Status](https://travis-ci.org/yosiat/panko_serializer.svg?branch=master)](https://travis-ci.org/yosiat/panko_serializer)
+[![Build Status](https://api.travis-ci.com/yosiat/panko_serializer.svg?branch=master)](https://travis-ci.org/yosiat/panko_serializer)
 
 Panko is library which is inspired by ActiveModelSerializers 0.9 for serializing ActiveRecord/Ruby objects to JSON strings, fast.
 

data/Rakefile

@@ -48,7 +48,7 @@ rescue PTY::ChildExited
   []
 end
 
-def run_benchmarks(files, items_count: 7_000)
+def run_benchmarks(files, items_count: 2_300)
   headings = ["Benchmark", "ip/s", "allocs/retained"]
   files.each do |benchmark_file|
 

data/ext/panko_serializer/attributes_writer/active_record.c

@@ -21,20 +21,6 @@ VALUE panko_read_lazy_attributes_hash(VALUE object) {
   return lazy_attributes_hash;
 }
 
-void read_attribute_from_hash(VALUE attributes_hash,
-                              VALUE member,
-                              volatile VALUE* value,
-                              volatile VALUE* type) {
-  volatile VALUE attribute_metadata = rb_hash_aref(attributes_hash, member);
-  if (attribute_metadata != Qnil) {
-    *value = rb_ivar_get(attribute_metadata, value_before_type_cast_id);
-
-    if (NIL_P(*type)) {
-      *type = rb_ivar_get(attribute_metadata, type_id);
-    }
-  }
-}
-
 struct attributes {
   VALUE attributes_hash;
 
@@ -84,21 +70,30 @@ struct attributes init_context(VALUE obj) {
 }
 
 VALUE read_attribute(struct attributes attributes_ctx, Attribute attribute) {
-  VALUE member = attribute->name_str;
-  volatile VALUE value = Qundef;
+  volatile VALUE member, value, attribute_metadata;
+
+  member = attribute->name_str;
+  value = Qundef;
+
+  if (attributes_ctx.shouldReadFromHash == true) {
+    volatile VALUE attribute_metadata =
+        rb_hash_aref(attributes_ctx.attributes_hash, member);
+    if (attribute_metadata != Qnil) {
+      value = rb_ivar_get(attribute_metadata, value_before_type_cast_id);
 
-  if (!NIL_P(attributes_ctx.values)) {
+      if (NIL_P(attribute->type)) {
+        attribute->type = rb_ivar_get(attribute_metadata, type_id);
+      }
+    }
+  }
+
+  if (value == Qundef && !NIL_P(attributes_ctx.values)) {
     value = rb_hash_aref(attributes_ctx.values, member);
     if (NIL_P(value)) {
       value = Qundef;
     }
   }
 
-  if (value == Qundef && attributes_ctx.shouldReadFromHash == true) {
-    read_attribute_from_hash(attributes_ctx.attributes_hash, member, &value,
-                             &attribute->type);
-  }
-
   if (NIL_P(attribute->type) && !NIL_P(value)) {
     if (attributes_ctx.tryToReadFromAdditionalTypes == true) {
       attribute->type = rb_hash_aref(attributes_ctx.additional_types, member);
@@ -116,10 +111,8 @@ VALUE read_attribute(struct attributes attributes_ctx, Attribute attribute) {
   return value;
 }
 
-void active_record_attributes_writer(VALUE obj,
-                                     VALUE attributes,
-                                     EachAttributeFunc func,
-                                     VALUE writer) {
+void active_record_attributes_writer(VALUE obj, VALUE attributes,
+                                     EachAttributeFunc func, VALUE writer) {
   long i;
   struct attributes attributes_ctx = init_context(obj);
   volatile VALUE record_class = CLASS_OF(obj);

data/ext/panko_serializer/attributes_writer/active_record.h

@@ -11,6 +11,6 @@
 extern void active_record_attributes_writer(VALUE object,
                                             VALUE attributes,
                                             EachAttributeFunc func,
-                                            VALUE context);
+                                            VALUE writer);
 
 void init_active_record_attributes_writer(VALUE mPanko);

data/ext/panko_serializer/attributes_writer/attributes_writer.c

@@ -27,17 +27,14 @@ AttributesWriter create_attributes_writer(VALUE subject) {
     return (AttributesWriter){
         .object_type = ActiveRecord,
         .write_attributes = active_record_attributes_writer};
-  } else {
-    return (AttributesWriter){.object_type = Plain,
-                              .write_attributes = plain_attributes_writer};
   }
+  return (AttributesWriter){.object_type = Plain,
+                            .write_attributes = plain_attributes_writer};
 
   return create_empty_attributes_writer();
 }
 
-void empty_write_attributes(VALUE obj,
-                            VALUE attributes,
-                            EachAttributeFunc func,
+void empty_write_attributes(VALUE obj, VALUE attributes, EachAttributeFunc func,
                             VALUE writer) {}
 
 AttributesWriter create_empty_attributes_writer() {

data/ext/panko_serializer/attributes_writer/plain.c

@@ -1,9 +1,7 @@
 #include "plain.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) {
   long i;
   for (i = 0; i < RARRAY_LEN(attributes); i++) {
     volatile VALUE raw_attribute = RARRAY_AREF(attributes, i);

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

@@ -25,9 +25,7 @@ VALUE is_iso8601_time_string(const char* value) {
   return r >= 0 ? Qtrue : Qfalse;
 }
 
-void append_region_str(const char* source,
-                       char** to,
-                       int regionBegin,
+void append_region_str(const char* source, char** to, int regionBegin,
                        int regionEnd) {
   long iter = 0;
   for (iter = regionBegin; iter < regionEnd; iter++) {
@@ -98,19 +96,19 @@ VALUE iso_ar_iso_datetime_string(const char* value) {
 
     *cur++ = '.';
     if (value[19] == '.' && isdigit(value[20])) {
-      if(isdigit(value[20])) {
+      if (isdigit(value[20])) {
         *cur++ = value[20];
       } else {
         *cur++ = '0';
       }
 
-      if(isdigit(value[21])) {
+      if (isdigit(value[21])) {
         *cur++ = value[21];
       } else {
         *cur++ = '0';
       }
 
-      if(isdigit(value[22])) {
+      if (isdigit(value[22])) {
         *cur++ = value[22];
       } else {
         *cur++ = '0';

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

@@ -212,13 +212,9 @@ bool is_json_type(VALUE type_klass) {
           (ar_json_type != Qundef && type_klass == ar_json_type));
 }
 
-VALUE rescue_func() {
-  return Qnil;
-}
+VALUE rescue_func() { return Qnil; }
 
-VALUE parse_json(VALUE value) {
-  return rb_funcall(oj_type, load_id, 1, value);
-}
+VALUE parse_json(VALUE value) { return rb_funcall(oj_type, load_id, 1, value); }
 
 VALUE cast_json_type(VALUE value) {
   if (!RB_TYPE_P(value, T_STRING)) {
@@ -230,9 +226,7 @@ VALUE cast_json_type(VALUE value) {
   return result;
 }
 
-bool is_boolean_type(VALUE type_klass) {
-  return type_klass == ar_boolean_type;
-}
+bool is_boolean_type(VALUE type_klass) { return type_klass == ar_boolean_type; }
 
 VALUE cast_boolean_type(VALUE value) {
   if (value == Qtrue || value == Qfalse) {

data/ext/panko_serializer/panko_serializer.c

@@ -16,8 +16,7 @@ void write_value(VALUE str_writer, VALUE key, VALUE value) {
   rb_funcall(str_writer, push_value_id, 2, value, key);
 }
 
-void serialize_method_fields(VALUE subject,
-                             VALUE str_writer,
+void serialize_method_fields(VALUE subject, VALUE str_writer,
                              SerializationDescriptor descriptor) {
   if (RARRAY_LEN(descriptor->method_fields) == 0) {
     return;
@@ -43,8 +42,7 @@ void serialize_method_fields(VALUE subject,
   rb_ivar_set(serializer, object_id, Qnil);
 }
 
-void serialize_fields(VALUE subject,
-                      VALUE str_writer,
+void serialize_fields(VALUE subject, VALUE str_writer,
                       SerializationDescriptor descriptor) {
   descriptor->attributes_writer.write_attributes(
       subject, descriptor->attributes, write_value, str_writer);
@@ -52,9 +50,7 @@ void serialize_fields(VALUE subject,
   serialize_method_fields(subject, str_writer, descriptor);
 }
 
-void serialize_has_one_associations(VALUE subject,
-                                    VALUE str_writer,
-                                    SerializationDescriptor descriptor,
+void serialize_has_one_associations(VALUE subject, VALUE str_writer,
                                     VALUE associations) {
   long i;
   for (i = 0; i < RARRAY_LEN(associations); i++) {
@@ -72,9 +68,7 @@ void serialize_has_one_associations(VALUE subject,
   }
 }
 
-void serialize_has_many_associations(VALUE subject,
-                                     VALUE str_writer,
-                                     SerializationDescriptor descriptor,
+void serialize_has_many_associations(VALUE subject, VALUE str_writer,
                                      VALUE associations) {
   long i;
   for (i = 0; i < RARRAY_LEN(associations); i++) {
@@ -92,9 +86,7 @@ void serialize_has_many_associations(VALUE subject,
   }
 }
 
-VALUE serialize_subject(VALUE key,
-                        VALUE subject,
-                        VALUE str_writer,
+VALUE serialize_subject(VALUE key, VALUE subject, VALUE str_writer,
                         SerializationDescriptor descriptor) {
   sd_set_writer(descriptor, subject);
 
@@ -103,12 +95,12 @@ VALUE serialize_subject(VALUE key,
   serialize_fields(subject, str_writer, descriptor);
 
   if (RARRAY_LEN(descriptor->has_one_associations) > 0) {
-    serialize_has_one_associations(subject, str_writer, descriptor,
+    serialize_has_one_associations(subject, str_writer,
                                    descriptor->has_one_associations);
   }
 
   if (RARRAY_LEN(descriptor->has_many_associations) > 0) {
-    serialize_has_many_associations(subject, str_writer, descriptor,
+    serialize_has_many_associations(subject, str_writer,
                                     descriptor->has_many_associations);
   }
 
@@ -117,9 +109,7 @@ VALUE serialize_subject(VALUE key,
   return Qnil;
 }
 
-VALUE serialize_subjects(VALUE key,
-                         VALUE subjects,
-                         VALUE str_writer,
+VALUE serialize_subjects(VALUE key, VALUE subjects, VALUE str_writer,
                          SerializationDescriptor descriptor) {
   long i;
 
@@ -139,17 +129,13 @@ VALUE serialize_subjects(VALUE key,
   return Qnil;
 }
 
-VALUE serialize_subject_api(VALUE klass,
-                            VALUE subject,
-                            VALUE str_writer,
+VALUE serialize_subject_api(VALUE klass, VALUE subject, VALUE str_writer,
                             VALUE descriptor) {
   SerializationDescriptor sd = sd_read(descriptor);
   return serialize_subject(Qnil, subject, str_writer, sd);
 }
 
-VALUE serialize_subjects_api(VALUE klass,
-                             VALUE subjects,
-                             VALUE str_writer,
+VALUE serialize_subjects_api(VALUE klass, VALUE subjects, VALUE str_writer,
                              VALUE descriptor) {
   serialize_subjects(Qnil, subjects, str_writer, sd_read(descriptor));
 

data/ext/panko_serializer/serialization_descriptor/attribute.h

@@ -19,7 +19,7 @@ typedef struct _Attribute {
 } * Attribute;
 
 Attribute attribute_read(VALUE attribute);
-void attribute_try_invalidate(Attribute attribute, VALUE record);
+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)

data/ext/panko_serializer/serialization_descriptor/serialization_descriptor.c

@@ -133,7 +133,7 @@ VALUE sd_aliases_set(VALUE self, VALUE aliases) {
   return Qnil;
 }
 
-VALUE sd_aliases_aref(VALUE self, VALUE aliases) {
+VALUE sd_aliases_aref(VALUE self) {
   SerializationDescriptor sd = (SerializationDescriptor)DATA_PTR(self);
   return sd->aliases;
 }

data/lib/panko/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: panko_serializer
 version: !ruby/object:Gem::Version
-  version: 0.5.7
+  version: 0.5.8
 platform: ruby
 authors:
 - Yosi Attias
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-16 00:00:00.000000000 Z
+date: 2019-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -116,8 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Fast serialization for ActiveModel