fast_serializer_ruby 0.6.5 → 0.6.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57d166375199eba26336a76a5fd98fdd3d434c2db20d08857f896137ae8c390a
-  data.tar.gz: 96aba9fff396a567ee408dad54c1485e39449a9258324fe811c62b98bc5fcf7a
+  metadata.gz: f2940f6fcbb0acd2b9606012952b2a49f2a50e2ae1af63ea42d7d31868783204
+  data.tar.gz: dae74a23431c7230147e1285cd3920c25ebb6573a012c13cabdbcc1607293ddc
 SHA512:
-  metadata.gz: e2fbd568da824165230e83774d86a5765592fa03dd494fc9768050db593ce8dba32f257e0542159cdfff9d8756a355c9ca597f5752bd3170baa0092dc9fd1690
-  data.tar.gz: 13f090892e0d9dd7c97517d46512f2af0bedb5e9c0a1d0a4604da80da704c35c7c7b8276e873055ca15d4f20cd847ce9c6e20c8511ada38e39e49bf4a823266b
+  metadata.gz: 208cac4f8ace7a76264b5d5175d290c884f1364978a2c3687ed80cc9bad9ad3d9874701547cd1c95a7a2eaeffe06678b9ed18b2e3069905a6b5a011b8685414e
+  data.tar.gz: 389bce4ee62355324e7aaffcc187f6201305a987fed082f83c339f01d662017f2c2303e0a8399d66193f2167589f7f638f220c859aa10aacfcf7672c4222ea67

data/.github/workflows/ruby.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ['2.3', '2.4', '2.5', '2.6', '2.7', 'jruby']
+        ruby-version: ['2.3', '2.4', '2.5', '2.6', '2.7', '3.0', 'jruby']
 
     steps:
     - uses: actions/checkout@v2

data/Gemfile

@@ -21,8 +21,4 @@ group :test do
   gem 'benchmark-memory'
   gem 'rspec'
   gem 'rspec-benchmark'
-
-  platform :mri do
-    gem 'pry-byebug'
-  end
 end

data/README.md

