panko_serializer 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 392d44930b3cd861d45c08e3f8092b55c84550525ced57fcd59d0425827ab177
-  data.tar.gz: bd30319fd499a26b1a44943e443f2f145b1969632fb1aa51472ace7f2d7e21a9
+  metadata.gz: fe095c4ba577a1757ae1cfde90e6847bb6064753dd34e68aaa0c16d6bb9cc844
+  data.tar.gz: 5b3d50d6dc2191240069fa36733248197a96555a1b130c405d799d9ca982e9ce
 SHA512:
-  metadata.gz: 811ed00b96b5a2dbc527b912c77f1f44576586b04de6366fd5c9a8d2a80f9f411a0ab22a5db87a9a3fa3129596cd94bfc6ac5fd2f7ac66725819612e97aa373f
-  data.tar.gz: dd894089a01e61a25da591725ac9cbb6be5e8de188a17a100f8d18bdedf787161d3c4e16263b91e5b1cbcd9eadb09f50576fe53aa3ffa0e544e5fa325c0ee565
+  metadata.gz: c7e73c88806d3195cf9c63aeed87ff67739cc4ff31a6f0121ebe59612627c8f4b020e64eba2aaa55d56242a616e4de177996263c7c18cb5416124e7364f32977
+  data.tar.gz: 91505d9d99eddab0e81e05340ea324c0350507ff9fcc6db77fc9c4efc34c84bd28f9ee69d3b3e876ee23e0258ad785971c1a85893af35307c3882948eb7996b2

data/.clang-format

@@ -59,6 +59,7 @@ ForEachMacros:
   - foreach
   - Q_FOREACH
   - BOOST_FOREACH
+IncludeBlocks:   Preserve
 IncludeCategories: 
   - Regex:           '^<ext/.*\.h>'
     Priority:        2
@@ -80,9 +81,10 @@ MacroBlockBegin: ''
 MacroBlockEnd:   ''
 MaxEmptyLinesToKeep: 1
 NamespaceIndentation: None
+ObjCBinPackProtocolList: Never
 ObjCBlockIndentWidth: 2
 ObjCSpaceAfterProperty: false
-ObjCSpaceBeforeProtocolList: false
+ObjCSpaceBeforeProtocolList: true
 PenaltyBreakAssignment: 2
 PenaltyBreakBeforeFirstCallParameter: 1
 PenaltyBreakComment: 300
@@ -92,8 +94,13 @@ PenaltyExcessCharacter: 1000000
 PenaltyReturnTypeOnItsOwnLine: 200
 PointerAlignment: Left
 RawStringFormats: 
-  - Delimiter:       pb
-    Language:        TextProto
+  - Language:        TextProto
+    Delimiters:      
+      - pb
+      - PB
+      - proto
+      - PROTO
+    CanonicalDelimiter: ''
     BasedOnStyle:    google
 ReflowComments:  true
 SortIncludes:    true
@@ -101,7 +108,10 @@ SortUsingDeclarations: true
 SpaceAfterCStyleCast: false
 SpaceAfterTemplateKeyword: true
 SpaceBeforeAssignmentOperators: true
+SpaceBeforeCtorInitializerColon: true
+SpaceBeforeInheritanceColon: true
 SpaceBeforeParens: ControlStatements
+SpaceBeforeRangeBasedForLoopColon: true
 SpaceInEmptyParentheses: false
 SpacesBeforeTrailingComments: 2
 SpacesInAngles:  false

data/.travis.yml

@@ -3,13 +3,17 @@ cache: bundler
 language: ruby
 rvm:
   - 2.5.1
+  - ruby-head
+matrix:
+  allow_failures:
+    - rvm: ruby-head
 
 env:
   global:
     - GIT_NAME: Travis CI
     - GIT_EMAIL: nobody@nobody.org
 
-install: bundle install --path=vendor/bundle --retry=3 --jobs=3
+install: bundle install --path=vendor/bundle --retry=3
 
 before_install:
   - gem install bundler

data/Rakefile

@@ -54,7 +54,13 @@ def run_benchmarks(files, items_count: 7_000)
 
     lines = run_process "ITEMS_COUNT=#{items_count} RAILS_ENV=production ruby #{benchmark_file}"
     rows = lines.map do |line|
-      row = JSON.parse(line)
+      begin
+        row = JSON.parse(line)
+      rescue JSON::ParserError
+        puts "> Failed parsing json"
+        puts lines.join
+        exit
+      end
       row.values
     end
 

data/benchmarks/bm_serialization_descriptor.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 require_relative "./benchmarking_support"
-require "rails"
 require "active_support"
 
 require "panko_serializer"

data/benchmarks/type_casts/bm_active_record.rb

