graphiti_gql 0.2.15 → 0.2.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36cf98699fc608187e70b321c60b32fc68989b5db05704fbd0f3adcdc3e7c947
-  data.tar.gz: 1ee21e3fcce82d24027172bd106f395a797dbb4e9de8b52cbb18caf3bb41f474
+  metadata.gz: 90e832970f0f3329260d83e026c58493b76711ed1fbb7eee3914978014cd4684
+  data.tar.gz: 993170a348f371cebc8bb101c21b48ca26f6df2ef82c9422061081a6da878880
 SHA512:
-  metadata.gz: ca86b7bba1a1c1b8e1a086872278ce730ad4e696002d45b7ebc519668294e1a0129c52da060d1a1a8673cf561f0d9d01e9c7c622b4f218316c1703fea554a5a6
-  data.tar.gz: 2f1081e4677027d6c6bdb703c8eb59a0f702fa6e07bd0249e6f4f4ecb103bc53ae794c9025c1b8634dcb445c476fd8ce04648f841cfcf4fd4ef04667cc19800a
+  metadata.gz: a84908687fd25d4324b6e9d1bc9bc9ef83a3388ca49ad33c829c71828e98992b3fd04476df6d1927ea3d6f17c87b5de89bbb6aa24f60d351f101c7f69b12ec53
+  data.tar.gz: ad12bf08064111c18ee81b2b4006195c38311846f81310bb158126b0b89c257dabce3b60c32fe7114bace33dca19475e2af0b9d9d5976749cd1eafdcf2bf3e37

data/Gemfile.lock

@@ -43,7 +43,7 @@ GEM
       jsonapi-serializable (~> 0.3.0)
     graphiti_errors (1.1.2)
       jsonapi-serializable (~> 0.1)
-    graphql (2.0.11)
+    graphql (2.0.12)
     graphql-batch (0.5.1)
       graphql (>= 1.10, < 3)
       promise.rb (~> 0.7.2)

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

@@ -26,6 +26,8 @@ module GraphitiGql
               else
                 hash[key] = Node.new(value, sideload.resource.class)
               end
+            else
+              hash[key] = Node.new(value)
             end
           end
         end
@@ -199,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,41 +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
-
-    module ControllerContext
-      def graphql_context
-        ctx = { controller: self }
-        ctx[:current_user] = current_user if respond_to?(:current_user)
-        ctx
-      end
-    end
-
-    initializer "graphiti_gql.define_controller" do
-      app_controller = GraphitiGql.config.application_controller || ::ApplicationController
-      app_controller.send(:include, ControllerContext)
-
-      # rubocop:disable Lint/ConstantDefinitionInBlock(Standard)
-      class GraphitiGql::ExecutionController < app_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
   end
-end
+end

data/lib/graphiti_gql/graphiti_hax.rb

@@ -68,6 +68,14 @@ module GraphitiGql
         end
       end
 
+      def filter(name, *args, &blk)
+        super
+        opts = args.extract_options!
+        if opts[:if]
+          attributes[name][:filterable] = opts[:if]
+        end
+      end
+
       def filter_group(filter_names, *args)
         if filter_names.blank?
           config[:grouped_filters] = {}

data/lib/graphiti_gql/schema/query.rb

@@ -22,7 +22,7 @@ module GraphitiGql
 
       def define_entrypoints
         registry.resource_types.each do |registered|
-          if GraphitiGql.entrypoint?(registered[:resource])
+          if registered[:resource].graphql_entrypoint
             Fields::Index.new(registered).apply(@query_class)
             Fields::Show.new(registered).apply(@query_class)
           end

data/lib/graphiti_gql/spec_helper.rb

@@ -84,6 +84,7 @@ module GraphitiGql
     end
 
     def run!
+      @json = nil
       @result = run.call
     end
 

data/lib/graphiti_gql/version.rb

@@ -1,3 +1,3 @@
 module GraphitiGql
-  VERSION = "0.2.15"
+  VERSION = "0.2.18"
 end

data/lib/graphiti_gql.rb

@@ -53,16 +53,8 @@ module GraphitiGql
     yield config
   end
 
-  def self.entrypoints=(val)
-    @entrypoints = val
-  end
-
-  def self.entrypoints
-    @entrypoints
-  end
-
   def self.entrypoint?(resource)
-    @entrypoints.nil? || @entrypoints.include?(resource)
+    !!resource.graphql_entrypoint
   end
 
   def self.run(query_string, variables = {}, context = {})

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphiti_gql
 version: !ruby/object:Gem::Version
-  version: 0.2.15
+  version: 0.2.18
 platform: ruby
 authors:
 - Lee Richmond
-autorequire:
+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
@@ -108,7 +108,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '7.0'
-description:
+description: 
 email:
 - richmolj@gmail.com
 executables: []
@@ -124,6 +124,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- app/controllers/graphiti_gql/execution_controller.rb
 - bin/bundle
 - bin/byebug
 - bin/coderay
@@ -170,7 +171,7 @@ licenses:
 - MIT
 metadata:
   homepage_uri: https://www.graphiti.dev
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -185,8 +186,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
-signing_key:
+rubygems_version: 3.0.3.1
+signing_key: 
 specification_version: 4
 summary: GraphQL support for Graphiti
 test_files: []