graphiti_gql 0.2.15 → 0.2.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36cf98699fc608187e70b321c60b32fc68989b5db05704fbd0f3adcdc3e7c947
-  data.tar.gz: 1ee21e3fcce82d24027172bd106f395a797dbb4e9de8b52cbb18caf3bb41f474
+  metadata.gz: 535af0267b130ee480022a9058880a17f742ec6aa2209cc2b1d9991a82f9afbc
+  data.tar.gz: 43c9d8f5c3ff6147776d71741a2a24996b300fa75c3c495f2a4cb00fb11a14ca
 SHA512:
-  metadata.gz: ca86b7bba1a1c1b8e1a086872278ce730ad4e696002d45b7ebc519668294e1a0129c52da060d1a1a8673cf561f0d9d01e9c7c622b4f218316c1703fea554a5a6
-  data.tar.gz: 2f1081e4677027d6c6bdb703c8eb59a0f702fa6e07bd0249e6f4f4ecb103bc53ae794c9025c1b8634dcb445c476fd8ce04648f841cfcf4fd4ef04667cc19800a
+  metadata.gz: f5a0ea00caf0626444fd452c6502c07367cca9f579b561fd97ef2f615a6467fb415c82de9782f8d2640b567f9aeea90495e5cebb19533b564b2282afed25846b
+  data.tar.gz: 7cdf9e78135dd6257ec9226256d7242af74347762a4d22e4b7f1563f330fd0245b0326e164177fea524338d6c7b95f63f6c29bf13fa7e8e267aabe12affc325a

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/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

data/lib/graphiti_gql/engine.rb

@@ -9,34 +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
       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

@@ -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.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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: graphiti_gql
 version: !ruby/object:Gem::Version
-  version: 0.2.15
+  version: 0.2.16
 platform: ruby
 authors:
 - Lee Richmond