plucker_serializer 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1afbdbecad2e29b9ee1e5cc59f143597f8995ad851b2d4a7b28ddcab61349de
-  data.tar.gz: 6a4bbd5de3a4d833833030fa8c2e35f43fc3ed56c2b2bfaeb435352495a904d0
+  metadata.gz: 3b74f3d1f2fee4bfa2fd0fc3e6968f35f6d1bbe852b69c6fda56ad63bdbe8ada
+  data.tar.gz: c9daa990c9d467958e6f30dd2faba3a69aa81dfa0708a6289243026504f88351
 SHA512:
-  metadata.gz: d06fa3ebe3216c2aef19f60eb42887f8d4190111ce6f6d2d07010d2e0401965d9a5968e01e1da0915fd4dea468f727b2d05df323dda072351559e590c851cb04
-  data.tar.gz: 2ee3ef45ca3635bdf8400ec8b988a7d6ee2fc0bc524a9ee957287f8f59a8713ffcc04b5ec91195fa7f546b261152e395b107d22d25e6b756ca656fff5f5c0c16
+  metadata.gz: f051ad0a434f02690092cdeb7481db0fc606b780574d8109251746f99b3f1888842c906231321f82ba896e9615939461a93ad95245082086235cb670fc27710b
+  data.tar.gz: b05c2e4c4f327a32c0c9faeae82fc017265f316e41f5f111a709577801862a70d481f7545b226b8cb848a8a83d705702a963851e9582ba2fbc72ec670ba3ccb3

data/lib/plucker/attribute.rb

@@ -1,5 +1,48 @@
 # frozen_string_literal: true
 module Plucker
-    class Attribute < Plucker::Field
+    class Attribute
+        attr_reader :name, :block, :condition
+       
+        def initialize(name, options = {}, block)
+            @name = name
+            @block = block
+            @condition = options[:if]
+        end
+
+        def value(serializer)
+            block_value = instance_exec(serializer.object, &@block) if @block
+            if @block && block_value != :nil
+                block_value
+            else
+                if serializer.respond_to?(@name)
+                    serializer.send(@name)
+                else
+                    serializer.object.send(@name)
+                end
+            end
+        end
+
+        def is_pluckable?
+            @block.blank?
+        end
+
+        def should_include?(serializer)
+            case @condition
+            when nil
+                true
+            when Symbol
+                serializer.public_send(@condition)
+            when String
+                serializer.instance_eval(@condition)
+            when Proc
+                if @condition.arity.zero?
+                    serializer.instance_exec(&@condition)
+                else
+                    serializer.instance_exec(serializer, &@condition)
+                end
+            else
+                nil
+            end
+        end
     end
 end

data/lib/plucker/base.rb

@@ -27,9 +27,9 @@ module Plucker
             self.object = object
         end
 
-        def serializable_hash
-            if self.class.cache_enabled?
-                fetch do
+        def serializable_hash(use_cache: true)
+            if use_cache && self.class.cache_enabled?
+                fetch(adapter: :hash) do
                     get_hash
                 end
             else
@@ -43,8 +43,14 @@ module Plucker
             serializable_hash
         end
 
-        def to_json(options = {})
-            Oj.dump(serializable_hash, mode: :rails)
+        def to_json(options = {}, use_cache: true)
+            if use_cache && self.class.cache_enabled?
+                fetch(adapter: :json) do
+                    Oj.dump(get_hash, mode: :rails)
+                end
+            else
+                Oj.dump(get_hash, mode: :rails)
+            end
         end
 
         def get_hash
@@ -52,17 +58,15 @@ module Plucker
         end
 
         def associations_hash
-            hash = {}
-            self.class._descriptor._relationships.each do |(key, relationship)|
-                next if relationship.excluded?(self)
+            self.class._descriptor._relationships.each_with_object({}) do |(key, relationship), hash|
+                next if !relationship.should_include?(self)
                 hash[key.to_s] = relationship.value(self)
             end
