cache_crispies 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7be596f4546279c27b355a83a6c87b5d986cbcc65779def4310df106c3017557
-  data.tar.gz: e7b5ceb4ac6c68d7149bb45246bdba99864c5fbd289277d054b22c5c622f748d
+  metadata.gz: dde77903d49df53ae283abc8d1c0b93e9f8d849b8d1696d39fced6a664b005dd
+  data.tar.gz: e656b7ce6ce5e74076380b67fb5d86b6fe731a4df80edbb953c5e63694ce40de
 SHA512:
-  metadata.gz: ac4fe247753da8c9afa3e2d5a27d8f673c780b6bbb0d71a8777e736e9b9761be4791c33e5370a3f6a1ade8df2ff65befd648c9004908f1d4ebaafb3ce3678aa1
-  data.tar.gz: 823e1a06a9a007e74cb148751f765cf506e96849b5947e5132b2fffadfbaaa447a3c379cbd805d72fb03ceffd2bb8daf12a8649e282020d1d91b98656af97e82
+  metadata.gz: fb83071875231fa5ec31244d47e2594de335787515dafe75fd9ce433060e151b38469c7b06e2a5428c6e1746855ced29ca6cf25970bd874c3dae056936347478
+  data.tar.gz: be8908410852bc16ac94efe31b9972d384b82932fb791aad2e9e98df646386131fc260317e3b1d7d3c94e19f20ffc5e3c5951d0a87be67d68da88c7d8eb41cc4

data/lib/cache_crispies/attribute.rb

@@ -14,6 +14,7 @@ module CacheCrispies
     # @param from [Symbol] the method on the model to call to get the value
     # @param with [CacheCrispies::Base] a serializer to use to serialize the
     # @param to [Class, Symbol] the data type to coerce the value into
+    # @param collection [Boolean] force rendering as single or collection
     # @param nesting [Array<Symbol>] the JSON keys this attribute will be
     #    nested inside
     # @param conditions [Array<CacheCrispies::Condition>] the show_if condition
@@ -22,7 +23,8 @@ module CacheCrispies
     #   argument's value
     def initialize(
       key,
-      from: nil, with: nil, through: nil, to: nil, nesting: [], conditions: [],
+      from: nil, with: nil, through: nil, to: nil, collection: nil,
+      nesting: [], conditions: [],
       &block
     )
       @key = key
@@ -30,6 +32,7 @@ module CacheCrispies
       @serializer = with
       @through = through
       @coerce_to = to
+      @collection = collection
       @nesting = Array(nesting)
       @conditions = Array(conditions)
       @block = block
@@ -41,6 +44,7 @@ module CacheCrispies
       :serializer,
       :through,
       :coerce_to,
+      :collection,
       :nesting,
       :conditions,
       :block
@@ -66,8 +70,6 @@ module CacheCrispies
       serializer ? serialize(value, options) : coerce(value)
     end
 
-
-
     private
 
     def through?
@@ -81,7 +83,9 @@ module CacheCrispies
     # Here we'll render the attribute with a given serializer and attempt to
     # cache the results for better cache reusability
     def serialize(value, options)
-      plan = CacheCrispies::Plan.new(serializer, value, options)
+      plan = CacheCrispies::Plan.new(
+        serializer, value, collection: collection, **options
+      )
 
       if plan.collection?
         plan.cache { Collection.new(value, serializer, options).as_json }

data/lib/cache_crispies/base.rb

@@ -220,7 +220,7 @@ module CacheCrispies
 
     def self.serialize(
       *attribute_names,
-      from: nil, with: nil, through: nil, to: nil,
+      from: nil, with: nil, through: nil, to: nil, collection: nil,
       &block
     )
       attribute_names.flatten.map { |att| att&.to_sym }.map do |attrib|
@@ -234,6 +234,7 @@ module CacheCrispies
             with: with,
             through: through,
             to: to,
+            collection: collection,
             nesting: current_nesting,
             conditions: current_conditions,
             &block

data/lib/cache_crispies/controller.rb

@@ -25,8 +25,13 @@ module CacheCrispies
     #    or Rails-supported symbol. See
     #    https://guides.rubyonrails.org/layouts_and_rendering.html#the-status-option
     # @return [void]
-    def cache_render(serializer, cacheable, options = {})
-      plan = CacheCrispies::Plan.new(serializer, cacheable, options)
+    def cache_render(serializer, cacheable, key: nil, collection: nil, status: nil, **options)
+      plan = CacheCrispies::Plan.new(
+        serializer,
+        cacheable,
+        key: key, collection: collection,
+        **options
+      )
 
       if CacheCrispies.config.etags?
         response.weak_etag = plan.etag
@@ -44,7 +49,7 @@ module CacheCrispies
         end
 
       render_hash = { json: Oj.dump(plan.wrap(serializer_json), mode: OJ_MODE) }
-      render_hash[:status] = options[:status] if options.key?(:status)
+      render_hash[:status] = status if status
 
       render render_hash
     end

data/lib/cache_crispies/plan.rb

@@ -16,14 +16,13 @@ module CacheCrispies
     #   data under
     # @option options [Boolean] :collection whether to render the data as a
     #   collection/array or a single object
-    def initialize(serializer, cacheable, options = {})
+    def initialize(serializer, cacheable, key: nil, collection: nil, **options)
       @serializer = serializer
       @cacheable = cacheable
 
-      opts = options.dup
-      @key = opts.delete(:key)
-      @collection = opts.delete(:collection)
-      @options = opts
+      @key = key
+      @collection = collection
+      @options = options
     end
 
     # Whether or not the cacheable should be treated like a collection

data/lib/cache_crispies/version.rb

@@ -2,5 +2,5 @@
 
 module CacheCrispies
   # The version of the gem
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cache_crispies
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Adam Crownoble
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-12 00:00:00.000000000 Z
+date: 2020-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties