panko_serializer 0.5.9 → 0.5.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63ba1589249e7119add78bbd81491fd03a58cc76e0ad9d78598a2d7e39190421
-  data.tar.gz: 1fff975d250c4c05de70a84e680f41caf7e1bee10f2884bfbbe0504d1137f33a
+  metadata.gz: 7ec2a5cbfc062d6b8e272f038638645e3289b94dc9aa730f2317082d1ff2d9c4
+  data.tar.gz: e2d04c62d3b1fcf2f292170181e3a4f689367af7d3cc53719bbbcfc6a7eea9af
 SHA512:
-  metadata.gz: 8823f02c307fa4baf1346f0ab89e6eb8c2b415b8739a8e5ee0f4d8ceb30b010fa34002958d8197852468736cdb9257435fabcc03ae64c001d000343a58a223dd
-  data.tar.gz: e7eb68e825b8483d203a603ca54ee475ebd08fdbec32633408bab40365f03b90de017374d0a15a96e25476bfc1ff06b322a1042edbe17a2d948811327c44ae61
+  metadata.gz: 80ec461198ad3a7fd1db51a692686b1a90874444a1f6c2c9cde22aef40cf5a79b597804d6ba6aa77b5f7f8e765e5e2dd5b95401b9817b3a8dd5136a1e849fa36
+  data.tar.gz: 7637de2f896f9c6a6b788da226fda929ca28f944eaa1b2b0a4f00f3dd95a771350b6fe0975459502669dadbccc565008708a38263c4baa71f892c95bd8531242

data/.travis.yml

@@ -2,8 +2,9 @@ sudo: false
 cache: bundler
 language: ruby
 rvm:
-  - 2.5.3
-  - 2.6.0
+  - 2.3.8
+  - 2.5.5
+  - 2.6.3
 
 env:
   global:
@@ -25,3 +26,8 @@ env:
   matrix:
   - "RAILS_VERSION=4.2.0"
   - "RAILS_VERSION=5.2.0"
+  - "RAILS_VERSION=6.0.0.beta3"
+
+matrix:
+  allow_failures:
+    - "RAILS_VERSION=6.0.0.beta3"

data/Gemfile

@@ -11,8 +11,13 @@ gem "activemodel", rails_version
 gem "activerecord", rails_version, group: :test
 
 group :benchmarks do
-  gem "sqlite3"
-  gem "pg", "0.21"
+  gem "sqlite3", "~> 1.3.6"
+
+  if raw_rails_version.include? "4.2"
+    gem "pg", "~> 0.15"
+  else
+    gem "pg", ">= 0.18", "< 2.0"
+  end
 
   gem "memory_profiler"
   gem "ruby-prof"

data/README.md

@@ -1,6 +1,6 @@
 # Panko
 
