plucker_serializer 0.2.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 26a16586daa2f18223613d2c0d7b8d058f3d013325c8477f988b7ab2f7e0b6ad
-  data.tar.gz: 93fe0cc9d2877e9960fd39461864243bdcd6b812c35d08f57b250c07bd9b16e3
+  metadata.gz: b1afbdbecad2e29b9ee1e5cc59f143597f8995ad851b2d4a7b28ddcab61349de
+  data.tar.gz: 6a4bbd5de3a4d833833030fa8c2e35f43fc3ed56c2b2bfaeb435352495a904d0
 SHA512:
-  metadata.gz: f780d77f1a8160851c1c04efe52263f453df1525f45b290fbfeb41653005317563235078259adf388afba8216cfa991bcd10eaa197f4e9deee615c28da7ea874
-  data.tar.gz: cb06a2e6340ede77cbd0b368cd617c58b6cfa85c571f69e7458c520b2a349222caff40595effc969476c4f84818020994651489484f52375eae41b58e137b5fd
+  metadata.gz: d06fa3ebe3216c2aef19f60eb42887f8d4190111ce6f6d2d07010d2e0401965d9a5968e01e1da0915fd4dea468f727b2d05df323dda072351559e590c851cb04
+  data.tar.gz: 2ee3ef45ca3635bdf8400ec8b988a7d6ee2fc0bc524a9ee957287f8f59a8713ffcc04b5ec91195fa7f546b261152e395b107d22d25e6b756ca656fff5f5c0c16

data/lib/plucker/base.rb

@@ -4,6 +4,7 @@ require_relative 'descriptor'
 require_relative 'has_many'
 require_relative 'belongs_to'
 require_relative 'has_one'
+require "oj"
 require 'active_support/all'
 
 module Plucker
@@ -38,19 +39,23 @@ module Plucker
         alias to_hash serializable_hash
         alias to_h serializable_hash
 
-        def get_hash
-            attributes_hash.merge! associations_hash
+        def as_json(options = nil)
+            serializable_hash
         end
 
-        def as_json(options = nil)
-            to_h.as_json(options)
+        def to_json(options = {})
+            Oj.dump(serializable_hash, mode: :rails)
+        end
+
+        def get_hash
+            attributes_hash.merge! associations_hash
         end
 
         def associations_hash
             hash = {}
             self.class._descriptor._relationships.each do |(key, relationship)|
                 next if relationship.excluded?(self)
-                hash[key] = relationship.value(self)
+                hash[key.to_s] = relationship.value(self)
             end
             hash
         end
@@ -58,7 +63,7 @@ module Plucker
         def attributes_hash
             self.class._descriptor._attributes.each_with_object({}) do |(key, attr), hash|
                 next if attr.excluded?(self)
-                hash[key] = attr.value(self)
+                hash[key.to_s] = attr.value(self)
             end
         end
 

data/lib/plucker/collection.rb

@@ -1,16 +1,19 @@
 # frozen_string_literal: true
 require_relative 'concerns/caching'
+require "oj"
+require "pluck_all"
 
 module Plucker
   class Collection
     include Enumerable
     include Caching
 
-    attr_reader :objects, :serializer_class, :options
+    attr_reader :objects, :cache_type, :serializer_class, :options
 
     def initialize(objects, options = {})
       @objects = objects
       @options = options
+      @cache_type = options[:cache] == :multi ? :multi : :collection
       @serializer_class = get_serialized_model(objects)
     end
 
@@ -20,24 +23,12 @@ module Plucker
           serializer_class.new(object).serializable_hash
         end.compact
       else
-        if serializer_class.cache_enabled?
+        if @cache_type == :collection && serializer_class.cache_enabled?
           fetch do
-            if serializer_class.is_pluckable?
-              associated_hash
-            else
-              objects.map do |object|
-                serializer_class.new(object).serializable_hash
-              end.compact
-            end
+            get_hash
           end
         else
-          if serializer_class.is_pluckable?
-            associated_hash
-          else
-            objects.map do |object|
-              serializer_class.new(object).serializable_hash
-            end.compact
-          end
+          get_hash
         end
       end
     end
@@ -45,7 +36,21 @@ module Plucker
     alias to_h serializable_hash
 
     def as_json(options = nil)
-      to_h.as_json(options)
+      serializable_hash
+    end
+
+    def to_json(options = {})
+      Oj.dump(serializable_hash, mode: :rails)
+    end
+
+    def get_hash
+      if serializer_class.is_pluckable?
+        associated_hash
+      else
+        objects.map do |object|
+          serializer_class.new(object).serializable_hash
+        end.compact
+      end
     end
 
     def cache_version
@@ -63,9 +68,9 @@ module Plucker
       pluck_to_hash(objects, serializer_class.pluckable_columns.to_a)
     end
 
-    def pluck_to_hash(object, attrs)
-      namespaced_attrs = attrs.map { |attr| object.model.table_name.to_s + "." + attr.to_s }
-      object.pluck(Arel.sql(namespaced_attrs.join(','))).map { |el| attrs.zip(el).to_h }
+    def pluck_to_hash(objects, attrs)
+      namespaced_attrs = attrs.map { |attr| objects.model.table_name.to_s + "." + attr.to_s }
+      objects.pluck_all(namespaced_attrs.join(','))
     end
 
     def get_serialized_model(objects)

data/lib/plucker/descriptor.rb

@@ -7,12 +7,12 @@ module Plucker
             self._serialized_model = get_serialized_model(serializer_class)
             self._attributes = {}
             self._relationships = {}
-            self._pluckable_columns = Set.new([:updated_at])
+            self._pluckable_columns = Set.new
             self._is_pluckable = true
         end
 
         def is_pluckable?
-            self._is_pluckable && !self._relationships.present?
+            self._is_pluckable
         end
 
         def add_attribute(key, attr)

data/lib/plucker/relationship.rb

@@ -5,7 +5,12 @@ require_relative "field"
 module Plucker
     class Relationship < Plucker::Field
         def associated_object(serializer)
-            serializer.object.send(name)
+            block_value = instance_exec(serializer.object, &block) if block
+            if block && block_value != :nil
+                block_value
+            else
+                serializer.object.send(name)
+            end
         end
 
         def value(serializer)

data/lib/plucker/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: plucker_serializer
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Henry Boisgibault
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-01 00:00:00.000000000 Z
+date: 2022-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -24,6 +24,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: oj
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pluck_all
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A blazing fast JSON serializer for ActiveRecord & Ruby objects
 email: henry@logora.fr
 executables: []