action_policy-graphql 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a36627f17b3f0ed75370d60052cfc7f62fff25520c9bb58ba98289c1f3480903
-  data.tar.gz: 45f7c8b1e3a2401113f90fa3b5cf002f6efba4647a9df98209b77c4123691100
+  metadata.gz: 4af0cfd306d4128f52758c4336988f29bfa8628f5839aa18e1a54b366c07a9b9
+  data.tar.gz: 69098890e8c59b44dd2af5a902639dbc407ce190a73e55c1d84b6c9ce464bad0
 SHA512:
-  metadata.gz: 800c62024be3fb01378ebe900e62bd5fbc9343f27857dfa4c20125dd007ce6260e037599880df2e3d97cdab136466c272f6d3756f994595d46b4dbd3514ed330
-  data.tar.gz: 37287ca3abcf008b787f8b9e504db6f4f396f22e4aab5c628524b8d2f543f99e043730ff2ec7455dbce106c7820578040576275e85f546d80f2ea0671d1fd642
+  metadata.gz: 2ee55992d03aa2cd350c2c29e9c632c84dff85288a55ef3608e5f277d407f182a98a1bafd820e18caffe4571b1f896cc5608f72979958da0336e6afef0d7f7ef
+  data.tar.gz: a99cac79463311fecb84d459b537555b9cefe88e0b268b07412d5a0b053ce603c8cea3a426e92cd58033b789d474f008bd3f22b7296270f66e0409f37c0ac6bf

data/.travis.yml

@@ -15,9 +15,13 @@ matrix:
   fast_finish: true
   include:
     - rvm: ruby-head
-      gemfile: gemfiles/graphqlmaster.gemfile
+      gemfile: gemfiles/graphql/master.gemfile
     - rvm: 2.6
-      gemfile: gemfiles/graphqlmaster.gemfile
+      gemfile: gemfiles/graphql/master.gemfile
+    - rvm: 2.6
+      gemfile: gemfiles/action_policy/master.gemfile
+    - rvm: 2.6
+      gemfile: gemfiles/action_policy/0.3.gemfile
     - rvm: jruby-9.2.5.0
       gemfile: gemfiles/jruby.gemfile
     - rvm: 2.6
@@ -28,6 +32,8 @@ matrix:
       gemfile: Gemfile
   allow_failures:
     - rvm: ruby-head
-      gemfile: gemfiles/graphqlmaster.gemfile
+      gemfile: gemfiles/graphql/master.gemfile
+    - rvm: 2.6
+      gemfile: gemfiles/graphql/master.gemfile
     - rvm: 2.6
-      gemfile: gemfiles/graphqlmaster.gemfile
+      gemfile: gemfiles/action_policy/master.gemfile

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## master (unreleased)
 
+## 0.3.2 (2019-12-12)
+
+- Fix compatibility with Action Policy 0.4.0 ([@haines][])
+
 ## 0.3.1 (2019-10-23)
 
 - Add support for using Action Policy methods in `self.authorized?`. ([@palkan][])
@@ -30,3 +34,4 @@ Action Policy helpers there.
 - Initial version. ([@palkan][])
 
 [@palkan]: https://github.com/palkan
+[@haines]: https://github.com/haines

data/Gemfile

@@ -11,6 +11,6 @@ if File.exist?(local_gemfile)
   # Specify custom action_policy/graphql-ruby version in Gemfile.local
   eval(File.read(local_gemfile)) # rubocop:disable Security/Eval
 else
-  gem "action_policy", "~> 0.3.0"
+  gem "action_policy", "~> 0.4.0"
   gem "graphql", "~> 1.9.3"
 end

data/README.md

@@ -80,6 +80,8 @@ end
 
 You can customize the authorization options, e.g. `authorize: {to: :preview?, with: CustomPolicy}`.
 
+If you don't want to raise an exception but return a null instead, you should set a `raise: false` option.
+
 ### `authorized_scope: *`
 
 You can add `authorized_scope: true` option to the field (list or _connection_ field) to

data/gemfiles/action_policy/0.3.gemfile

@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+gem "action_policy", "~> 0.3.0"
+
+gemspec path: "../.."

data/gemfiles/action_policy/master.gemfile

@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+gem "action_policy", github: "palkan/action_policy"
+
+gemspec path: "../.."

data/gemfiles/{graphqlmaster.gemfile → graphql/master.gemfile}

@@ -2,4 +2,4 @@ source "https://rubygems.org"
 
 gem "graphql", github: "rmosolgo/graphql-ruby"
 
-gemspec path: ".."
+gemspec path: "../.."

data/lib/action_policy/graphql/authorized_field.rb

@@ -13,52 +13,61 @@ module ActionPolicy
     #     field :comments, null: false, authorized: { type: :relation, with: MyPostPolicy }
     #   end
     module AuthorizedField
-      class AuthorizeExtension < ::GraphQL::Schema::FieldExtension
-        def initialize(*)
-          super
-          options[:to] ||= ::ActionPolicy::GraphQL.default_authorize_rule
-          options[:raise] = ::ActionPolicy::GraphQL.authorize_raise_exception unless options.key?(:raise)
+      class Extension < ::GraphQL::Schema::FieldExtension
+        def extract_option(key, &default)
+          value = options.fetch(key, &default)
+          options.delete key
+          value
+        end
+      end
+
+      class AuthorizeExtension < Extension
+        def apply
+          @to = extract_option(:to) { ::ActionPolicy::GraphQL.default_authorize_rule }
+          @raise = extract_option(:raise) { ::ActionPolicy::GraphQL.authorize_raise_exception }
         end
 
         def after_resolve(value:, context:, object:, **_rest)
           return value if value.nil?
 
-          if options[:raise]
-            object.authorize! value, **options
+          if @raise
+            object.authorize! value, to: @to, **options
             value
           else
-            object.allowed_to?(options[:to], value, options) ? value : nil
+            object.allowed_to?(@to, value, **options) ? value : nil
           end
         end
       end
 
-      class PreauthorizeExtension < ::GraphQL::Schema::FieldExtension
-        def initialize(*)
-          super
+      class PreauthorizeExtension < Extension
+        def apply
           if options[:with].nil?
             raise ArgumentError, "You must specify the policy for preauthorization: " \
                                  "`field :#{field.name}, preauthorize: {with: SomePolicy}`"
           end
-          options[:to] ||=
+
+          @to = extract_option(:to) do
             if field.type.list?
               ::ActionPolicy::GraphQL.default_preauthorize_list_rule
             else
               ::ActionPolicy::GraphQL.default_preauthorize_node_rule
             end
-          options[:raise] = ::ActionPolicy::GraphQL.authorize_raise_exception unless options.key?(:raise)
+          end
+
+          @raise = extract_option(:raise) { ::ActionPolicy::GraphQL.authorize_raise_exception }
         end
 
         def resolve(context:, object:, arguments:, **_rest)
-          if options[:raise]
-            object.authorize! field.name, **options
+          if @raise
+            object.authorize! field.name, to: @to, **options
             yield object, arguments
-          elsif object.allowed_to?(options[:to], field.name, options)
+          elsif object.allowed_to?(@to, field.name, **options)
             yield object, arguments
           end
         end
       end
 
-      class ScopeExtension < ::GraphQL::Schema::FieldExtension
+      class ScopeExtension < Extension
         def after_resolve(value:, context:, object:, **_rest)
           return value if value.nil?
 

data/lib/action_policy/graphql/version.rb

@@ -2,6 +2,6 @@
 
 module ActionPolicy
   module GraphQL
-    VERSION = "0.3.1"
+    VERSION = "0.3.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: action_policy-graphql
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Vladimir Dementyev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-23 00:00:00.000000000 Z
+date: 2019-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: action_policy
@@ -154,7 +154,9 @@ files:
 - action_policy-graphql.gemspec
 - bin/console
 - bin/setup
-- gemfiles/graphqlmaster.gemfile
+- gemfiles/action_policy/0.3.gemfile
+- gemfiles/action_policy/master.gemfile
+- gemfiles/graphql/master.gemfile
 - gemfiles/jruby.gemfile
 - lib/action_policy-graphql.rb
 - lib/action_policy/graphql.rb
@@ -188,7 +190,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Action Policy integration for GraphQL-Ruby