graphql_rails 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60ad653d6c6acbfe0816f0b7ddb406dae7131b1c07f86f7ab35b98813079edb1
-  data.tar.gz: ff9446c8240615d5cba3e6ac3206444d47d257d201278e0860d765976c8f99fc
+  metadata.gz: aab866d81cb8b70ef283c47914ea056c15eb07000b701414a42a7055fe1dabe1
+  data.tar.gz: 814a9189c63ffee28c8ab47c761b8740680da723669ea05d0d0e2256770b61d7
 SHA512:
-  metadata.gz: 59caf8be61dcf8777a5cdc2ac498f389006e8630b9ef62076976a0be849e8e09466e8a7b76891bf6a5b42510f5efc0856666383e9bd6e3e68c245500fb308d47
-  data.tar.gz: 9851cb4dd601fa253c5790f39cbdf835403e08814c85db9f0646bd986ccb62650249216b2225f20dfa8ada581e0bd374e3eb30001dc51f2eb7a182d9c2f626c6
+  metadata.gz: 99fe93c9a15507f4ebd0c1ec8667ddeac6b211342ca4df65b4a866fd3ba1dc34dd5661c4fba8317e4deea5241b9c52a2cb176e9d1dc0d9a57ec57d464f7e1dfa
+  data.tar.gz: db4a1d9fb7d4c9a20fb449a54ae5c27e784c39672052d5f95e0c7927801eaebe3c88c4899e8477da3d892c7ff420cdc29a15b3753cf6ec1e9c94c946f6c6de66

data/CHANGELOG.md

@@ -9,8 +9,17 @@ 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)
+
+* Added/Changed/Deprecated/Removed/Fixed/Security: YOUR CHANGE HERE
+
 * 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.0)
       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)
@@ -92,7 +92,7 @@ GEM
     method_source (1.0.0)
     mimemagic (0.3.5)
     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 +100,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 +112,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)

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/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/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(self)
+          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
 

data/lib/graphql_rails/router/schema_builder.rb

@@ -21,11 +21,21 @@ 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]) }
 
           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.1.0'
+  VERSION = '1.2.0'
 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.0
 platform: ruby
 authors:
 - Povilas Jurčys
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-11-25 00:00:00.000000000 Z
+date: 2021-02-15 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: []