graphql-guard 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b06636860d44863e738be1b6e7bfd9431559d4bb32271526144cdcdd2b8ad97c
-  data.tar.gz: 47bd22cf638fd78deee5d1e6ff211ca465be8dfaacf2a792553bdd31a15fe892
+  metadata.gz: fbde911695d5151407974b87a6ddd6ab4e02c726685ed35c1c59ad270a541a3c
+  data.tar.gz: 877dfa834f5b5880fe11f020567d55dfda0e8e012e3ea3d6c2a4e8acb9ed6ce7
 SHA512:
-  metadata.gz: 5ff2142a28b03afd323ec97755b3e4e3f21fd1b07246023b14154af1a31b783fad9bcda934e3c287adc3ce7dbf1fc76c3560f0650d9366078e4937e04203fefd
-  data.tar.gz: 17a671a32a162bd40773509f07f94d50df969ed4060b1bd24b2fe44f734d04e2749816c04ac21e8f3f5f9f0a722b7b9ab2312489910bd2bd0ada2f00c0565749
+  metadata.gz: 5a485275f3e04a296a2fe0b5362aa8c15ee6002edab671f817758f4540ba05761675532d5b05b0ded05c78c05fd974e44c145085b8237aab59fb3df023e421a1
+  data.tar.gz: 52cade5337f95be53a0200663ecbe039a4026f63d21d54069b243676a65a23c594ada684defe85c194217caae0d1807ca487015196560a75a5fe2eab4adf786a

data/.travis.yml

@@ -6,24 +6,24 @@ matrix:
     - gemfile: graphql-1.7.gemfile
       env: GRAPHQL_RUBY_VERSION=1_7 CI=true
       rvm: 2.3.8
-    - gemfile: graphql-1.8.gemfile
-      env: GRAPHQL_RUBY_VERSION=1_8 CI=true
+    - gemfile: graphql-latest.gemfile
+      env: GRAPHQL_RUBY_VERSION=LATEST CI=true
       rvm: 2.3.8
     - gemfile: graphql-1.7.gemfile
       env: GRAPHQL_RUBY_VERSION=1_7 CI=true
       rvm: 2.4.5
-    - gemfile: graphql-1.8.gemfile
-      env: GRAPHQL_RUBY_VERSION=1_8 CI=true
+    - gemfile: graphql-latest.gemfile
+      env: GRAPHQL_RUBY_VERSION=LATEST CI=true
       rvm: 2.4.5
     - gemfile: graphql-1.7.gemfile
       env: GRAPHQL_RUBY_VERSION=1_7 CI=true
       rvm: 2.5.7
-    - gemfile: graphql-1.8.gemfile
-      env: GRAPHQL_RUBY_VERSION=1_8 CI=true
+    - gemfile: graphql-latest.gemfile
+      env: GRAPHQL_RUBY_VERSION=LATEST CI=true
       rvm: 2.5.7
     - gemfile: graphql-1.7.gemfile
       env: GRAPHQL_RUBY_VERSION=1_7 CI=true
       rvm: 2.6.5
-    - gemfile: graphql-1.8.gemfile
-      env: GRAPHQL_RUBY_VERSION=1_8 CI=true
+    - gemfile: graphql-latest.gemfile
+      env: GRAPHQL_RUBY_VERSION=LATEST CI=true
       rvm: 2.6.5

data/CHANGELOG.md

@@ -12,6 +12,10 @@ that you can set version constraints properly.
 
 * WIP
 
+#### [v1.3.1](https://github.com/exAspArk/graphql-guard/compare/v1.3.0...v1.3.1) – 2020-01-22
+
+* `Fixed`: compatibility with `graphql` gem version 1.10. [#36](https://github.com/exAspArk/graphql-guard/pull/36)
+
 #### [v1.3.0](https://github.com/exAspArk/graphql-guard/compare/v1.2.2...v1.3.0) – 2019-10-24
 
 * `Added`: More descriptive default error message for `NotAuthorizedError`. [#32](https://github.com/exAspArk/graphql-guard/pull/32)

data/Gemfile

@@ -2,7 +2,7 @@ source "https://rubygems.org"
 
 gem "pry"
 
-gem "graphql", "~> 1.8.4"
+gem "graphql", "~> 1.10"
 
 # Specify your gem's dependencies in graphql-guard.gemspec
 gemspec

data/README.md

@@ -120,11 +120,20 @@ class <b>GraphqlPolicy</b>
 end
 </pre>
 
-With `graphql-ruby` gem version >= 1.8 and class-based type definitions, `type` doesn't return the actual type class [rmosolgo/graphql-ruby#1429](https://github.com/rmosolgo/graphql-ruby/issues/1429). To get the actual type class:
+With `graphql-ruby` gem version >= 1.8 and class-based type definitions, use `camelCased` field names in the policy object.
+You'd also need to use `type.metadata` (related to [rmosolgo/graphql-ruby#1429](https://github.com/rmosolgo/graphql-ruby/issues/1429)) to get the type class:
 
 <pre>
-def self.guard(type, field)
-  RULES.dig(<b>type.metadata[:type_class]</b>, field)
+class GraphqlPolicy
+  RULES = {
+    MutationType => {
+      <b>createPost</b>: ->(obj, args, cts) { ctx[:current_user].admin? }
+    }
+  }
+
+  def self.guard(type, field)
+    RULES.dig(<b>type.metadata[:type_class]</b>, field)
+  end
 end
 </pre>
 

data/{graphql-1.8.gemfile → graphql-latest.gemfile}

@@ -3,6 +3,6 @@ source "https://rubygems.org"
 gem "pry"
 gem 'coveralls'
 
-gem "graphql", "~> 1.8.4"
+gem "graphql", "~> 1.10"
 
 gemspec

data/lib/graphql/guard.rb

@@ -19,13 +19,7 @@ module GraphQL
 
     def use(schema_definition)
       schema_definition.instrument(:field, self)
-      schema_definition.target.instance_eval do
-        def default_filter
-          GraphQL::Filter.new(except: default_mask).merge(only: ->(schema_member, ctx) {
-            schema_member.metadata[:mask] ? schema_member.metadata[:mask].call(ctx) : true
-          })
-        end
-      end
+      add_schema_masking!(schema_definition)
     end
 
     def instrument(type, field)
@@ -55,6 +49,22 @@ module GraphQL
 
     private
 
+    def add_schema_masking!(schema_definition)
+      default_filter_proc = Proc.new do
+        def default_filter
+          GraphQL::Filter.new(except: default_mask).merge(only: ->(schema_member, ctx) {
+            schema_member.metadata[:mask] ? schema_member.metadata[:mask].call(ctx) : true
+          })
+        end
+      end
+
+      if schema_definition.is_a?(Class) # GraphQL-Ruby version >= 1.10
+        schema_definition.class_eval(&default_filter_proc)
+      else
+        schema_definition.target.instance_eval(&default_filter_proc)
+      end
+    end
+
     def policy_object_guard(type, field_name)
       policy_object && policy_object.guard(type, field_name)
     end

data/lib/graphql/guard/version.rb

@@ -2,6 +2,6 @@
 
 module GraphQL
   class Guard
-    VERSION = "1.3.0"
+    VERSION = "1.3.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql-guard
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - exAspArk
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-24 00:00:00.000000000 Z
+date: 2020-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql
@@ -92,8 +92,8 @@ files:
 - bin/console
 - bin/setup
 - graphql-1.7.gemfile
-- graphql-1.8.gemfile
 - graphql-guard.gemspec
+- graphql-latest.gemfile
 - lib/graphql/guard.rb
 - lib/graphql/guard/testing.rb
 - lib/graphql/guard/version.rb