panko_serializer 0.1.10 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21cd55b904edc40658adf9f43695d89e8962b2c5
-  data.tar.gz: 664554f19ac39bca5e995e3fce1d50d2293e7ae2
+  metadata.gz: f657c0585ef9811fe8d9fcf0e2d1556869823b72
+  data.tar.gz: 9e4cc917aabb38d3b803e0978fc312b5fe5696da
 SHA512:
-  metadata.gz: e4a4c7bd6d5e437ed52bb617dfa36b4970cd2274952df2870858f470bec00db243dd9fe1fd1b8bb163f42d51463ba41dce68f7a5d52a80803f0aa9d4dd0f9177
-  data.tar.gz: d047bfc815bd8e092f0dceee0e2815a38e04d082157cf4fb873215e61a0f80a17e82ef793ce0665b22707da65779048bd6f0f66e6c465d82754b8d8890725303
+  metadata.gz: bd44b3774e47cbd74a400c53040f41bc9edb7f58c1dc63a1e7c530827b2c878948bdfebe6c0250c59ea5af122ef281113f09402fd282e4f16aff5d883ca5df8f
+  data.tar.gz: 3da4b8644375ed05481a7d9e00e27082ee5274eea06a60282395abe5aab06b90f0c17d4b525bcc4c44c08a5e48108f6cc725e9c6a6e85ee40c6c70b4f21e9102

data/.gitignore

@@ -7,6 +7,7 @@
 /pkg/
 /spec/reports/
 /tmp/
+/vendor/bundle/
 
 # rspec failure tracking
 .rspec_status

data/.travis.yml

@@ -2,7 +2,13 @@ sudo: false
 cache: bundler
 language: ruby
 rvm:
-  - 2.4.1
-  - ruby-head
+  - 2.4.2
+install: bundle install --path=vendor/bundle --retry=3 --jobs=3
 before_install: gem install bundler
 after_success: bundle exec rake benchmarks
+
+env:
+  matrix:
+  - "RAILS_VERSION=4.2"
+  - "RAILS_VERSION=5.0"
+  - "RAILS_VERSION=5.1"

data/Gemfile

@@ -3,15 +3,14 @@ source "https://rubygems.org"
 
 gemspec
 
-version = "4.2"
-gem_version = "~> #{version}.9"
-
-gem "rails", gem_version
-gem "railties", gem_version
-gem "activesupport", gem_version
-gem "activemodel", gem_version
-gem "actionpack", gem_version
-gem "activerecord", gem_version, group: :test
+rails_version = "~> #{ENV.fetch("RAILS_VERSION", "4.2")}"
+
+gem "rails", rails_version
+gem "railties", rails_version
+gem "activesupport", rails_version
+gem "activemodel", rails_version
+gem "actionpack", rails_version
+gem "activerecord", rails_version, group: :test
 
 group :benchmarks do
   gem "sqlite3"

data/benchmarks/type_casts/bm_active_record.rb

@@ -3,14 +3,27 @@ require_relative "./support"
 
 def ar_type_convert(type_klass, from, to)
   converter = type_klass.new
-  assert type_klass.name, converter.type_cast_from_database(from), to
 
-  Benchmark.run("#{type_klass.name}_TypeCast") do
-    converter.type_cast_from_database(from)
-  end
+  if ENV["RAILS_VERSION"].start_with? "4.2"
+    assert type_klass.name, converter.type_cast_from_database(from), to
+
+    Benchmark.run("#{type_klass.name}_TypeCast") do
+      converter.type_cast_from_database(from)
+    end
+
+    Benchmark.run("#{type_klass.name}_NoTypeCast") do
+      converter.type_cast_from_database(to)
+    end
+  else
+    assert type_klass.name, converter.deserialize(from), to
 
-  Benchmark.run("#{type_klass.name}_NoTypeCast") do
-    converter.type_cast_from_database(to)
+    Benchmark.run("#{type_klass.name}_TypeCast") do
+      converter.deserialize(from)
+    end
+
+    Benchmark.run("#{type_klass.name}_NoTypeCast") do
+      converter.deserialize(to)
+    end
   end
 end
 
@@ -22,8 +35,14 @@ def utc_ar_time
   type = ActiveRecord::ConnectionAdapters::PostgreSQL::OID::DateTime.new
   converter = ActiveRecord::AttributeMethods::TimeZoneConversion::TimeZoneConverter.new(type)
 
-  Benchmark.run("#{tz}_#{type.class.name}_TypeCast") do
-    converter.type_cast_from_database(from).iso8601
+  if ENV["RAILS_VERSION"].start_with? "4.2"
+    Benchmark.run("#{tz}_#{type.class.name}_TypeCast") do
+      converter.type_cast_from_database(from).iso8601
+    end
+  else
+    Benchmark.run("#{tz}_#{type.class.name}_TypeCast") do
+      converter.deserialize(from).iso8601
+    end
   end
 end
 
@@ -35,8 +54,15 @@ def db_ar_time
 
   from = "2017-07-10 09:26:40.937392"
 
-  Benchmark.run("ActiveRecord_Time_TypeCast_WithISO8601") do
-    converter.type_cast_from_database(from).iso8601
+
+  if ENV["RAILS_VERSION"].start_with? "4.2"
+    Benchmark.run("ActiveRecord_Time_TypeCast_WithISO8601") do
+      converter.type_cast_from_database(from).iso8601
+    end
+  else
+    Benchmark.run("ActiveRecord_Time_TypeCast_WithISO8601") do
+      converter.deserialize(from).iso8601
+    end
   end
 end
 
@@ -48,9 +74,11 @@ 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
 
-ar_type_convert ActiveRecord::ConnectionAdapters::PostgreSQL::OID::Integer, "1", 1
-ar_type_convert ActiveRecord::ConnectionAdapters::PostgreSQL::OID::Float, "1.23", 1.23
-ar_type_convert ActiveRecord::ConnectionAdapters::PostgreSQL::OID::Float, "Infinity", ::Float::INFINITY
+if ENV["RAILS_VERSION"].start_with? "4.2"
+  ar_type_convert ActiveRecord::ConnectionAdapters::PostgreSQL::OID::Integer, "1", 1
+  ar_type_convert ActiveRecord::ConnectionAdapters::PostgreSQL::OID::Float, "1.23", 1.23
+  ar_type_convert ActiveRecord::ConnectionAdapters::PostgreSQL::OID::Float, "Infinity", ::Float::INFINITY
+end
 ar_type_convert ActiveRecord::ConnectionAdapters::PostgreSQL::OID::Json, '{"a":1}', {a:1}
 
 db_ar_time

data/benchmarks/type_casts/bm_panko.rb

@@ -44,6 +44,9 @@ def db_panko_time
 		Panko::_type_cast(converter, from)
   end
 end
+panko_type_convert ActiveRecord::ConnectionAdapters::PostgreSQL::OID::Json, '{"a":1}', {a:1}
+db_panko_time
+utc_panko_time
 
 panko_type_convert ActiveRecord::Type::String, 1, "1"
 panko_type_convert ActiveRecord::Type::Text, 1, "1"
@@ -53,9 +56,11 @@ 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
 
-panko_type_convert ActiveRecord::ConnectionAdapters::PostgreSQL::OID::Integer, "1", 1
-panko_type_convert ActiveRecord::ConnectionAdapters::PostgreSQL::OID::Float, "1.23", 1.23
-panko_type_convert ActiveRecord::ConnectionAdapters::PostgreSQL::OID::Float, "Infinity", ::Float::INFINITY
+if ENV["RAILS_VERSION"].start_with? "4.2"
+  panko_type_convert ActiveRecord::ConnectionAdapters::PostgreSQL::OID::Integer, "1", 1
+  panko_type_convert ActiveRecord::ConnectionAdapters::PostgreSQL::OID::Float, "1.23", 1.23
+  panko_type_convert ActiveRecord::ConnectionAdapters::PostgreSQL::OID::Float, "Infinity", ::Float::INFINITY
+end
 
 panko_type_convert ActiveRecord::ConnectionAdapters::PostgreSQL::OID::Json, '{"a":1}', {a:1}
 db_panko_time

