graphiti_gql 0.2.32 → 0.2.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8d0cda6314cfd3485283ae277bdaa56494a4b8eae9c62f9037b5b78f17b2825
-  data.tar.gz: 28fcbab36f65c81bb8a673aefaefe7bd54888f02ca741fcf5a889f2f858e094a
+  metadata.gz: 389d9a348fca14259146eef09736c6a7358ff7ad824282fe6c838ee61ebf1ca0
+  data.tar.gz: 50dc70797c83ae98540c902df942487c3a3b4f183243331a51b44adc19064baf
 SHA512:
-  metadata.gz: 864e7b0fbd88fb01f3aa8bc0490ce144a4d62e02c9d9ce30dc032f6209b91cf9e5766b06bf85113cbdb9d4603dd397b8b831fcbc8f76ff123ff12307e82a4815
-  data.tar.gz: 61304ca30da99696a76c625c3737037429182df25ca6271c9f779bbbfa96740e2d1b3c792cbaaea560a31b52edc90f342b49a8aab12d607ece04804415e3d1e1
+  metadata.gz: c58333b9a7bbd43a68e27974d6a6cfdfdb9087e97ed5ca42d37be102995c15470f4279cd6499eef3ef7157f648dd8749e3df7d8921277139cbef39cd4bbaa34a
+  data.tar.gz: 378e41e41e6c1aa19b65274f29233aec4371e9cf44fd3dcf9dbf17404029230454ca8042bde7341177fe6349b9cc7233332546f4c10cae7b4ff4563176a9697d

data/lib/graphiti_gql/engine.rb

@@ -2,10 +2,7 @@ module GraphitiGql
   class Engine < ::Rails::Engine
     isolate_namespace GraphitiGql
 
-    config.to_prepare do
-      Dir.glob("#{Rails.root}/app/resources/**/*").each { |f| require(f) }
-      GraphitiGql.schema!
-
+    config.after_initialize do
       log_level = ENV.fetch('GRAPHITI_LOG_LEVEL', '1').to_i
       log_activerecord = false
       if log_level == -1 && defined?(ActiveRecord)

data/lib/graphiti_gql/graphiti_hax.rb

@@ -128,13 +128,21 @@ module GraphitiGql
         super
         # default behavior is to force single: true
         filters[name][:single] = false if boolean_array
-       
+
         opts = args.extract_options!
         if opts[:if]
           attributes[name][:filterable] = opts[:if]
         end
       end
 
+      def sort(name, *args, &blk)
+        super
+        opts = args.extract_options!
+        if opts[:schema] == false
+          config[:sorts][name][:schema] = false
+        end
+      end
+
       def filter_group(filter_names, *args)
         if filter_names.blank?
           config[:grouped_filters] = {}
@@ -143,6 +151,14 @@ module GraphitiGql
         end
       end
 
+      def paginatable=(val)
+        config[:paginatable] = val
+      end
+
+      def paginatable
+        config[:paginatable] == false ? false : true
+      end
+
       def value_object?
         !!config[:is_value_object]
       end
@@ -289,7 +305,7 @@ module GraphitiGql
         attr_reader :join_table_alias, :edge_magic, :edge_resource
       end
     end
-    
+
     def initialize(name, opts = {})
       @join_table_alias = opts[:join_table_alias]
       @edge_magic = opts[:edge_magic] == false ? false : true
@@ -431,7 +447,7 @@ module GraphitiGql
       clause = {attribute => value}
       is_not ? scope.where.not(clause) : scope.where(clause)
     end
- 
+
     def sanitized_like_for(scope, attribute, value, &block)
       escape_char = "\\"
       column = column_for(scope, attribute)
@@ -493,7 +509,7 @@ module GraphitiGql
       hash
     end
   end
-  
+
   Graphiti::Query.send(:prepend, QueryExtras)
   module ScopeExtras
     def initialize(object, resource, query, opts = {})
@@ -599,4 +615,4 @@ module Graphiti
     level ||= :debug
     logger.send(level, colored)
   end
-end
+end

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

@@ -12,8 +12,8 @@ module GraphitiGql
             @registered[:type].connection_type,
             null: false,
             connection: false,
-            extensions: [RelayConnectionExtension],
             extras: [:lookahead]
+          field.extension(RelayConnectionExtension, resource: resource)
           ListArguments.new(resource).apply(field)
           query.define_method name do |**arguments|
             params = Util.params_from_args(arguments)

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

@@ -14,11 +14,13 @@ module GraphitiGql
             connection: false,
             extras: [:lookahead]
           }
-          opts[:extensions] = [RelayConnectionExtension] unless has_one?
           field_type = has_one? ? @sideload_type : @connection_type
           field = type.field @sideload.name,
             field_type,
             **opts
+          unless has_one?
+            field.extension(RelayConnectionExtension, resource: @sideload.resource.class)
+          end
           ListArguments.new(@sideload.resource.class, @sideload).apply(field)
           _sideload = @sideload
           type.define_method(@sideload.name) do |**arguments|

data/lib/graphiti_gql/schema/list_arguments.rb

@@ -14,7 +14,7 @@ module GraphitiGql
 
       def apply(field)
         define_filters(field) unless @resource.filters.empty?
-        define_sorts(field) unless @resource.sorts.empty?
+        define_sorts(field) unless sorts.empty?
       end
 
       private
@@ -39,7 +39,7 @@ module GraphitiGql
         required = true if @resource.grouped_filters.any? && !@sideload
         field.argument :filter, filter_type, required: required
       end
-    
+
       def generate_filter_type(field)
         type_name = "#{registry.key_for(@resource)}Filter"
         if (registered = registry[type_name])
@@ -65,7 +65,7 @@ module GraphitiGql
         registry[type_name] = { type: klass }
         klass
       end
-    
+
       def generate_filter_attribute_type(type_name, filter_name, filter_config)
         klass = Class.new(GraphQL::Schema::InputObject)
         filter_graphql_name = "#{type_name}Filter#{filter_name.to_s.camelize(:lower)}"
@@ -82,13 +82,13 @@ module GraphitiGql
           if (allowlist = filter_config[:allow])
             type = define_allowlist_type(filter_graphql_name, allowlist)
           end
-  
+
           type = [type] unless !!filter_config[:single]
           klass.argument operator, type, required: false
         end
         klass
       end
-    
+
       def define_allowlist_type(filter_graphql_name, allowlist)
         name = "#{filter_graphql_name}Allow"
         if (registered = registry[name])
@@ -103,6 +103,12 @@ module GraphitiGql
         klass
       end
 
+      def sorts
+        @resource.sorts.reject do |key, value|
+          value[:schema] == false
+        end
+      end
+
       def define_sorts(field)
         sort_type = generate_sort_type
         field.argument :sort, [sort_type], required: false
@@ -116,13 +122,13 @@ module GraphitiGql
         klass = Class.new(GraphQL::Schema::Enum) {
           graphql_name(type_name)
         }
-        @resource.sorts.each_pair do |name, config|
+        sorts.each_pair do |name, config|
           klass.value name.to_s.camelize(:lower), "Sort by #{name}"
         end
         registry[type_name] = { type: klass }
         klass
       end
-  
+
       def generate_sort_type
         type_name = "#{registry.key_for(@resource)}Sort"
         if (registered = registry[type_name])
@@ -139,4 +145,4 @@ module GraphitiGql
       end
     end
   end
-end
+end

data/lib/graphiti_gql/schema.rb

@@ -62,6 +62,10 @@ module GraphitiGql
     }
 
     class RelayConnectionExtension < GraphQL::Schema::Field::ConnectionExtension
+      def apply
+        super if options[:resource].paginatable
+      end
+
       def resolve(object:, arguments:, context:)
         next_args = arguments.dup
         yield(object, next_args, arguments)
@@ -98,8 +102,24 @@ module GraphitiGql
       @resources = resources
     end
 
+    def self.resource_types!
+      resources = Graphiti.resources.reject(&:abstract_class?)
+      resources.each { |resource| ResourceType.new(resource).build }
+      # add relationships
+      registry.resource_types.each do |registered|
+        resource, type = registered[:resource], registered[:type]
+        ResourceType.add_relationships(resource, type)
+      end
+      # add_value_objects
+      registry.resource_types(value_objects: false).each do |registered|
+        resource, type = registered[:resource], registered[:type]
+        ResourceType.add_value_objects(resource, type)
+      end
+    end
+
     def generate
-      klass = Class.new(::GraphQL::Schema)
+      klass = Class.new(::GraphitiGql.config.base_schema || ::GraphQL::Schema)
+      # TODO inherit from klass.query if exists
       klass.query(Query.new(@resources).build)
       klass.use(GraphQL::Batch)
       klass.connections.add(ResponseShim, Connection)

data/lib/graphiti_gql/version.rb

@@ -1,3 +1,3 @@
 module GraphitiGql
-  VERSION = "0.2.32"
+  VERSION = "0.2.34"
 end

data/lib/graphiti_gql.rb

@@ -35,7 +35,10 @@ module GraphitiGql
   class Error < StandardError; end
 
   class Configuration
-    attr_accessor :exception_handler, :error_handling, :logging
+    attr_accessor :base_schema,
+      :exception_handler,
+      :error_handling,
+      :logging
 
     def exception_handler
       @exception_handler ||= ExceptionHandler
@@ -57,7 +60,7 @@ module GraphitiGql
   end
 
   def self.schema
-    @schema
+    @schema ||= schema!
   end
 
   def self.config

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphiti_gql
 version: !ruby/object:Gem::Version
-  version: 0.2.32
+  version: 0.2.34
 platform: ruby
 authors:
 - Lee Richmond
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-09-02 00:00:00.000000000 Z
+date: 2022-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql