graphql_rails 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd5007444af16b72661bd4c9ad03866017b9fbbaadbd4a4bccc5c788c73f95bf
-  data.tar.gz: 884390854d3490c9b323f82c527b922a087a0617a1a862fb5cbcd3d18f31e955
+  metadata.gz: 1909c3b76c9addab63bcc0337232c147ceebde0d1f2252da93606b48d1843c64
+  data.tar.gz: 6b405941e4bae0e98abbcc07b93ac1a95fa22bcbdfcaa962d241740a15453ba7
 SHA512:
-  metadata.gz: dcc498d22901bfecb649f44b266634ed762d119d0c4d876df04fbe5ae595173e61c3fe53078ea1803000fd5ec6faaa8686e1198aa2037ae6f09b91bf4e20b001
-  data.tar.gz: 58a8ae501e143744082ca85ac0dba51bdcf5883fa949b25d23fd4c5510c28b877c4f5ca9cbc7f0af5d6d19b7c742fa835fa4b6d7afc1ccaaca0b83c153e9aeb9
+  metadata.gz: f5292647cd5c49c51bec7f9f1df33be882637ac83bd54fb23259fc2b5c6d8f351f3501c5db23f0ff7c10daafafed531b4026ff3790ff281cfd71890ff2b2c007
+  data.tar.gz: 054adf43e83c54be23fb33547ee521e17ae8f180f5f4c05bf3a7b78f554367e6531483d9bf66af75fe4567940f2931c56f93c2adc6af412efba8e644043af8bc

data/CHANGELOG.md

@@ -9,6 +9,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 * Added/Changed/Deprecated/Removed/Fixed/Security: YOUR CHANGE HERE
 
+## [2.2.0](2022-01-25)
+
+* Added: support for subscription type
+* Fixed: correctly detect all graphql-ruby objects when using stringified types
+* Added: make code compatible with newer graphql-ruby version
+
 ## [2.1.0](2022-01-12)
 
 * Added: decorated relations now can be called using "find", "empty?" and "find_by" methods

data/Gemfile.lock

@@ -1,112 +1,111 @@
 PATH
   remote: .
   specs:
-    graphql_rails (2.1.0)
+    graphql_rails (2.2.0)
       activesupport (>= 4)
       graphql (~> 1.12, >= 1.12.4)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.0.3.4)
-      actionpack (= 6.0.3.4)
+    actioncable (6.1.4.4)
+      actionpack (= 6.1.4.4)
+      activesupport (= 6.1.4.4)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.0.3.4)
-      actionpack (= 6.0.3.4)
-      activejob (= 6.0.3.4)
-      activerecord (= 6.0.3.4)
-      activestorage (= 6.0.3.4)
-      activesupport (= 6.0.3.4)
+    actionmailbox (6.1.4.4)
+      actionpack (= 6.1.4.4)
+      activejob (= 6.1.4.4)
+      activerecord (= 6.1.4.4)
+      activestorage (= 6.1.4.4)
+      activesupport (= 6.1.4.4)
       mail (>= 2.7.1)
-    actionmailer (6.0.3.4)
-      actionpack (= 6.0.3.4)
-      actionview (= 6.0.3.4)
-      activejob (= 6.0.3.4)
+    actionmailer (6.1.4.4)
+      actionpack (= 6.1.4.4)
+      actionview (= 6.1.4.4)
+      activejob (= 6.1.4.4)
+      activesupport (= 6.1.4.4)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.0.3.4)
-      actionview (= 6.0.3.4)
-      activesupport (= 6.0.3.4)
-      rack (~> 2.0, >= 2.0.8)
+    actionpack (6.1.4.4)
+      actionview (= 6.1.4.4)
+      activesupport (= 6.1.4.4)
+      rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.0.3.4)
-      actionpack (= 6.0.3.4)
-      activerecord (= 6.0.3.4)
-      activestorage (= 6.0.3.4)
-      activesupport (= 6.0.3.4)
+    actiontext (6.1.4.4)
+      actionpack (= 6.1.4.4)
+      activerecord (= 6.1.4.4)
+      activestorage (= 6.1.4.4)
+      activesupport (= 6.1.4.4)
       nokogiri (>= 1.8.5)
-    actionview (6.0.3.4)
-      activesupport (= 6.0.3.4)
+    actionview (6.1.4.4)
+      activesupport (= 6.1.4.4)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.0.3.4)
-      activesupport (= 6.0.3.4)
+    activejob (6.1.4.4)
+      activesupport (= 6.1.4.4)
       globalid (>= 0.3.6)
-    activemodel (6.0.3.4)
-      activesupport (= 6.0.3.4)
-    activerecord (6.0.3.4)
-      activemodel (= 6.0.3.4)
-      activesupport (= 6.0.3.4)
-    activestorage (6.0.3.4)
-      actionpack (= 6.0.3.4)
-      activejob (= 6.0.3.4)
-      activerecord (= 6.0.3.4)
-      marcel (~> 0.3.1)
-    activesupport (6.0.3.4)
+    activemodel (6.1.4.4)
+      activesupport (= 6.1.4.4)
+    activerecord (6.1.4.4)
+      activemodel (= 6.1.4.4)
+      activesupport (= 6.1.4.4)
+    activestorage (6.1.4.4)
+      actionpack (= 6.1.4.4)
+      activejob (= 6.1.4.4)
+      activerecord (= 6.1.4.4)
+      activesupport (= 6.1.4.4)
+      marcel (~> 1.0.0)
+      mini_mime (>= 1.1.0)
+    activesupport (6.1.4.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
     ast (2.4.2)
-    bson (4.11.0)
+    bson (4.14.0)
     builder (3.2.4)
     byebug (11.1.3)
-    codecov (0.2.12)
-      json
-      simplecov
+    codecov (0.6.0)
+      simplecov (>= 0.15, < 0.22)
     coderay (1.1.3)
-    concurrent-ruby (1.1.7)
+    concurrent-ruby (1.1.9)
     crass (1.0.6)
-    diff-lcs (1.4.4)
-    docile (1.3.2)
-    erubi (1.9.0)
-    globalid (0.4.2)
-      activesupport (>= 4.2.0)
-    graphql (1.13.4)
-    i18n (1.8.5)
+    diff-lcs (1.5.0)
+    docile (1.4.0)
+    erubi (1.10.0)
+    globalid (1.0.0)
+      activesupport (>= 5.0)
+    graphql (1.13.6)
+    i18n (1.8.11)
       concurrent-ruby (~> 1.0)
-    json (2.3.1)
-    loofah (2.7.0)
+    loofah (2.13.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
-    marcel (0.3.3)
-      mimemagic (~> 0.3.2)
+    marcel (1.0.2)
     method_source (1.0.0)
-    mimemagic (0.3.10)
-      nokogiri (~> 1)
-      rake
-    mini_mime (1.0.2)
-    mini_portile2 (2.6.1)
-    minitest (5.14.2)
-    mongo (2.13.1)
+    mini_mime (1.1.2)
+    mini_portile2 (2.7.1)
+    minitest (5.15.0)
+    mongo (2.17.0)
       bson (>= 4.8.2, < 5.0.0)
-    mongoid (7.1.4)
-      activemodel (>= 5.1, < 6.1)
-      mongo (>= 2.7.0, < 3.0.0)
-    nio4r (2.5.4)
-    nokogiri (1.12.5)
-      mini_portile2 (~> 2.6.1)
+    mongoid (7.3.3)
+      activemodel (>= 5.1, < 6.2)
+      mongo (>= 2.10.5, < 3.0.0)
+      ruby2_keywords (~> 0.0.5)
+    nio4r (2.5.8)
+    nokogiri (1.13.1)
+      mini_portile2 (~> 2.7.0)
       racc (~> 1.4)
-    parallel (1.20.1)
-    parser (3.0.1.1)
+    parallel (1.21.0)
+    parser (3.1.0.0)
       ast (~> 2.4.1)
     pry (0.13.1)
       coderay (~> 1.1)
@@ -114,53 +113,53 @@ GEM
     pry-byebug (3.9.0)
       byebug (~> 11.0)
       pry (~> 0.13.0)
-    racc (1.5.2)
+    racc (1.6.0)
     rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (6.0.3.4)
-      actioncable (= 6.0.3.4)
-      actionmailbox (= 6.0.3.4)
-      actionmailer (= 6.0.3.4)
-      actionpack (= 6.0.3.4)
-      actiontext (= 6.0.3.4)
-      actionview (= 6.0.3.4)
-      activejob (= 6.0.3.4)
-      activemodel (= 6.0.3.4)
-      activerecord (= 6.0.3.4)
-      activestorage (= 6.0.3.4)
-      activesupport (= 6.0.3.4)
-      bundler (>= 1.3.0)
-      railties (= 6.0.3.4)
+    rails (6.1.4.4)
+      actioncable (= 6.1.4.4)
+      actionmailbox (= 6.1.4.4)
+      actionmailer (= 6.1.4.4)
+      actionpack (= 6.1.4.4)
+      actiontext (= 6.1.4.4)
+      actionview (= 6.1.4.4)
+      activejob (= 6.1.4.4)
+      activemodel (= 6.1.4.4)
+      activerecord (= 6.1.4.4)
+      activestorage (= 6.1.4.4)
+      activesupport (= 6.1.4.4)
+      bundler (>= 1.15.0)
+      railties (= 6.1.4.4)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.3.0)
+    rails-html-sanitizer (1.4.2)
       loofah (~> 2.3)
-    railties (6.0.3.4)
-      actionpack (= 6.0.3.4)
-      activesupport (= 6.0.3.4)
+    railties (6.1.4.4)
+      actionpack (= 6.1.4.4)
+      activesupport (= 6.1.4.4)
       method_source
-      rake (>= 0.8.7)
-      thor (>= 0.20.3, < 2.0)
-    rainbow (3.0.0)
-    rake (13.0.1)
-    regexp_parser (2.1.1)
+      rake (>= 0.13)
+      thor (~> 1.0)
+    rainbow (3.1.1)
+    rake (13.0.6)
+    regexp_parser (2.2.0)
     rexml (3.2.5)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
       rspec-expectations (~> 3.10.0)
       rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.0)
+    rspec-core (3.10.1)
       rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.0)
+    rspec-expectations (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-support (3.10.0)
+    rspec-support (3.10.3)
     rubocop (1.5.2)
       parallel (~> 1.10)
       parser (>= 2.7.1.5)
@@ -170,35 +169,37 @@ GEM
       rubocop-ast (>= 1.2.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (1.5.0)
+    rubocop-ast (1.15.1)
       parser (>= 3.0.1.1)
-    rubocop-performance (1.8.1)
-      rubocop (>= 0.87.0)
+    rubocop-performance (1.10.2)
+      rubocop (>= 0.90.0, < 2.0)
       rubocop-ast (>= 0.4.0)
-    rubocop-rspec (2.3.0)
+    rubocop-rspec (2.4.0)
       rubocop (~> 1.0)
       rubocop-ast (>= 1.1.0)
     ruby-progressbar (1.11.0)
-    simplecov (0.19.1)
+    ruby2_keywords (0.0.5)
+    simplecov (0.21.2)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.3)
     sprockets (4.0.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.2.2)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
+    sprockets-rails (3.4.2)
+      actionpack (>= 5.2)
+      activesupport (>= 5.2)
       sprockets (>= 3.0.0)
-    thor (1.0.1)
-    thread_safe (0.3.6)
-    tzinfo (1.2.7)
-      thread_safe (~> 0.1)
-    unicode-display_width (1.7.0)
-    websocket-driver (0.7.3)
+    thor (1.2.1)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (1.8.0)
+    websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    zeitwerk (2.4.1)
+    zeitwerk (2.5.3)
 
 PLATFORMS
   ruby

data/docs/components/routes.md

@@ -73,14 +73,15 @@ end
 
 This will generate `userDetails` field on GraphQL side.
 
-## _query_ and _mutation_
+## _query_ and _mutation_ & _subscription_
 
-in case you want to have non-CRUD controller with custom actions you can define your own `query`/`mutation` actions like this:
+in case you want to have non-CRUD controller with custom actions you can define your own `query`/`mutation`/`subscription` actions like this:
 
 ```ruby
 MyGraphqlSchema = GraphqlRails::Router.draw do
   mutation :logIn, to: 'sessions#login'
-  query :me, to 'users#current_user'
+  query :me, to: 'users#current_user'
+  subscribtion :new_message, to: 'messages#created'
 end
 ```
 

data/lib/graphql_rails/attributes/type_parseable.rb

@@ -52,12 +52,6 @@ module GraphqlRails
         GraphQL::InputObjectType
       ].freeze
 
-      PARSEABLE_RAW_GRAPHQL_TYPES = [
-        GraphQL::Schema::Object,
-        GraphQL::Schema::Scalar,
-        GraphQL::Schema::Enum
-      ].freeze
-
       RAW_GRAPHQL_TYPES = (WRAPPER_TYPES + GRAPHQL_BASE_TYPES).freeze
 
       def unwrapped_scalar_type
@@ -103,7 +97,7 @@ module GraphqlRails
       def graphql_type_object?(type_class)
         return false unless type_class.is_a?(Class)
 
-        PARSEABLE_RAW_GRAPHQL_TYPES.any? { |parent_type| type_class < parent_type }
+        type_class < GraphQL::Schema::Member
       end
 
       def applicable_graphql_type?(type)

data/lib/graphql_rails/controller/log_controller_action.rb

@@ -62,9 +62,14 @@ module GraphqlRails
       end
 
       def parameter_filter_class
-        return ActiveSupport::ParameterFilter if Object.const_defined?('ActiveSupport::ParameterFilter')
+        if ActiveSupport.gem_version.segments.first < 6
+          return ActiveSupport::ParameterFilter if Object.const_defined?('ActiveSupport::ParameterFilter')
 
-        ActionDispatch::Http::ParameterFilter
+          ActionDispatch::Http::ParameterFilter
+        else
+          require 'active_support/parameter_filter'
+          ActiveSupport::ParameterFilter
+        end
       end
     end
   end

data/lib/graphql_rails/input_configurable.rb

@@ -26,7 +26,7 @@ module GraphqlRails
       pagination_options = nil if pagination_options == false
 
       @pagination_options = pagination_options
-      permit(:before, :after, first: :int, last: :int)
+      self
     end
 
     def paginated?

data/lib/graphql_rails/model/find_or_build_graphql_type.rb

@@ -46,11 +46,7 @@ module GraphqlRails
 
       def find_or_build_dynamic_type(attribute)
         graphql_model = attribute.graphql_model
-        if graphql_model
-          find_or_build_graphql_model_type(graphql_model)
-        else
-          AddFieldsToGraphqlType.call(klass: klass, attributes: [attribute])
-        end
+        find_or_build_graphql_model_type(graphql_model) if graphql_model
       end
 
       def find_or_build_graphql_model_type(graphql_model)

data/lib/graphql_rails/router/mutation_route.rb

@@ -13,6 +13,10 @@ module GraphqlRails
       def mutation?
         true
       end
+
+      def subscription?
+        false
+      end
     end
   end
 end

data/lib/graphql_rails/router/query_route.rb

@@ -13,6 +13,10 @@ module GraphqlRails
       def mutation?
         false
       end
+
+      def subscription?
+        false
+      end
     end
   end
 end

data/lib/graphql_rails/router/resource_routes_builder.rb

@@ -28,6 +28,10 @@ module GraphqlRails
         routes << build_mutation(*args, **kwargs)
       end
 
+      def subscription(*args, **kwargs)
+        routes << build_subscription(*args, **kwargs)
+      end
+
       private
 
       attr_reader :autogenerated_action_names, :name, :options
@@ -62,6 +66,10 @@ module GraphqlRails
         build_route(QueryRoute, *args, **kwargs)
       end
 
+      def build_subscription(*args, **kwargs)
+        build_route(SubscriptionRoute, *args, **kwargs)
+      end
+
       # rubocop:disable Metrics/ParameterLists
       def build_route(builder, action, prefix: action, suffix: false, on: :member, **custom_options)
         if suffix == true

data/lib/graphql_rails/router/schema_builder.rb