-            hash
         end
 
         def attributes_hash
             self.class._descriptor._attributes.each_with_object({}) do |(key, attr), hash|
-                next if attr.excluded?(self)
+                next if !attr.should_include?(self)
                 hash[key.to_s] = attr.value(self)
             end
         end

data/lib/plucker/collection.rb

@@ -23,12 +23,16 @@ module Plucker
           serializer_class.new(object).serializable_hash
         end.compact
       else
-        if @cache_type == :collection && serializer_class.cache_enabled?
-          fetch do
-            get_hash
+        if serializer_class.cache_enabled?
+          if @cache_type == :collection
+            fetch(adapter: :hash) do
+              get_hash(use_cache: false)
+            end
+          elsif @cache_type == :multi
+            get_hash(use_cache: true)
           end
         else
-          get_hash
+          get_hash(use_cache: false)
         end
       end
     end
@@ -40,15 +44,35 @@ module Plucker
     end
 
     def to_json(options = {})
-      Oj.dump(serializable_hash, mode: :rails)
+      if serializer_class.cache_enabled?
+        if @cache_type == :collection
+          fetch(adapter: :json) do
+            Oj.dump(get_collection_json(use_cache: false), mode: :rails)
+          end
+        elsif @cache_type == :multi
+          Oj.dump(get_collection_json(use_cache: true), mode: :rails)
+        end
+      else
+        Oj.dump(get_collection_json(use_cache: false), mode: :rails)
+      end
     end
 
-    def get_hash
+    def get_collection_json(use_cache: false)
       if serializer_class.is_pluckable?
         associated_hash
       else
         objects.map do |object|
-          serializer_class.new(object).serializable_hash
+          Oj.load(serializer_class.new(object).to_json(use_cache: use_cache))
+        end
+      end
+    end
+
+    def get_hash(use_cache: false)
+      if serializer_class.is_pluckable?
+        associated_hash
+      else
+        objects.map do |object|
+          serializer_class.new(object).serializable_hash(use_cache: use_cache)
         end.compact
       end
     end
@@ -58,9 +82,8 @@ module Plucker
       @cache_version = objects.cache_version
     end
 
-    def cache_key
-      return @cache_key if defined?(@cache_key)
-      @cache_key = objects.cache_key + '/' + serializer_class._cache_digest
+    def cache_key(adapter: :json)
+      objects.cache_key + '/' + serializer_class._cache_digest + "/" + adapter.to_s
     end
 
     private

data/lib/plucker/concerns/caching.rb

@@ -30,9 +30,9 @@ module Plucker
       end
     end
 
-    def fetch
+    def fetch(adapter: :json)
       if serializer_class.cache_enabled?
-        serializer_class._cache_store.fetch(cache_key, version: cache_version, options: serializer_class._cache_options) do
+        serializer_class._cache_store.fetch(cache_key(adapter: adapter), version: cache_version, options: serializer_class._cache_options) do
           yield
         end
       else
@@ -45,9 +45,8 @@ module Plucker
       @cache_version = object.cache_version
     end
 
-    def cache_key
-      return @cache_key if defined?(@cache_key)
-      @cache_key = object.cache_key + "/" + serializer_class._cache_digest
+    def cache_key(adapter: :json)
+      object.cache_key + "/" + serializer_class._cache_digest + "/" + adapter.to_s
     end
 
     def serializer_class

data/lib/plucker/relationship.rb

@@ -1,15 +1,42 @@
 # frozen_string_literal: true
 require_relative 'collection'
-require_relative "field"
 
 module Plucker