data/ext/panko_serializer/attributes_iterator.c

@@ -14,19 +14,15 @@ VALUE read_attributes(VALUE obj) {
 }
 
 VALUE panko_read_lazy_attributes_hash(VALUE object) {
-  volatile VALUE attributes_set, attributes_hash;
+  volatile VALUE attributes_set, lazy_attributes_hash;
 
   attributes_set = read_attributes(object);
   if (attributes_set == Qnil) {
     return Qnil;
   }
 
-  attributes_hash = read_attributes(attributes_set);
-  if (attributes_hash == Qnil) {
-    return Qnil;
-  }
-
-  return attributes_hash;
+  lazy_attributes_hash = read_attributes(attributes_set);
+  return lazy_attributes_hash;
 }
 
 void panko_read_types_and_value(VALUE attributes_hash,
@@ -38,28 +34,60 @@ void panko_read_types_and_value(VALUE attributes_hash,
   *values = rb_ivar_get(attributes_hash, values_id);
 }
 
+bool panko_is_empty_hash(VALUE hash) {
+  if (hash == Qnil || hash == Qundef) {
+    return true;
+  }
+
+  return RHASH_SIZE(hash) == 0;
+}
+
+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);
+    *type = rb_ivar_get(attribute_metadata, type_id);
+  }
+}
+
 VALUE panko_each_attribute(VALUE obj,
                            VALUE attributes,
                            VALUE aliases,
                            EachAttributeFunc func,
                            VALUE context) {
-  volatile VALUE attributes_hash, delegate_hash;
+  volatile VALUE lazy_attribute_hash, delegate_hash;
+  VALUE values = Qundef;
+  VALUE types = Qundef;
+  VALUE additional_types = Qundef;
   int i;
 
-  attributes_hash = panko_read_lazy_attributes_hash(obj);
-  if (attributes_hash == Qnil) {
+  lazy_attribute_hash = panko_read_lazy_attributes_hash(obj);
+  if (lazy_attribute_hash == Qnil) {
     return Qnil;
   }
 
-  delegate_hash = rb_ivar_get(attributes_hash, delegate_hash_id);
-  bool tryToReadFromDelegateHash = RHASH_SIZE(delegate_hash) > 0;
+  bool tryToReadFromDelegateHash = false;
+  bool tryToReadFromAdditionalTypes = false;
 
-  VALUE types, additional_types, values;
-  panko_read_types_and_value(attributes_hash, &types, &additional_types,
-                             &values);
-  bool tryToReadFromAdditionalTypes = RHASH_SIZE(additional_types) > 0;
+  // If lazy_attribute_hash is not ActiveRecord::LazyAttributeHash
+  // and it's actually hash, read from it
+  if (RB_TYPE_P(lazy_attribute_hash, T_HASH)) {
+    delegate_hash = lazy_attribute_hash;
+    tryToReadFromDelegateHash = true;
+  } else {
+    delegate_hash = rb_ivar_get(lazy_attribute_hash, delegate_hash_id);
+    tryToReadFromDelegateHash = !panko_is_empty_hash(delegate_hash);
 
-  bool tryToReadFromAliases = RHASH_SIZE(aliases) > 0;
+    panko_read_types_and_value(lazy_attribute_hash, &types, &additional_types,
+                               &values);
+
+    tryToReadFromAdditionalTypes = !panko_is_empty_hash(additional_types);
+  }
+
+  bool tryToReadFromAliases = !panko_is_empty_hash(aliases);
 
   for (i = 0; i < RARRAY_LEN(attributes); i++) {
     volatile VALUE member_raw = RARRAY_AREF(attributes, i);
@@ -72,14 +100,10 @@ VALUE panko_each_attribute(VALUE obj,
     // If the object was create in memory `User.new(name: "Yosi")`
     // it won't exist in types/values
     if (tryToReadFromDelegateHash) {
-      volatile VALUE attribute_metadata = rb_hash_aref(delegate_hash, member);
-      if (attribute_metadata != Qnil) {
-        value = rb_ivar_get(attribute_metadata, value_before_type_cast_id);
-        type_metadata = rb_ivar_get(attribute_metadata, type_id);
-      }
+      read_attribute_from_hash(delegate_hash, member, &value, &type_metadata);
     }
 
-    if (value == Qundef) {
+    if (values != Qundef && value == Qundef) {
       value = rb_hash_aref(values, member);
 
       if (tryToReadFromAdditionalTypes) {
@@ -90,9 +114,9 @@ VALUE panko_each_attribute(VALUE obj,
       }
     }
 
-    if(tryToReadFromAliases) {
+    if (tryToReadFromAliases) {
       volatile VALUE alias_name = rb_hash_aref(aliases, member_raw);
-      if(alias_name != Qnil) {
+      if (alias_name != Qnil) {
         member = rb_sym2str(alias_name);
       }
     }

data/ext/panko_serializer/type_cast.c

@@ -1,7 +1,7 @@
 #include "type_cast.h"
 #include "time_conversion.h"
 
-ID type_cast_from_database_id = 0;
+ID deserialize_from_db_id = 0;
 ID to_s_id = 0;
 ID to_i_id = 0;
 
@@ -79,7 +79,7 @@ void cache_type_lookup() {
 
   initiailized = 1;
 
-  VALUE ar, ar_type;
+  VALUE ar, ar_type, ar_type_methods;
 
   ar = rb_const_get_at(rb_cObject, rb_intern("ActiveRecord"));
 
@@ -93,6 +93,13 @@ void cache_type_lookup() {
   ar_boolean_type = rb_const_get_at(ar_type, rb_intern("Boolean"));
   ar_date_time_type = rb_const_get_at(ar_type, rb_intern("DateTime"));
 
+  ar_type_methods = rb_class_instance_methods(0, NULL, ar_string_type);
+  if(rb_ary_includes(ar_type_methods, rb_to_symbol(rb_str_new_cstr("deserialize")))) {
+    deserialize_from_db_id = rb_intern("deserialize");
+  } else {
+    deserialize_from_db_id = rb_intern("type_cast_from_database");
+  }
+
   // TODO: if we get error or not, add this to some debug log
   int isErrored;
   rb_protect(cache_postgres_type_lookup, ar, &isErrored);
@@ -241,7 +248,7 @@ VALUE cast_date_time_type(VALUE value) {
 }
 
 VALUE type_cast(VALUE type_metadata, VALUE value) {
-  if(value == Qnil || value == Qundef) {
+  if (value == Qnil || value == Qundef) {
     return value;
   }
 
@@ -261,7 +268,7 @@ VALUE type_cast(VALUE type_metadata, VALUE value) {
   }
 
   if (typeCastedValue == Qundef) {
-    return rb_funcall(type_metadata, type_cast_from_database_id, 1, value);
+    return rb_funcall(type_metadata, deserialize_from_db_id, 1, value);
   }
 
   return typeCastedValue;
@@ -272,7 +279,6 @@ VALUE public_type_cast(VALUE module, VALUE type_metadata, VALUE value) {
 }
 
 void panko_init_type_cast(VALUE mPanko) {
-  type_cast_from_database_id = rb_intern_const("type_cast_from_database");
   to_s_id = rb_intern_const("to_s");
   to_i_id = rb_intern_const("to_i");
 

data/lib/panko/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: panko_serializer
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.2.0
 platform: ruby
 authors:
 - Yosi Attias
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-14 00:00:00.000000000 Z
+date: 2017-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler