surrealist 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b3537308a609571f4a82a0f35792244135fd0fe249b85b408d444dc46c4ecf4
-  data.tar.gz: 8c50d83dbbe452bb55f70eadccc69ad024a6055e2ee1e60aa29f768c3281bfbc
+  metadata.gz: 0a5a2bfdc5cbfe0e1a5f8fbc9e8213da087e2d149ac40857bf8a7e3730c52b87
+  data.tar.gz: 9b28deb85b05ba4a6baf61eb0b9d52f5746fc9d819765175dd74dd45fae53f3d
 SHA512:
-  metadata.gz: 3b5a167801a3393667d0fae41727f3512be479bfcdfb26426615a422173ff417b186ea59d067550db2f2f44af49a789450c5056bad07de500849e8b21ae46e0e
-  data.tar.gz: 9c3923e37180abfaa4159dbc5f55b393f6ab88927803bf639ffa1825cbf5aa16e8a61199a7dc19e65f8586e26666b6208f4e995826d6a8ecaa03b9868ce01f57
+  metadata.gz: 6d37a7cc610900148814b0eda41e4d5d1d12ee6eeacba3bddeaa947d7793992b4983b893aa2a1b22cf8641fc2a8954384f52bc92aa5db2a45ef1aa8d3938f63d
+  data.tar.gz: 8d6ba4e24d856e9498f2bea63a9570d9b04439ad9efb84913c43bd575a1a19a442282f87a40a6244e4386869aab85bb836a6e5eea5abae476017a4f69aba7456

data/.rubocop.yml

@@ -148,7 +148,10 @@ Style/SignalException:
 Style/TrailingCommaInArguments:
   EnforcedStyleForMultiline: comma
 
-Style/TrailingCommaInLiteral:
+Style/TrailingCommaInArrayLiteral:
+  EnforcedStyleForMultiline: comma
+
+Style/TrailingCommaInHashLiteral:
   EnforcedStyleForMultiline: comma
 
 Style/MethodMissing:

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 1.1.1
+
+## Fixed
+* Bug with several serializations in a row ([@past-one][]) [#90](https://github.com/nesaulov/surrealist/pull/90)
+
 # 1.1.0
 
 ## Added
@@ -82,5 +87,5 @@
 [@nulldef]: https://github.com/nulldef
 [@azhi]: https://github.com/azhi
 [@chrisatanasian]: https://github.com/chrisatanasian
-
+[@past-one]: https://github.com/past-one
 

data/README.md

@@ -115,7 +115,7 @@ class Person
       nested: {
         at: {
           any: Integer,
-          level: Boolean,
+          level: Bool,
         },
       },
     }
@@ -760,8 +760,6 @@ type check will be passed. If you want to be strict about `nil`s consider using
 
 ## Roadmap
 Here is a list of features that are not implemented yet (contributions are welcome):
-* [Having a config that would keep serialization parameters](https://github.com/nesaulov/surrealist/issues/76)
-* [DSL for serializer contexts](https://github.com/nesaulov/surrealist/issues/67)
 * Memoization/caching
 
 ## Contributing

data/_config.yml

@@ -0,0 +1 @@
+theme: jekyll-theme-cayman

data/lib/surrealist/builder.rb

@@ -79,9 +79,8 @@ module Surrealist
     #
     # @return [Hash] the schema hash
     def construct_collection(schema, instance, key, value)
-      schema[key] = []
-      instance.send(key).each do |inst|
-        schema[key].push(call(Copier.deep_copy(value, carrier), inst))
+      schema[key] = instance.send(key).map do |inst|
+        call(Copier.deep_copy(value, carrier), inst)
       end
     end
   end

data/lib/surrealist/carrier.rb

@@ -46,7 +46,7 @@ module Surrealist
 
     # Checks if all arguments are set to default
     def no_args_provided?
-      @no_args ||= no_args
+      @no_args_provided ||= no_args_provided
     end
 
     # Returns all arguments
@@ -96,7 +96,7 @@ module Surrealist
     end
 
     # Checks if all arguments are set to default
-    def no_args
+    def no_args_provided
       !camelize && !include_root && !include_namespaces && root.nil? &&
         namespaces_nesting_level == DEFAULT_NESTING_LEVEL
     end

data/lib/surrealist/exception_raiser.rb

@@ -87,9 +87,9 @@ module Surrealist
       # method on the object.
       #
       # @raise Surrealist::UndefinedMethodError
-      def raise_invalid_key!(e)
+      def raise_invalid_key!(err)
         raise Surrealist::UndefinedMethodError,
-              "#{e.message}. You have probably defined a key " \
+              "#{err.message}. You have probably defined a key " \
               "in the schema that doesn't have a corresponding method."
       end
 

data/lib/surrealist/value_assigner.rb

@@ -13,8 +13,8 @@ module Surrealist
       def assign(schema, instance)
         value = raw_value(instance, schema)
 
-        # array to track and prevent infinite self references in surrealization
-        @stack ||= []
+        # set to track and prevent infinite self references in surrealization
+        @skip_set ||= Set.new
 
         if value.respond_to?(:build_schema)
           yield assign_nested_record(instance, value)
@@ -61,11 +61,8 @@ module Surrealist
       #
       # @return [Array] of schemas
       def assign_nested_collection(instance, value)
-        return if @stack.include?(value.first.class)
-        @stack.push(instance.class).push(value.first.class)
-        result = Surrealist.surrealize_collection(value, raw: true)
-        @stack.delete(instance.class)
-        result
+        return if @skip_set.include?(value.first.class)
+        with_skip_set(instance.class) { Surrealist.surrealize_collection(value, raw: true) }
       end
 
       # Assists in recursively generating schema for a record while preventing infinite self-referencing
@@ -75,10 +72,20 @@ module Surrealist
       #
       # @return [Hash] schema
       def assign_nested_record(instance, value)
-        return if @stack.include?(value.class)
-        @stack.push(instance.class)
-        result = value.build_schema
-        @stack.delete(instance.class)
+        return if @skip_set.include?(value.class)
+        with_skip_set(instance.class) { value.build_schema }
+      end
+
+      # Run block with klass in skip set
+      #
+      # @param [Class] klass of current instance.
+      #
+      # @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)
         result
       end
     end

data/lib/surrealist/version.rb

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

data/surrealist.gemspec

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'surrealist/version'
 
@@ -24,11 +24,11 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
   spec.required_ruby_version = '>= 2.2.0'
 
-  spec.add_runtime_dependency 'oj', '3.4.0'
+  spec.add_runtime_dependency 'oj', '~> 3.0'
 
   spec.add_development_dependency 'bundler', '~> 1.16'
   spec.add_development_dependency 'pry', '~> 0.11'
   spec.add_development_dependency 'rake', '~> 12.3'
   spec.add_development_dependency 'rspec', '~> 3.7'
-  spec.add_development_dependency 'rubocop', '~> 0.52'
+  spec.add_development_dependency 'rubocop', '~> 0.54'
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: surrealist
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Nikita Esaulov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-28 00:00:00.000000000 Z
+date: 2018-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.52'
+        version: '0.54'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.52'
+        version: '0.54'
 description: A gem that provides DSL for serialization of plain old Ruby objects to
   JSON in a declarative style by defining a `schema`. It also provides a trivial type
   checking in the runtime before serialization.
@@ -114,6 +114,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- _config.yml
 - benchmarks/surrealist_vs_ams.rb
 - bin/console
 - gemfiles/activerecord42.gemfile