graphiti_graphql 0.1.11 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3572b13acb369033180b7ab0e4bba6f610d069302dfb3efab30fb4af890ad758
-  data.tar.gz: 522d580599507c14ca4b477be3787905cf7574b7f9ca487418108ae0afc08cd5
+  metadata.gz: 06b6392e0c336de1983a2b40f69a748942e424b85adb20c4e64cbe581eb88ee0
+  data.tar.gz: f2d1aed4a0aba07bc3bf2279659011f0da8d33f509a325df5935c6e8500e384c
 SHA512:
-  metadata.gz: 697d98b5580457160179f895ded0fd81738c7714773636a9850ecab3b131ca6bab9a4e916c131f7a29519631a7333640135870f2d95d4c14aa2916c67c00b68d
-  data.tar.gz: 2cc559be1dc33bf52056d1be94e6a3a0cb88a4de240bcd19603dd1661e2f27c6504d1cc315c8ab5b888828868857fb05c9bb535353793ed810cbbd84924e2968
+  metadata.gz: befa7b4bdbf8389aeca15592942b72d4904f65e59bb00873e3a17a8d95eef3da70ce2001c80dd9c6863778edef485feeb9c62969047a8aea2972bf1f680cd550
+  data.tar.gz: 83d7689197e18b71c1b140ff1cf09b48fb7e6d950cc1b72187e33b38bba23e5d01ff5526c93cd19c9410ea7adf6bc5d19d3fba06aef1d2a993f47e1758de6bac

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    graphiti_graphql (0.1.10)
+    graphiti_graphql (0.1.15)
       activesupport (>= 4.1)
       graphiti (~> 1.3)
       graphql (~> 1.12)
@@ -9,9 +9,9 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.1.1)
-      activesupport (= 6.1.1)
-    activesupport (6.1.1)
+    activemodel (6.1.4.1)
+      activesupport (= 6.1.4.1)
+    activesupport (6.1.4.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -23,14 +23,14 @@ GEM
     ast (2.4.2)
     byebug (11.1.3)
     coderay (1.1.3)
-    concurrent-ruby (1.1.8)
+    concurrent-ruby (1.1.10)
     diff-lcs (1.4.4)
-    dry-configurable (0.12.1)
+    dry-configurable (0.15.0)
       concurrent-ruby (~> 1.0)
-      dry-core (~> 0.5, >= 0.5.0)
-    dry-container (0.8.0)
+      dry-core (~> 0.6)
+    dry-container (0.9.0)
       concurrent-ruby (~> 1.0)
-      dry-configurable (~> 0.1, >= 0.1.3)
+      dry-configurable (~> 0.13, >= 0.13.0)
     dry-core (0.7.1)
       concurrent-ruby (~> 1.0)
     dry-inflector (0.2.1)
@@ -43,9 +43,9 @@ GEM
       dry-core (~> 0.5, >= 0.5)
       dry-inflector (~> 0.1, >= 0.1.2)
       dry-logic (~> 1.0, >= 1.0.2)
-    google-protobuf (3.15.2)
-    graphiti (1.3.0)
-      activesupport (>= 4.1)
+    google-protobuf (3.17.3)
+    graphiti (1.3.6)
+      activesupport (>= 5.2)
       concurrent-ruby (~> 1.0)
       dry-types (>= 0.15.0, < 2.0)
       graphiti_errors (~> 1.1.0)
@@ -56,30 +56,30 @@ GEM
     graphiti_spec_helpers (1.0.5)
       graphiti (>= 1.0.alpha.1)
       rspec (~> 3.0)
-    graphql (1.12.3)
+    graphql (1.12.15)
     graphql-batch (0.4.3)
       graphql (>= 1.3, < 2)
       promise.rb (~> 0.7.2)
-    i18n (1.8.9)
+    i18n (1.10.0)
       concurrent-ruby (~> 1.0)
     jsonapi-renderer (0.2.2)
     jsonapi-serializable (0.3.1)
       jsonapi-renderer (~> 0.2.0)
     method_source (1.0.0)
-    minitest (5.14.4)
+    minitest (5.15.0)
     parallel (1.20.1)
-    parser (3.0.0.0)
+    parser (3.0.2.0)
       ast (~> 2.4.1)
     promise.rb (0.7.4)
-    pry (0.13.1)
+    pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    pry-byebug (3.9.0)
+    pry-byebug (3.8.0)
       byebug (~> 11.0)
-      pry (~> 0.13.0)
+      pry (~> 0.10)
     rainbow (3.0.0)
     rake (10.5.0)
-    regexp_parser (2.0.3)
+    regexp_parser (2.1.1)
     rexml (3.2.5)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
@@ -94,30 +94,30 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.2)
-    rubocop (1.8.1)
+    rubocop (1.20.0)
       parallel (~> 1.10)
       parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.2.0, < 2.0)
