plucker_serializer 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf134b11d47d300e2df621e5f027ea881cfae344ae1a807eeb8a51b001888720
-  data.tar.gz: 20f2cee76e31ed9d07f69fe41013cc733b1f3194bc940425309b93639763c1aa
+  metadata.gz: 5944e6c05d1bab433f405984a62980c72501367bcddae6c91164aaf412eab4fc
+  data.tar.gz: c3d20b80b2d9759239d1b35b669a6a1ea09bad571c952b9a3c768330937af866
 SHA512:
-  metadata.gz: d2693c8756d65c1a32f5b0be8aa857e9b5b0c77e8574b99de84ddac9289754f8df4f97cb80cd0928c1aa40ca23588366f0433b01ae60c1668081861f29c20c50
-  data.tar.gz: 9a11ff786953fe594b81dea45f4fa883bbb947bae007207c5724ba0c8077cfcdc0329b9f95457379c906ef39bee27d2acd6d4059eb103184b253a9dcdedf16c4
+  metadata.gz: d402fd1eebbd1b62394292f11b57a04e02e4d90dd2402272b239da98fe504900d9164dba7dc94c4fc13c8bc5b4db7350b1841021977ebe69c77d187c06b9fc0d
+  data.tar.gz: fdd3db583cb2d0cee54ae0a96b137657d977a21477d8ea13550ca388162f0a5636108690166f34ce88c10ea5764730985858d9b71f9173422ededaaeb289e359

data/lib/plucker/attribute.rb

@@ -27,7 +27,7 @@ module Plucker
       end
     end
 
-    def is_pluckable?
+    def pluckable?
       @block.blank?
     end
 

data/lib/plucker/base.rb

@@ -62,7 +62,7 @@ module Plucker
       self.class._descriptor._relationships.each_with_object({}) do |(key, relationship), hash|
         next unless relationship.should_include?(self)
 
-        hash[key.to_s] = relationship.value(self)
+        hash[key.to_sym] = relationship.value(self)
       end
     end
 
@@ -70,12 +70,12 @@ module Plucker
       self.class._descriptor._attributes.each_with_object({}) do |(key, attr), hash|
         next unless attr.should_include?(self)
 
-        hash[key.to_s] = attr.value(self)
+        hash[key.to_sym] = attr.value(self)
       end
     end
 
-    def self.is_pluckable?
-      self._descriptor.is_pluckable?
+    def self.pluckable?
+      self._descriptor.pluckable?
     end
 
     def self.pluckable_columns
@@ -89,19 +89,27 @@ module Plucker
     end
 
     def self.attribute(attr, options = {}, &block)
-      self._descriptor.add_attribute(options.fetch(:key, attr), Plucker::Attribute.new(attr, options, block))
+      key = options.fetch(:key, attr)
+      attribute = Plucker::Attribute.new(attr, options, block)
+      self._descriptor.add_attribute(key.to_sym, attribute)
     end
 
     def self.belongs_to(attr, options = {}, &block)
-      self._descriptor.add_relationship(options.fetch(:key, attr), Plucker::BelongsTo.new(attr, options, block))
+      key = options.fetch(:key, attr)
+      belongs_to = Plucker::BelongsTo.new(attr, options, block)
+      self._descriptor.add_relationship(key.to_sym, belongs_to)
     end
 
     def self.has_one(attr, options = {}, &block)
-      self._descriptor.add_relationship(options.fetch(:key, attr), Plucker::HasOne.new(attr, options, block))
+      key = options.fetch(:key, attr)
+      has_one = Plucker::HasOne.new(attr, options, block)
+      self._descriptor.add_relationship(key.to_sym, has_one)
     end
 
     def self.has_many(attr, options = {}, &block)
-      self._descriptor.add_relationship(options.fetch(:key, attr), Plucker::HasMany.new(attr, options, block))
+      key = options.fetch(:key, attr)
+      has_many = Plucker::HasMany.new(attr, options, block)
+      self._descriptor.add_relationship(key.to_sym, has_many)
     end
 
     def self.model(attr)

data/lib/plucker/collection.rb

@@ -57,7 +57,7 @@ module Plucker
     end
 
     def get_collection_json(use_cache: false)
-      if serializer_class.is_pluckable?
+      if serializer_class.pluckable?
         associated_hash
       else
         objects.map do |object|
@@ -67,8 +67,8 @@ module Plucker
     end
 
     def get_hash(use_cache: false)
-      if serializer_class.is_pluckable?
-        associated_hash
+      if serializer_class.pluckable?
+        associated_hash.map(&:symbolize_keys)
       else
         objects.map do |object|
           serializer_class.new(object).serializable_hash(use_cache: use_cache)
@@ -77,9 +77,7 @@ module Plucker
     end
 
     def cache_version
-      return @cache_version if defined?(@cache_version)
-
-      @cache_version = objects.cache_version
+      @cache_version ||= objects.cache_version
     end
 
     def cache_key(adapter: :json)

data/lib/plucker/concerns/caching.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'active_support/all'
 
 module Plucker
@@ -16,7 +17,8 @@ module Plucker
     module ClassMethods
       def _cache_digest
         return @_cache_digest if defined?(@_cache_digest)
-        @_cache_digest = Digest::SHA1.hexdigest(self.name)
+
+        @_cache_digest = Digest::SHA1.hexdigest(name)
       end
 
       def cache(options = {})
@@ -26,15 +28,14 @@ module Plucker
       end
 
       def cache_enabled?
-        self._cache_store.present? && _cache.present?
+        _cache_store.present? && _cache.present?
       end
     end
 
-    def fetch(adapter: :json)
+    def fetch(adapter: :json, &block)
       if serializer_class.cache_enabled?
-        serializer_class._cache_store.fetch(cache_key(adapter: adapter), version: cache_version, options: serializer_class._cache_options) do
-          yield
-        end
+        serializer_class._cache_store.fetch(cache_key(adapter: adapter), version: cache_version,
+                                                                         options: serializer_class._cache_options, &block)
       else
         yield
       end
@@ -42,15 +43,16 @@ module Plucker
 
     def cache_version
       return @cache_version if defined?(@cache_version)
+
       @cache_version = object.cache_version
     end
 
     def cache_key(adapter: :json)
-      object.cache_key + "/" + serializer_class._cache_digest + "/" + adapter.to_s
+      "#{object.cache_key}/#{serializer_class._cache_digest}/#{adapter}"
     end
 
     def serializer_class
       @serializer_class ||= self.class
     end
   end
-end
+end

data/lib/plucker/descriptor.rb

@@ -2,32 +2,32 @@
 
 module Plucker
   class Descriptor
-    attr_accessor :_serialized_model, :_attributes, :_relationships, :_pluckable_columns, :_is_pluckable
+    attr_accessor :_serialized_model, :_attributes, :_relationships, :_pluckable_columns, :_pluckable
 
     def initialize(serializer_class)
       self._serialized_model = get_serialized_model(serializer_class)
       self._attributes = {}
       self._relationships = {}
       self._pluckable_columns = Set.new
-      self._is_pluckable = true
+      self._pluckable = true
     end
 
-    def is_pluckable?
-      _is_pluckable
+    def pluckable?
+      _pluckable
     end
 
     def add_attribute(key, attr)
       _attributes[key] = attr
-      if attr.is_pluckable? && _serialized_model&.column_names&.include?(attr.name.to_s)
+      if attr.pluckable? && _serialized_model&.column_names&.include?(attr.name.to_s)
         _pluckable_columns << attr.name
       else
-        self._is_pluckable = false
+        self._pluckable = false
       end
     end
 
     def add_relationship(key, relationship)
       _relationships[key] = relationship
-      self._is_pluckable = false
+      self._pluckable = false
     end
 
     def set_model(model)
@@ -36,7 +36,7 @@ module Plucker
 
     def get_serialized_model(serializer_class)
       serializer_class.name.split(/Serializer/).first.constantize
-    rescue NameError, LoadError => e
+    rescue NameError, LoadError
       nil
     end
   end

data/lib/plucker/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Plucker
-  VERSION = '0.6.0'
+  VERSION = '0.7.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: plucker_serializer
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Henry Boisgibault
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2025-02-10 00:00:00.000000000 Z
+date: 2025-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport