fast_serializer_ruby 0.6.4 → 0.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac8a1a9a688c7c866eed16ff360db7ce7e898449d01638f0a2e5ad8e25c10ec3
-  data.tar.gz: 537b93afce1348b456bd52e0cfa6e5bad52e68067ff890930c1c7282003d0a2d
+  metadata.gz: 9c4af5f498164053b8b9a53fd9b8946385d4f541710cd6c3ce76ea4a4840fc64
+  data.tar.gz: 1ec8e454473467c832669016032c8305ba859cbee0f51acdd5e8a6c3c012d7e0
 SHA512:
-  metadata.gz: df1582559bdd4cc6e17d976c1aaf0916d37485f60a792991038224dea46493fdc4815406e64da801b4c00ea34bcde21fbdafd196697e1f3a9ba5e2ff5cc41f75
-  data.tar.gz: 238535794943fd0361027c85d99a5e03758e91db2b363bd9bebfc5fa5eec5197e2f8ed0387871136ec5936cdbbc28d1a0e228c280359a9b191aded5478963670
+  metadata.gz: 391ce5281f4ed65dbb0c6d505e008bf3c1fe90da341a1f2648cd488757ce0d763f63249aab56de2b2a8af2cdcaf33383816d3c2e477cead34267465671be6e30
+  data.tar.gz: 2cea4c882c7b081422d9043136b749d82894dd07515893566ae47ff11f7f4aebc9a1ff15a38173c1bd5b8364c9fe43f966b2df39eb737050239e600a9c6ebb8a

data/.github/workflows/ruby.yml

@@ -0,0 +1,42 @@
+name: Ruby
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ['2.3', '2.4', '2.5', '2.6', '2.7', '3.0', 'jruby']
+
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@473e4d8fe5dd94ee328fdfca9f8c9c7afc9dae5e
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true
+    - run: bundle exec rspec --tag ~performance:true
+
+  coverage:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ['2.7']
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@473e4d8fe5dd94ee328fdfca9f8c9c7afc9dae5e
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true
+    - name: Test & publish code coverage
+      uses: paambaati/codeclimate-action@v2.7.5
+      with:
+        coverageCommand: bundle exec rspec --tag ~performance:true
+      env:
+        CC_TEST_REPORTER_ID: 99325a42b78ef51a9d51574d20dbcd6acdfe75c8568f1433f73b61f17149e05d
+        COVERAGE: 1
+

data/.gitignore

@@ -15,3 +15,4 @@
 .history
 /.vscode
 .rubocop.yml
+Gemfile.lock

data/Gemfile

@@ -12,14 +12,13 @@ group :development, :test do
 end
 
 group :test do
-  gem 'active_model_serializers', '~> 0.10.0'
+  gem 'active_model_serializers'
   gem 'factory_bot'
   gem 'faker'
-  gem 'activesupport', '< 6'
+  gem 'activesupport'
   gem 'allocation_stats'
-  gem 'simplecov', '~> 0.17.1'
-  gem 'benchmark-memory', '~> 0.1'
-  gem 'rspec', '~> 3.0'
+  gem 'simplecov'
+  gem 'benchmark-memory'
+  gem 'rspec'
   gem 'rspec-benchmark'
-  gem 'pry-byebug'
 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)
 
@@ -106,8 +106,6 @@ schema.serializable_hash
      }
    }
 
-
-
 ```
 
 

data/fast_serializer.gemspec

@@ -14,7 +14,6 @@ Gem::Specification.new do |spec|
   spec.description   = 'This library intends to solve such a typical and on the other hand important problem as efficient ruby object to hash transformation.'
   spec.homepage      = 'https://github.com/estepnv/fast_serializer'
   spec.license       = 'MIT'
-  spec.platform      = Gem::Platform::RUBY
   spec.required_ruby_version = '>= 2.3.0'
 
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'

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
@@ -150,7 +151,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

@@ -9,6 +9,8 @@ module FastSerializer
     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.4'
+  VERSION = '0.6.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fast_serializer_ruby
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.8
 platform: ruby
 authors:
 - Evgeny Stepanov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-26 00:00:00.000000000 Z
+date: 2022-03-25 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.
@@ -18,12 +18,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
-- ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -66,7 +65,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.3.6
 signing_key: 
 specification_version: 4
 summary: fast_serializer is a lightweight ruby objects serializer.

data/.travis.yml

@@ -1,40 +0,0 @@
-sudo: false
-
-language: ruby
-
-rvm:
-  - 2.3
-  - 2.4
-  - 2.5
-  - 2.6
-  - 2.7
-  - jruby-9.2.0.0
-  - ruby-head
-  - jruby-head
-
-matrix:
-  allow_failures:
-    - rvm: jruby-9.2.0.0
-    - rvm: ruby-head
-    - rvm: jruby-head
-
-before_install:
-  - yes | gem update --system --force
-  - gem install bundler
-
-before_script:
-  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
-  - chmod +x ./cc-test-reporter
-  - ./cc-test-reporter before-build
-
-script: bundle exec rspec --tag ~performance:true
-
-after_script:
-  - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT
-
-cache: bundler
-
-env:
-  global:
-    CC_TEST_REPORTER_ID=99325a42b78ef51a9d51574d20dbcd6acdfe75c8568f1433f73b61f17149e05d
-    COVERAGE=1

data/Gemfile.lock

@@ -1,139 +0,0 @@
-PATH
-  remote: .
-  specs:
-    fast_serializer_ruby (0.6.4)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actionpack (5.2.4.1)
-      actionview (= 5.2.4.1)
-      activesupport (= 5.2.4.1)
-      rack (~> 2.0, >= 2.0.8)
-      rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.4.1)
-      activesupport (= 5.2.4.1)
-      builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    active_model_serializers (0.10.10)
-      actionpack (>= 4.1, < 6.1)
-      activemodel (>= 4.1, < 6.1)
-      case_transform (>= 0.2)
-      jsonapi-renderer (>= 0.1.1.beta1, < 0.3)
-    activemodel (5.2.4.1)
-      activesupport (= 5.2.4.1)
-    activesupport (5.2.4.1)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    allocation_stats (0.1.5)
-    benchmark-malloc (0.2.0)
-    benchmark-memory (0.1.2)
-      memory_profiler (~> 0.9)
-    benchmark-perf (0.6.0)
-    benchmark-trend (0.4.0)
-    builder (3.2.4)
-    byebug (11.1.3)
-    case_transform (0.2)
-      activesupport
-    coderay (1.1.2)
-    concurrent-ruby (1.1.6)
-    crass (1.0.6)
-    diff-lcs (1.3)
-    docile (1.3.2)
-    erubi (1.9.0)
-    factory_bot (5.1.1)
-      activesupport (>= 4.2.0)
-    faker (2.10.2)
-      i18n (>= 1.6, < 2)
-    ffi (1.12.2-java)
-    i18n (1.8.2)
-      concurrent-ruby (~> 1.0)
-    json (2.3.0)
-    json (2.3.0-java)
-    jsonapi-renderer (0.2.2)
-    loofah (2.4.0)
-      crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
-    memory_profiler (0.9.14)
-    method_source (0.9.2)
-    mini_portile2 (2.4.0)
-    minitest (5.14.0)
-    nokogiri (1.10.9)
-      mini_portile2 (~> 2.4.0)
-    nokogiri (1.10.9-java)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    pry (0.12.2-java)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-      spoon (~> 0.0)
-    pry-byebug (3.8.0)
-      byebug (~> 11.0)
-      pry (~> 0.10)
-    rack (2.2.2)
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
-      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.3.0)
-      loofah (~> 2.3)
-    rake (13.0.1)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-benchmark (0.6.0)
-      benchmark-malloc (~> 0.2)
-      benchmark-perf (~> 0.6)
-      benchmark-trend (~> 0.4)
-      rspec (>= 3.0)
-    rspec-core (3.9.1)
-      rspec-support (~> 3.9.1)
-    rspec-expectations (3.9.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.2)
-    simplecov (0.17.1)
-      docile (~> 1.1)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
-    spoon (0.0.6)
-      ffi
-    thread_safe (0.3.6)
-    thread_safe (0.3.6-java)
-    tzinfo (1.2.6)
-      thread_safe (~> 0.1)
-
-PLATFORMS
-  java
-  ruby
-
-DEPENDENCIES
-  active_model_serializers (~> 0.10.0)
-  activesupport (< 6)
-  allocation_stats
-  benchmark-memory (~> 0.1)
-  factory_bot
-  faker
-  fast_serializer_ruby!
-  pry
-  pry-byebug
-  rake
-  rspec (~> 3.0)
-  rspec-benchmark
-  simplecov (~> 0.17.1)
-
-BUNDLED WITH
-   2.1.4