panko_serializer 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 191ab315beed684a1a584eccdcfb500521e5f3b5
-  data.tar.gz: bdc4bf8c0bdc1e66b09a0221d640ec033b21463c
+  metadata.gz: ae00bf37cb1dcce9c00df00c32e4f23bdba6081c
+  data.tar.gz: '08e3f85bd87fe2a6c94b4210d53c605c5f5c2f53'
 SHA512:
-  metadata.gz: 1075d2458fc18945ece197e3c1b45ed19d7c37cfcad48beed72ee38d0b147b1a338b756ddce9a740d24681192a3a7159953daee5816d182678921d5c818b72ca
-  data.tar.gz: 278b97815ce09041391744fd01c385e92b0b8bcc54edeecc1250a7f9cc459f19fe5df0d43d77e955e5b6d717677fd81ee67baaa2c5dc87da4b68551da28b921e
+  metadata.gz: 158ff5e032d418ae77b9758e9b84429029738c8cc09f40b3ac8d01c29490a1824e9785df97b066fd0bec83f9b2e17728a29680cf90966e0f3908d954e60990e7
+  data.tar.gz: 25d8c763c866c2987ad320a72c3a1d9ec93f10a82f6d909d1fe549479262211752c8e79bf70eb2626fba39554482262663b5b5c6c435ae5f2cbe7860dfc63a28

data/benchmarks/benchmarking_support.rb

@@ -4,14 +4,14 @@ require "json"
 require "memory_profiler"
 
 module Benchmark
-  module ActiveModelSerializers
+  module Runner
     def data
       posts = Post.all.includes(:author).to_a
       posts_50 = posts.first(50).to_a
       { all: posts, small: posts_50 }
     end
 
-    def ams(label = nil, time: 10, disable_gc: true, warmup: 3, &block)
+    def run(label = nil, time: 10, disable_gc: true, warmup: 3, &block)
       fail ArgumentError.new, "block should be passed" unless block_given?
 
       GC.start
@@ -39,5 +39,5 @@ module Benchmark
     end
   end
 
-  extend Benchmark::ActiveModelSerializers
+  extend Benchmark::Runner
 end

data/benchmarks/bm_active_model_serializers.rb

@@ -25,7 +25,7 @@ def benchmark_ams(prefix, serializer, options = {})
   posts_50 = data[:small]
 
 
-  Benchmark.ams("AMS_#{prefix}_Posts_#{posts.count}") do
+  Benchmark.run("AMS_#{prefix}_Posts_#{posts.count}") do
     ActiveModel::ArraySerializer.new(posts, merged_options).serializable_object
   end
 
@@ -33,7 +33,7 @@ def benchmark_ams(prefix, serializer, options = {})
   posts = data[:all]
   posts_50 = data[:small]
 
-  Benchmark.ams("AMS_#{prefix}_Posts_50") do
+  Benchmark.run("AMS_#{prefix}_Posts_50") do
     ActiveModel::ArraySerializer.new(posts_50, merged_options).serializable_object
   end
 end

data/benchmarks/bm_controller.rb

@@ -75,7 +75,7 @@ def request(method, path)
 end
 
 
-Benchmark.ams("text") { request(:get, "/text") }
-Benchmark.ams("simple") { request(:get, "/simple") }
+Benchmark.run("text") { request(:get, "/text") }
+Benchmark.run("simple") { request(:get, "/simple") }
 
-Benchmark.ams("serialize_to_string") { request(:get, "/serialize_to_string") }
+Benchmark.run("serialize_to_string") { request(:get, "/serialize_to_string") }

data/benchmarks/bm_panko_json.rb

@@ -40,7 +40,7 @@ def benchmark(prefix, serializer, options = {})
 
   merged_options = options.merge(each_serializer: serializer)
 
-  Benchmark.ams("Panko_#{prefix}_Posts_#{posts.count}") do
+  Benchmark.run("Panko_#{prefix}_Posts_#{posts.count}") do
     Panko::ArraySerializer.new(posts, merged_options).to_json
   end
 
@@ -48,7 +48,7 @@ def benchmark(prefix, serializer, options = {})
   posts = data[:all]
   posts_50 = data[:small]
 
-  Benchmark.ams("Panko_#{prefix}_Posts_50") do
+  Benchmark.run("Panko_#{prefix}_Posts_50") do
     Panko::ArraySerializer.new(posts_50, merged_options).to_json
   end
 end

data/benchmarks/bm_panko_object.rb

@@ -32,7 +32,7 @@ def benchmark(prefix, serializer, options = {})
 
   merged_options = options.merge(each_serializer: serializer)
 
-  Benchmark.ams("Panko_#{prefix}_Posts_#{posts.count}") do
+  Benchmark.run("Panko_#{prefix}_Posts_#{posts.count}") do
     Panko::ArraySerializer.new(posts, merged_options).to_a
   end
 
@@ -40,7 +40,7 @@ def benchmark(prefix, serializer, options = {})
   posts = data[:all]
   posts_50 = data[:small]
 
-  Benchmark.ams("Panko_#{prefix}_Posts_50") do
+  Benchmark.run("Panko_#{prefix}_Posts_50") do
     Panko::ArraySerializer.new(posts_50, merged_options).to_a
   end
 
@@ -50,7 +50,7 @@ def benchmark(prefix, serializer, options = {})
   posts = data[:all]
   posts_50 = data[:small]
 
-  Benchmark.ams("Panko_Reused_#{prefix}_Posts_#{posts.count}") do
+  Benchmark.run("Panko_Reused_#{prefix}_Posts_#{posts.count}") do
     posts_array_serializer.serialize posts
   end
 
@@ -58,7 +58,7 @@ def benchmark(prefix, serializer, options = {})
   posts = data[:all]
   posts_50 = data[:small]
 
-  Benchmark.ams("Panko_Reused_#{prefix}_Posts_50") do
+  Benchmark.run("Panko_Reused_#{prefix}_Posts_50") do
     posts_array_serializer.serialize posts_50
   end
 end

data/benchmarks/sanity.rb

@@ -40,7 +40,7 @@ def benchmark(prefix, serializer, options = {})
 
   merged_options = options.merge(each_serializer: serializer)
 
-  Benchmark.ams("Panko_#{prefix}_Posts_#{posts.count}") do
+  Benchmark.run("Panko_#{prefix}_Posts_#{posts.count}") do
     Panko::ArraySerializer.new(posts, merged_options).to_json
   end
 
@@ -48,20 +48,14 @@ def benchmark(prefix, serializer, options = {})
   posts = data[:all]
   posts_50 = data[:small]
 
-  Benchmark.ams("Panko_#{prefix}_Posts_50") do
+  Benchmark.run("Panko_#{prefix}_Posts_50") do
     Panko::ArraySerializer.new(posts_50, merged_options).to_json
   end
 end
 
-#puts "Waiting .. #{Process.pid}"
-#gets.chomp
 
-#puts "Starting!"
+
 
 benchmark 'SimpleWithMethodCall', PostFastWithMethodCallSerializer
 benchmark "HasOne", PostWithHasOneFastSerializer
 benchmark "Simple", PostFastSerializer
-
-# benchmark 'SimpleWithMethodCall', PostFastWithMethodCallSerializer
-# benchmark 'Except', PostWithHasOneFastSerializer, except: [:title]
-# benchmark 'Include', PostWithHasOneFastSerializer, include: [:id, :body, :author_id, :author]

data/benchmarks/type_casts/bm_active_record.rb

@@ -5,11 +5,11 @@ def ar_type_convert(type_klass, from, to)
   converter = type_klass.new
   assert type_klass.name, converter.type_cast_from_database(from), to
 
-  Benchmark.ams("#{type_klass.name}_TypeCast") do
+  Benchmark.run("#{type_klass.name}_TypeCast") do
     converter.type_cast_from_database(from)
   end
 
-  Benchmark.ams("#{type_klass.name}_NoTypeCast") do
+  Benchmark.run("#{type_klass.name}_NoTypeCast") do
     converter.type_cast_from_database(to)
   end
 end
@@ -22,7 +22,7 @@ def utc_ar_time
   type = ActiveRecord::ConnectionAdapters::PostgreSQL::OID::DateTime.new
   converter = ActiveRecord::AttributeMethods::TimeZoneConversion::TimeZoneConverter.new(type)
 
-  Benchmark.ams("#{tz}_#{type.class.name}_TypeCast") do
+  Benchmark.run("#{tz}_#{type.class.name}_TypeCast") do
     converter.type_cast_from_database(from).iso8601
   end
 end
@@ -35,7 +35,7 @@ def db_ar_time
 
   from = "2017-07-10 09:26:40.937392"
 
-  Benchmark.ams("ActiveRecord_Time_TypeCast_WithISO8601") do
+  Benchmark.run("ActiveRecord_Time_TypeCast_WithISO8601") do
     converter.type_cast_from_database(from).iso8601
   end
 end

data/benchmarks/type_casts/bm_panko.rb

@@ -5,11 +5,11 @@ def panko_type_convert(type_klass, from, to)
   converter = type_klass.new
   assert "#{type_klass.name}", Panko::_type_cast(converter, from), to
 
-  Benchmark.ams("#{type_klass.name}_TypeCast") do
+  Benchmark.run("#{type_klass.name}_TypeCast") do
     Panko::_type_cast(converter, from)
   end
 
-  Benchmark.ams("#{type_klass.name}_NoTypeCast") do
+  Benchmark.run("#{type_klass.name}_NoTypeCast") do
     Panko::_type_cast(converter, to)
   end
 end
@@ -25,11 +25,11 @@ def utc_panko_time
 
   to = Panko::_type_cast(converter, from)
 
-  Benchmark.ams("#{tz}_#{type.class.name}_TypeCast") do
+  Benchmark.run("#{tz}_#{type.class.name}_TypeCast") do
     Panko::_type_cast(converter, from)
   end
 
-  Benchmark.ams("#{tz}_#{type.class.name}_NoTypeCast") do
+  Benchmark.run("#{tz}_#{type.class.name}_NoTypeCast") do
     Panko::_type_cast(converter, to)
   end
 end
@@ -40,7 +40,7 @@ def db_panko_time
 
   from = "2017-07-10 09:26:40.937392"
 
-  Benchmark.ams("Panko_Time_TypeCast") do
+  Benchmark.run("Panko_Time_TypeCast") do
 		Panko::_type_cast(converter, from)
   end
 end

data/ext/panko_serializer/attributes_iterator.c

@@ -2,6 +2,7 @@
 
 static ID attributes_id;
 static ID types_id;
+static ID additional_types_id;
 static ID values_id;
 static ID delegate_hash_id;
 
@@ -30,13 +31,16 @@ VALUE panko_read_lazy_attributes_hash(VALUE object) {
 
 void panko_read_types_and_value(VALUE attributes_hash,
                                 VALUE* types,
+                                VALUE* additional_types,
                                 VALUE* values) {
   *types = rb_ivar_get(attributes_hash, types_id);
+  *additional_types = rb_ivar_get(attributes_hash, additional_types_id);
   *values = rb_ivar_get(attributes_hash, values_id);
 }
 
 VALUE panko_each_attribute(VALUE obj,
                            VALUE attributes,
+                           VALUE aliases,
                            EachAttributeFunc func,
                            VALUE context) {
   volatile VALUE attributes_hash, delegate_hash;
@@ -50,11 +54,16 @@ VALUE panko_each_attribute(VALUE obj,
   delegate_hash = rb_ivar_get(attributes_hash, delegate_hash_id);
   bool tryToReadFromDelegateHash = RHASH_SIZE(delegate_hash) > 0;
 
-  VALUE types, values;
-  panko_read_types_and_value(attributes_hash, &types, &values);
+  VALUE types, additional_types, values;
+  panko_read_types_and_value(attributes_hash, &types, &additional_types,
+                             &values);
+  bool tryToReadFromAdditionalTypes = RHASH_SIZE(additional_types) > 0;
+
+  bool tryToReadFromAliases = RHASH_SIZE(aliases) > 0;
 
   for (i = 0; i < RARRAY_LEN(attributes); i++) {
-    volatile VALUE member = rb_sym2str(RARRAY_AREF(attributes, i));
+    volatile VALUE member_raw = RARRAY_AREF(attributes, i);
+    volatile VALUE member = rb_sym2str(member_raw);
 
     volatile VALUE value = Qundef;
     volatile VALUE type_metadata = Qnil;
@@ -72,7 +81,20 @@ VALUE panko_each_attribute(VALUE obj,
 
     if (value == Qundef) {
       value = rb_hash_aref(values, member);
-      type_metadata = rb_hash_aref(types, member);
+
+      if (tryToReadFromAdditionalTypes) {
+        type_metadata = rb_hash_aref(additional_types, member);
+      }
+      if (type_metadata == Qnil) {
+        type_metadata = rb_hash_aref(types, member);
+      }
+    }
+
+    if(tryToReadFromAliases) {
+      volatile VALUE alias_name = rb_hash_aref(aliases, member_raw);
+      if(alias_name != Qnil) {
+        member = rb_sym2str(alias_name);
+      }
     }
 
     func(obj, member, value, type_metadata, context);
@@ -86,6 +108,7 @@ void panko_init_attributes_iterator(VALUE mPanko) {
   delegate_hash_id = rb_intern("@delegate_hash");
   values_id = rb_intern("@values");
   types_id = rb_intern("@types");
+  additional_types_id = rb_intern("@additional_types");
   type_id = rb_intern("@type");
   value_before_type_cast_id = rb_intern("@value_before_type_cast");
 }

data/ext/panko_serializer/attributes_iterator.h

@@ -11,6 +11,7 @@ typedef void (*EachAttributeFunc)(VALUE object,
 
 extern VALUE panko_each_attribute(VALUE object,
                                   VALUE attributes,
+                                  VALUE aliases,
                                   EachAttributeFunc func,
                                   VALUE context);
 

data/ext/panko_serializer/panko_serializer.c

@@ -48,16 +48,16 @@ void panko_attributes_iter(VALUE object,
                            VALUE name,
                            VALUE value,
                            VALUE type_metadata,
-                           VALUE context) {
-  write_value(context, name, value, type_metadata);
+                           VALUE str_writer) {
+  write_value(str_writer, name, value, type_metadata);
 }
 
 void serialize_fields(VALUE subject,
                       VALUE str_writer,
                       SerializationDescriptor descriptor,
                       VALUE context) {
-  panko_each_attribute(subject, descriptor->fields, panko_attributes_iter,
-                       str_writer);
+  panko_each_attribute(subject, descriptor->fields, descriptor->aliases,
+                       panko_attributes_iter, str_writer);
 
   serialize_method_fields(subject, str_writer, descriptor, context);
 }

data/ext/panko_serializer/serialization_descriptor.c

@@ -18,6 +18,7 @@ static void serialization_descriptor_free(void* ptr) {
   sd->method_fields = Qnil;
   sd->has_one_associations = Qnil;
   sd->has_many_associations = Qnil;
+  sd->aliases = Qnil;
 }
 
 void serialization_descriptor_mark(SerializationDescriptor data) {
@@ -27,6 +28,7 @@ void serialization_descriptor_mark(SerializationDescriptor data) {
   rb_gc_mark(data->method_fields);
   rb_gc_mark(data->has_one_associations);
   rb_gc_mark(data->has_many_associations);
+  rb_gc_mark(data->aliases);
 }
 
 static VALUE serialization_descriptor_new(int argc, VALUE* argv, VALUE self) {
@@ -38,6 +40,7 @@ static VALUE serialization_descriptor_new(int argc, VALUE* argv, VALUE self) {
   sd->method_fields = Qnil;
   sd->has_one_associations = Qnil;
   sd->has_many_associations = Qnil;
+  sd->aliases = Qnil;
 
   return Data_Wrap_Struct(cSerializationDescriptor,
                           serialization_descriptor_mark,
@@ -126,6 +129,17 @@ VALUE serialization_descriptor_type_aref(VALUE self, VALUE type) {
   return sd->serializer_type;
 }
 
+VALUE serialization_descriptor_aliases_set(VALUE self, VALUE aliases) {
+  SerializationDescriptor sd = (SerializationDescriptor)DATA_PTR(self);
+  sd->aliases = aliases;
+  return Qnil;
+}
+
+VALUE serialization_descriptor_aliases_aref(VALUE self, VALUE aliases) {
+  SerializationDescriptor sd = (SerializationDescriptor)DATA_PTR(self);
+  return sd->aliases;
+}
+
 // Exposing this for testing
 VALUE serialization_descriptor_build_serializer(VALUE self) {
   SerializationDescriptor sd = (SerializationDescriptor)DATA_PTR(self);
@@ -165,8 +179,13 @@ void panko_init_serialization_descriptor(VALUE mPanko) {
 
   rb_define_method(cSerializationDescriptor,
                    "type=", serialization_descriptor_type_set, 1);
+  rb_define_method(cSerializationDescriptor, "type",
+                   serialization_descriptor_type_aref, 0);
+
   rb_define_method(cSerializationDescriptor,
-                   "type", serialization_descriptor_type_aref, 0);
+                   "aliases=", serialization_descriptor_aliases_set, 1);
+  rb_define_method(cSerializationDescriptor, "aliases",
+                   serialization_descriptor_aliases_aref, 0);
 
   rb_define_method(cSerializationDescriptor, "build_serializer",
                    serialization_descriptor_build_serializer, 0);

data/ext/panko_serializer/serialization_descriptor.h

@@ -12,6 +12,7 @@ typedef struct _SerializationDescriptor {
   // Metadata
   VALUE fields;
   VALUE method_fields;
+  VALUE aliases;
   VALUE has_one_associations;
   VALUE has_many_associations;
 } * SerializationDescriptor;

data/lib/panko/serialization_descriptor.rb

@@ -26,6 +26,8 @@ module Panko
       backend.has_many_associations = descriptor.has_many_associations
       backend.has_one_associations = descriptor.has_one_associations
 
+      backend.aliases = descriptor.aliases
+
       backend
     end
 
@@ -108,10 +110,5 @@ module Panko
 
       fields
     end
-
-
-    def self.resolve_serializer(serializer)
-      Object.const_get(serializer.name)
-    end
   end
 end

data/lib/panko/serializer.rb

@@ -9,6 +9,7 @@ module Panko
         base._descriptor = Panko::SerializationDescriptor.new
         base._descriptor.type = base
 
+        base._descriptor.aliases = {}
         base._descriptor.fields = []
         base._descriptor.method_fields = []
         base._descriptor.has_many_associations = []
@@ -21,6 +22,11 @@ module Panko
         @_descriptor.fields.push(*attrs).uniq!
       end
 
+      def aliases(aliases = {})
+        @_descriptor.aliases = aliases
+        attributes(*aliases.keys)
+      end
+
       def method_added(method)
         return if @_descriptor.nil?
         @_descriptor.fields.delete(method)
@@ -28,7 +34,7 @@ module Panko
       end
 
       def has_one(name, options)
-        serializer_const = Panko::SerializationDescriptor.resolve_serializer(options[:serializer])
+        serializer_const = options[:serializer]
 
         @_descriptor.has_one_associations << [
           name,
@@ -37,7 +43,7 @@ module Panko
       end
 
       def has_many(name, options)
-        serializer_const = Panko::SerializationDescriptor.resolve_serializer(options[:serializer])
+        serializer_const = options[:serializer] || options[:each_serializer]
 
         @_descriptor.has_many_associations << [
           name,

data/lib/panko/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: panko_serializer
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Yosi Attias
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-17 00:00:00.000000000 Z
+date: 2017-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -110,7 +110,6 @@ files:
 - benchmarks/setup.rb
 - benchmarks/type_casts/bm_active_record.rb
 - benchmarks/type_casts/bm_panko.rb
-- benchmarks/type_casts/bm_pg.rb
 - benchmarks/type_casts/support.rb
 - ext/panko_serializer/attributes_iterator.c
 - ext/panko_serializer/attributes_iterator.h

data/benchmarks/type_casts/bm_pg.rb

@@ -1,35 +0,0 @@
-# frozen_string_literal: true
-require_relative "./support"
-
-def pg_type_convert(type_klass, from, to)
-  converter = type_klass.new
-  assert type_klass.name, converter.decode(from), to
-
-  Benchmark.ams("#{type_klass.name}_TypeCast") do
-    converter.decode(from)
-  end
-end
-
-def pg_time
-  decoder = PG::TextDecoder::TimestampWithoutTimeZone.new
-
-  from = "2017-07-10 09:26:40.937392"
-
-  Benchmark.ams("#{decoder.class.name}_TypeCast") do
-    decoder.decode(from)
-  end
-
-  Benchmark.ams("#{decoder.class.name}_TypeCast_InTimeZone") do
-    decoder.decode(from).in_time_zone
-  end
-end
-
-
-
-
-pg_type_convert PG::TextDecoder::Integer, "1", 1
-pg_type_convert PG::TextDecoder::Float, "1.23", 1.23
-pg_type_convert PG::TextDecoder::Float, "Infinity", ::Float::INFINITY
-pg_type_convert PG::TextDecoder::Float, "-Infinity", ::Float::INFINITY
-pg_type_convert PG::TextDecoder::Float, "NaN", ::Float::NaN
-pg_time