@@ -70,7 +70,6 @@ ar_type_convert ActiveRecord::Type::String, 1, "1"
 ar_type_convert ActiveRecord::Type::Text, 1, "1"
 ar_type_convert ActiveRecord::Type::Integer, "1", 1
 ar_type_convert ActiveRecord::Type::Float, "1.23", 1.23
-ar_type_convert ActiveRecord::Type::Float, "Infinity", 0.0
 ar_type_convert ActiveRecord::Type::Boolean, "true", true
 ar_type_convert ActiveRecord::Type::Boolean, "t", true
 

data/benchmarks/type_casts/bm_panko.rb

@@ -49,7 +49,6 @@ panko_type_convert ActiveRecord::Type::String, 1, "1"
 panko_type_convert ActiveRecord::Type::Text, 1, "1"
 panko_type_convert ActiveRecord::Type::Integer, "1", 1
 panko_type_convert ActiveRecord::Type::Float, "1.23", 1.23
-panko_type_convert ActiveRecord::Type::Float, "Infinity", ::Float::INFINITY
 panko_type_convert ActiveRecord::Type::Boolean, "true", true
 panko_type_convert ActiveRecord::Type::Boolean, "t", true
 

data/ext/panko_serializer/attributes_writer/active_record.h

@@ -3,9 +3,9 @@
 #include <ruby.h>
 #include <stdbool.h>
 
+#include "common.h"
 #include "serialization_descriptor/attribute.h"
 #include "type_cast/type_cast.h"
-#include "common.h"
 
 extern VALUE active_record_attributes_writer(VALUE object,
                                              VALUE attributes,

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

@@ -25,22 +25,38 @@ VALUE is_iso8601_time_string(const char* value) {
   return r >= 0 ? Qtrue : Qfalse;
 }
 
-void append_region(const char* source,
-                   char** to,
-                   const OnigRegion* region,
-                   int region_number) {
+void append_region_str(const char* source,
+                       char** to,
+                       int regionBegin,
+                       int regionEnd) {
   long iter = 0;
-  long regionEnd = region->end[region_number];
-  for (iter = region->beg[region_number]; iter < regionEnd; iter++) {
+  for (iter = regionBegin; iter < regionEnd; iter++) {
     *(*to)++ = source[iter];
   }
 }
 
-VALUE iso_ar_iso_datetime_string(const char* value) {
+bool is_iso_ar_iso_datetime_string_fast_case(const char* value) {
+  return (
+      // year
+      isdigit(value[0]) && isdigit(value[1]) && isdigit(value[2]) &&
+      isdigit(value[3]) && value[4] == '-' &&
+      // month
+      isdigit(value[5]) && isdigit(value[6]) && value[7] == '-' &&
+      // mday
+      isdigit(value[8]) && isdigit(value[9]) && value[10] == ' ' &&
+
+      // hour
+      isdigit(value[11]) && isdigit(value[12]) && value[13] == ':' &&
+      // minute
+      isdigit(value[14]) && isdigit(value[15]) && value[16] == ':' &&
+      // seconds
+      isdigit(value[17]) && isdigit(value[18]));
+}
+
+bool is_iso_ar_iso_datetime_string_slow_case(const char* value) {
   const UChar *start, *range, *end;
   OnigPosition r;
   OnigRegion* region = onig_region_new();
-  volatile VALUE output;
 
   const UChar* str = (const UChar*)(value);
 
@@ -50,34 +66,42 @@ VALUE iso_ar_iso_datetime_string(const char* value) {
   r = onig_search(ar_iso_datetime_regex, str, end, start, range, region,
                   ONIG_OPTION_NONE);
 
-  output = Qnil;
-  if (r >= 0) {
+  onig_region_free(region, 1);
+
+  return (r >= 0);
+}
+
+VALUE iso_ar_iso_datetime_string(const char* value) {
+  if (is_iso_ar_iso_datetime_string_fast_case(value) == true ||
+      is_iso_ar_iso_datetime_string_slow_case(value) == true) {
+    volatile VALUE output;
+
     char buf[21] = "";
     char* cur = buf;
 
-    append_region(value, &cur, region, YEAR_REGION);
+    append_region_str(value, &cur, 0, 4);
     *cur++ = '-';
 
-    append_region(value, &cur, region, MONTH_REGION);
+    append_region_str(value, &cur, 5, 7);
     *cur++ = '-';
 
-    append_region(value, &cur, region, DAY_REGION);
+    append_region_str(value, &cur, 8, 10);
     *cur++ = 'T';
 
-    append_region(value, &cur, region, HOUR_REGION);
+    append_region_str(value, &cur, 11, 13);
     *cur++ = ':';
 
-    append_region(value, &cur, region, MINUTE_REGION);
+    append_region_str(value, &cur, 14, 16);
     *cur++ = ':';
 
-    append_region(value, &cur, region, SECOND_REGION);
+    append_region_str(value, &cur, 17, 19);
     *cur++ = 'Z';
 
     output = rb_str_new(buf, cur - buf);
+    return output;
   }
 
-  onig_region_free(region, 1);
-  return output;
+  return Qnil;
 }
 
 void build_regex(OnigRegex* reg, const UChar* pattern) {

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

@@ -1,7 +1,9 @@
 #pragma once
 
+#include <ctype.h>
 #include <ruby.h>
 #include <ruby/oniguruma.h>
+#include <stdbool.h>
 
 VALUE is_iso8601_time_string(const char* value);
 VALUE iso_ar_iso_datetime_string(const char* value);

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

@@ -243,8 +243,8 @@ VALUE cast_boolean_type(VALUE value) {
     return Qnil;
   }
 
-  if(RB_TYPE_P(value, T_STRING)) {
-    if(RSTRING_LEN(value) == 0) {
+  if (RB_TYPE_P(value, T_STRING)) {
+    if (RSTRING_LEN(value) == 0) {
       return Qnil;
     }
 
@@ -262,7 +262,7 @@ VALUE cast_boolean_type(VALUE value) {
     return value == INT2NUM(1) ? Qtrue : Qfalse;
   }
 
-  return Qnil;
+  return Qundef;
 }
 
 bool is_date_time_type(VALUE type_klass) {

data/ext/panko_serializer/attributes_writer/writer.h

@@ -2,8 +2,8 @@
 
 #include <ruby.h>
 
-#include "common.h"
 #include "active_record.h"
+#include "common.h"
 #include "plain.h"
 
 enum ObjectType { Unknown = 0, ActiveRecord = 1, Plain = 2 };

data/ext/panko_serializer/panko_serializer.h

@@ -1,9 +1,9 @@
 #include <ruby.h>
 
 #include "attributes_writer/writer.h"
-#include "serialization_descriptor/serialization_descriptor.h"
 #include "serialization_descriptor/association.h"
 #include "serialization_descriptor/attribute.h"
+#include "serialization_descriptor/serialization_descriptor.h"
 
 VALUE serialize_subject(VALUE key,
                         VALUE subject,

data/ext/panko_serializer/serialization_descriptor/serialization_descriptor.c

@@ -6,7 +6,6 @@ static ID context_id;
 static ID scope_id;
 static ID object_id;
 
-
 static void sd_free(SerializationDescriptor sd) {
   if (!sd) {
     return;
@@ -59,7 +58,6 @@ SerializationDescriptor sd_read(VALUE descriptor) {
   return (SerializationDescriptor)DATA_PTR(descriptor);
 }
 
-
 void sd_set_writer(SerializationDescriptor sd, VALUE subject) {
   if (sd->attributes_writer.object_type != Unknown) {
     return;
@@ -90,7 +88,9 @@ VALUE sd_serializer_ref(VALUE self) {
   return sd->serializer;
 }
 
-void sd_apply_serializer_config(SerializationDescriptor descriptor, VALUE serializer, VALUE object) {
+void sd_apply_serializer_config(SerializationDescriptor descriptor,
+                                VALUE serializer,
+                                VALUE object) {
   rb_ivar_set(serializer, object_id, object);
   if (descriptor->context != Qnil && descriptor->context != Qundef) {
     rb_ivar_set(serializer, context_id, descriptor->context);
@@ -99,7 +99,6 @@ void sd_apply_serializer_config(SerializationDescriptor descriptor, VALUE serial
   if (descriptor->scope != Qnil && descriptor->scope != Qundef) {
     rb_ivar_set(serializer, scope_id, descriptor->scope);
   }
-
 }
 VALUE sd_attributes_set(VALUE self, VALUE attributes) {
   SerializationDescriptor sd = (SerializationDescriptor)DATA_PTR(self);

data/ext/panko_serializer/serialization_descriptor/serialization_descriptor.h

@@ -28,7 +28,9 @@ SerializationDescriptor sd_read(VALUE descriptor);
 void sd_mark(SerializationDescriptor data);
 
 VALUE sd_build_serializer(SerializationDescriptor descriptor);
-void sd_apply_serializer_config(SerializationDescriptor descriptor, VALUE serializer, VALUE object);
+void sd_apply_serializer_config(SerializationDescriptor descriptor,
+                                VALUE serializer,
+                                VALUE object);
 void sd_set_writer(SerializationDescriptor sd, VALUE subject);
 
 void panko_init_serialization_descriptor(VALUE mPanko);

data/lib/panko/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Panko
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: panko_serializer
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Yosi Attias
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-02 00:00:00.000000000 Z
+date: 2018-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj