graphql_rails 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1d9d24469554419e5b4b033eb06b1e8f0be82079285d31ee7dbfb1e8e19e825
-  data.tar.gz: 3acc8f452a19ca66421a438103e8da1ed24da263ce551eb7d082ac67458011e8
+  metadata.gz: 309517d73a351c64e7d68b46d53cc6dc5b1305c1f782115bd5e88cde0d54ee34
+  data.tar.gz: 0fa2965c43db677ab4206eb383b23a995a1ee757d8857fd836d7f64f6524abf0
 SHA512:
-  metadata.gz: 47974bc6d410ff9ed1215025aa4d06362494f87e20fee0c4259a3186ffa001a38c495b9ec7a9eff2428e966dc32ed52f776129cbab413abf874bc8ecb4334bc2
-  data.tar.gz: aa1f164524942256b310088b0ae046f5d98b90e283f4c17f465c8d3ca64a3ca4b8cd836af78b2fe77332fe062518b00380ed68d22df57b61d6eca824f0f6caff
+  metadata.gz: f3769cec225cae791c8e71276f195a317f4a6bafcfb24d155896555aaa214380d54e62b573032c3b056e7da0b0133c8fb680e5055addc7c1df473d47b3a7073b
+  data.tar.gz: d0dd5023a8e0130f8e2f40ed34f5ddc636498420fc312e88e606e53749f37fff70cae4a0b0cd18f3d80fa973ab62ebd598bd61108202bae0a365accf17107277

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    graphql_rails (0.4.0)
+    graphql_rails (0.4.1)
       activesupport (>= 4)
       graphql (~> 1)
 
@@ -22,10 +22,12 @@ GEM
     arel (9.0.0)
     ast (2.4.0)
     bson (4.3.0)
+    byebug (10.0.2)
     codecov (0.1.10)
       json
       simplecov
       url
+    coderay (1.1.2)
     concurrent-ruby (1.0.5)
     diff-lcs (1.3)
     docile (1.3.0)
@@ -33,6 +35,7 @@ GEM
     i18n (1.0.1)
       concurrent-ruby (~> 1.0)
     json (2.1.0)
+    method_source (0.9.0)
     minitest (5.11.3)
     mongo (2.5.1)
       bson (>= 4.3.0, < 5.0.0)
@@ -43,6 +46,12 @@ GEM
     parser (2.5.1.0)
       ast (~> 2.4.0)
     powerpack (0.1.1)
+    pry (0.11.3)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
+    pry-byebug (3.6.0)
+      byebug (~> 10.0)
+      pry (~> 0.10)
     rainbow (3.0.0)
     rake (10.5.0)
     rspec (3.7.0)
@@ -88,6 +97,7 @@ DEPENDENCIES
   codecov
   graphql_rails!
   mongoid
+  pry-byebug
   rake (~> 10.0)
   rspec (~> 3.0)
   rubocop

data/docs/components/controller.md

