graphiti_graphql 0.1.12 → 0.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e50aa66c6cf3fda89d96665c6f2fc61fa92db821b4d00461101970d72c24eea6
-  data.tar.gz: 1e058e770b73378802fd43b3e852720d9cfa9b5b80cfc77c40ea1e2e2ea602df
+  metadata.gz: d786f75270cbe5652b90aaff1a9b3fedb993a7b9d5428c53a97c9ff98a4502d2
+  data.tar.gz: 9781d093ab340bfbe489098bc88c0054868f353b5e63073279c454b36ae44764
 SHA512:
-  metadata.gz: 7ecb9fda5f17d3414b2ae8a39f5e9fddb40f34ed683fc9d966c1098bd86f93422e9ee77439c8f27faed1384ab5876ee67bbfc296980f314c7f656930edee3734
-  data.tar.gz: f00540102b8cccd704a2ef2d6b7cb787c750f23858b78e425e1dc59e452065b16c9d8788065c0a0c2e87a653fac70d803f743f72ead06405f207e549e0f8e132
+  metadata.gz: aa5dc90dde1d56a5089813f11a3fbb8b0a02a2d831e7f8d0553efc7d78dedf7d55f444a7def0f28571937652abc05158d4dc3210424c0bee182bc851ffb9f8b1
+  data.tar.gz: 0df39b1128f036a98faee0bfbb24e9f0245f64bb24278463ccb7437e67b950a4e4710d5098b19975010171ba8fdfd9235217b4b2326feb85c93f7ec28c12f937

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    graphiti_graphql (0.1.12)
+    graphiti_graphql (0.1.15)
       activesupport (>= 4.1)
-      graphiti (~> 1.3.2)
+      graphiti (~> 1.3)
       graphql (~> 1.12)
 
 GEM
@@ -23,14 +23,14 @@ GEM
     ast (2.4.2)
     byebug (11.1.3)
     coderay (1.1.3)
-    concurrent-ruby (1.1.9)
+    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)
@@ -44,8 +44,8 @@ GEM
       dry-inflector (~> 0.1, >= 0.1.2)
       dry-logic (~> 1.0, >= 1.0.2)
     google-protobuf (3.17.3)
-    graphiti (1.3.2)
-      activesupport (>= 4.1)
+    graphiti (1.3.7)
+      activesupport (>= 5.2)
       concurrent-ruby (~> 1.0)
       dry-types (>= 0.15.0, < 2.0)
       graphiti_errors (~> 1.1.0)
@@ -60,13 +60,13 @@ GEM
     graphql-batch (0.4.3)
       graphql (>= 1.3, < 2)
       promise.rb (~> 0.7.2)
-    i18n (1.8.10)
+    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.2.0)
       ast (~> 2.4.1)
@@ -117,7 +117,7 @@ GEM
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.0.0)
-    zeitwerk (2.4.2)
+    zeitwerk (2.5.4)
 
 PLATFORMS
   ruby

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/graphiti_graphql.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "graphiti", "~> 1.3.2"
+  spec.add_dependency "graphiti", "~> 1.3"
   spec.add_dependency "activesupport", ">= 4.1"
   spec.add_dependency "graphql", "~> 1.12"
 

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,11 +7,18 @@ module GraphitiGraphQL
           @type_name = type_name
         end
 
-        def has_many(relationship_name, foreign_key: nil, magic: true, &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,
-            magic: magic,
+            field: field,
+            filter: filter,
             &blk
         end
       end
@@ -34,13 +41,13 @@ module GraphitiGraphQL
         #
         # * 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:, magic: true, 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 magic
+          return unless (filter || field)
 
           attribute = attributes.find { |name, config|
             name.to_sym == foreign_key &&
@@ -49,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/runner.rb

@@ -332,7 +332,7 @@ module GraphitiGraphQL
       if stats
         stat_param = {}
         stats.children.each do |stat_node|
-          stat_name = stat_node.name
+          stat_name = stat_node.name.underscore
           calculations = stat_node.children.map(&:name)
           stat_param[stat_name.to_sym] = calculations.join(",")
         end

data/lib/graphiti_graphql/version.rb

@@ -1,3 +1,3 @@
 module GraphitiGraphQL
-  VERSION = "0.1.12"
+  VERSION = "0.1.16"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphiti_graphql
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.16
 platform: ruby
 authors:
 - Lee Richmond
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-08-31 00:00:00.000000000 Z
+date: 2022-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphiti
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -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