graphql_rails 1.0.0 → 1.2.3

data/docs/components/controller.md

@@ -78,7 +78,7 @@ Specifies input type:
 class OrderController < GraphqlRails::Controller
   action(:create)
     .permit_input(:price, type: :integer!)
-    # Same as `.permit(amount: :integer!)`
+    # Same as `.permit(price: :integer!)`
 end
 ```
 
@@ -169,7 +169,7 @@ class UsersController < GraphqlRails::Controller
 end
 ```
 
-Also check ['decorating controller responses']('components/decorator') for more details about working with active record and decorators.
+Also check ['decorating controller responses'](components/decorator) for more details about working with active record and decorators.
 
 #### *max_page_size*
 
@@ -219,6 +219,22 @@ class UsersController < GraphqlRails::Controller
 end
 ```
 
+You can also return raw graphql-ruby types:
+
+```ruby
+# raw graphql-ruby type:
+class OrderType < GraphQL::Schema::Object
+  graphql_name 'Order'
+  field :id, ID
+end
+
+class UsersController < GraphqlRails::Controller
+  action(:last_order).permit(:id).returns(OrderType)
+end
+```
+
+Check [graphql-ruby documentation](https://graphql-ruby.org) for more details about graphql-ruby types.
+
 ### *returns_list*
 
 When you have defined `model` dynamically, you can use `returns_list` to indicate that action must return list without specifying model type for each action. By default list and inner types are required but you can change that with `required_list: false` and `required_inner: false`
@@ -430,7 +446,7 @@ class UsersController < GraphqlRails::Controller
     raise 'Not authenticated' unless User.where(token: params[:token]).exist?
   end
 
-  def require_auth_token
+  def require_admin_token
     raise 'Admin not authenticated' unless Admin.where(token: params[:admin_token]).exist?
   end
 end
@@ -438,13 +454,13 @@ end
 
 ## decorating objects
 
-See ['Decorating controller responses']('components/decorator') for various options how you can decorate paginated responses
+See ['Decorating controller responses'](components/decorator) for various options how you can decorate paginated responses
 
 ## Rendering errors
 
 ### Rendering strings as errors
 
-The simples way to render error is to provide list of error messages, like this:
+The simplest way to render an error is to provide a list of error messages, like this:
 
 ```ruby
 class UsersController < GraphqlRails::Controller
@@ -509,12 +525,12 @@ end
 
 ### Raising custom error classes
 
-If you want to have customized error classes you need to create errors which inherits from `GraphqlRails::ExecutionError`
+If you want to have customized error classes you need to create errors which inherit from `GraphqlRails::ExecutionError`
 
 ```ruby
 class MyCustomError < GraphqlRails::ExecutionError
   def to_h
-    # this part will be rendered in graphl
+    # this part will be rendered in graphql
     { something_custom: 'yes' }
   end
 end

data/docs/components/model.md

@@ -17,13 +17,13 @@ end
 
 ## graphql
 
-This method must be called inside your model body. `grapqhl` is used for making your model convertible to graphql type.
+This method must be called inside your model body. `graphql` is used for making your model convertible to graphql type.
 
 ## attribute
 
 Most commonly you will use `attribute` to make your model methods and attributes visible via graphql endpoint.
 
-## attribute.type
+### attribute.type
 
 Some types can be determined by attribute name, so you can skip this attribute:
 
@@ -54,9 +54,33 @@ class User
 end
 ```
 
+#### attribute.type: using graphql-ruby objects
+
+You can also use raw graphql-ruby objects as attribute types. Here is an example:
+
+```ruby
+# raw graphql-ruby type:
+class AddressType < GraphQL::Schema::Object
+  graphql_name 'Address'
+
+  field :city, String, null: false
+  field :street_name, String, null: false
+  field :street_number, Integer
+end
+
+# GraphqlRails model:
+class User
+  include GraphqlRails::Model
+
+  graphql.attribute :address, type: AddressType, required: true
+end
+```
+
+Check [graphql-ruby documentation](https://graphql-ruby.org) for more details about graphql-ruby types.
+
 ### attribute.property
 
-By default graphql attribute names are expected to be same as model methods/attributes, but if you want to use different name on grapqhl side, you can use `propery` option:
+By default graphql attribute names are expected to be same as model methods/attributes, but if you want to use different name on grapqhl side, you can use `property` option:
 
 ```ruby
 class User
@@ -86,6 +110,22 @@ class User
 end
 ```
 
+### attribute.options
+
+Allows passing options to attribute definition. Available options:
+
+* `attribute_name_format` - if `:original` value is passed, it will not camelCase attribute name.
+
+```ruby
+class User
+  include GraphqlRails::Model
+
+  graphql do |c|
+    c.attribute :first_name # will be accessible as firstName from client side
+    c.attribute :first_name, options: { attribute_name_format: :original } # will be accessible as first_name from client side
+  end
+end
+
 ### attribute.permit
 
 To define attributes which are accepted by each model method, you need to call `permit` method, like this:

data/docs/getting_started/quick_start.md

@@ -11,7 +11,7 @@ bundle exec rails g graphql_rails:install
 ```ruby
 # config/graphql/routes.rb
 GraphqlRails::Router.draw do
-  # will create createUser, updateUser, deleteUser mutations and user, users queries.
+  # will create createUser, updateUser, destroyUser mutations and user, users queries.
   # expects that UsersController class exist
   resources :users
 

data/docs/index.html

@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
   <meta charset="UTF-8">
-  <title>Document</title>
+  <title>GraphqlRails</title>
   <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
   <meta name="description" content="Description">
   <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">

data/docs/other_tools/query_runner.md

@@ -16,7 +16,7 @@ end
 
 ## Executing grouped schema
 
-If you have multiple schemas (read [routes section]((components/routes) on how to do that) and you want to render group specific schema, you need to provide group name, like this:
+If you have multiple schemas (read [routes section](components/routes) on how to do that) and you want to render group specific schema, you need to provide group name, like this:
 
 ```ruby
 class MyRailsClass < ApplicationController

data/docs/other_tools/schema_dump.md

@@ -8,7 +8,7 @@ rake graphql_rails:schema:dump
 
 ## Dumping non default schema
 
-You can have multiple graphql schemas. Read more about this in [routes section]((components/routes). In order to generate schema for one of groups, provide optional `name` argument:
+You can have multiple graphql schemas. Read more about this in [routes section](components/routes). In order to generate schema for one of groups, provide optional `name` argument:
 
 ```bash
 rake graphql_rails:schema:dump['your_group_name']

data/graphql_rails.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ['Povilas Jurčys']
   spec.email         = ['po.jurcys@gmail.com']
 
-  spec.summary       = %q{GraphQL server and client for rails}
+  spec.summary       = %q{Rails style structure for GraphQL API.}
   spec.homepage      = 'https://github.com/samesystem/graphql_rails'
   spec.license       = 'MIT'
 
@@ -20,13 +20,13 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'graphql', '>= 1.9.12'
+  spec.add_dependency 'graphql', '~> 1.12', '>= 1.12.4'
   spec.add_dependency 'activesupport', '>= 4'
 
-  spec.add_development_dependency 'bundler', '~> 1.16'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'bundler', '~> 2'
+  spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'activerecord'
   spec.add_development_dependency 'pry-byebug'
-  spec.add_development_dependency 'rails', '~> 5'
+  spec.add_development_dependency 'rails', '~> 6'
 end

data/lib/generators/graphql_rails/templates/graphql_router_spec.erb

@@ -3,16 +3,19 @@
 require 'rails_helper'
 
 RSpec.describe GraphqlRouter do
-  describe '#execute' do
+  subject(:schema) { described_class.graphql_schema }
+
+  describe '#to_definition' do
+    subject(:to_definition) { schema.to_definition.strip }
+
+    let(:schema_dump_path) { Rails.root.join('spec', 'fixtures', 'graphql_schema.graphql') }
+    let(:previous_definition) { File.read(schema_dump_path).strip }
+
     it 'returns correct structure' do
       # if you need to update saved_schema, run rake task:
-      #   $ RAILS_ENV=test rake graphql_rails:schema:dump
-
-      schema_path = Rails.root.join('spec', 'fixtures', 'graphql_schema.graphql')
-      saved_schema = File.read(schema_path).strip
-      real_schema = described_class.to_definition.strip
+      #   $ RAILS_ENV=test bin/rake graphql_rails:schema:dump
 
-      expect(real_schema).to eq(saved_schema)
+      expect(to_definition).to eq(previous_definition)
     end
   end
 end

data/lib/graphql_rails/attributes/attributable.rb

@@ -21,11 +21,9 @@ module GraphqlRails
       end
 
       def required?
-        if @required.nil?
-          attribute_name_parser.required? || !initial_type.to_s[/!$/].nil?
-        else
-          @required
-        end
+        return @required unless @required.nil?
+
+        attribute_name_parser.required? || !initial_type.to_s[/!$/].nil? || initial_type.is_a?(GraphQL::Schema::NonNull)
       end
 
       def required
@@ -46,10 +44,8 @@ module GraphqlRails
         !required?
       end
 
-      protected
-
-      def options
-        {}
+      def scalar_type?
+        type_parser.raw_graphql_type? || type_parser.core_scalar_type?
       end
 
       private

data/lib/graphql_rails/attributes/attribute.rb

@@ -13,14 +13,17 @@ module GraphqlRails
 
       attr_reader :attributes
 
-      def initialize(name, type = nil, description: nil, property: name, required: nil)
+      # rubocop:disable Metrics/ParameterLists
+      def initialize(name, type = nil, description: nil, property: name, required: nil, options: {})
         @initial_type = type
         @initial_name = name
+        @options = options
         @description = description
         @property = property.to_s
         @required = required
         @attributes ||= {}
       end
+      # rubocop:enable Metrics/ParameterLists
 
       def type(new_type = nil)
         return @initial_type if new_type.nil?
@@ -43,18 +46,29 @@ module GraphqlRails
         self
       end
 
+      def options(new_options = {})
+        return @options if new_options.blank?
+
+        @options = new_options
+        self
+      end
+
       def field_args
         [
           field_name,
           type_parser.type_arg,
-          *description,
-          {
-            method: property.to_sym,
-            null: optional?
-          }
+          *description
         ]
       end
 
+      def field_options
+        {
+          method: property.to_sym,
+          null: optional?,
+          camelize: camelize?
+        }
+      end
+
       def argument_args
         [
           field_name,
@@ -69,6 +83,12 @@ module GraphqlRails
       protected
 
       attr_reader :initial_type, :initial_name
+
+      private
+
+      def camelize?
+        options[:input_format] != :original && options[:attribute_name_format] != :original
+      end
     end
   end
 end

data/lib/graphql_rails/attributes/attribute_name_parser.rb

@@ -27,11 +27,11 @@ module GraphqlRails
         @graphql_type ||= \
           case name
           when 'id', /_id\Z/
-            GraphQL::ID_TYPE
+            GraphQL::Types::ID
           when /\?\Z/
-            GraphQL::BOOLEAN_TYPE
+            GraphQL::Types::Boolean
           else
-            GraphQL::STRING_TYPE
+            GraphQL::Types::String
           end
       end
 
@@ -44,7 +44,7 @@ module GraphqlRails
       attr_reader :options
 
       def original_format?
-        options[:input_format] == :original
+        options[:input_format] == :original || options[:attribute_name_format] == :original
       end
 
       def preprocesed_name

data/lib/graphql_rails/attributes/input_attribute.rb

@@ -24,7 +24,11 @@ module GraphqlRails
       def input_argument_args
         type = raw_input_type || input_type_parser.input_type_arg
 
-        [field_name, type, { required: required?, description: description, camelize: false }]
+        [field_name, type]
+      end
+
+      def input_argument_options
+        { required: required?, description: description, camelize: false }
       end
 
       def paginated?

data/lib/graphql_rails/attributes/type_parseable.rb

@@ -11,23 +11,23 @@ module GraphqlRails
       class UnknownTypeError < ArgumentError; end
 
       TYPE_MAPPING = {
-        'id' => GraphQL::ID_TYPE,
+        'id' => GraphQL::Types::ID,
 
-        'int' => GraphQL::INT_TYPE,
-        'integer' => GraphQL::INT_TYPE,
+        'int' => GraphQL::Types::Int,
+        'integer' => GraphQL::Types::Int,
 
-        'string' => GraphQL::STRING_TYPE,
-        'str' => GraphQL::STRING_TYPE,
-        'text' => GraphQL::STRING_TYPE,
-        'time' => GraphQL::STRING_TYPE,
-        'date' => GraphQL::STRING_TYPE,
+        'string' => GraphQL::Types::String,
+        'str' => GraphQL::Types::String,
+        'text' => GraphQL::Types::String,
+        'time' => GraphQL::Types::String,
+        'date' => GraphQL::Types::String,
 
-        'bool' => GraphQL::BOOLEAN_TYPE,
-        'boolean' => GraphQL::BOOLEAN_TYPE,
+        'bool' => GraphQL::Types::Boolean,
+        'boolean' => GraphQL::Types::Boolean,
 
-        'float' => GraphQL::FLOAT_TYPE,
-        'double' => GraphQL::FLOAT_TYPE,
-        'decimal' => GraphQL::FLOAT_TYPE
+        'float' => GraphQL::Types::Float,
+        'double' => GraphQL::Types::Float,
+        'decimal' => GraphQL::Types::Float
       }.freeze
 
       WRAPPER_TYPES = [
@@ -57,6 +57,10 @@ module GraphqlRails
           unparsed_type < GraphQL::Schema::Member
       end
 
+      def core_scalar_type?
+        unwrapped_scalar_type.in?(TYPE_MAPPING.values)
+      end
+
       def graphql_model
         type_class = \
           if unparsed_type.is_a?(Class) && unparsed_type < GraphqlRails::Model

data/lib/graphql_rails/concerns/service.rb

@@ -7,8 +7,12 @@ module GraphqlRails
     extend ActiveSupport::Concern
 
     class_methods do
-      def call(*args, &block)
-        new(*args).call(&block)
+      def call(*args, **kwargs, &block)
+        if kwargs.present?
+          new(*args, **kwargs).call(&block)
+        else
+          new(*args).call(&block)
+        end
       end
     end
   end

data/lib/graphql_rails/controller.rb

@@ -18,16 +18,16 @@ module GraphqlRails
         subclass.instance_variable_set(:@controller_configuration, new_config)
       end
 
-      def before_action(*args, &block)
-        controller_configuration.add_action_hook(:before, *args, &block)
+      def before_action(*args, **kwargs, &block)
+        controller_configuration.add_action_hook(:before, *args, **kwargs, &block)
       end
 
-      def around_action(*args, &block)
-        controller_configuration.add_action_hook(:around, *args, &block)
+      def around_action(*args, **kwargs, &block)
+        controller_configuration.add_action_hook(:around, *args, **kwargs, &block)
       end
 
-      def after_action(*args, &block)
-        controller_configuration.add_action_hook(:after, *args, &block)
+      def after_action(*args, **kwargs, &block)
+        controller_configuration.add_action_hook(:after, *args, **kwargs, &block)
       end
 
       def action(action_name)