+      rubocop-ast (>= 1.9.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.4.1)
-      parser (>= 2.7.1.5)
-    rubocop-performance (1.9.2)
-      rubocop (>= 0.90.0, < 2.0)
+    rubocop-ast (1.11.0)
+      parser (>= 3.0.1.1)
+    rubocop-performance (1.11.5)
+      rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
     ruby-progressbar (1.11.0)
-    standard (0.12.0)
-      rubocop (= 1.8.1)
-      rubocop-performance (= 1.9.2)
+    standard (1.3.0)
+      rubocop (= 1.20.0)
+      rubocop-performance (= 1.11.5)
     standardrb (1.0.0)
       standard
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.0.0)
-    zeitwerk (2.4.2)
+    zeitwerk (2.5.4)
 
 PLATFORMS
   ruby
@@ -137,4 +137,4 @@ DEPENDENCIES
   standardrb
 
 BUNDLED WITH
-   2.2.16
+   2.2.25

data/README.md

@@ -50,6 +50,8 @@ And then in `config/application.rb`:
 # require "sprockets/railtie"
 ```
 
+Alternatively, follow [this comment](https://github.com/rmosolgo/graphiql-rails/issues/53#issuecomment-877819958).
+
 ## Usage
 
 #### Blending with graphql-ruby

data/lib/graphiti_graphql/engine.rb

@@ -21,7 +21,8 @@ module GraphitiGraphQL
       case Rails::VERSION::MAJOR
       when 4 then ActionDispatch::Reloader
       when 5 then ActiveSupport::Reloader
-      when 6 then ::Rails.application.reloader
+      else
+        ::Rails.application.reloader
       end
     end
 
@@ -64,15 +65,16 @@ module GraphitiGraphQL
     end
 
     initializer "graphiti_graphql.define_controller" do
-        app_controller = GraphitiGraphQL.config.federation_application_controller || ::ApplicationController
-        # rubocop:disable Lint/ConstantDefinitionInBlock(Standard)
-        class GraphitiGraphQL::ExecutionController < app_controller
-          register_exception Graphiti::Errors::UnreadableAttribute, message: true
-          def execute
-            params = request.params # avoid strong_parameters
-            render json: Graphiti.gql(params[:query], params[:variables])
-          end
+      require "#{Rails.root}/app/controllers/application_controller"
+      app_controller = GraphitiGraphQL.config.federation_application_controller || ::ApplicationController
+      # rubocop:disable Lint/ConstantDefinitionInBlock(Standard)
+      class GraphitiGraphQL::ExecutionController < app_controller
+        register_exception Graphiti::Errors::UnreadableAttribute, message: true
+        def execute
+          params = request.params # avoid strong_parameters
+          render json: Graphiti.gql(params[:query], params[:variables])
         end
+      end
     end
 
     initializer "graphiti_graphql.federation" do

data/lib/graphiti_graphql/federation/resource_dsl.rb

@@ -7,10 +7,18 @@ module GraphitiGraphQL
           @type_name = type_name
         end
 
-        def has_many(relationship_name, foreign_key: nil, &blk)
+        def has_many(
+          relationship_name,
+          foreign_key: nil,
+          field: true,
+          filter: true,
+          &blk
+        )
           @caller.federated_has_many relationship_name,
             type: @type_name,
             foreign_key: foreign_key,
+            field: field,
+            filter: filter,
             &blk
         end
       end
@@ -29,14 +37,18 @@ module GraphitiGraphQL
           config[:federated_resources] ||= []
         end
 
+        # NB - for external use, use federated_type("Type").has_many instead
+        #
         # * Add to the list of external graphql-ruby types we need in schema
         # * Add a readable and filterable FK, without clobbering pre-existing
-        def federated_has_many(name, type:, foreign_key: nil, &blk)
+        def federated_has_many(name, type:, filter: true, field: true, foreign_key: nil, &blk)
           foreign_key ||= :"#{type.underscore}_id"
           resource = FederatedResource.new(type)
           federated_resources << resource
           resource.add_relationship(:has_many, name, self, foreign_key, &blk)
 
+          return unless (filter || field)
+
           attribute = attributes.find { |name, config|
             name.to_sym == foreign_key &&
               !!config[:readable] &&
@@ -44,20 +56,31 @@ module GraphitiGraphQL
           }
           has_filter = filters.key?(foreign_key)
           if !attribute && !has_filter
-            attribute foreign_key, :integer,
-              only: [:readable, :filterable],
-              schema: false,
-              readable: :gql?,
-              filterable: :gql?
-          elsif has_filter && !attribute
+            if field
+              opts = {
+                only: [:readable],
+                schema: false,
+                readable: :gql?
+              }
+              if filter
+                opts[:only] << :filterable
+                opts[:filterable] = :gql?
+              end
+              attribute foreign_key, :integer, opts
+            elsif filter
+              filter foreign_key, :integer, schema: false
+              attributes[foreign_key][:filterable] = :gql?
+            end
+          elsif has_filter && !attribute && field
             prior = filters[foreign_key]
             attribute foreign_key, prior[:type],
               only: [:readable, :filterable],
               schema: false,
               readable: :gql?
             filters[foreign_key] = prior
-          elsif attribute && !has_filter
-            filter foreign_key, attribute[:type]
+          elsif attribute && !has_filter && filter
+            filter foreign_key, attribute[:type], schema: false
+            attributes[foreign_key][:filterable] = :gql?
           end
         end
 

data/lib/graphiti_graphql/schema.rb

@@ -52,14 +52,18 @@ module GraphitiGraphQL
       @base_interface || BaseInterface
     end
 
-    def self.generate(entrypoint_resources = nil)
+    def self.generate(resources: nil, entrypoints: nil)
       instance = new
       schema = Class.new(::GraphitiGraphQL.schema_class || GraphQL::Schema)
       graphiti_schema = GraphitiGraphQL::GraphitiSchema::Wrapper
         .new(Graphiti::Schema.generate)
       instance.graphiti_schema = graphiti_schema
+
+      resources ||= graphiti_schema.resources
+      entrypoints ||= self.entrypoints || resources
+
       instance.schema = schema
-      instance.apply_query(entrypoint_resources || entrypoints)
+      instance.apply_query(resources, entrypoints)
       instance
     end
 
@@ -72,8 +76,8 @@ module GraphitiGraphQL
       @query_fields = {}
     end
 
-    def apply_query(entries)
-      query_type = generate_schema_query(entries)
+    def apply_query(resources, entrypoints)
+      query_type = generate_schema_query(resources, entrypoints)
       Federation::SchemaDecorator.decorate(self) if self.class.federation?
 
       # NB - don't call .query here of federation will break things
@@ -86,7 +90,7 @@ module GraphitiGraphQL
       schema.query # Actually fires the federation code
     end
 
-    def generate_schema_query(entrypoint_resources = nil)
+    def generate_schema_query(resources, entrypoints)
       existing_query = schema.instance_variable_get(:@query)
       existing_query ||= schema.send(:find_inherited_value, :query)
       # NB - don't call graphql_schema.query here of federation will break things
@@ -97,13 +101,11 @@ module GraphitiGraphQL
 
       # Ensure all types are generated, even if they aren't in a top-level Query
       # We might now want to expose the query, but do want to federate the Type
-      graphiti_schema.resources.each do |resource|
-        next if resource.remote?
+      get_schema_resources(resources).each do |resource|
         generate_type(resource)
       end
 
-      get_entrypoints(entrypoint_resources).each do |resource|
-        next if resource.remote?
+      get_schema_resources(entrypoints).each do |resource|
         add_index(query_class, resource)
         add_show(query_class, resource)
       end
@@ -203,14 +205,14 @@ module GraphitiGraphQL
         top_level_single: true
     end
 
-    def get_entrypoints(manually_specified)
+    def get_schema_resources(manually_specified)
       resources = graphiti_schema.resources
       if manually_specified
         resources = resources.select { |r|
           manually_specified.map(&:name).include?(r.name)
         }
       end
-      resources
+      resources.reject(&:remote?)
     end
 
     def generate_sort_att_type_for(resource)

data/lib/graphiti_graphql/version.rb

@@ -1,3 +1,3 @@
 module GraphitiGraphQL
-  VERSION = "0.1.11"
+  VERSION = "0.1.15"
 end

data/lib/graphiti_graphql.rb

@@ -53,8 +53,11 @@ module GraphitiGraphQL
       @generated ||= GraphitiGraphQL::Schema.generate
     end
 
-    def generate!(entrypoint_resources = nil)
-      @generated = GraphitiGraphQL::Schema.generate(entrypoint_resources)
+    # resources: All resources to put in the schema. Mostly just for testing.
+    # entrypoints: All resources to expose as top-level query objects
+    def generate!(resources: nil, entrypoints: nil)
+      @generated = GraphitiGraphQL::Schema
+        .generate(resources: resources, entrypoints: entrypoints)
     end
 
     def generated?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphiti_graphql
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.15
 platform: ruby
 authors:
 - Lee Richmond
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-08-16 00:00:00.000000000 Z
+date: 2022-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphiti
@@ -274,7 +274,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: GraphQL support for Graphiti