jsonapi-serializer-formats 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1084dc152896ad4da2aedbc71a966548553ede8f5d6897112407c917da528bc8
-  data.tar.gz: 239766aba4009f0b05697f34aa7b5e847197a0cc0e600f3b80a145701bb9fffa
+  metadata.gz: 46af0de9ebc9db137bf79ec1782170647c0644178a7680278a5427b6d5ea4e31
+  data.tar.gz: 8a1698007a3790c49e9952778b40fffab279fb45b141cfad8daa3f422441bdab
 SHA512:
-  metadata.gz: 3a66408aadc65d5487572eae3d7d0e104f2cb743bfcc904f507acdfade2b4241dd82ff42441f7cbf469dfb6fc5f9bdffabc96fbce84521dddcda936cb3b034b0
-  data.tar.gz: 2292765309f012cb9d4a36c61af3b8d4c4162ad5a5aaf2b188aa9bf92115b776aee45e2e2f4642d125ba0a80bf2b551ac6ccd5d3f09fd97a639d6ecb3376d859
+  metadata.gz: 5f4dd9574fb1eb90413e69bb044437a8a564f3ca4e4cc5167ee9285e50dd3c09c81516f08e67f6ada4494bbc7e55b02167543e30a88c1366cc5d74a8a8168dcd
+  data.tar.gz: bdaeb23994576e785d90e09b0e38b24f8fa1982b4d2fe34157834bdba267cb8872a04747e0ef260c9badb715192e52a5aa16470c1c4e906bcd21a21b1d40e77b

data/lib/jsonapi-serializer-formats.rb

@@ -6,7 +6,11 @@ module JSONAPI
       class << self 
 
         def scoped_formats
-          @@scoped_formats ||= []
+          @scoped_formats ||= []
+        end
+
+        def formats_per_attr
+          @formats_per_attr ||= {}
         end
   
         # --- Override the attribute and relationship methods to support contexts
@@ -23,23 +27,30 @@ module JSONAPI
           alias_method original_method_name, method_name
 
           define_method(method_name) do |*attributes_list, &block|
-            formats = [*scoped_formats]
-    
-            if formats.length.positive?
+
+            # --- If we're not in a format blocked, pass through
+
+            return send(original_method_name, *attributes_list, &block) unless scoped_formats.length.positive?
               
-              # --- Read options hash (if present)
+            # --- Read options hash (if present)
 
-              opts = attributes_list.last
-              unless opts.is_a?(Hash)
-                opts = {}
-                attributes_list << opts
-              end
+            opts = attributes_list.last
+            unless opts.is_a?(Hash)
+              opts = {}
+              attributes_list << opts
+            end
+
+            user_condition = opts[:if] || Proc.new { true }
+            
+            attributes_list[0..-2].each do |field|
+
+              (formats_per_attr[field] ||= []) << [*scoped_formats]
               
               # --- Inject an :if condition
 
-              cond = opts[:if]
-              opts[:if] = Proc.new do |_, params = {}|
-                if cond.present? && !cond.call(_, params)
+              field_opts = opts.dup
+              field_opts[:if] = Proc.new do |_, params = {}|
+                if !user_condition.call(_, params)
                   next false # --- The user's condition failed
                 end
 
@@ -47,13 +58,13 @@ module JSONAPI
 
                 # --- Return true if the user passed the require formats as params
 
-                formats.all? { |f| render_formats.include?(f) }
+                formats_per_attr[field].any? do |formats|
+                  formats.all? { |f| render_formats.include?(f) }
+                end
               end
-            end
-    
-            # --- Call the original method
 
-            send(original_method_name, *attributes_list, &block)
+              send(original_method_name, *[field, field_opts], &block)
+            end
           end
         end
   

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jsonapi-serializer-formats
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Patrick Rabier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-20 00:00:00.000000000 Z
+date: 2021-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jsonapi-serializer