graphiti_gql 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84a7ebf615007ac087b7bab32e53b78fc1bbdb7abcd9d65e38beac1ec7e578fc
-  data.tar.gz: d5c625d0e34f750d8fc3bc8c71f39ccabb70aa1c87340978620e965137e15feb
+  metadata.gz: b9a1b76315488d9389a214fc640f6029d9e1a05a08182ebbdb9ed7958565e4aa
+  data.tar.gz: e4d6952a6929bf8310a99ba5b2d40e3821fe8bad51e89b3012c041fed9f1c47a
 SHA512:
-  metadata.gz: e8ea8defdb4712239187bcbb14a0d5dbeee9e52bf11a7c32dd747da2eae62247ef66fda15dd63b57886920a895f8215fe7a33b8eb3dc156194b3b2e3fd2f75c6
-  data.tar.gz: 42f885befb9c54a6b915642e40f2d2bb8704571c901c392f2a6fe11196d805113ca7af546ff15db7b336fdceff172ba2c27e9f443381462db26b4b44461eab6b
+  metadata.gz: 30cb9c3f67aa059d0e68845fc64aee6313d9f0d14d36e19024357c619ca15e176d4178ae2836055c22b407a53187038b21b8447007e37fbed04ab70330c12ff4
+  data.tar.gz: 6ece60976b6d36294e9ef01e8521efdf26d9637b28c6fcfec833e3f2a81d493eece073137071e3373f2ac948c786c18e79734904b62e369a1cc0c0353860d71d

data/lib/graphiti_gql/spec_helper.rb

@@ -2,6 +2,21 @@ module GraphitiGql
   module SpecHelper
     extend ActiveSupport::Concern
 
+    module ScopeTrackable
+      def self.prepended(klass)
+        klass.class_eval do
+          class << self
+            attr_accessor :resolved_scope
+          end
+        end
+      end
+
+      def resolve(scope)
+        self.class.resolved_scope = scope
+        super
+      end
+    end
+
     included do
       extend Forwardable
       def_delegators :result,
@@ -11,31 +26,38 @@ module GraphitiGql
         :nodes,
         :stats
 
+      Graphiti::Resource.send(:prepend, ScopeTrackable)
+
       if defined?(RSpec)
-        let(:params) do
-          fields = []
-          resource.attributes.each_pair do |name, config|
-            (fields << name) if config[:readable]
-          end
-          { fields: fields }
-        end
+        let(:params) { {} }
         let(:resource) { described_class }
         let(:ctx) { {} }
+        let(:only_fields) { [] }
+        let(:except_fields) { [] }
 
         def self.only_fields(*fields)
-          before do
-            fields.each { |f| params[:fields].select! { |p| p == f } }
-          end
+          let(:only_fields) { fields }
         end
 
         def self.except_fields(*fields)
-          before do
-            fields.each { |f| params[:fields].reject! { |p| p == f } }
-          end
+          let(:except_fields) { fields }
         end
       end
     end
 
+    def fields
+      fields = []
+      resource.attributes.each_pair do |name, config|
+        (fields << name) if config[:readable]
+      end
+      if respond_to?(:only_fields) && only_fields.present?
+        fields.select! { |f| only_fields.include?(f) }
+      elsif respond_to?(:except_fields) && except_fields.present?
+        fields.reject! { |f| except_fields.include?(f) }
+      end
+      fields
+    end
+
     def gql_datetime(timestamp, precise = false)
       if precise
         timestamp.utc.round(10).iso8601(6)
@@ -44,9 +66,16 @@ module GraphitiGql
       end
     end
 
+    def proxy
+      resource.gql(params.merge(fields: fields), ctx)
+    end
+
+    def query
+      proxy.query
+    end
+
     def run
       lambda do
-        proxy = resource.gql(params, ctx)
         proxy.to_h
         proxy
       end

data/lib/graphiti_gql/version.rb

@@ -1,3 +1,3 @@
 module GraphitiGql
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: graphiti_gql
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Lee Richmond