graphiti_gql 0.2.12 → 0.2.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 738c0d01e7e5491204399c4ddf9b0d346943555c49a1b64937e62c4503a23d9b
-  data.tar.gz: 80837b0265bcfda82c95bb498e262f52208a75a06b61670df342aea53d16ceb5
+  metadata.gz: 535af0267b130ee480022a9058880a17f742ec6aa2209cc2b1d9991a82f9afbc
+  data.tar.gz: 43c9d8f5c3ff6147776d71741a2a24996b300fa75c3c495f2a4cb00fb11a14ca
 SHA512:
-  metadata.gz: 3ad649a5f015c967529be572ad5f586edbeeb83205aaf4421c0f8906099213565492ba54f871e141aee37a668d5255cfa7188429cbbb15484d11af20c2b70cbe
-  data.tar.gz: b1b6812f8e4f350682124de0dfefde997602ed41f6d7b5e704ae640d2e59636c789e1ba54c75a51ef5beea41fbd76d3213424736d7159f455aad27bd6323361d
+  metadata.gz: f5a0ea00caf0626444fd452c6502c07367cca9f579b561fd97ef2f615a6467fb415c82de9782f8d2640b567f9aeea90495e5cebb19533b564b2282afed25846b
+  data.tar.gz: 7cdf9e78135dd6257ec9226256d7242af74347762a4d22e4b7f1563f330fd0245b0326e164177fea524338d6c7b95f63f6c29bf13fa7e8e267aabe12affc325a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    graphiti_gql (0.2.11)
+    graphiti_gql (0.2.15)
       graphiti (~> 1.3.9)
       graphql (~> 2.0)
       graphql-batch (~> 0.5)
@@ -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/lib/graphiti_gql/active_resource.rb

@@ -13,15 +13,21 @@ module GraphitiGql
             if (sideload = resource.sideload(key))
               if value.key?(:edges) 
                 @edges[key] = value[:edges].map do |edge|
-                  node_id = edge[:node][:id]
+                  node_id = edge[:node][:id] if edge[:node]
                   Node.new(edge.except(:node).merge(node_id: node_id))
                 end
-                hash[key] = value[:edges].map { |v| Node.new(v[:node], sideload.resource.class) }
+                if value[:edges].any? { |e| e[:node] }
+                  hash[key] = value[:edges].map { |v| Node.new(v[:node], sideload.resource.class) }
+                else
+                  hash[key] = value[:edges]
+                end
               elsif value.key?(:nodes)
                 hash[key] = value[:nodes].map { |n| Node.new(n, sideload.resource.class) }
               else
                 hash[key] = Node.new(value, sideload.resource.class)
               end
+            else
+              hash[key] = Node.new(value)
             end
           end
         end
@@ -59,15 +65,19 @@ module GraphitiGql
         @with_pagination = !!options[:with_pagination]
       end
 
-      def to_h(symbolize_keys: true)
+      def run!(symbolize_keys: true)
         result = GraphitiGql.run(query, @params, @ctx)
         result = result.deep_symbolize_keys if symbolize_keys
         @response = result
         result
       end
 
-      def node(id)
-        nodes.find { |n| n.id == id.to_s }
+      def node(id = nil)
+        if @resource.singular
+          Node.new(underscore(data[data.keys.first]), @resource)
+        else
+          nodes.find { |n| n.id == id.to_s }
+        end
       end
 
       def nodes
@@ -82,7 +92,7 @@ module GraphitiGql
       alias :to_a :nodes
 
       def response
-        @response ||= to_h
+        @response ||= run!
       end
 
       def data

data/lib/graphiti_gql/engine.rb

@@ -9,35 +9,20 @@ module GraphitiGql
       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
-      require "#{Rails.root}/app/controllers/application_controller"
       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] || {}
+          ctx = respond_to?(:graphql_context) ? graphql_context : {}
           result = GraphitiGql.run params[:query],
             params[:variables],
-            graphql_context
+            ctx
           render json: result
         end
-
-        private
-
-        def default_context
-          defined?(:current_user)
-        end
       end
     end
   end

data/lib/graphiti_gql/graphiti_hax.rb

@@ -2,15 +2,40 @@
 # Ideally we eventually rip out the parts of Graphiti we need and roll this into
 # that effort.
 module GraphitiGql
+  module RunnerExtras
+    def jsonapi_resource
+      @jsonapi_resource ||= begin
+        r = @resource_class.new
+        r.instance_variable_set(:@params, @params)
+        r
+      end
+    end
+  end
+  Graphiti::Runner.send(:prepend, RunnerExtras)
+
   module ResourceExtras
     extend ActiveSupport::Concern
 
     included do
       class << self
-        attr_accessor :graphql_name
+        attr_accessor :graphql_name, :singular
+      end
+    end
+
+    def filterings
+      @filterings ||= begin
+        if @params.key?(:filter)
+          @params[:filter].keys
+        else
+          []
+        end
       end
     end
 
+    def parent_field
+      context[:current_arguments][:lookahead].field.owner
+    end
+
     def selections
       return @selections if @selections
       lookahead = context[:current_arguments]
@@ -42,6 +67,22 @@ module GraphitiGql
           att[:name] = args.first # for easier lookup
         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] = {}
+        else
+          super
+        end
+      end
     end
   end
   Graphiti::Resource.send(:include, ResourceExtras)
@@ -145,8 +186,10 @@ module GraphitiGql
   module ManyToManyExtras
     def self.prepended(klass)
       klass.class_eval do
+        attr_reader :join_table_alias, :edge_magic
+
         class << self
-          attr_accessor :edge_resource
+          attr_reader :edge_resource
 
           def attribute(*args, &blk)
             @edge_resource ||= Class.new(Graphiti::Resource) do
@@ -159,6 +202,12 @@ module GraphitiGql
         end
       end
     end
+    
+    def initialize(name, opts = {})
+      @join_table_alias = opts[:join_table_alias]
+      @edge_magic = opts[:edge_magic] == false ? false : true
+      super
+    end
 
     def apply_belongs_to_many_filter
       super

data/lib/graphiti_gql/loaders/belongs_to.rb

@@ -53,11 +53,18 @@ module GraphitiGql
             fulfill(id, val[:data][0])
           end
         else
-          params = {filter: {id: {eq: ids.join(",")}}}
           resource = Schema.registry.get(@sideload.resource.class)[:resource]
+          params = {}
+          unless resource.singular
+            params[:filter] = {id: { eq: ids.join(",") } }
+          end
           records = resource.all(params).data
-          map = records.index_by { |record| record.id }
-          ids.each { |id| fulfill(id, map[id]) }
+          if resource.singular
+            ids.each { |id| fulfill(id, records[0]) }
+          else
+            map = records.index_by { |record| record.id }
+            ids.each { |id| fulfill(id, map[id]) }
+          end
         end
       end
     end

data/lib/graphiti_gql/loaders/has_many.rb

@@ -3,7 +3,14 @@ module GraphitiGql
     class HasMany < Many
       def assign(parent_records, proxy)
         records = proxy.data
-        map = records.group_by { |record| record.send(@sideload.foreign_key) }
+
+        foreign_key = @sideload.foreign_key
+        config = @sideload.resource.attributes[foreign_key]
+        if config && config[:alias]
+          foreign_key = config[:alias]
+        end
+
+        map = records.group_by { |record| record.send(foreign_key) }
         parent_records.each do |pr|
           data = [map[pr.send(@sideload.primary_key)] || [], proxy]
           fulfill(pr, data)

data/lib/graphiti_gql/loaders/many.rb

@@ -57,7 +57,7 @@ module GraphitiGql
         elsif @sideload.type == :many_to_many
           fk = @sideload.foreign_key.values.first
           @params[:filter].merge!(fk => { eq: ids.join(",") })
-        else
+        elsif !@sideload.parent_resource.class.singular
           @params[:filter].merge!(@sideload.foreign_key => { eq: ids.join(",") })
         end
 

data/lib/graphiti_gql/loaders/many_to_many.rb

@@ -17,14 +17,16 @@ module GraphitiGql
       private
 
       def add_join_table_magic(proxy)
+        return unless @sideload.edge_magic
         if defined?(ActiveRecord) && proxy.resource.model.ancestors.include?(ActiveRecord::Base)
           thru = @sideload.foreign_key.keys.first
           reflection = @sideload.parent_resource.model.reflect_on_association(thru)
           thru_model = reflection.klass
 
+          thru_table_name = @sideload.join_table_alias || thru_model.table_name
           names = thru_model.column_names.map do |n|
             next if n == :id
-            "#{thru_model.table_name}.#{n} as _edge_#{n}"
+            "#{thru_table_name}.#{n} as _edge_#{n}"
           end
           scope = proxy.scope.object
           scope = scope.select(["#{proxy.resource.model.table_name}.*"] + names)

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

@@ -11,7 +11,9 @@ module GraphitiGql
             @registered[:type],
             null: true,
             extras: [:lookahead]
-          field.argument(:id, String, required: true)
+          unless @registered[:resource].singular
+            field.argument(:id, String, required: true)
+          end
           _registered = @registered
           query.define_method name do |**arguments|
             params = Util.params_from_args(arguments)

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

@@ -78,17 +78,22 @@ module GraphitiGql
     def run
       lambda do
         instance = proxy
-        instance.to_h
+        instance.run!
         instance
       end
     end
 
     def run!
+      @json = nil
       @result = run.call
     end
 
     def result
       @result ||= run!
     end
+
+    def json
+      @json ||= result.response
+    end
   end
 end

data/lib/graphiti_gql/version.rb

@@ -1,3 +1,3 @@
 module GraphitiGql
-  VERSION = "0.2.12"
+  VERSION = "0.2.16"
 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.12
+  version: 0.2.16
 platform: ruby
 authors:
 - Lee Richmond
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-07-17 00:00:00.000000000 Z
+date: 2022-07-26 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: []
@@ -170,7 +170,7 @@ licenses:
 - MIT
 metadata:
   homepage_uri: https://www.graphiti.dev
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -185,8 +185,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: GraphQL support for Graphiti
 test_files: []