plucker_serializer 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 965b22f7307d9bb8930fe6e49e44eed985ad2dabd98970e12e79349855f7d99d
-  data.tar.gz: 1b21385382669c1eb7a6ebb15802a73edaceb8d8f81f9ed0caee8c9f9ade990f
+  metadata.gz: e84cbc970b672503e92f8825f69e898d886d513a9a19a8bd04998b358889bf4a
+  data.tar.gz: 8fae9558248c250b5414b72630c6637d4ab0215ec95db08e060e16804d036874
 SHA512:
-  metadata.gz: ce2ee569cfc9b2fd4157715efa36c823001f0a4aad122270e41d4752048d8e74867869e3dfb51ca8af08ff6d217a6b692855af7dc657cdccdef689cfb331cad2
-  data.tar.gz: 8cd5c5d6228800fc97429853b3b658ffe12222dca1567b3fea357b475948a4ce23c31cb7c91537b81514fe455c8dccc9b5764540c947d9f0737b92e4317e9687
+  metadata.gz: ef153929e8bfaf8c9ae3243f8d99fc7526b93720b0efb06cf720f3f9f58c6e46ec2054c5ade7795c3ad5e1d315563966374bffb1a27ffbea352f9a9e46fb74dd
+  data.tar.gz: 57ccf7fac652350f672aae10f617d86976b543d31a7f65f0c78ae2d7a0f4d34ea31bc5e284567dd661af1221ca1a2cbfa83cd06226d86a38bfe1136e1fdd3288

data/lib/plucker/collection.rb

@@ -13,42 +13,40 @@ module Plucker
 
     def initialize(objects, options = {})
       @objects = objects
-      @options = options
+      @options = options.freeze
       @cache_type = options[:cache] == :multi ? :multi : :collection
-      @serializer_class = get_serialized_model(objects)
+      @serializer_class = determine_serializer_class(objects)
     end
 
     def serializable_hash
-      if !objects.is_a?(ActiveRecord::Relation)
-        objects.map do |object|
+      unless objects.is_a?(ActiveRecord::Relation)
+        return objects.map do |object|
           serializer_class.new(object).serializable_hash
         end.compact
-      elsif 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
+
+      if serializer_class.cache_enabled?
+        if cache_type == :collection
+          fetch(adapter: :hash) { compute_hash(use_cache: false) }
+        elsif cache_type == :multi
+          compute_hash(use_cache: true)
         end
       else
-        get_hash(use_cache: false)
+        compute_hash(use_cache: false)
       end
     end
     alias to_hash serializable_hash
     alias to_h serializable_hash
 
-    def as_json(options = nil)
+    def as_json(_options = nil)
       serializable_hash
     end
 
-    def to_json(options = {})
+    def to_json(_options = {})
       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
+        if cache_type == :collection
+          fetch(adapter: :json) { Oj.dump(get_collection_json(use_cache: false), mode: :rails) }
+        elsif cache_type == :multi
           Oj.dump(get_collection_json(use_cache: true), mode: :rails)
         end
       else
@@ -56,46 +54,44 @@ module Plucker
       end
     end
 
+    def cache_version
+      @cache_version ||= objects.cache_version
+    end
+
+    def cache_key(adapter: :json)
+      "#{objects.cache_key}/#{serializer_class._cache_digest}/#{adapter}"
+    end
+
+    private
+
     def get_collection_json(use_cache: false)
       if serializer_class.pluckable?
         associated_hash
       else
-        objects.map do |object|
-          Oj.load(serializer_class.new(object).to_json(use_cache: use_cache))
-        end
+        objects.map { |object| Oj.load(serializer_class.new(object).to_json(use_cache: use_cache)) }
       end
     end
 
-    def get_hash(use_cache: false)
+    def compute_hash(use_cache: false)
       if serializer_class.pluckable?
         associated_hash.map(&:symbolize_keys)
       else
-        objects.map do |object|
-          serializer_class.new(object).serializable_hash(use_cache: use_cache)
-        end.compact
+        objects.map { |object| serializer_class.new(object).serializable_hash(use_cache: use_cache) }.compact
       end
     end
 
-    def cache_version
-      @cache_version ||= objects.cache_version
-    end
-
-    def cache_key(adapter: :json)
-      "#{objects.cache_key}/#{serializer_class._cache_digest}/#{adapter}"
-    end
-
-    private
-
     def associated_hash
-      pluck_to_hash(objects, serializer_class.pluckable_columns.to_a)
+      objects.pluck_all(namespaced_columns)
     end
 
-    def pluck_to_hash(objects, attrs)
-      namespaced_attrs = attrs.map { |attr| "#{objects.model.table_name}.#{attr}" }
-      objects.pluck_all(namespaced_attrs.join(','))
+    def namespaced_columns
+      @namespaced_columns ||= begin
+        cols = serializer_class.pluckable_columns.to_a.map { |attr| "#{objects.model.table_name}.#{attr}" }
+        cols.join(',').freeze
+      end
     end
 
-    def get_serialized_model(objects)
+    def determine_serializer_class(objects)
       if options[:serializer].blank?
         "#{objects.klass.name.demodulize.camelize}Serializer".constantize
       else

data/lib/plucker/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: plucker_serializer
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Henry Boisgibault