graphql_rails 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f314505789425775da7e899dd4d30bbc6558da828af5b3f617a84d42eb8f4933
-  data.tar.gz: 9afab45a8f249aadf6540715514d2f7e21a713290fa7f753fc1933bc574cb18a
+  metadata.gz: f63b8e5d3c98d472ff1ec382261d772e83d70d7d8af6df29da806b72f8563858
+  data.tar.gz: d075ad40f236b39d0f57e7a47469c6de5a7a3b5ebba5ab62fff30981b7e536ce
 SHA512:
-  metadata.gz: 0c5709a879b830f8beeccfd391ec0f4f7de83cc3af0d4a37880f3051ab00d2d06fc88794087c5b0f8a18331c5d059caca389894cdc36c722e11d4393546fb289
-  data.tar.gz: 9df5208778bfbe2a47c8e652ec2b5442747e51a5e5c4a315fbada63c92248d96d37a85d4598ec8210b5c2e8cc34e8df2f7731faf988ceefb6c91c499da38a68b
+  metadata.gz: 5edf95451b857f27d304701402e8a18c771150385cf1fbc7a72db0d446ee7848c4de6ff0c85466fc6129e9adde4e14057c9b11b244cc388d2f6ee692547511e2
+  data.tar.gz: dfd50167b6c86ee5f371e0183eac93bb8b32d6a3572c85b2cdc1b218c3ca026afc501a44d4534728b45dd0594c4fb9ad451d8d240e1ad9a8fbf12246b2200091

data/CHANGELOG.md

@@ -1,6 +1,7 @@
 ## [Unreleased]
 