@@ -6,11 +6,12 @@ module GraphqlRails
     class SchemaBuilder
       require_relative './plain_cursor_encoder'
 
-      attr_reader :queries, :mutations, :raw_actions
+      attr_reader :queries, :mutations, :subscriptions, :raw_actions
 
-      def initialize(queries:, mutations:, raw_actions:, group: nil)
+      def initialize(queries:, mutations:, subscriptions:, raw_actions:, group: nil)
         @queries = queries
         @mutations = mutations
+        @subscriptions = subscriptions
         @raw_actions = raw_actions
         @group = group
       end
@@ -18,6 +19,7 @@ module GraphqlRails
       def call
         query_type = build_group_type('Query', queries)
         mutation_type = build_group_type('Mutation', mutations)
+        subscription_type = build_group_type('Subscription', subscriptions)
         raw = raw_actions
 
         Class.new(GraphQL::Schema) do
@@ -30,6 +32,7 @@ module GraphqlRails
 
           query(query_type) if query_type
           mutation(mutation_type) if mutation_type
+          subscription(subscription_type) if subscription_type
         end
       end
 
@@ -39,7 +42,13 @@ module GraphqlRails
 
       def build_group_type(type_name, routes)
         group_name = group
-        group_routes = routes.select { |route| route.show_in_group?(group_name) }
+        group_routes =
+          routes
+          .select { |route| route.show_in_group?(group_name) }
+          .reverse
+          .uniq(&:name)
+          .reverse
+
         return if group_routes.empty?
 
         build_type(type_name, group_routes)

data/lib/graphql_rails/router/subscription_route.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require_relative 'route'
+
+module GraphqlRails
+  class Router
+    # stores subscription type graphql action info
+    class SubscriptionRoute < Route
+      def query?
+        false
+      end
+
+      def mutation?
+        false
+      end
+
+      def subscription?
+        true
+      end
+    end
+  end
+end

data/lib/graphql_rails/router.rb

@@ -5,6 +5,7 @@ require 'active_support/core_ext/string/inflections'
 require 'graphql_rails/router/schema_builder'
 require 'graphql_rails/router/mutation_route'
 require 'graphql_rails/router/query_route'
+require 'graphql_rails/router/subscription_route'
 require 'graphql_rails/router/resource_routes_builder'
 
 module GraphqlRails
@@ -27,6 +28,7 @@ module GraphqlRails
       @group_names = group_names
       @routes ||= Set.new
       @raw_graphql_actions ||= []
+      @graphql_schema = {}
     end
 
     def group(*group_names, &block)
@@ -57,6 +59,10 @@ module GraphqlRails
       routes << build_route(MutationRoute, name, **options)
     end
 
+    def subscription(name, **options)
+      routes << build_route(SubscriptionRoute, name, **options)
+    end
+
     RAW_ACTION_NAMES.each do |action_name|
       define_method(action_name) do |*args, &block|
         add_raw_action(action_name, *args, &block)
@@ -64,17 +70,17 @@ module GraphqlRails
     end
 
     def graphql_schema(group = nil)
-      @graphql_schema ||= {}
       @graphql_schema[group&.to_sym] ||= SchemaBuilder.new(
         queries: routes.select(&:query?),
         mutations: routes.select(&:mutation?),
+        subscriptions: routes.select(&:subscription?),
         raw_actions: raw_graphql_actions,
         group: group
       ).call
     end
 
     def reload_schema
-      @graphql_schema = nil
+      @graphql_schema.clear
     end
 
     private

data/lib/graphql_rails/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql_rails
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Povilas Jurčys
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-01-12 00:00:00.000000000 Z
+date: 2022-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql
@@ -226,6 +226,7 @@ files:
 - lib/graphql_rails/router/resource_routes_builder.rb
 - lib/graphql_rails/router/route.rb
 - lib/graphql_rails/router/schema_builder.rb
+- lib/graphql_rails/router/subscription_route.rb
 - lib/graphql_rails/rspec_controller_helpers.rb
 - lib/graphql_rails/tasks/dump_graphql_schema.rb
 - lib/graphql_rails/tasks/dump_graphql_schemas.rb