fast_serializer_ruby 0.2.1 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4226b5f0bc68c749226425f93db90d60bfe5b0cba0faa74a77e9cfd24680a73b
-  data.tar.gz: 697304fc0c88cdd9848c974027689c5eb4a0f90daa3e95fb4c2d2e723ceb8040
+  metadata.gz: c2fe112ed6cdaf1cd66461af7dda6f655b2b818de5e3c53e9932e115daeefd77
+  data.tar.gz: 8d54849329a8e725d7a1cb68df6650f3bec50dc40881728fb2dd703c16cd5cf0
 SHA512:
-  metadata.gz: ad76357998ec5b0de5768057e6dd6191f4cc8f7eba5dfc9170206245570ad725ba822f1bbf5d35dfed5364227f6dd28130aaadc70717158f42d80d906f76f98b
-  data.tar.gz: 2a43e81fe55e7d4a8dd56b56a489030d38f4d810564b332ee0f965b0d16b3152622a5aab97779dfa45b8cfe276640b16da6fd1eb7c81c4a629bbb82939ab6e05
+  metadata.gz: 43c4b93e93306ccb4d59a6386576fe7277aa24306fa74a36b2661ca78671f0355a9b85ab085c32619117cfb3f1e57e8663e2873064bbfc8a6c12b7a9fa2aeb0a
+  data.tar.gz: e843ff147fe2e66ebbcba2436ed372cbcce3b902282e8b71ce0b087ff8c16084cb2c74edd09fc9334040f6b0070c763479ba0f3dc38c0df177373fb2343441ed

data/.travis.yml

@@ -17,9 +17,6 @@ matrix:
     - rvm: ruby-head
     - rvm: jruby-head
 
-before_install:
-  - gem update --system -N
-
 before_script:
   - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
   - chmod +x ./cc-test-reporter

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fast_serializer_ruby (0.2.0)
+    fast_serializer_ruby (0.4.1)
 
 GEM
   remote: https://rubygems.org/
@@ -123,6 +123,3 @@ DEPENDENCIES
   rspec (~> 3.0)
   rspec-benchmark
   simplecov
-
-BUNDLED WITH
-   2.0.2

data/lib/fast_serializer/json_model/attribute.rb

@@ -24,7 +24,16 @@ module FastSerializer
 
         cond = @opts[:if] || @opts[:unless]
 
-        res = context.instance_exec(resource, params, &cond)
+        res = if cond.is_a?(Proc)
+                if cond.arity.abs == 1
+                  context.instance_exec(resource, &cond)
+                else
+                  context.instance_exec(resource, params, &cond)
+                end
+              else
+                context.public_send(cond)
+              end
+
         res = !res unless @opts[:unless].nil?
 
         res

data/lib/fast_serializer/json_model/node.rb

@@ -6,7 +6,7 @@ module FastSerializer
       attr_accessor :key, :method, :context
 
       def initialize(key: nil, method: nil, opts: {}, **_)
-        @key = key
+        @key = key&.to_sym
         @method = method || key
         @opts = opts || {}
       end

data/lib/fast_serializer/json_model/relationship.rb

@@ -14,13 +14,23 @@ module FastSerializer
       end
 
       def included?(resource, params, context)
-        super(resource, params) && include_relation?(params)
+        super && include_relation?(params)
       end
 
       def include_relation?(params)
-        return true if params[:include].nil?
+        include?(params) && !exclude?(params)
+      end
 
-        params[:include].include?(key)
+      def exclude?(params)
+        return false if params[:exclude].nil?
+        return false if params[:exclude].empty?
+        params[:exclude_index].key?(key)
+      end
+
+      def include?(params)
+        return true if params[:include].nil?
+        return false if params[:include].empty?
+        params[:include_index].has_key?(key)
       end
     end
   end

data/lib/fast_serializer/schema.rb

@@ -12,11 +12,29 @@ module FastSerializer
       @serialization_schema = JsonModel::Object.new
       @params               = (params || {}).symbolize_keys
       @params[:self]        = self
+      @params[:include_index] = {}
+      @params[:exclude_index] = {}
 
-      if @params[:include]
-        if @params[:include].any?
-          @params[:include] = @params[:include].map(&:to_sym)
-        end
+      self.include = @params.delete(:include)
+      self.exclude = @params.delete(:exclude)
+    end
+
+    def include=(list)
+      return if !list
+
+
+      if list.any?
+        @params[:include] = list.map(&:to_sym)
+        @params[:include_index] = @params[:include].map { |key| [key, nil] }.to_h
+      end
+    end
+
+    def exclude=(list)
+      return if !list
+
+      if list.any?
+        @params[:exclude] = list.map(&:to_sym)
+        @params[:exclude_index] = @params[:exclude].map { |key| [key, nil] }.to_h
       end
     end
 
@@ -101,6 +119,7 @@ module FastSerializer
       meta        = _params_dup.delete(:meta)
 
       is_collection = resource.respond_to?(:size) && !resource.respond_to?(:each_pair)
+      is_collection = params.delete(:is_collection) if params.has_key?(:is_collection)
 
       _serialization_schema = if is_collection
                                 JsonModel::Array.new(schema: serialization_schema)
@@ -118,7 +137,7 @@ module FastSerializer
     end
 
     def serialize_resource_to_json(resource, params = {}, context = self)
-      FastSerializer.config.coder.dump(serialize_resource(resource, params))
+      FastSerializer.config.coder.dump(serialize_resource(resource, params, context))
     end
 
     module Mixin
@@ -147,11 +166,13 @@ module FastSerializer
           self.params   = params || {}
         end
 
-        def serializable_hash
+        def serializable_hash(opts = {})
+          self.params = params.merge(opts)
           self.class.__schema__.serialize_resource(resource, params, self)
         end
 
-        def serialized_json
+        def serialized_json(opts = {})
+          self.params = params.merge(opts)
           self.class.__schema__.serialize_resource_to_json(resource, params, self)
         end
 

data/lib/fast_serializer/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FastSerializer
-  VERSION = '0.2.1'
+  VERSION = '0.4.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fast_serializer_ruby
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.4.1
 platform: ruby
 authors:
 - Evgeny Stepanov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-16 00:00:00.000000000 Z
+date: 2019-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers