surrealist 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4029b143bcc01a58f0b5a38d64a457f9a781ef7da37eaa3bc335be8d2ddafcfa
-  data.tar.gz: 4f88b4c0b4224fddfe8fa7f6d16f2d0d2618609f280a7fdfd7bea2e4f46aa2b8
+  metadata.gz: 5067bf220ce8d757b29dc527c562e28410070dc101396d3029f3442940ebcebf
+  data.tar.gz: '09513dc82a8d7538fb9a5e77c842a596a27c5f2ba201960b396607373dbc029a'
 SHA512:
-  metadata.gz: 369823e9f4d78b1c48aa7878f76e69f7381bfacffd79653ba667f747f8c2c23802dc2126eab7ba3b2e0ab6a3ce04878745b12f42c5dbcdb36ac307e953c9b259
-  data.tar.gz: 8c7f310b4150ce62e568bfb8d0d4c0e5da187fff1fbbb11f338098ca17cf1c4e83646bbb6b05e9c0ff6d5d9790a7bcc59a00d6dd70d07fa1e61014f0dc4be0d9
+  metadata.gz: 6db73c57dae2758e58701201fa9835b6c5c177df66b94f6e81688ad5f5c8e06e914c14b8cb97336678d68353303ca5d3f5eb572a25b6d2c9ab6cd8310fb7a699
+  data.tar.gz: 450fee40e105f4a88213ef30147a2e67d249455d82a6383183ab9dca4eb8252ac857f6eaec37ccfe72f5c525ce88c9fb272160855ca01d6a91883b9a0d8b9a42

data/.travis.yml

@@ -1,6 +1,5 @@
 language: ruby
 sudo: false
-cache: bundler
 before_install: gem install bundler
 script: bundle exec rake
 matrix:

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 1.3.1
+
+## Fixed
+* Invoke parent serializer method instead of object method with the same names ([@kolasss][]) [#118](https://github.com/nesaulov/surrealist/pull/118)
+
 # 1.3.0
 
 ## Added
@@ -115,3 +120,4 @@
 [@past-one]: https://github.com/past-one
 [@stefkin]: https://github.com/stefkin
 [@gjhenrique]: https://github.com/gjhenrique
+[@kolasss]: https://github.com/kolasss

data/lib/surrealist/serializer.rb

@@ -48,6 +48,26 @@ module Surrealist
 
       # Plural form ¯\_(ツ)_/¯
       alias serializer_contexts serializer_context
+
+      # Only lookup for methods defined in Surrealist::Serializer subclasses
+      #   to prevent invoke of Kernel methods
+      #
+      # @param [Symbol] method method to be invoked
+      #
+      # @return [Boolean]
+      def method_defined?(method)
+        return true if instance_methods(false).include?(method)
+        return false if superclass == Surrealist::Serializer
+
+        super
+      end
+
+      def private_method_defined?(method)
+        return true if private_instance_methods(false).include?(method)
+        return false if superclass == Surrealist::Serializer
+
+        super
+      end
     end
 
     # NOTE: #context will work only when using serializer explicitly,

data/lib/surrealist/value_assigner.rb

@@ -47,8 +47,8 @@ module Surrealist
       # @return [Object] the return value of the method
       def invoke_method(instance, method)
         object = instance.instance_variable_get(:@object)
-        instance_method = instance.class.instance_methods(false).include?(method) ||
-          instance.class.private_instance_methods(false).include?(method)
+        instance_method = instance.class.method_defined?(method) ||
+                          instance.class.private_method_defined?(method)
         invoke_object = !instance_method && object && object.respond_to?(method, true)
         invoke_object ? object.send(method) : instance.send(method)
       end
@@ -77,6 +77,7 @@ module Surrealist
       # @return [Array] of schemas
       def assign_nested_collection(instance, value)
         return if @skip_set.include?(value.first.class)
+
         with_skip_set(instance.class) { Surrealist.surrealize_collection(value, raw: true) }
       end
 
@@ -88,6 +89,7 @@ module Surrealist
       # @return [Hash] schema
       def assign_nested_record(instance, value)
         return if @skip_set.include?(value.class)
+
         with_skip_set(instance.class) { value.build_schema }
       end
 
@@ -98,6 +100,7 @@ module Surrealist
       # @return [Object] block result
       def with_skip_set(klass)
         return yield if @skip_set.include?(klass)
+
         @skip_set.add(klass)
         result = yield
         @skip_set.delete(klass)

data/lib/surrealist/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: surrealist
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Nikita Esaulov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-09 00:00:00.000000000 Z
+date: 2018-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj