plucker_serializer 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b8f9afc9f1301b0b3d66270d02332a3c561f154e812c14473d82b26455da90e
-  data.tar.gz: 9081e6e37b2ae439c167774d58b35702e4bc6d8ba5daea474496feae8bcd7835
+  metadata.gz: af8283b8fb399c77763762271db9ee9e01c7cb67a6c1d65076bd76761b81c779
+  data.tar.gz: c0e79765da235b4cec454375c967ed85e0483d74a3403e8a11a8c7b30e916e00
 SHA512:
-  metadata.gz: 831adf15e780f90a1ee9f64811f7a8bf0a684e929a2030884daac8496fafb645473c4d4633d061463f4ca99afb3134bed70b5d22bc691d0103a2f831bf23af68
-  data.tar.gz: 03fc6353497d3abb9668fe4c36e8d68cade203310e2b2bd20afaf21baa09ad6caf9f16de434b30aec6c168573525a6c5e7d05daa15f0d570402d26352a412fbb
+  metadata.gz: c7acb91c9ec72c63fa5bce5f0d3d5c08979478caf08235efd7abefdf674ce146dd1f9ad7179fb6d40ac9ed4e67c9f152c10d8532dd338ec1b94374f675e6fd9c
+  data.tar.gz: fb0c12340759e5d09ccf56f3cbe49c04c112d6d219166de5004b1c241408788cfff8648053b2853b6c8689c15efd7f04e70ac9b37ee44e91ded5a705da752062

data/lib/plucker/base.rb

@@ -38,19 +38,19 @@ 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 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 +58,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,5 +1,6 @@
 # frozen_string_literal: true
 require_relative 'concerns/caching'
+require "pluck_all"
 
 module Plucker
   class Collection
@@ -22,22 +23,10 @@ module Plucker
       else
         if 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 +34,17 @@ module Plucker
     alias to_h serializable_hash
 
     def as_json(options = nil)
-      to_h.as_json(options)
+      serializable_hash
+    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 +62,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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: plucker_serializer
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Henry Boisgibault
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-01 00:00:00.000000000 Z
+date: 2022-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !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: []