sinja 1.0.0.pre1 → 1.0.0.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ca76b5776f261ca35dbf3d7728b8f6c5e17b720
-  data.tar.gz: eb1238aab2e77a50558b6445a0cd5055e3fe9f39
+  metadata.gz: 7c550d3cff0b520955dbd6add3f45fe426d0ba03
+  data.tar.gz: 2c0273185088e63db97d8a1de1e6c8612f9999c8
 SHA512:
-  metadata.gz: 9134e5396394e7b0f92305e88df7777e4abbd39e0f1b0da839e5382629dd59d97bdd41c72cc45bd2455578bc332d2381b6aa49548653333b21f7965fe4db5e28
-  data.tar.gz: 6907c31c9ecbe601b2eb1f93accedf39288d2cf20be57df6e96a295a1baddc8dbc4f662d1a50e367eb0806718d69e8daf8d77fe54e971ea3a7c1e6ccc89ff71f
+  metadata.gz: beaec25e26829f91f373e886449a64d10629f4905c1fb809576522aa866cd7843bd61c263fb219e566fe17fe2f31c59d0565c5c4230d10e9acd23bd4b09dc781
+  data.tar.gz: d7d470ba61bc03da60129b9e8566b5bd98fdcf7e6223f4e59e72c112bca2fdbfc8d026e209aeb4a651493281a6e38e0f247733ddd906dbefd4c2bce66ee44177

data/README.md

@@ -277,6 +277,17 @@ end
 : Returns the `data` key of the deserialized request payload (with symbolized
   names).
 
+**dedasherize**
+: Takes a string or symbol and returns the string or symbol with any and all
+  dashes transliterated to underscores.
+
+**dedasherize_names**
+: Takes a hash and returns the hash with its keys dedasherized (deeply).
+
+**role?**
+: Takes a list of role(s) and returns true if it has members in common with the
+  current user's role(s).
+
 **serialize_model**
 : Takes a model (and optional hash of JSONAPI::Serializers options) and returns
   a serialized model.
@@ -295,13 +306,6 @@ end
   and returns a serialized collection if non-empty, or the root metadata if
   present, or a HTTP status 204.
 
-**dedasherize**
-: Takes a string or symbol and returns the string or symbol with any and all
-  dashes transliterated to underscores.
-
-**dedasherize_names**
-: Takes a hash and returns the hash with its keys dedasherized (deeply).
-
 **sideloaded?**
 : Returns true if the request was invoked from another action helper.
 
@@ -626,8 +630,8 @@ end
 ```
 
 You may invoke an action helper keyword without a block to modify the options
-(i.e. roles) of a previously-registered action helper while preseving the
-existing behavior:
+(i.e. roles and sideloading) of a previously-registered action helper while
+preseving the existing behavior:
 
 ```ruby
 resource :bars do

data/lib/sinja/helpers/serializers.rb

@@ -68,20 +68,24 @@ module Sinja
 
         # Walk the tree and try to exclude based on fetch and pluck permissions
         included.keep_if do |termstr|
-          # Start cursor at root of current resource
-          roles = settings._resource_roles
-
-          termstr.split('.').all? do |term|
-            break true unless roles
-
-            rel_roles =
-              roles.dig(:has_many, term.to_sym, :fetch) ||
-              roles.dig(:has_one, term.to_sym, :pluck)
+          catch :keep? do
+            *terms, last_term = termstr.split('.')
+
+            # Start cursor at root of current resource
+            roles = settings._resource_roles
+            terms.each do |term|
+              # Move cursor through each term, avoiding the default proc,
+              # halting if no roles found, i.e. client asked to include
+              # something that Sinja doesn't know about
+              throw :keep?, true \
+                unless roles = settings._sinja.resource_roles.fetch(term.pluralize.to_sym, nil)
+            end
 
-            # Move cursor ahead for next iteration (if necessary), avoiding default proc
-            roles = settings._sinja.resource_roles.fetch(term.pluralize.to_sym, nil)
+            roles =
+              roles.dig(:has_many, last_term.pluralize.to_sym, :fetch) ||
+              roles.dig(:has_one, last_term.singularize.to_sym, :pluck)
 
-            rel_roles && (rel_roles.empty? || rel_roles === memoized_role)
+            throw :keep?, roles && (roles.empty? || roles === memoized_role)
           end
         end
       end

data/lib/sinja/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Sinja
-  VERSION = '1.0.0.pre1'
+  VERSION = '1.0.0.pre2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinja
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre1
+  version: 1.0.0.pre2
 platform: ruby
 authors:
 - Mike Pastore