graphql-pundit 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a644c29c51d4a66d193bc9417a85b22b9573c495
-  data.tar.gz: c913a8f1fe165bf091dbc3a20dfd29074a237601
+  metadata.gz: 2c8cfdd5652e733a3ccf9160bd6671d6f4e4936a
+  data.tar.gz: c0ca0b99379ec209201fa08ed543517f031dd8ff
 SHA512:
-  metadata.gz: 9ab7475fa807ec3ac98123d462a2e86894fdd3f3c10f0d4bd90e1de668ec74c73b97026e1fd8b6a8a12f9ca0afbcee75b95891acae9382713b0a32bbc3ee0b7a
-  data.tar.gz: f062e98925ee41433ef60d6d04ed660109d07dbcf806489d020ac9c0481200f9822ef58305d82306d2677e5ded5573726c4351705276bcd78374f8c6eb0a7a77
+  metadata.gz: 2764f622ac9f231d910550114cc6706fbba50c324ad07aea103d01916c281928ba7035691804bfc3b1431877aa188cec94ddb3287ce45bd6f39364b31d1eded0
+  data.tar.gz: c7c685e2e16c836039afebafad18edd91896756766fd6b67584bdf608162a7b5994de573b4be48326f0ef685dfdf61b823c2f5a080fb1ba2131e9025523ba2f3

data/lib/graphql-pundit/instrumenters/scope.rb

@@ -19,11 +19,12 @@ module GraphQL
               raise ArgumentError, 'Invalid value passed to `scope`'
             end
 
-            @scope = new_scope(scope)
+            @scope = scope
           end
 
           def call(root, arguments, context)
-            new_scope = scope.call(root, arguments, context)
+            scope_proc = new_scope(scope)
+            new_scope = scope_proc.call(root, arguments, context)
             old_resolver.call(new_scope, arguments, context)
           end
 
@@ -33,11 +34,23 @@ module GraphQL
             return scope if proc?(scope)
 
             lambda do |root, _arguments, context|
-              unless inferred?(scope)
-                root.define_singleton_method(:policy_class) { scope }
-              end
+              scope = find_scope(root, scope)
+              scope.new(context[current_user], root).resolve
+            end
+          end
 
-              ::Pundit.policy_scope!(context[current_user], root)
+          def find_scope(root, scope)
+            if !inferred?(scope)
+              scope::Scope
+            else
+              # Special case for Sequel datasets that do not respond to
+              # ActiveModel's model_name
+              infer_from = if root.respond_to?(:model)
+                             root.model
+                           else
+                             root
+                           end
+              ::Pundit::PolicyFinder.new(infer_from).scope!
             end
           end
 

data/lib/graphql-pundit/version.rb

@@ -2,6 +2,6 @@
 
 module GraphQL
   module Pundit
-    VERSION = '0.5.0'
+    VERSION = '0.5.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql-pundit
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Ontohub Core Developers
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-27 00:00:00.000000000 Z
+date: 2017-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql