graphql_rails 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aab866d81cb8b70ef283c47914ea056c15eb07000b701414a42a7055fe1dabe1
-  data.tar.gz: 814a9189c63ffee28c8ab47c761b8740680da723669ea05d0d0e2256770b61d7
+  metadata.gz: 66c6e2cd4ba018ee3af6aa4461b67b29ed202d21a93b5d0ea877d5fdfdecfbc7
+  data.tar.gz: 5955a5e193a761dd3821107bb60c02db6aa8d72717b0288b4863b79920a8ad4e
 SHA512:
-  metadata.gz: 99fe93c9a15507f4ebd0c1ec8667ddeac6b211342ca4df65b4a866fd3ba1dc34dd5661c4fba8317e4deea5241b9c52a2cb176e9d1dc0d9a57ec57d464f7e1dfa
-  data.tar.gz: db4a1d9fb7d4c9a20fb449a54ae5c27e784c39672052d5f95e0c7927801eaebe3c88c4899e8477da3d892c7ff420cdc29a15b3753cf6ec1e9c94c946f6c6de66
+  metadata.gz: 9342f037b0b41b4a70621787f14188da08693fa773d0efd2e3148c8d6be7e6086e3ae8215d349e72ab3a7448643f49ca7ccc2fe9c3d5a911d152a9a06131d164
+  data.tar.gz: c3ef9dda6a219e42394e3027fe4710af88360c8f699a13d8bc66a11c1bf8c31a25a295e6a217d8c1b04e6826899e24d73950a279d5f5505893601181e6da8d28

data/CHANGELOG.md

@@ -9,9 +9,11 @@ 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.0](2021-02-15)
+## [1.2.1](2021-02-17)
 
-* Added/Changed/Deprecated/Removed/Fixed/Security: YOUR CHANGE HERE
+* 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`

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    graphql_rails (1.2.0)
+    graphql_rails (1.2.1)
       activesupport (>= 4)
       graphql (~> 1.12, >= 1.12.4)
 

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/lib/graphql_rails/attributes/attributable.rb

@@ -47,7 +47,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/router/schema_builder.rb

@@ -30,12 +30,6 @@ module GraphqlRails
 
           query(query_type) if query_type
           mutation(mutation_type) if mutation_type
-
-          def self.type_from_ast(*args)
-            type = super
-
-            type.respond_to?(:to_graphql) ? type.to_graphql : type
-          end
         end
       end
 

data/lib/graphql_rails/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql_rails
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Povilas Jurčys
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-02-15 00:00:00.000000000 Z
+date: 2021-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql