serega 0.8.2 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d467016ac66fcd328919f3d7068dd556ac5a7768f657adb30948c2c316480a1
-  data.tar.gz: 3ae0c46dc6760cdf94299c0edc34b41a8b195cea92dff13b91a4017bb21653f7
+  metadata.gz: 116b00d5c709f65a90899a9eda49f6e2c95cc9a47781a1cddf2499057553f427
+  data.tar.gz: 5f8fe19470218be68c09704964228be0381e677f5bd3cbcf9688f92974e9392d
 SHA512:
-  metadata.gz: 9f2a9f714be636a26f4ca2de8a5f692455080354f495dc5cc2d69dd874d207ddd0bc3286b47ea600ebf5a0ba2ddfd774d6876da67e82906d35319f4a54614caa
-  data.tar.gz: 766931dbb8aaa415dcc008a477258ba6f63ca35b664267278ee31ab0becc91f124e16eb1f57bd5968df03e333bb59c98a8396f796be84c254a76e674a472d6e1
+  metadata.gz: 047de5335017cf65ee0f887124f81a755b94e19eea0e53a56ae24cb81698e7bdcc7e8eb6eba9256b5160a24bb011a5c0a1c1628cca77c7e7951b8883629ad96f
+  data.tar.gz: 5836df28c6e1cf2238d8c8471280dc806dd41a0cbbe474a101118d801e460830cda97dcb419e0885f9106d1e4e5ae795776ff5cc475555bdab6cb4c5408c1c94

data/VERSION

@@ -1 +1 @@
-0.8.2
+0.8.3

data/lib/serega/json/oj.rb

@@ -6,6 +6,9 @@ class Serega
     # JSON dump adapter for ::Oj
     #
     class OjDump
+      # Default Oj serialization options
+      OPTS = {mode: :compat}.freeze
+
       #
       # Dumps data to JSON string
       #
@@ -14,7 +17,7 @@ class Serega
       # @return [String] Data serialized to JSON
       #
       def self.call(data)
-        ::Oj.dump(data, mode: :compat)
+        ::Oj.dump(data, OPTS)
       end
     end
 

data/lib/serega/map.rb

@@ -35,7 +35,8 @@ class Serega
 
       def cached_map_for(opts, max_cache_size)
         @cache ||= {}
-        cache_key = opts.to_s
+        cache_key = construct_cache_key(opts)
+
         map = @cache[cache_key] ||= map_for(opts)
         @cache.shift if @cache.length > max_cache_size
         map
@@ -50,7 +51,8 @@ class Serega
       end
 
       def construct_map(serializer_class, only:, except:, with:)
-        serializer_class.attributes.each_with_object([]) do |(name, attribute), map|
+        map = []
+        serializer_class.attributes.each do |name, attribute|
           next unless attribute.visible?(only: only, except: except, with: with)
 
           nested_points =
@@ -65,6 +67,21 @@ class Serega
 
           map << serializer_class::SeregaMapPoint.new(attribute, nested_points)
         end
+        map
+      end
+
+      def construct_cache_key(opts, cache_key = nil)
+        return nil if opts.empty?
+
+        cache_key ||= +""
+
+        opts.each do |key, nested_opts|
+          cache_key.insert(-1, SeregaUtils::SymbolName.call(key))
+          cache_key.insert(-1, "-")
+          construct_cache_key(nested_opts, cache_key)
+        end
+
+        cache_key
       end
     end
 

data/lib/serega/plugins/string_modifiers/parse_string_modifiers.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "stringio"
+
 class Serega
   module SeregaPlugins
     #
@@ -14,7 +16,7 @@ class Serega
     #   PostSerializer.new(only: "id,user(id,username)").to_h(post)
     #   PostSerializer.new(except: "user(username,email)").to_h(post)
     #   PostSerializer.new(with: "user(email)").to_h(post)
-
+    #
     #   # Modifiers can still be provided old way with nested hashes or arrays.
     #   PostSerializer.new(with: {user: %i[email, username]}).to_h(post)
     #
@@ -52,9 +54,11 @@ class Serega
         def parse(fields)
           res = {}
           attribute = +""
+          char = +""
           path_stack = nil
+          fields = StringIO.new(fields)
 
-          fields.each_char do |char|
+          while fields.read(1, char)
             case char
             when ","
               add_attribute(res, path_stack, attribute, FROZEN_EMPTY_HASH)

data/lib/serega/utils/symbol_name.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+class Serega
+  module SeregaUtils
+    #
+    # Utility to get frozen string from symbol in any ruby version
+    #
+    class SymbolName
+      class << self
+        #
+        # Returns frozen string corresponding to provided symbol
+        #
+        # @param key [Symbol]
+        #
+        # @return [String] frozen string corresponding to provided symbol
+        #
+        def call(key)
+          key.is_a?(String) ? key : to_frozen_string(key)
+        end
+
+        private
+
+        # :nocov:
+        if RUBY_VERSION < "3"
+          def to_frozen_string(key)
+            key.to_s.freeze
+          end
+        else
+          def to_frozen_string(key)
+            key.name
+          end
+        end
+        # :nocov:
+      end
+    end
+  end
+end

data/lib/serega/validations/attribute/check_name.rb

@@ -27,7 +27,7 @@ class Serega
           # @return [void]
           #
           def call(name)
-            name = name.to_s
+            name = SeregaUtils::SymbolName.call(name)
 
             valid =
               case name.size

data/lib/serega.rb

@@ -16,6 +16,7 @@ end
 require_relative "serega/errors"
 require_relative "serega/helpers/serializer_class_helper"
 require_relative "serega/utils/enum_deep_dup"
+require_relative "serega/utils/symbol_name"
 require_relative "serega/utils/to_hash"
 require_relative "serega/json/adapter"
 
@@ -184,7 +185,7 @@ class Serega
     # Serializes provided object to Hash
     #
     # @param object [Object] Serialized object
-    # @param opts [Hash] Serializer modifiers and other instantiating options
+    # @param opts [Hash, nil] Serializer modifiers and other instantiating options
     # @option opts [Array, Hash, String, Symbol] :only The only attributes to serialize
     # @option opts [Array, Hash, String, Symbol] :except Attributes to hide
     # @option opts [Array, Hash, String, Symbol] :with Attributes (usually hidden) to serialize additionally
@@ -194,13 +195,23 @@ class Serega
     #
     # @return [Hash] Serialization result
     #
-    def call(object, opts = FROZEN_EMPTY_HASH)
+    def call(object, opts = nil)
+      opts ||= FROZEN_EMPTY_HASH
       initiate_keys = config.initiate_keys
-      new(opts.slice(*initiate_keys)).to_h(object, opts.except(*initiate_keys))
+
+      if opts.empty?
+        modifiers_opts = FROZEN_EMPTY_HASH
+        serialize_opts = nil
+      else
+        serialize_opts = opts.except(*initiate_keys)
+        modifiers_opts = opts.slice(*initiate_keys)
+      end
+
+      new(modifiers_opts).to_h(object, serialize_opts)
     end
 
     # @see #call
-    def to_h(object, opts = FROZEN_EMPTY_HASH)
+    def to_h(object, opts = nil)
       call(object, opts)
     end
 
@@ -208,7 +219,7 @@ class Serega
     # Serializes provided object to JSON string
     #
     # @param object [Object] Serialized object
-    # @param opts [Hash] Serializer modifiers and other instantiating options
+    # @param opts [Hash, nil] Serializer modifiers and other instantiating options
     # @option opts [Array, Hash, String, Symbol] :only The only attributes to serialize
     # @option opts [Array, Hash, String, Symbol] :except Attributes to hide
     # @option opts [Array, Hash, String, Symbol] :with Attributes (usually hidden) to serialize additionally
@@ -218,16 +229,15 @@ class Serega
     #
     # @return [String] Serialization result
     #
-    def to_json(object, opts = FROZEN_EMPTY_HASH)
-      initiate_keys = config.initiate_keys
-      new(opts.slice(*initiate_keys)).to_json(object, opts.except(*initiate_keys))
+    def to_json(object, opts = nil)
+      config.to_json.call(to_h(object, opts))
     end
 
     #
     # Serializes provided object as JSON
     #
     # @param object [Object] Serialized object
-    # @param opts [Hash] Serializer modifiers and other instantiating options
+    # @param opts [Hash, nil] Serializer modifiers and other instantiating options
     # @option opts [Array, Hash, String, Symbol] :only The only attributes to serialize
     # @option opts [Array, Hash, String, Symbol] :except Attributes to hide
     # @option opts [Array, Hash, String, Symbol] :with Attributes (usually hidden) to serialize additionally
@@ -237,7 +247,7 @@ class Serega
     #
     # @return [Hash] Serialization result
     #
-    def as_json(object, opts = FROZEN_EMPTY_HASH)
+    def as_json(object, opts = nil)
       config.from_json.call(to_json(object, opts))
     end
   end
@@ -249,36 +259,37 @@ class Serega
     #
     # Instantiates new Serega class
     #
-    # @param opts [Hash] Serializer modifiers and other instantiating options
+    # @param opts [Hash, nil] Serializer modifiers and other instantiating options
     # @option opts [Array, Hash, String, Symbol] :only The only attributes to serialize
     # @option opts [Array, Hash, String, Symbol] :except Attributes to hide
     # @option opts [Array, Hash, String, Symbol] :with Attributes (usually hidden) to serialize additionally
     # @option opts [Boolean] :validate Validates provided modifiers (Default is true)
     #
-    def initialize(opts = FROZEN_EMPTY_HASH)
-      @opts = (opts == FROZEN_EMPTY_HASH) ? opts : prepare_modifiers(opts)
-      self.class::CheckInitiateParams.new(@opts).validate if opts.fetch(:check_initiate_params) { config.check_initiate_params }
+    def initialize(opts = nil)
+      @opts = (opts.nil? || opts.empty?) ? FROZEN_EMPTY_HASH : prepare_modifiers(opts)
+      self.class::CheckInitiateParams.new(@opts).validate if opts&.fetch(:check_initiate_params) { config.check_initiate_params }
     end
 
     #
     # Serializes provided object to Hash
     #
     # @param object [Object] Serialized object
-    # @param opts [Hash] Serializer modifiers and other instantiating options
+    # @param opts [Hash, nil] Serializer modifiers and other instantiating options
     # @option opts [Hash] :context Serialization context
     # @option opts [Boolean] :many Set true if provided multiple objects (Default `object.is_a?(Enumerable)`)
     #
     # @return [Hash] Serialization result
     #
-    def call(object, opts = {})
-      self.class::CheckSerializeParams.new(opts).validate
+    def call(object, opts = nil)
+      self.class::CheckSerializeParams.new(opts).validate if opts&.any?
+      opts ||= {}
       opts[:context] ||= {}
 
       serialize(object, opts)
     end
 
     # @see #call
-    def to_h(object, opts = {})
+    def to_h(object, opts = nil)
       call(object, opts)
     end
 
@@ -286,13 +297,13 @@ class Serega
     # Serializes provided object to JSON string
     #
     # @param object [Object] Serialized object
-    # @param opts [Hash] Serializer modifiers and other instantiating options
+    # @param opts [Hash, nil] Serializer modifiers and other instantiating options
     # @option opts [Hash] :context Serialization context
     # @option opts [Boolean] :many Set true if provided multiple objects (Default `object.is_a?(Enumerable)`)
     #
     # @return [Hash] Serialization result
     #
-    def to_json(object, opts = {})
+    def to_json(object, opts = nil)
       hash = to_h(object, opts)
       config.to_json.call(hash)
     end
@@ -301,13 +312,13 @@ class Serega
     # Serializes provided object as JSON
     #
     # @param object [Object] Serialized object
-    # @param opts [Hash] Serializer modifiers and other instantiating options
+    # @param opts [Hash, nil] Serializer modifiers and other instantiating options
     # @option opts [Hash] :context Serialization context
     # @option opts [Boolean] :many Set true if provided multiple objects (Default `object.is_a?(Enumerable)`)
     #
     # @return [Hash] Serialization result
     #
-    def as_json(object, opts = {})
+    def as_json(object, opts = nil)
       json = to_json(object, opts)
       config.from_json.call(json)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serega
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors:
 - Andrey Glushkov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-12-20 00:00:00.000000000 Z
+date: 2023-02-14 00:00:00.000000000 Z
 dependencies: []
 description: |
   JSON Serializer
@@ -73,6 +73,7 @@ files:
 - lib/serega/plugins/string_modifiers/parse_string_modifiers.rb
 - lib/serega/plugins/string_modifiers/string_modifiers.rb
 - lib/serega/utils/enum_deep_dup.rb
+- lib/serega/utils/symbol_name.rb
 - lib/serega/utils/to_hash.rb
 - lib/serega/validations/attribute/check_block.rb
 - lib/serega/validations/attribute/check_name.rb
@@ -114,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.15
+rubygems_version: 3.4.6
 signing_key: 
 specification_version: 4
 summary: JSON Serializer