@@ -164,6 +164,26 @@ class UsersController < GraphqlRails::Controller
 end
 ```
 
+## anonymous action filters
+
+before/after/around action filters can be written as blocks too:
+
+```ruby
+class UsersController < GraphqlRails::Controller
+  around_action do |controller, block|
+    I18n.with_locale('it') do
+      block.call
+    end
+  end
+
+  def create
+    User.create(params)
+  end
+end
+```
+
+it's not recommended but might be helpful in some edge cases.
+
 ### *only* and *except* option
 
 `UsersController.before_action` accepts `only` or `except` options which allows to skip filters for some actions.

data/graphql_rails.gemspec

@@ -26,4 +26,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.16'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'pry-byebug'
 end

data/lib/graphql_rails/controller.rb

@@ -10,16 +10,20 @@ module GraphqlRails
   # base class for all graphql_rails controllers
   class Controller
     class << self
-      def before_action(*args)
-        controller_configuration.add_before_action(*args)
+      def inherited(sublass)
+        sublass.instance_variable_set(:@controller_configuration, controller_configuration.dup)
       end
 
-      def around_action(*args)
-        controller_configuration.add_around_action(*args)
+      def before_action(*args, &block)
+        controller_configuration.add_action_hook(:before, *args, &block)
       end
 
-      def after_action(*args)
-        controller_configuration.add_after_action(*args)
+      def around_action(*args, &block)
+        controller_configuration.add_action_hook(:around, *args, &block)
+      end
+
+      def after_action(*args, &block)
+        controller_configuration.add_action_hook(:after, *args, &block)
       end
 
       def action(action_name)
@@ -31,11 +35,14 @@ module GraphqlRails
       end
     end
 
+    attr_reader :action_name
+
     def initialize(graphql_request)
       @graphql_request = graphql_request
     end
 
     def call(method_name)
+      @action_name = method_name
       call_with_rendering(method_name)
 
       FormatResults.new(
@@ -44,6 +51,8 @@ module GraphqlRails
         params: params,
         graphql_context: graphql_request.context
       ).call
+    ensure
+      @action_name = nil
     end
 
     protected

data/lib/graphql_rails/controller/action_configuration.rb

@@ -10,6 +10,11 @@ module GraphqlRails
     class ActionConfiguration
       attr_reader :attributes, :return_type, :pagination_options
 
+      def initialize_copy(other)
+        super
+        @attributes = other.instance_variable_get(:@attributes).dup.transform_values(&:dup)
+      end
+
       def initialize
         @attributes = {}
         @can_return_nil = false

data/lib/graphql_rails/controller/{action_filter.rb → action_hook.rb}

@@ -2,12 +2,13 @@
 
 module GraphqlRails
   class Controller
-    # stores information about controller filter
-    class ActionFilter
-      attr_reader :name
+    # stores information about controller hooks like before_action, after_action, etc.
+    class ActionHook
+      attr_reader :name, :action_proc
 
-      def initialize(name, only: [], except: [])
+      def initialize(name: nil, only: [], except: [], &action_proc)
         @name = name
+        @action_proc = action_proc
         @only_actions = Array(only).map(&:to_sym)
         @except_actions = Array(except).map(&:to_sym)
       end
@@ -22,6 +23,10 @@ module GraphqlRails
         end
       end
 
+      def anonymous?
+        !!action_proc # rubocop:disable Style/DoubleNegation
+      end
+
       private
 
       attr_reader :only_actions, :except_actions

data/lib/graphql_rails/controller/action_hooks_runner.rb

@@ -10,43 +10,47 @@ module GraphqlRails
       end
 
       def call
-        run_before_action_hooks
-        run_around_actions { yield }.tap do
-          run_after_action_hooks
-        end
+        result = nil
+        run_action_hooks(:before)
+        run_around_action_hooks { result = yield }
+        run_action_hooks(:after)
+        result
       end
 
       private
 
       attr_reader :action_name, :controller
 
-      def all_around_actions
-        controller_configuration.around_actions_for(action_name)
+      def all_around_hooks
+        controller_configuration.action_hooks_for(:around, action_name)
       end
 
       def controller_configuration
         controller.class.controller_configuration
       end
 
-      def run_around_actions(around_actions = all_around_actions, &block)
-        pending_around_actions = around_actions.clone
-        around_action = pending_around_actions.shift
+      def run_around_action_hooks(around_hooks = all_around_hooks, &block)
+        pending_around_hooks = around_hooks.clone
+        action_hook = pending_around_hooks.shift
 
-        if around_action
-          controller.send(around_action.name) { run_around_actions(pending_around_actions, &block) }
+        if action_hook
+          execute_hook(action_hook) { run_around_action_hooks(pending_around_hooks, &block) }
         else
           yield
         end
       end
 
-      def run_before_action_hooks
-        before_actions = controller_configuration.before_actions_for(action_name)
-        before_actions.each { |filter| controller.send(filter.name) }
+      def execute_hook(action_hook, &block)
+        if action_hook.anonymous?
+          action_hook.action_proc.call(controller, *block)
+        else
+          controller.send(action_hook.name, &block)
+        end
       end
 
-      def run_after_action_hooks
-        after_actions = controller_configuration.after_actions_for(action_name)
-        after_actions.each { |filter| controller.send(filter.name) }
+      def run_action_hooks(hook_type)
+        action_hooks = controller_configuration.action_hooks_for(hook_type, action_name)
+        action_hooks.each { |hook| execute_hook(hook) }
       end
     end
   end

data/lib/graphql_rails/controller/configuration.rb

@@ -3,41 +3,43 @@
 require 'active_support/core_ext/string/inflections'
 require 'graphql_rails/attribute'
 require 'graphql_rails/controller/action_configuration'
-require 'graphql_rails/controller/action_filter'
+require 'graphql_rails/controller/action_hook'
 
 module GraphqlRails
   class Controller
     # stores all graphql_rails contoller specific config
     class Configuration
       def initialize
-        @before_actions = {}
-        @around_actions = {}
-        @after_actions = {}
+        @hooks = {
+          before: {},
+          after: {},
+          around: {}
+        }
+
         @action_by_name = {}
       end
 
-      def before_actions_for(action_name)
-        action_filters_for(action_name, before_actions)
-      end
+      def initialize_copy(other)
+        super
 
-      def around_actions_for(action_name)
-        action_filters_for(action_name, around_actions)
-      end
+        @action_by_name = other.instance_variable_get(:@action_by_name).transform_values(&:dup)
 
-      def after_actions_for(action_name)
-        action_filters_for(action_name, after_actions)
+        hooks_to_copy = other.instance_variable_get(:@hooks)
+        @hooks = hooks_to_copy.each.with_object({}) do |(hook_type, type_hooks), new_hooks|
+          new_hooks[hook_type] = type_hooks.transform_values(&:dup)
+        end
       end
 
-      def add_around_action(name, **options)
-        add_action(name, around_actions, **options)
+      def action_hooks_for(hook_type, action_name)
+        hooks[hook_type].values.select { |hook| hook.applicable_for?(action_name) }
       end
 
-      def add_before_action(name, **options)
-        add_action(name, before_actions, **options)
-      end
+      def add_action_hook(hook_type, name = nil, **options, &block)
+        hook_name = name&.to_sym
+        hook_key = hook_name || :"anonymous_#{block.hash}"
 
-      def add_after_action(name, **options)
-        add_action(name, after_actions, **options)
+        hooks[hook_type][hook_key] = \
+          ActionHook.new(name: hook_name, **options, &block)
       end
 
       def action(method_name)
@@ -46,16 +48,7 @@ module GraphqlRails
 
       private
 
-      attr_reader :before_actions, :around_actions, :after_actions
-
-      def action_filters_for(action_name, action_filters)
-        action_filters.values.select { |filter| filter.applicable_for?(action_name) }
-      end
-
-      def add_action(name, actions_collection, **options)
-        symbolized_name = name.to_sym
-        actions_collection[symbolized_name] = ActionFilter.new(symbolized_name, **options)
-      end
+      attr_reader :hooks
     end
   end
 end

data/lib/graphql_rails/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GraphqlRails
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql_rails
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Povilas Jurčys
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-21 00:00:00.000000000 Z
+date: 2018-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - po.jurcys@gmail.com
@@ -117,7 +131,7 @@ files:
 - lib/graphql_rails/controller.rb
 - lib/graphql_rails/controller/action.rb
 - lib/graphql_rails/controller/action_configuration.rb
-- lib/graphql_rails/controller/action_filter.rb
+- lib/graphql_rails/controller/action_hook.rb
 - lib/graphql_rails/controller/action_hooks_runner.rb
 - lib/graphql_rails/controller/configuration.rb
 - lib/graphql_rails/controller/controller_function.rb