graphql-rails-api 0.2 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d57fa3b16ccdcf04df7d00d4fe67475c52023335a4655a2efa0261023a4cf78c
-  data.tar.gz: 13a7ae285e5f4594322f9960d400f9657c06326e57bfde6322633764b573e3b0
+  metadata.gz: a1281132c1de853a10666be60aba3a29e7e4e6d83342c550435dec84829c3c42
+  data.tar.gz: 02d99ace4e2fbf81ad86a6704acf254c164dc0335c2c54d97e52f61e5edd38d4
 SHA512:
-  metadata.gz: 525754f37def8d961cceb0ae151d44e00369b8f2099f5ad6648f5ab276759b9de36ad1e1ed0e50f1ec48130f5c0088be7193d5bbd8d881c699fa3e1f84f16d95
-  data.tar.gz: 9d5d568d8e8e22a50ef9b4760629cb1efbcf6a536c397510bc4d170bba5d4e178962a3ef933cba12ab8c4a45078319c45e33bc9824a9d16ddf1707bc2a6fdf66
+  metadata.gz: aa12edf3276a69cf22677fa055acc59c2387700d6b61445da2f2b5e628904b626b40025509234d61f2d0099c9d1797576cda526c9b3932495111e7cb4cd2cb50
+  data.tar.gz: 9f8a42aa10470ed57a530ed790d237a37ef125ba9e85e771d6d31f0f65ed2fb5a9c881a798224465a4b3cecf58f487b074b9ca3fa6165d71c14b36f508b46b36

data/lib/generators/graphql_rails_api/install_generator.rb

@@ -67,7 +67,7 @@ module GraphqlRailsApi
       write_at(
         'config/application.rb',
         5,
-        "require 'graphql/hydrate_query'\nrequire 'graphql/visibility_hash'\n"
+        "require 'graphql/hydrate_query'\n"
       )
     end
 

data/lib/graphql/hydrate_query.rb

@@ -1,39 +1,48 @@
 module Graphql
   class HydrateQuery
 
-    def initialize(model, context, id: nil, user: nil)
+    def initialize(model, context, check_visibility: true, id: nil, user: nil)
       @fields = context&.irep_node&.scoped_children&.values&.first
       @model = model
+      @models = [model_name.singularize.camelize]
+      @check_visibility = check_visibility
       @id = id
       @user = user
     end
 
     def run
-      hash = parse_fields(@fields)
-      array = hash_to_array_of_hashes(hash, @model)
       @model = @model.where(id: @id) if @id
-      plucked = @model.deep_pluck(*array)
-      result = plucked_attr_to_structs(plucked)
+      plucked = @model.deep_pluck(*hash_to_array_of_hashes(parse_fields(@fields), @model))
+      result = plucked_attr_to_structs(plucked, model_name.singularize.camelize.constantize)
       @id ? result.first : result
     end
 
-    def plucked_attr_to_structs(arr)
-      arr.map { |e| hash_to_struct(e) }
+    def plucked_attr_to_structs(arr, parent_model)
+      arr.map { |e| hash_to_struct(e, parent_model) }
     end
 
-    def hash_to_struct(hash)
+    def hash_to_struct(hash, parent_model)
+      return if !visibility_hash[parent_model].include?(hash['id']) && @check_visibility
       hash.each_with_object(OpenStruct.new) do |(k, v), struct|
-        next struct[k.to_sym] = plucked_attr_to_structs(v) if v.is_a?(Array)
-        next struct[k.to_sym] = hash_to_struct(v) if v.is_a?(Hash)
+        next struct[k.to_sym] = plucked_attr_to_structs(v, evaluate_model(parent_model, k)) if v.is_a?(Array)
+        next struct[k.to_sym] = hash_to_struct(v, evaluate_model(parent_model, k)) if v.is_a?(Hash)
         struct[k.to_sym] = v
       end
     end
 
+    def visibility_hash
+      @visibility_hash ||= @models.each_with_object({}) do |model, hash|
+        hash[model.constantize] = model.constantize.visible_for(user: @user).pluck(:id)
+      end
+    end
+
     def hash_to_array_of_hashes(hash, parent_class)
       return if parent_class.nil?
+      hash['id'] = nil if hash['id'].blank?
       hash.each_with_object([]) do |(k, v), arr|
         next arr << k if v.blank? && parent_class.new.attributes.key?(k)
         klass = evaluate_model(parent_class, k)
+        @models << klass.to_s unless @models.include?(klass.to_s)
         arr << { k.to_sym => hash_to_array_of_hashes(v, klass) } if klass.present? && v.present?
       end
     end

data/lib/graphql/rails/api/version.rb

@@ -1,7 +1,7 @@
 module Graphql
   module Rails
     module Api
-      VERSION = '0.2'.freeze
+      VERSION = '0.2.2'.freeze
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: graphql-rails-api
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: 0.2.2
 platform: ruby
 authors:
 - poilon
@@ -70,7 +70,6 @@ files:
 - lib/graphql/hydrate_query.rb
 - lib/graphql/rails/api/config.rb
 - lib/graphql/rails/api/version.rb
-- lib/graphql/visibility_hash.rb
 - lib/tasks/graphql/rails/api_tasks.rake
 homepage: https://github.com/poilon/graphql-rails-api
 licenses:

data/lib/graphql/visibility_hash.rb

@@ -1,26 +0,0 @@
-module Graphql
-  class VisibilityHash
-
-    def initialize(joins, user)
-      @joins = joins
-      @user = user
-    end
-
-    def run
-      fetch_models(@joins).each_with_object({}) do |model, hash|
-        hash[model.to_s.underscore.to_sym] = model.visible_for(user: @user).pluck(:id)
-      end
-    end
-
-    def fetch_models(hash)
-      model_names = hash.each_with_object([]) do |(k, v), keys|
-        keys << k
-        keys.concat(fetch_models(v)) if v.is_a? Hash
-      end.map { |m| m.to_s.singularize.camelize }.uniq
-      model_names.select do |m|
-        Object.const_defined?(m) && m.constantize.ancestors.include?(ActiveRecord::Base)
-      end.map(&:constantize)
-    end
-
-  end
-end