-    class Relationship < Plucker::Field
+    class Relationship
+        attr_reader :name, :block, :options, :condition
+       
+        def initialize(name, options = {}, block)
+            @name = name
+            @block = block
+            @options = options
+            @condition = options[:if]
+        end
+
+        def should_include?(serializer)
+            case @condition
+            when nil
+                true
+            when Symbol
+                serializer.public_send(@condition)
+            when String
+                serializer.instance_eval(@condition)
+            when Proc
+                if @condition.arity.zero?
+                    serializer.instance_exec(&@condition)
+                else
+                    serializer.instance_exec(serializer, &@condition)
+                end
+            else
+                nil
+            end
+        end
+
         def associated_object(serializer)
-            block_value = instance_exec(serializer.object, &block) if block
-            if block && block_value != :nil
+            block_value = instance_exec(serializer.object, &@block) if @block
+            if @block && block_value != :nil
                 block_value
             else
-                serializer.object.send(name)
+                serializer.object.send(@name)
             end
         end
 
@@ -19,15 +46,15 @@ module Plucker
 
         private
         def relationship_serializer(serializer, relationship_object=nil)
-            if self.options[:serializer].blank?
+            if @options[:serializer].blank?
                 if relationship_object.present?
                     association_class = relationship_object.class.name
                 else
-                    association_class = serializer.object.class.reflect_on_association(self.name.to_sym).class_name
+                    association_class = serializer.object.class.reflect_on_association(@name.to_sym).class_name
                 end
                 "#{association_class.demodulize.camelize}Serializer".constantize
             else
-                self.options[:serializer]
+                @options[:serializer]
             end
         end
     end

data/lib/plucker/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Plucker
-    VERSION = "0.4.0"
+    VERSION = "0.5.0"
 end

data/lib/plucker_serializer.rb

@@ -7,7 +7,6 @@ require "plucker/relationship"
 require "plucker/belongs_to"
 require "plucker/has_one"
 require "plucker/has_many"
-require "plucker/field"
 require "plucker/descriptor"
 require "plucker/concerns/caching"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: plucker_serializer
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Henry Boisgibault
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-03 00:00:00.000000000 Z
+date: 2022-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -65,7 +65,6 @@ files:
 - lib/plucker/concerns/caching.rb
 - lib/plucker/configuration.rb
 - lib/plucker/descriptor.rb
-- lib/plucker/field.rb
 - lib/plucker/has_many.rb
 - lib/plucker/has_one.rb
 - lib/plucker/relationship.rb

data/lib/plucker/field.rb

@@ -1,81 +0,0 @@
-# frozen_string_literal: true
-module Plucker
-    Field = Struct.new(:name, :options, :block) do
-        def initialize(*)
-            super
-            validate_condition!
-        end
-
-        def value(serializer)
-            block_value = instance_exec(serializer.object, &block) if block
-            if block && block_value != :nil
-                block_value
-            else
-                if serializer.respond_to?(name)
-                    serializer.send(name)
-                else
-                    serializer.object.send(name)
-                end
-            end
-        end
-
-        def is_pluckable?
-            block.blank?
-        end
-
-        def excluded?(serializer)
-            case condition_type
-            when :if
-                !evaluate_condition(serializer)
-            when :unless
-                evaluate_condition(serializer)
-            else
-                false
-            end
-        end
-
-        private
-        def validate_condition!
-            return if condition_type == :none
-
-            case condition
-            when Symbol, String, Proc
-                # noop
-            else
-                fail TypeError, "#{condition_type.inspect} should be a Symbol, String or Proc"
-            end
-        end
-
-        def evaluate_condition(serializer)
-            case condition
-            when Symbol
-                serializer.public_send(condition)
-            when String
-                serializer.instance_eval(condition)
-            when Proc
-                if condition.arity.zero?
-                    serializer.instance_exec(&condition)
-                else
-                    serializer.instance_exec(serializer, &condition)
-                end
-            else
-                nil
-            end
-        end
-
-        def condition_type
-            @condition_type ||=
-                if options.key?(:if)
-                    :if
-                elsif options.key?(:unless)
-                    :unless
-                else
-                    :none
-                end
-        end
-
-        def condition
-            options[condition_type]
-        end
-    end
-end