surrealist 0.4.0 → 1.0.0

data/lib/surrealist/value_assigner.rb

@@ -10,16 +10,16 @@ module Surrealist
       # @param [Struct] schema containing a single schema key and value
       #
       # @return [Hash] schema
-      def assign(instance:, schema:)
-        value = raw_value(instance: instance, schema: schema)
+      def assign(schema, instance)
+        value = raw_value(instance, schema)
 
         # array to track and prevent infinite self references in surrealization
         @stack ||= []
 
         if value.respond_to?(:build_schema)
-          yield assign_nested_record(instance: instance, value: value)
+          yield assign_nested_record(instance, value)
         elsif value.respond_to?(:each) && !value.empty? && value.all? { |v| Helper.surrealist?(v.class) }
-          yield assign_nested_collection(instance: instance, value: value)
+          yield assign_nested_collection(instance, value)
         else
           yield value
         end
@@ -33,9 +33,9 @@ module Surrealist
       # @param [Struct] schema containing a single schema key and value
       #
       # @return [Object] value to be further processed
-      def raw_value(instance:, schema:)
+      def raw_value(instance, schema)
         value = instance.is_a?(Hash) ? instance[schema.key] : instance.send(schema.key)
-        coerce_value(value, schema: schema)
+        coerce_value(value, schema)
       end
 
       # Coerces value if type check is passed
@@ -46,12 +46,12 @@ module Surrealist
       # @raise +Surrealist::InvalidTypeError+ if type-check failed at some point.
       #
       # @return [Object] value to be further processed
-      def coerce_value(value, schema:)
-        unless TypeHelper.valid_type?(value: value, type: schema.value)
+      def coerce_value(value, schema)
+        unless TypeHelper.valid_type?(value, schema.value)
           raise Surrealist::InvalidTypeError,
                 "Wrong type for key `#{schema.key}`. Expected #{schema.value}, got #{value.class}."
         end
-        TypeHelper.coerce(type: schema.value, value: value)
+        TypeHelper.coerce(value, schema.value)
       end
 
       # Assists in recursively generating schema for records while preventing infinite self-referencing
@@ -60,9 +60,9 @@ module Surrealist
       # @param [Object] value a value that has to be type-checked.
       #
       # @return [Array] of schemas
-      def assign_nested_collection(instance:, value:)
+      def assign_nested_collection(instance, value)
         return if @stack.include?(value.first.class)
-        @stack << instance.class << value.first.class
+        @stack.push(instance.class).push(value.first.class)
         result = Surrealist.surrealize_collection(value, raw: true)
         @stack.delete(instance.class)
         result
@@ -74,9 +74,9 @@ module Surrealist
       # @param [Object] value a value that has to be type-checked.
       #
       # @return [Hash] schema
-      def assign_nested_record(instance:, value:)
+      def assign_nested_record(instance, value)
         return if @stack.include?(value.class)
-        @stack << instance.class
+        @stack.push(instance.class)
         result = value.build_schema
         @stack.delete(instance.class)
         result

data/lib/surrealist/vars_helper.rb

@@ -9,8 +9,10 @@ module Surrealist
     CLASS_VARIABLE = '@@__surrealist_schema'.freeze
     # Regexp to resolve ROM structure
     ROM_REGEXP = /ROM::Struct/o
-    # Instance variable that keeps serializer class
-    SERIALIZER_CLASS = '@__surrealist_serializer'.freeze
+    # Instance variable that keeps serializer classes
+    SERIALIZER_CLASSES = '@__surrealist_serializers'.freeze
+    # Tag for default behaviour in multiple serializers
+    DEFAULT_TAG = :default
 
     class << self
       # Find the schema
@@ -41,18 +43,27 @@ module Surrealist
       # Checks if there is a serializer defined for a given class and returns it
       #
       # @param [Class] klass a class to check
+      # @param [Symbol] tag a tag associated with serializer
       #
       # @return [Class | nil]
-      def find_serializer(klass)
-        klass.instance_variable_get(SERIALIZER_CLASS)
+      def find_serializer(klass, tag: nil)
+        tag ||= DEFAULT_TAG
+        hash = klass.instance_variable_get(SERIALIZER_CLASSES)
+        serializer = hash && hash.fetch(tag.to_sym, nil)
+        Surrealist::ExceptionRaiser.raise_unknown_tag!(tag) if serializer.nil? && tag != DEFAULT_TAG
+        serializer
       end
 
       # Sets a serializer for class
       #
       # @param [Class] self_class class of object that points to serializer
       # @param [Class] serializer_class class of serializer
-      def set_serializer(self_class, serializer_class)
-        self_class.instance_variable_set(SERIALIZER_CLASS, serializer_class)
+      # @param [Symbol] tag a tag associated with serializer
+      def add_serializer(self_class, serializer_class, tag: nil)
+        tag ||= DEFAULT_TAG
+        hash = self_class.instance_variable_get(SERIALIZER_CLASSES) || {}
+        hash[tag.to_sym] = serializer_class
+        self_class.instance_variable_set(SERIALIZER_CLASSES, hash)
       end
 
       private

data/lib/surrealist/version.rb

@@ -2,5 +2,5 @@
 
 module Surrealist
   # Defines the version of Surrealist
-  VERSION = '0.4.0'.freeze
+  VERSION = '1.0.0'.freeze
 end

data/lib/surrealist.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'json'
+require 'oj'
 require_relative 'surrealist/any'
 require_relative 'surrealist/bool'
 require_relative 'surrealist/builder'
@@ -54,13 +54,13 @@ module Surrealist
     #   # => "[{\"name\":\"Nikita\",\"age\":23}, {\"name\":\"Alessandro\",\"age\":24}]"
     #   # For more examples see README
     def surrealize_collection(collection, **args)
-      raise Surrealist::ExceptionRaiser.raise_invalid_collection! unless collection.respond_to?(:each)
+      Surrealist::ExceptionRaiser.raise_invalid_collection! unless collection.respond_to?(:each)
 
       result = collection.map do |object|
         Helper.surrealist?(object.class) ? __build_schema(object, args) : object
       end
 
-      args[:raw] ? result : JSON.dump(result)
+      args[:raw] ? result : Oj.dump(result, mode: :compat)
     end
 
     # Dumps the object's methods corresponding to the schema
@@ -78,7 +78,7 @@ module Surrealist
     #   provided in the object's class. Values will be taken from the return values
     #   of appropriate methods from the object.
     def surrealize(instance:, **args)
-      JSON.dump(build_schema(instance: instance, **args))
+      Oj.dump(build_schema(instance: instance, **args), mode: :compat)
     end
 
     # Builds hash from schema provided in the object's class and type-checks the values.
@@ -126,13 +126,8 @@ module Surrealist
 
       Surrealist::ExceptionRaiser.raise_unknown_schema!(instance) if schema.nil?
 
-      normalized_schema = Surrealist::Copier.deep_copy(
-        hash:    schema,
-        klass:   instance.class.name,
-        carrier: carrier,
-      )
-
-      hash = Builder.new(carrier: carrier, schema: normalized_schema, instance: instance).call
+      normalized_schema = Surrealist::Copier.deep_copy(schema, carrier, instance.class.name)
+      hash = Builder.new(carrier, normalized_schema, instance).call
       carrier.camelize ? Surrealist::HashUtils.camelize_hash(hash) : hash
     end
 
@@ -148,7 +143,9 @@ module Surrealist
     #   provided in the object's class. Values will be taken from the return values
     #   of appropriate methods from the object.
     def __build_schema(object, **args)
-      if (serializer = Surrealist::VarsHelper.find_serializer(object.class))
+      return args[:serializer].new(object, args[:context].to_h).build_schema(args) if args[:serializer]
+
+      if (serializer = Surrealist::VarsHelper.find_serializer(object.class, tag: args[:for]))
         serializer.new(object, args[:context].to_h).build_schema(args)
       else
         build_schema(instance: object, **args)

data/surrealist.gemspec

@@ -24,6 +24,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
   spec.required_ruby_version = '>= 2.2.0'
 
+  spec.add_runtime_dependency 'oj', '~> 3'
+
   spec.add_development_dependency 'bundler', '~> 1.16'
   spec.add_development_dependency 'pry', '~> 0.11'
   spec.add_development_dependency 'rake', '~> 12.3'

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: surrealist
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Nikita Esaulov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-17 00:00:00.000000000 Z
+date: 2018-02-11 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: oj
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -100,6 +114,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- benchmarks/surrealist_vs_ams.rb
 - bin/console
 - gemfiles/activerecord42.gemfile
 - lib/surrealist.rb