@@ -1,5 +1,5 @@
 [![Gem Version](https://badge.fury.io/rb/fast_serializer_ruby.svg)](https://badge.fury.io/rb/fast_serializer_ruby)
-[![Build Status](https://travis-ci.org/estepnv/fast_serializer.svg?branch=master)](https://travis-ci.org/estepnv/fast_serializer)
+![Build Status](https://github.com/estepnv/fast_serializer/actions/workflows/ruby.yml/badge.svg)
 [![Maintainability](https://api.codeclimate.com/v1/badges/df7897bec85d376709bd/maintainability)](https://codeclimate.com/github/estepnv/fast_serializer/maintainability)
 [![Test Coverage](https://api.codeclimate.com/v1/badges/df7897bec85d376709bd/test_coverage)](https://codeclimate.com/github/estepnv/fast_serializer/test_coverage)
 

data/lib/fast_serializer/json_model/attribute.rb

@@ -3,7 +3,11 @@
 module FastSerializer
   module JsonModel
     class Attribute < Node
-      attr_accessor :mixin,
+      attr_accessor :key,
+                    :method,
+                    :context,
+                    :opts,
+                    :mixin,
                     :method_name,
                     :method_arity,
                     :cond,
@@ -11,18 +15,25 @@ module FastSerializer
                     :cond_method_name,
                     :injected
 
-      def initialize(*)
-        super
+      def initialize(key, method, opts = {})
+        super()
 
-        @mixin = nil
-        @method_name = nil
+        @opts = opts || {}
+        @injected_methods = Hash.new { |h, method_name| h[method_name] = true }
+        @key = key.to_sym
+        @method = !method ? key : method
+
+        @mixin = Module.new
         @injected = false
-        @cond_method_name = nil
-        @cond = nil
-        @cond = @opts[:if] || @opts[:unless] || @cond
 
-        init_with_proc if method.is_a?(Proc)
-        init_with_cond if !cond.nil? && cond.is_a?(Proc)
+        @method_name = @method && !@method.is_a?(Proc) ? @method : nil
+        @method_arity = @method.is_a?(Proc) ? [@method.arity, 0].max : nil
+        @cond = @opts[:if] || @opts[:unless]
+        @cond_method_name = @cond && !@cond.is_a?(Proc) ? @cond : nil
+        @cond_arity = @cond.is_a?(Proc) ? [@cond.arity, 0].max : nil
+
+        init_with_proc if @method.is_a?(Proc)
+        init_with_cond if @cond && @cond.is_a?(Proc)
       end
 
       def injectable?
@@ -39,14 +50,14 @@ module FastSerializer
       # @param context [Hash]
       # @return [Object]
       def serialize(resource, params, context)
-        can_execute_on_mixin = injected && !method_name.nil? && !context.nil?
+        can_execute_on_mixin = !!(injected && method_name && @injected_methods.key?(method_name) && context)
 
         val = if can_execute_on_mixin
                 call_method_on_context(context, method_name, method_arity, resource, params)
               elsif method.is_a?(Proc)
                 call_proc_binding_to_context(context, method, method_arity, resource, params)
               else
-                resource.public_send(method)
+                resource.public_send(method_name)
               end
 
         val.freeze
@@ -59,9 +70,9 @@ module FastSerializer
       # @param context [Hash]
       # @return [Boolean]
       def included?(resource, params, context)
-        return true if cond.nil?
+        return true if !cond
 
-        can_execute_on_mixin = injected && !cond_method_name.nil? && !context.nil?
+        can_execute_on_mixin = !!(injected && cond_method_name && @injected_methods.key?(cond_method_name) && context)
 
         res = if can_execute_on_mixin
                 call_method_on_context(context, cond_method_name, cond_arity, resource, params)
@@ -80,8 +91,7 @@ module FastSerializer
 
       def init_with_cond
         @cond_method_name = "__#{key}_cond__"
-        @cond_arity = cond.arity.abs
-        @mixin ||= Module.new
+        @injected_methods[@cond_method_name]
 
         if RUBY_VERSION <= '2.5.0'
           @mixin.redefine_method @cond_method_name, &cond
@@ -92,8 +102,7 @@ module FastSerializer
 
       def init_with_proc
         @method_name = "__#{key}__"
-        @method_arity = method.arity.abs
-        @mixin = Module.new
+        @injected_methods[@method_name]
 
         if RUBY_VERSION <= '2.5.0'
           @mixin.redefine_method @method_name, &method

data/lib/fast_serializer/json_model/node.rb

@@ -3,16 +3,6 @@
 module FastSerializer
   module JsonModel
     class Node
-      attr_accessor :key, :method, :context
-
-      # @param key [String]
-      # @param method [String]
-      # @param opts [Hash]
-      def initialize(key: nil, method: nil, opts: {}, **_)
-        @key = key&.to_sym
-        @method = method || key
-        @opts = opts || {}
-      end
 
       # @return [Boolean]
       def injectable?

data/lib/fast_serializer/json_model/object.rb

@@ -1,11 +1,10 @@
 # frozen_string_literal: true
-
 module FastSerializer
   module JsonModel
     class Object < Node
       attr_accessor :attributes
 
-      def initialize(args = {})
+      def initialize
         super
         @attributes = {}
       end
@@ -20,7 +19,7 @@ module FastSerializer
       # @param context [Hash]
       # @return [Hash]
       def serialize(resource, params, context)
-        return if resource.nil?
+        return if !resource
 
         result = {}
 

data/lib/fast_serializer/json_model/relationship.rb

@@ -7,13 +7,13 @@ module FastSerializer
 
       # @param serializer [FastSerializer::Schema::Mixin]
       # @param schema [FastSerializer::Schema]
-      def initialize(serializer: nil, schema: nil, **)
-        super
+      def initialize(key, method, serializer = nil, schema = nil, opts = {})
+        super(key, method, opts)
 
         @serializer_klass = serializer
         @schema = schema
 
-        if @serializer_klass.nil? && @schema.nil?
+        if !@serializer_klass && !@schema
           raise ArgumentError, 'must provide serializer or schema'
         end
       end

data/lib/fast_serializer/schema.rb

@@ -43,7 +43,7 @@ module FastSerializer
     def attributes(*attribute_names)
       attribute_names.each do |attribute_name|
         serialization_schema.add_attribute(
-          JsonModel::Attribute.new(key: attribute_name, method: attribute_name)
+          JsonModel::Attribute.new(attribute_name, attribute_name)
         )
       end
     end
@@ -57,12 +57,11 @@ module FastSerializer
     # @param block [Proc] result is used as the attribute value
     #
     def attribute(attribute_name, opts = {}, &block)
+      method = (opts.is_a?(String) || opts.is_a?(Symbol)) ? opts : block
+      opts = opts.is_a?(Hash) ? opts : {}
+
       serialization_schema.add_attribute(
-        JsonModel::Attribute.new(
-          key: attribute_name,
-          method: block,
-          opts: opts
-        )
+        JsonModel::Attribute.new(attribute_name, method, opts)
       )
     end
 
@@ -76,12 +75,14 @@ module FastSerializer
     # @option opts [FastSerializer::Schema] :schema
     #
     def has_one(attribute_name, opts = {})
-      serialization_schema.add_attribute JsonModel::HasOneRelationship.new(
-        key: opts.delete(:key) || attribute_name,
-        method: opts.delete(:method) || attribute_name,
-        opts: opts,
-        schema: opts.delete(:schema),
-        serializer: opts.delete(:serializer)
+      serialization_schema.add_attribute(
+        JsonModel::HasOneRelationship.new(
+          opts.delete(:key) || attribute_name,
+          opts.delete(:method) || attribute_name,
+          opts.delete(:serializer),
+          opts.delete(:schema),
+          opts,
+        )
       )
     end
 
@@ -92,11 +93,11 @@ module FastSerializer
     def has_many(attribute_name, opts = {})
       serialization_schema.add_attribute(
         JsonModel::HasManyRelationship.new(
-          key: opts.delete(:key) || attribute_name,
-          method: opts.delete(:method) || attribute_name,
-          opts: opts,
-          schema: opts.delete(:schema),
-          serializer: opts.delete(:serializer)
+          opts.delete(:key) || attribute_name,
+          opts.delete(:method) || attribute_name,
+          opts.delete(:serializer),
+          opts.delete(:schema),
+          opts,
         )
       )
     end
@@ -106,11 +107,11 @@ module FastSerializer
     def list(attribute_name, opts = {})
       serialization_schema.add_attribute(
         JsonModel::Array.new(
-          key: attribute_name,
-          method: attribute_name,
-          opts: opts,
-          schema: opts.delete(:schema),
-          serializer: opts.delete(:serializer)
+          attribute_name,
+          attribute_name,
+          opts.delete(:serializer),
+          opts.delete(:schema),
+          opts,
         )
       )
     end
@@ -131,8 +132,10 @@ module FastSerializer
     end
 
     def serialize_resource(resource, params = {}, context = self)
-      Utils.ref_merge(self.params, params)
       _params_dup = FastSerializer::Utils.symbolize_keys(self.params)
+      Utils.ref_merge(_params_dup, params)
+      self.params.delete(:meta)
+
       meta        = _params_dup.delete(:meta)
 
       is_collection = if _params_dup.key?(:is_collection)
@@ -150,7 +153,7 @@ module FastSerializer
                 # need to bind context
                 resource.map { |entry| context.class.new(entry, _params_dup).serializable_hash }
               else
-                JsonModel::Array.new(schema: serialization_schema).serialize(resource, _params_dup, context)
+                JsonModel::Array.new(:base, :base, nil, serialization_schema).serialize(resource, _params_dup, context)
               end
 
             else

data/lib/fast_serializer/utils.rb

@@ -5,10 +5,12 @@ module FastSerializer
     def self.symbolize_keys(hash)
       res = {}
       hash.each { |key, value| res[key.to_sym] = value }
-      hash
+      res
     end
 
     def self.ref_merge(hash_a, hash_b)
+      return if hash_a.equal?(hash_b)
+
       hash_b.each do |key, value|
         hash_a[key] = value
       end

data/lib/fast_serializer/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FastSerializer
-  VERSION = '0.6.5'
+  VERSION = '0.6.9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fast_serializer_ruby
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.9
 platform: ruby
 authors:
 - Evgeny Stepanov
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-13 00:00:00.000000000 Z
+date: 2022-08-10 00:00:00.000000000 Z
 dependencies: []
 description: This library intends to solve such a typical and on the other hand important
   problem as efficient ruby object to hash transformation.
@@ -50,7 +50,7 @@ metadata:
   homepage_uri: https://github.com/estepnv/fast_serializer
   source_code_uri: https://github.com/estepnv/fast_serializer
   changelog_uri: https://github.com/estepnv/fast_serializer/CHANGELOG.md
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -65,8 +65,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.27
-signing_key:
+rubygems_version: 3.3.6
+signing_key: 
 specification_version: 4
 summary: fast_serializer is a lightweight ruby objects serializer.
 test_files: []