-[![Build Status](https://api.travis-ci.com/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.com/yosiat/panko_serializer)
 
 Panko is library which is inspired by ActiveModelSerializers 0.9 for serializing ActiveRecord/Ruby objects to JSON strings, fast.
 

data/Rakefile

@@ -37,8 +37,7 @@ def run_process(cmd)
         lines << line
       end
     rescue Errno::EIO
-      puts "Errno:EIO error, but this probably just means " +
-            "that the process has finished giving output - #{cmd}"
+      # ignore this
     end
   end
 
@@ -56,12 +55,10 @@ def run_benchmarks(files, items_count: 2_300)
     rows = lines.map do |line|
       begin
         row = JSON.parse(line)
+        row.values
       rescue JSON::ParserError
-        puts "> Failed parsing json"
-        puts lines.join
-        exit
+        puts "> [ERROR] Failed running #{benchmark_file} - #{lines.join}"
       end
-      row.values
     end
 
     puts "\n\n"

data/ext/panko_serializer/attributes_writer/attributes_writer.c

@@ -17,13 +17,13 @@ VALUE init_types(VALUE v) {
   return Qundef;
 }
 
-AttributesWriter create_attributes_writer(VALUE subject) {
+AttributesWriter create_attributes_writer(VALUE object) {
   // If ActiveRecord::Base can't be found it will throw error
   int isErrored;
   rb_protect(init_types, Qnil, &isErrored);
 
   if (ar_base_type != Qundef &&
-      rb_obj_is_kind_of(subject, ar_base_type) == Qtrue) {
+      rb_obj_is_kind_of(object, ar_base_type) == Qtrue) {
     return (AttributesWriter){
         .object_type = ActiveRecord,
         .write_attributes = active_record_attributes_writer};

data/ext/panko_serializer/attributes_writer/attributes_writer.h

@@ -11,16 +11,14 @@ enum ObjectType { Unknown = 0, ActiveRecord = 1, Plain = 2 };
 typedef struct _AttributesWriter {
   enum ObjectType object_type;
 
-  void (*write_attributes)(VALUE object,
-                           VALUE attributes,
-                           EachAttributeFunc func,
-                           VALUE context);
+  void (*write_attributes)(VALUE object, VALUE attributes,
+                           EachAttributeFunc func, VALUE context);
 } AttributesWriter;
 
 /**
- * Infers the attributes writer from the subject type
+ * Infers the attributes writer from the object type
  */
-AttributesWriter create_attributes_writer(VALUE subject);
+AttributesWriter create_attributes_writer(VALUE object);
 
 /**
  * Creates empty writer

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

@@ -74,3 +74,9 @@ static struct _TypeCast type_casts[] = {
 
 extern VALUE type_cast(VALUE type_metadata, VALUE value);
 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))
+#endif
+

data/ext/panko_serializer/panko_serializer.c

@@ -16,7 +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 object, VALUE str_writer,
                              SerializationDescriptor descriptor) {
   if (RARRAY_LEN(descriptor->method_fields) == 0) {
     return;
@@ -28,7 +28,7 @@ void serialize_method_fields(VALUE subject, VALUE str_writer,
   method_fields = descriptor->method_fields;
 
   serializer = descriptor->serializer;
-  rb_ivar_set(serializer, object_id, subject);
+  rb_ivar_set(serializer, object_id, object);
 
   for (i = 0; i < RARRAY_LEN(method_fields); i++) {
     volatile VALUE raw_attribute = RARRAY_AREF(method_fields, i);
@@ -42,65 +42,65 @@ void serialize_method_fields(VALUE subject, VALUE str_writer,
   rb_ivar_set(serializer, object_id, Qnil);
 }
 
-void serialize_fields(VALUE subject, VALUE str_writer,
+void serialize_fields(VALUE object, VALUE str_writer,
                       SerializationDescriptor descriptor) {
-  descriptor->attributes_writer.write_attributes(
-      subject, descriptor->attributes, write_value, str_writer);
+  descriptor->attributes_writer.write_attributes(object, descriptor->attributes,
+                                                 write_value, str_writer);
 
-  serialize_method_fields(subject, str_writer, descriptor);
+  serialize_method_fields(object, str_writer, descriptor);
 }
 
-void serialize_has_one_associations(VALUE subject, VALUE str_writer,
+void serialize_has_one_associations(VALUE object, VALUE str_writer,
                                     VALUE associations) {
   long i;
   for (i = 0; i < RARRAY_LEN(associations); i++) {
     volatile VALUE association_el = RARRAY_AREF(associations, i);
     Association association = association_read(association_el);
 
-    volatile VALUE value = rb_funcall(subject, association->name_id, 0);
+    volatile VALUE value = rb_funcall(object, association->name_id, 0);
 
     if (NIL_P(value)) {
       write_value(str_writer, association->name_str, value);
     } else {
-      serialize_subject(association->name_str, value, str_writer,
-                        association->descriptor);
+      serialize_object(association->name_str, value, str_writer,
+                       association->descriptor);
     }
   }
 }
 
-void serialize_has_many_associations(VALUE subject, VALUE str_writer,
+void serialize_has_many_associations(VALUE object, VALUE str_writer,
                                      VALUE associations) {
   long i;
   for (i = 0; i < RARRAY_LEN(associations); i++) {
     volatile VALUE association_el = RARRAY_AREF(associations, i);
     Association association = association_read(association_el);
 
-    volatile VALUE value = rb_funcall(subject, association->name_id, 0);
+    volatile VALUE value = rb_funcall(object, association->name_id, 0);
 
     if (NIL_P(value)) {
       write_value(str_writer, association->name_str, value);
     } else {
-      serialize_subjects(association->name_str, value, str_writer,
-                         association->descriptor);
+      serialize_objects(association->name_str, value, str_writer,
+                        association->descriptor);
     }
   }
 }
 
-VALUE serialize_subject(VALUE key, VALUE subject, VALUE str_writer,
-                        SerializationDescriptor descriptor) {
-  sd_set_writer(descriptor, subject);
+VALUE serialize_object(VALUE key, VALUE object, VALUE str_writer,
+                       SerializationDescriptor descriptor) {
+  sd_set_writer(descriptor, object);
 
   rb_funcall(str_writer, push_object_id, 1, key);
 
-  serialize_fields(subject, str_writer, descriptor);
+  serialize_fields(object, str_writer, descriptor);
 
   if (RARRAY_LEN(descriptor->has_one_associations) > 0) {
-    serialize_has_one_associations(subject, str_writer,
+    serialize_has_one_associations(object, str_writer,
                                    descriptor->has_one_associations);
   }
 
   if (RARRAY_LEN(descriptor->has_many_associations) > 0) {
-    serialize_has_many_associations(subject, str_writer,
+    serialize_has_many_associations(object, str_writer,
                                     descriptor->has_many_associations);
   }
 
@@ -109,19 +109,19 @@ VALUE serialize_subject(VALUE key, VALUE subject, VALUE str_writer,
   return Qnil;
 }
 
-VALUE serialize_subjects(VALUE key, VALUE subjects, VALUE str_writer,
-                         SerializationDescriptor descriptor) {
+VALUE serialize_objects(VALUE key, VALUE objects, VALUE str_writer,
+                        SerializationDescriptor descriptor) {
   long i;
 
   rb_funcall(str_writer, push_array_id, 1, key);
 
-  if (!RB_TYPE_P(subjects, T_ARRAY)) {
-    subjects = rb_funcall(subjects, to_a_id, 0);
+  if (!RB_TYPE_P(objects, T_ARRAY)) {
+    objects = rb_funcall(objects, to_a_id, 0);
   }
 
-  for (i = 0; i < RARRAY_LEN(subjects); i++) {
-    volatile VALUE subject = RARRAY_AREF(subjects, i);
-    serialize_subject(Qnil, subject, str_writer, descriptor);
+  for (i = 0; i < RARRAY_LEN(objects); i++) {
+    volatile VALUE object = RARRAY_AREF(objects, i);
+    serialize_object(Qnil, object, str_writer, descriptor);
   }
 
   rb_funcall(str_writer, pop_id, 0);
@@ -129,15 +129,15 @@ VALUE serialize_subjects(VALUE key, VALUE subjects, VALUE str_writer,
   return Qnil;
 }
 
-VALUE serialize_subject_api(VALUE klass, VALUE subject, VALUE str_writer,
-                            VALUE descriptor) {
+VALUE serialize_object_api(VALUE klass, VALUE object, VALUE str_writer,
+                           VALUE descriptor) {
   SerializationDescriptor sd = sd_read(descriptor);
-  return serialize_subject(Qnil, subject, str_writer, sd);
+  return serialize_object(Qnil, object, str_writer, sd);
 }
 
-VALUE serialize_subjects_api(VALUE klass, VALUE subjects, VALUE str_writer,
-                             VALUE descriptor) {
-  serialize_subjects(Qnil, subjects, str_writer, sd_read(descriptor));
+VALUE serialize_objects_api(VALUE klass, VALUE objects, VALUE str_writer,
+                            VALUE descriptor) {
+  serialize_objects(Qnil, objects, str_writer, sd_read(descriptor));
 
   return Qnil;
 }
@@ -153,11 +153,11 @@ void Init_panko_serializer() {
 
   VALUE mPanko = rb_define_module("Panko");
 
-  rb_define_singleton_method(mPanko, "serialize_subject", serialize_subject_api,
+  rb_define_singleton_method(mPanko, "serialize_object", serialize_object_api,
                              3);
 
-  rb_define_singleton_method(mPanko, "serialize_subjects",
-                             serialize_subjects_api, 3);
+  rb_define_singleton_method(mPanko, "serialize_objects", serialize_objects_api,
+                             3);
 
   panko_init_serialization_descriptor(mPanko);
   init_attributes_writer(mPanko);

data/ext/panko_serializer/panko_serializer.h

@@ -5,12 +5,8 @@
 #include "serialization_descriptor/attribute.h"
 #include "serialization_descriptor/serialization_descriptor.h"
 
-VALUE serialize_subject(VALUE key,
-                        VALUE subject,
-                        VALUE str_writer,
-                        SerializationDescriptor descriptor);
+VALUE serialize_object(VALUE key, VALUE object, VALUE str_writer,
+                       SerializationDescriptor descriptor);
 
-VALUE serialize_subjects(VALUE key,
-                         VALUE subjects,
-                         VALUE str_writer,
-                         SerializationDescriptor descriptor);
+VALUE serialize_objects(VALUE key, VALUE objects, VALUE str_writer,
+                        SerializationDescriptor descriptor);

data/ext/panko_serializer/serialization_descriptor/serialization_descriptor.c

@@ -50,12 +50,12 @@ SerializationDescriptor sd_read(VALUE descriptor) {
   return (SerializationDescriptor)DATA_PTR(descriptor);
 }
 
-void sd_set_writer(SerializationDescriptor sd, VALUE subject) {
+void sd_set_writer(SerializationDescriptor sd, VALUE object) {
   if (sd->attributes_writer.object_type != Unknown) {
     return;
   }
 
-  sd->attributes_writer = create_attributes_writer(subject);
+  sd->attributes_writer = create_attributes_writer(object);
 }
 
 VALUE sd_serializer_set(VALUE self, VALUE serializer) {

data/ext/panko_serializer/serialization_descriptor/serialization_descriptor.h

@@ -25,6 +25,6 @@ SerializationDescriptor sd_read(VALUE descriptor);
 
 void sd_mark(SerializationDescriptor data);
 
-void sd_set_writer(SerializationDescriptor sd, VALUE subject);
+void sd_set_writer(SerializationDescriptor sd, VALUE object);
 
 void panko_init_serialization_descriptor(VALUE mPanko);

data/lib/panko/array_serializer.rb

@@ -2,10 +2,10 @@
 
 module Panko
   class ArraySerializer
-    attr_accessor :subjects
+    attr_accessor :objects
 
-    def initialize(subjects, options = {})
-      @subjects = subjects
+    def initialize(objects, options = {})
+      @objects = objects
       @each_serializer = options[:each_serializer]
 
       if @each_serializer.nil?
@@ -27,20 +27,20 @@ Please pass valid each_serializer to ArraySerializer, for example:
     end
 
     def to_json
-      serialize_to_json @subjects
+      serialize_to_json @objects
     end
 
-    def serialize(subjects)
-      Oj.load(serialize_to_json(subjects))
+    def serialize(objects)
+      Oj.load(serialize_to_json(objects))
     end
 
     def to_a
-      Oj.load(serialize_to_json(@subjects))
+      Oj.load(serialize_to_json(@objects))
     end
 
-    def serialize_to_json(subjects)
+    def serialize_to_json(objects)
       writer = Oj::StringWriter.new(mode: :rails)
-      Panko.serialize_subjects(subjects.to_a, writer, @descriptor)
+      Panko.serialize_objects(objects.to_a, writer, @descriptor)
       @descriptor.set_serialization_context(nil) unless @serialization_context.is_a?(EmptySerializerContext)
       writer.to_s
     end

data/lib/panko/serializer.rb

@@ -120,7 +120,7 @@ module Panko
 
     def serialize_to_json(object)
       writer = Oj::StringWriter.new(mode: :rails)
-      Panko.serialize_subject(object, writer, @descriptor)
+      Panko.serialize_object(object, writer, @descriptor)
       @descriptor.set_serialization_context(nil) unless @serialization_context.is_a?(EmptySerializerContext)
       writer.to_s
     end

data/lib/panko/version.rb

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

data/panko_serializer.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
     "changelog_uri" => "https://github.com/yosiat/panko_serializer/releases"
   }
 
-  spec.required_ruby_version = ">= 2.0"
+  spec.required_ruby_version = ">= 2.3.7"
 
   spec.files = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: panko_serializer
 version: !ruby/object:Gem::Version
-  version: 0.5.9
+  version: 0.5.10
 platform: ruby
 authors:
 - Yosi Attias
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-05 00:00:00.000000000 Z
+date: 2019-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -113,14 +113,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: 2.3.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: High Performance JSON Serialization for ActiveRecord & Ruby Objects