graphql_rails 1.1.0 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60ad653d6c6acbfe0816f0b7ddb406dae7131b1c07f86f7ab35b98813079edb1
-  data.tar.gz: ff9446c8240615d5cba3e6ac3206444d47d257d201278e0860d765976c8f99fc
+  metadata.gz: 4fde3149c0119edc09198e27b61c428ed666ea2bb4582b428142db31a58749c4
+  data.tar.gz: d9faa17f35d1ac01400b829983d6a2b16230c62971bb6ed0178b9a6bf4b1c0bd
 SHA512:
-  metadata.gz: 59caf8be61dcf8777a5cdc2ac498f389006e8630b9ef62076976a0be849e8e09466e8a7b76891bf6a5b42510f5efc0856666383e9bd6e3e68c245500fb308d47
-  data.tar.gz: 9851cb4dd601fa253c5790f39cbdf835403e08814c85db9f0646bd986ccb62650249216b2225f20dfa8ada581e0bd374e3eb30001dc51f2eb7a182d9c2f626c6
+  metadata.gz: ee735c639cf392c7a4261db07791bb953942977fd4c001fcb101fd3e4a7009db58fb27520d0227e2b3254fdbc5d2dc52043d892597e99d4526ad18fc8919de30
+  data.tar.gz: 80e3a427bb04a91332230460638d7f866afc843dbebfd9e9211454869154c32459e9c1d3c2dcaa97e06bd767792bc6ff742b871ded561094354bc4beab2517a1

data/CHANGELOG.md

@@ -9,8 +9,31 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 * Added/Changed/Deprecated/Removed/Fixed/Security: YOUR CHANGE HERE
 
+## [1.2.4](2021-05-05)
+
+* Fixed: Dynamic types definition where type A references type B referencing type A.
+
+## [1.2.3](2021-04-12)
+
+* Fixed: Total count on paginated resources
+
+## [1.2.2](2021-02-19)
+
+* Fixed: Incorrect type resolution for required list type fields in model declaration.
+
+## [1.2.1](2021-02-17)
+
+* Fixed: Incorrect scalar types resolution is fixed. No more `type mismatch between ID / ID`
+
+## [1.2.0](2021-02-15)
+
 * Added: `options` argument to model level attribute. Allows disabling automatic camelCase
 * Fixed: methods with complex input arguments receives `Hash` instances instead of `GraphQL::Schema::InputObject`
+* Fixed: Using `ActiveSupport::ParameterFilter` (Rails 6.1), if it is defined, instead of `ActionDispatch::Http::ParameterFilter`
+* Changed: graphql version is now `1.12` which may require system-wide changes.
+* Fixed: improved connection wrapper for pagination to work.
+* Fixed: implementation of `total` field is no longer missing when using pagination.
+
 
 ## [1.0.0](2020-02-07)
 

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    graphql_rails (1.1.0)
+    graphql_rails (1.2.3)
       activesupport (>= 4)
-      graphql (~> 1.11, >= 1.11.6)
+      graphql (~> 1.12, >= 1.12.4)
 
 GEM
   remote: https://rubygems.org/
@@ -78,7 +78,7 @@ GEM
     erubi (1.9.0)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
-    graphql (1.11.6)
+    graphql (1.12.4)
     i18n (1.8.5)
       concurrent-ruby (~> 1.0)
     json (2.3.1)
@@ -90,9 +90,11 @@ GEM
     marcel (0.3.3)
       mimemagic (~> 0.3.2)
     method_source (1.0.0)
-    mimemagic (0.3.5)
+    mimemagic (0.3.10)
+      nokogiri (~> 1)
+      rake
     mini_mime (1.0.2)
-    mini_portile2 (2.4.0)
+    mini_portile2 (2.5.0)
     minitest (5.14.2)
     mongo (2.13.1)
       bson (>= 4.8.2, < 5.0.0)
@@ -100,8 +102,9 @@ GEM
       activemodel (>= 5.1, < 6.1)
       mongo (>= 2.7.0, < 3.0.0)
     nio4r (2.5.4)
-    nokogiri (1.10.10)
-      mini_portile2 (~> 2.4.0)
+    nokogiri (1.11.1)
+      mini_portile2 (~> 2.5.0)
+      racc (~> 1.4)
     parallel (1.19.2)
     parser (2.7.2.0)
       ast (~> 2.4.1)
@@ -111,6 +114,7 @@ GEM
     pry-byebug (3.9.0)
       byebug (~> 11.0)
       pry (~> 0.13.0)
+    racc (1.5.2)
     rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
@@ -143,7 +147,7 @@ GEM
     rainbow (3.0.0)
     rake (13.0.1)
     regexp_parser (1.8.2)
-    rexml (3.2.4)
+    rexml (3.2.5)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
       rspec-expectations (~> 3.10.0)

data/docs/README.md

@@ -37,7 +37,7 @@ This will generate code which will let you start your graphql faster
 ```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/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
 ```
 
@@ -446,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

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/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

@@ -20,7 +20,7 @@ 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.11', '>= 1.11.6'
+  spec.add_dependency 'graphql', '~> 1.12', '>= 1.12.4'
   spec.add_dependency 'activesupport', '>= 4'
 
   spec.add_development_dependency 'bundler', '~> 2'

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
@@ -47,7 +45,7 @@ module GraphqlRails
       end
 
       def scalar_type?
-        type_parser.raw_graphql_type? || type_parser.unwrapped_scalar_type.class == GraphQL::ScalarType
+        type_parser.raw_graphql_type? || type_parser.core_scalar_type?
       end
 
       private

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
 

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/controller/log_controller_action.rb

@@ -51,8 +51,7 @@ module GraphqlRails
             params
           else
             filter_options = Rails.configuration.filter_parameters
-            parametter_filter = ActionDispatch::Http::ParameterFilter.new(filter_options)
-            parametter_filter.filter(params)
+            parameter_filter_class.new(filter_options).filter(params)
           end
       end
 
@@ -61,6 +60,12 @@ module GraphqlRails
 
         Rails.application.config.filter_parameters || []
       end
+
+      def parameter_filter_class
+        return ActiveSupport::ParameterFilter if Object.const_defined?('ActiveSupport::ParameterFilter')
+
+        ActionDispatch::Http::ParameterFilter
+      end
     end
   end
 end

data/lib/graphql_rails/decorator/relation_decorator.rb

@@ -71,9 +71,5 @@ module GraphqlRails
         self.class.new(decorator: decorator, relation: new_relation, decorator_args: decorator_args)
       end
     end
-
-    GraphQL::Relay::BaseConnection.register_connection_implementation(
-      RelationDecorator, GraphQL::Relay::RelationConnection
-    )
   end
 end

data/lib/graphql_rails/model.rb

@@ -28,7 +28,7 @@ module GraphqlRails
 
       def graphql
         @graphql ||= Model::Configuration.new(self)
-        yield(@graphql) if block_given?
+        @graphql.tap { |it| yield(it) }.with_ensured_fields! if block_given?
         @graphql
       end
     end

data/lib/graphql_rails/model/build_connection_type.rb

@@ -30,7 +30,11 @@ module GraphqlRails
           graphql_name("#{type.graphql_name}Connection")
           edge_type(edge_type)
 
-          field :total, Integer, null: false, resolve: CountItems
+          field :total, Integer, null: false
+
+          def total
+            CountItems.call(object)
+          end
         end
       end
 

data/lib/graphql_rails/model/build_connection_type/count_items.rb

@@ -10,7 +10,7 @@ module GraphqlRails
 
         include ::GraphqlRails::Service
 
-        def initialize(graphql_object, _args, _ctx)
+        def initialize(graphql_object)
           @graphql_object = graphql_object
         end
 
@@ -27,7 +27,7 @@ module GraphqlRails
         attr_reader :graphql_object
 
         def list
-          graphql_object.nodes
+          graphql_object.items
         end
 
         def active_record?

data/lib/graphql_rails/model/configuration.rb

@@ -68,6 +68,14 @@ module GraphqlRails
         @connection_type ||= BuildConnectionType.call(graphql_type)
       end
 
+      def with_ensured_fields!
+        return self if @graphql_type.blank?
+
+        reset_graphql_type if attributes.any? && graphql_type.fields.length != attributes.length
+
+        self
+      end
+
       private
 
       attr_reader :model_class
@@ -75,6 +83,16 @@ module GraphqlRails
       def default_name
         @default_name ||= model_class.name.split('::').last
       end
+
+      def reset_graphql_type
+        @graphql_type = FindOrBuildGraphqlType.call(
+          name: name,
+          description: description,
+          attributes: attributes,
+          type_name: type_name,
+          force_define_attributes: true
+        )
+      end
     end
   end
 end

data/lib/graphql_rails/model/find_or_build_graphql_type.rb

@@ -10,20 +10,21 @@ module GraphqlRails
 
       include ::GraphqlRails::Service
 
-      def initialize(name:, description:, attributes:, type_name:)
+      def initialize(name:, description:, attributes:, type_name:, force_define_attributes: false)
         @name = name
         @description = description
         @attributes = attributes
         @type_name = type_name
+        @force_define_attributes = force_define_attributes
       end
 
       def call
-        klass.tap { add_fields_to_graphql_type if new_class? }
+        klass.tap { add_fields_to_graphql_type if new_class? || force_define_attributes }
       end
 
       private
 
-      attr_reader :name, :description, :attributes, :type_name
+      attr_reader :name, :description, :attributes, :type_name, :force_define_attributes
 
       delegate :klass, :new_class?, to: :type_class_finder
 

data/lib/graphql_rails/router/schema_builder.rb

@@ -21,6 +21,10 @@ module GraphqlRails
         raw = raw_actions
 
         Class.new(GraphQL::Schema) do
+          connections.add(
+            GraphqlRails::Decorator::RelationDecorator,
+            GraphQL::Pagination::ActiveRecordRelationConnection
+          )
           cursor_encoder(Router::PlainCursorEncoder)
           raw.each { |action| send(action[:name], *action[:args], &action[:block]) }
 

data/lib/graphql_rails/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql_rails
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.4
 platform: ruby
 authors:
 - Povilas Jurčys
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-11-25 00:00:00.000000000 Z
+date: 2021-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '1.12'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.11.6
+        version: 1.12.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '1.12'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.11.6
+        version: 1.12.4
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -128,7 +128,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '6'
-description: 
+description:
 email:
 - po.jurcys@gmail.com
 executables: []
@@ -232,7 +232,7 @@ homepage: https://github.com/samesystem/graphql_rails
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -248,7 +248,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.2
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Rails style structure for GraphQL API.
 test_files: []