graphiti_gql 0.2.17 → 0.2.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18a776555ead439b1ddfb5ff28835e1da6c5673b93287379d3cd8de4d366d5b7
-  data.tar.gz: 919983d1eb5ad3653b4a95d22d9ed0f1d46d159fce21b2095746118e7e3bd175
+  metadata.gz: 17c54a15f86e3855f814dcea6a7093ceb0b0252de6685c57017a19f3c83160db
+  data.tar.gz: e0f018dbe747eaa43401f3f02ef77a526e3f5f2a0dad8964dd138bc083a38ad6
 SHA512:
-  metadata.gz: e70f2ee088082aae875d1f98117e65f9a2daf1c08a752ea79142b3ca371c30c64333b75d4e54d890356a62cc11dcef8a6c7d214936b9ffa94241c893ec672cfb
-  data.tar.gz: 29c371f94406f5b37beb82e6e440f5f52b3bca2345f2cc7b719ecea5f67ce28333a25820c6fd46f87ca540a218e18a6bd24e67e862f1fd6db66ab53203b1241b
+  metadata.gz: b863f5de471a4991d28f35c544567cf7420b78852c202c527b79399deb7e67f7c03e4f539cd628e9827354670e259ba44a8762191aaa88a97e3c474d753ff0de
+  data.tar.gz: e857d78632c3055263d4ae6287ab30836752c28cdd41836f411a82f4b64119b1420a79447c5a042c2829d24b57eec040d14a1eb9d2705aacc70935612ce5d5f8

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/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/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.17"
+  VERSION = "0.2.20"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphiti_gql
 version: !ruby/object:Gem::Version
-  version: 0.2.17
+  version: 0.2.20
 platform: ruby
 authors:
 - Lee Richmond
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-07-28 00:00:00.000000000 Z
+date: 2022-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql
@@ -124,7 +124,6 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- app/controllers/graphiti_gql/execution_controller.rb
 - bin/bundle
 - bin/byebug
 - bin/coderay
@@ -136,7 +135,6 @@ files:
 - bin/rake
 - bin/rspec
 - bin/setup
-- config/routes.rb
 - graphiti_gql.gemspec
 - lib/graphiti_gql.rb
 - lib/graphiti_gql/active_resource.rb

data/app/controllers/graphiti_gql/execution_controller.rb

@@ -1,18 +0,0 @@
-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/config/routes.rb

@@ -1,6 +0,0 @@
-GraphitiGql::Engine.routes.draw do
-  # Default json so our error handler takes effect
-  scope defaults: {format: :json} do
-    post "/" => "execution#execute"
-  end
-end