graphiti_gql 0.2.16 → 0.2.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 535af0267b130ee480022a9058880a17f742ec6aa2209cc2b1d9991a82f9afbc
-  data.tar.gz: 43c9d8f5c3ff6147776d71741a2a24996b300fa75c3c495f2a4cb00fb11a14ca
+  metadata.gz: 8ff3654600729760d759d234decc94aeb9fd1927b27017bf14de01c70080ec34
+  data.tar.gz: 9e9cc547ace2c05ffbd9952cbe8db82ae9ef499ecc5123deaf72f2087cd6147b
 SHA512:
-  metadata.gz: f5a0ea00caf0626444fd452c6502c07367cca9f579b561fd97ef2f615a6467fb415c82de9782f8d2640b567f9aeea90495e5cebb19533b564b2282afed25846b
-  data.tar.gz: 7cdf9e78135dd6257ec9226256d7242af74347762a4d22e4b7f1563f330fd0245b0326e164177fea524338d6c7b95f63f6c29bf13fa7e8e267aabe12affc325a
+  metadata.gz: 496ee06e3e0ba183c867367a759ce0114764c183f0af8df346d18bf8c28bb1c034ba9aa7dcf43d8e04bb11106b05143fdc2d6fd0ca220089489e276d59079a84
+  data.tar.gz: a2b5b3a60d06253dcb0aad59fe7f5358c700e360ecd24c421fed659ac2dccce45f3492797d42c74c72e743c7488a7f02417daf8f0352372f87b9faa49af21f96

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    graphiti_gql (0.2.15)
+    graphiti_gql (0.2.18)
       graphiti (~> 1.3.9)
       graphql (~> 2.0)
       graphql-batch (~> 0.5)

data/app/controllers/graphiti_gql/execution_controller.rb

@@ -0,0 +1,18 @@
+module GraphitiGql
+  class ExecutionController < GraphitiGql.config.application_controller
+    def execute
+      params = request.params # avoid strong_parameters
+      variables = params[:variables] || {}
+      result = GraphitiGql.run params[:query],
+        params[:variables],
+        graphql_context
+      render json: result
+    end
+
+    private
+
+    def default_context
+      defined?(:current_user)
+    end
+  end
+end

data/lib/graphiti_gql/active_resource.rb

@@ -201,9 +201,11 @@ module GraphitiGql
             if sideload_fields.blank?
               sideload_fields = @resource.sideload(inc.to_sym).resource.attributes.select { |_, config| config[:readable] }.map(&:first)
             end
+            sideload_fields = sideload_fields.map { |sf| sf.to_s.camelize(:lower) }
+            sideload_fields |= [:__typename]
             sideload_fields.each do |name|
               q << %|
-                    #{indent}#{name.to_s.camelize(:lower)}|
+                    #{indent}#{name}|
             end
 
             if to_one

data/lib/graphiti_gql/engine.rb

@@ -3,27 +3,10 @@ module GraphitiGql
     isolate_namespace GraphitiGql
 
     # TODO improvable?
-    config.after_initialize do
+    config.to_prepare do
     # initializer "graphiti_gql.generate_schema" do
       Dir.glob("#{Rails.root}/app/resources/**/*").each { |f| require(f) }
       GraphitiGql.schema!
     end
-
-    initializer "graphiti_gql.define_controller" do
-      app_controller = GraphitiGql.config.application_controller || ::ApplicationController
-
-      # rubocop:disable Lint/ConstantDefinitionInBlock(Standard)
-      class GraphitiGql::ExecutionController < app_controller
-        def execute
-          params = request.params # avoid strong_parameters
-          variables = params[:variables] || {}
-          ctx = respond_to?(:graphql_context) ? graphql_context : {}
-          result = GraphitiGql.run params[:query],
-            params[:variables],
-            ctx
-          render json: result
-        end
-      end
-    end
   end
-end
+end

data/lib/graphiti_gql/schema/fields/attribute.rb

@@ -3,7 +3,8 @@ module GraphitiGql
     module Fields
       class Attribute
         # If sideload is present, we're applying m2m metadata to an edge
-        def initialize(name, config, sideload = nil)
+        def initialize(resource, name, config, sideload = nil)
+          @resource = resource
           @config = config
           @name = name
           @alias = config[:alias]
@@ -57,14 +58,34 @@ module GraphitiGql
         private
 
         def field_type
-          field_type = Graphiti::Types[@config[:type]][:graphql_type]
-          if !field_type
-            canonical_graphiti_type = Graphiti::Types.name_for(@config[:type])
-            field_type = GQL_TYPE_MAP[canonical_graphiti_type.to_sym]
-            field_type = String if @name == :id
+          if [:integer_enum, :string_enum].any? { |t| @config[:type] == t }
+            return find_or_create_enum_type
+          else
+            field_type = Graphiti::Types[@config[:type]][:graphql_type]
+            if !field_type
+              canonical_graphiti_type = Graphiti::Types.name_for(@config[:type])
+              field_type = GQL_TYPE_MAP[canonical_graphiti_type.to_sym]
+              field_type = String if @name == :id
+            end
+            field_type = [field_type] if @config[:type].to_s.starts_with?("array_of")
+            field_type
+          end
+        end
+
+        def find_or_create_enum_type
+          resource_type_name = Schema.registry.key_for(@resource, interface: false)
+          enum_type_name = "#{resource_type_name}_#{@name}"
+          if (registered = Schema.registry[enum_type_name])
+            registered[:type]
+          else
+            klass = Class.new(GraphQL::Schema::Enum)
+            klass.graphql_name(enum_type_name)
+            @config[:allow].each do |allowed|
+              klass.value(allowed)
+            end
+            Schema.registry[enum_type_name] = { type: klass }
+            klass
           end
-          field_type = [field_type] if @config[:type].to_s.starts_with?("array_of")
-          field_type
         end
       end
     end

data/lib/graphiti_gql/schema/fields/to_many.rb

@@ -64,7 +64,7 @@ module GraphitiGql
           edge_resource = @sideload.class.edge_resource
           edge_resource.attributes.each_pair do |name, config|
             next if name == :id
-            Schema::Fields::Attribute.new(name, config, @sideload).apply(edge_type_class)
+            Schema::Fields::Attribute.new(edge_resource, name, config, @sideload).apply(edge_type_class)
           end
           registered_parent = Schema.registry.get(@sideload.parent_resource.class)
           parent_name = registered_parent[:type].graphql_name

data/lib/graphiti_gql/schema/resource_type.rb

@@ -90,7 +90,7 @@ module GraphitiGql
       def add_fields(type, resource)
         resource.attributes.each_pair do |name, config|
           if config[:readable]
-            Fields::Attribute.new(name, config).apply(type)
+            Fields::Attribute.new(@resource, name, config).apply(type)
           end
         end
       end

data/lib/graphiti_gql/version.rb

@@ -1,3 +1,3 @@
 module GraphitiGql
-  VERSION = "0.2.16"
+  VERSION = "0.2.19"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphiti_gql
 version: !ruby/object:Gem::Version
-  version: 0.2.16
+  version: 0.2.19
 platform: ruby
 authors:
 - Lee Richmond
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-07-26 00:00:00.000000000 Z
+date: 2022-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql
@@ -124,6 +124,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- app/controllers/graphiti_gql/execution_controller.rb
 - bin/bundle
 - bin/byebug
 - bin/coderay