-* Your contribution here.
+* Fixed controller action hooks context [@povilasjurcys](https://github.com/povilasjurcys).
+* Added options for controller actions [@vastas1996](https://github.com/vastas1996).
 
 ## 0.5.0 (2019-04-03)
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    graphql_rails (0.5.0)
+    graphql_rails (0.5.1)
       activesupport (>= 4)
       graphql (~> 1)
 
@@ -31,7 +31,7 @@ GEM
     concurrent-ruby (1.1.5)
     diff-lcs (1.3)
     docile (1.3.1)
-    graphql (1.9.3)
+    graphql (1.9.4)
     i18n (1.6.0)
       concurrent-ruby (~> 1.0)
     jaro_winkler (1.5.2)
@@ -107,4 +107,4 @@ DEPENDENCIES
   simplecov
 
 BUNDLED WITH
-   1.16.2
+   1.16.4

data/docs/components/controller.md

@@ -138,6 +138,21 @@ class UsersController < GraphqlRails::Controller
 end
 ```
 
+### *options*
+
+You can customize your queries using `options` method. So far we've added `input_format` and allowed value is `:original` which specifies to keep the field name format.
+`options` method can be used like so:
+
+```ruby
+class UsersController < GraphqlRails::Controller
+  action(:create).options(input_format: :original).permit(:full_name)
+
+  def create
+    User.create(params)
+  end
+end
+```
+
 ## *before_action*
 
 You can add `before_action` to run some filters before calling your controller action. Here is an example:

data/graphql_rails.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ['po.jurcys@gmail.com']
 
   spec.summary       = %q{GraphQL server and client for rails}
-  spec.homepage      = 'https://github.com/povilasjurcys/graphql_rails'
+  spec.homepage      = 'https://github.com/samesystem/graphql_rails'
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|

data/lib/graphql_rails/attribute/attributable.rb

@@ -39,6 +39,10 @@ module GraphqlRails
 
       protected
 
+      def options
+        {}
+      end
+
       def nullable_type
         type = type_parser.graphql_type
         type.non_null? ? type.of_type : type
@@ -51,7 +55,7 @@ module GraphqlRails
       end
 
       def attribute_name_parser
-        @attribute_name_parser ||= AttributeNameParser.new(initial_name)
+        @attribute_name_parser ||= AttributeNameParser.new(initial_name, options: options)
       end
     end
   end

data/lib/graphql_rails/attribute/attribute_name_parser.rb

@@ -7,23 +7,20 @@ module GraphqlRails
     class AttributeNameParser
       attr_reader :name
 
-      def initialize(original_name)
+      def initialize(original_name, options: {})
         name = original_name.to_s
         @required = !name['!'].nil?
         @name = name.tr('!', '')
+        @options = options
       end
 
       def field_name
-        @field_name ||= begin
-          field =
-            if name.end_with?('?')
-              "is_#{name.remove(/\?\Z/)}"
-            else
-              name
-            end
-
-          field.camelize(:lower)
-        end
+        @field_name ||= \
+          if original_format?
+            preprocesed_name
+          else
+            preprocesed_name.camelize(:lower)
+          end
       end
 
       def graphql_type
@@ -41,6 +38,22 @@ module GraphqlRails
       def required?
         @required
       end
+
+      private
+
+      attr_reader :options
+
+      def original_format?
+        options[:input_format] == :original
+      end
+
+      def preprocesed_name
+        if name.end_with?('?')
+          "is_#{name.remove(/\?\Z/)}"
+        else
+          name
+        end
+      end
     end
   end
 end

data/lib/graphql_rails/controller/action_configuration.rb

@@ -18,9 +18,15 @@ module GraphqlRails
 
       def initialize
         @attributes = {}
+        @action_options = {}
         @can_return_nil = false
       end
 
+      def options(input_format:)
+        @action_options[:input_format] = input_format
+        self
+      end
+
       def permit(*no_type_attributes, **typed_attributes)
         no_type_attributes.each { |attribute| permit_attribute(attribute) }
         typed_attributes.each { |attribute, type| permit_attribute(attribute, type) }
@@ -67,7 +73,7 @@ module GraphqlRails
 
       private
 
-      attr_reader :custom_return_type
+      attr_reader :custom_return_type, :action_options
 
       def build_return_type
         return nil if custom_return_type.nil?
@@ -85,7 +91,7 @@ module GraphqlRails
 
       def permit_attribute(name, type = nil)
         field_name = name.to_s.remove(/!\Z/)
-        attributes[field_name] = Model::InputAttribute.new(name.to_s, type)
+        attributes[field_name] = Model::InputAttribute.new(name.to_s, type, options: action_options)
       end
     end
   end

data/lib/graphql_rails/controller/action_hooks_runner.rb

@@ -9,10 +9,10 @@ module GraphqlRails
         @controller = controller
       end
 
-      def call
+      def call(&block)
         result = nil
         run_action_hooks(:before)
-        run_around_action_hooks { result = yield }
+        run_around_action_hooks { result = controller.instance_exec(&block) }
         run_action_hooks(:after)
         result
       end
@@ -42,7 +42,7 @@ module GraphqlRails
 
       def execute_hook(action_hook, &block)
         if action_hook.anonymous?
-          action_hook.action_proc.call(controller, *block)
+          controller.instance_exec(controller, *block, &action_hook.action_proc)
         else
           controller.send(action_hook.name, &block)
         end

data/lib/graphql_rails/model/input_attribute.rb

@@ -8,10 +8,11 @@ module GraphqlRails
 
       attr_reader :description
 
-      def initialize(name, type = nil, description: nil)
+      def initialize(name, type = nil, description: nil, options: {})
         @initial_name = name
         @initial_type = type
         @description = description
+        @options = options
       end
 
       def function_argument_args
@@ -29,7 +30,7 @@ module GraphqlRails
 
       private
 
-      attr_reader :initial_name, :initial_type
+      attr_reader :initial_name, :initial_type, :options
 
       def raw_input_type
         return initial_type if initial_type.is_a?(GraphQL::InputObjectType)

data/lib/graphql_rails/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql_rails
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Povilas Jurčys
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-03 00:00:00.000000000 Z
+date: 2019-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql
@@ -159,7 +159,7 @@ files:
 - lib/graphql_rails/router/schema_builder.rb
 - lib/graphql_rails/rspec_controller_helpers.rb
 - lib/graphql_rails/version.rb
-homepage: https://github.com/povilasjurcys/graphql_rails
+homepage: https://github.com/samesystem/graphql_rails
 licenses:
 - MIT
 metadata: {}
@@ -179,7 +179,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: GraphQL server and client for rails