graphql-rails-api 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 106d6fbb14638d87cf01f586da3eac910f9287e7
-  data.tar.gz: 4ce1326fb1e76cb6ca8d9ea265fc6f817f08edae
+SHA256:
+  metadata.gz: ad933edeeaa5ed8f37ea3b5ba376670976ef245fff20d33fc7fbdfdf7c5b4fda
+  data.tar.gz: 54fa2e6d034e4ff46124f21980e9a3aa947cbd22208872a0595a651ad0f3e403
 SHA512:
-  metadata.gz: 233e224a5adbdbfe1e40c7cb1e21e892a1846c4df5dbd7fe25665573fb6c0c78167fdf9f71807a5cfa61609c46df8d7daacfb9637252f8bd642fca9af11e1b0f
-  data.tar.gz: 2a5134db639e3659c46859603f9aabf912385e14d713369db9da1ee24c6955fe13e6a90b8620f409e22d708eab551f4dc9913406135070d5bc166cc2af40ed85
+  metadata.gz: 21cbb6dd1a71aa888b3fc3b6b0fc71ae09ead22dece2d4a1a85b61ea6f0eaf44b39e3fab8687f2bc25e08faaade7b8a1e6cdbead36b7a501d252e07349ee7976
+  data.tar.gz: 9e806b335391d28de6a3b5561d312730c1fdaab8e76edb501d3cdb313dbb018d79c573e1ce3b324d8256ba2db32aab20a3906ff8273339e5fdde8a0fc00e58f5

data/lib/generators/graphql_rails_api/install_generator.rb

@@ -21,11 +21,24 @@ module GraphqlRailsApi
       write_channel if options.action_cable_subs?
       write_initializer
       write_require_application_rb
+      write_route
       write_uuid_extensions_migration if options.pg_uuid?
     end
 
     private
 
+    def write_route
+      route_file = File.read('config/routes.rb')
+      return if route_file.include?('graphql')
+      File.write(
+        'config/routes.rb',
+        route_file.gsub(
+          "Rails.application.routes.draw do\n",
+          "Rails.application.routes.draw do\n  post '/graphql', to: 'graphql#execute'\n"
+        )
+      )
+    end
+
     def write_application_record_methods
       lines_count = File.read('app/models/application_record.rb').lines.count
 
@@ -51,7 +64,7 @@ module GraphqlRailsApi
         'config/application.rb',
         File.read('config/application.rb').gsub(
           "require 'rails/all'",
-          "require 'rails/all'\nrequire 'graphql/hydrate_query'\n"
+          "require 'rails/all'\nrequire 'graphql/hydrate_query'\nrequire 'graphql/visibility_hash'\n"
         )
       )
     end
@@ -329,18 +342,16 @@ module GraphqlRailsApi
             end
 
             def index
-              Graphql::HydrateQuery.new(model.visible_for(user: @user), @context).run
+              Graphql::HydrateGraphqlQuery.new(model.all, @context, user: user).run
             end
 
             def show
-              puts 'SHOW'
-              object = Graphql::HydrateQuery.new(model.visible_for(user: @user), @context, id: params[:id]).run
+              object = Graphql::HydrateQuery.new(model.all, @context, user: user, id: params[:id]).run
               return not_allowed if object.blank?
               object
             end
 
             def create
-              puts 'CREATE'
               object = model.new(params.select { |p| model.new.respond_to?(p) })
               if object.save
                 object
@@ -350,7 +361,6 @@ module GraphqlRailsApi
             end
 
             def destroy
-              puts 'DESTROY'
               object = model.find_by(id: params[:id])
               return not_allowed if write_not_allowed
               if object.destroy
@@ -361,7 +371,6 @@ module GraphqlRailsApi
             end
 
             def update
-              puts "UPDATE, #{params}, #{object}"
               return not_allowed if write_not_allowed
               if object.update_attributes(params)
                 object

data/lib/graphql/hydrate_query.rb

@@ -1,10 +1,11 @@
 module Graphql
   class HydrateQuery
 
-    def initialize(model, context, id: nil)
+    def initialize(model, context, id: nil, user: nil)
       @fields = context&.irep_node&.scoped_children&.values&.first
       @model = model
       @id = id
+      @user = user
     end
 
     def run
@@ -16,6 +17,7 @@ module Graphql
       res2d = pluck_to_hash_with_ids(join_model, pluckable_attributes(selectable_values))
       joins_with_root = { model_name.to_sym => remove_keys_with_nil_values(Marshal.load(Marshal.dump(hash))) }
       ir = nest(joins_with_root, res2d).first
+      @visibility_hash = Graphql::VisibilityHash.new(joins_with_root, @user).run
       @id ? ir_to_output(ir).first : ir_to_output(ir)
     end
 
@@ -46,18 +48,19 @@ module Graphql
     def ir_to_output(inter_result)
       model_name = inter_result&.first&.first&.first&.first&.to_s
       return [] if model_name.blank?
-      if singular?(model_name)
-        ir_node_to_output(inter_result.first)
-      else
-        inter_result.map do |ir_node|
-          ir_node_to_output(ir_node) if ir_node
-        end
-      end
+      res = if singular?(model_name)
+              ir_node_to_output(inter_result.first)
+            else
+              inter_result.map { |ir_node| ir_node_to_output(ir_node) if ir_node }
+            end
+      res.compact! if res.is_a?(Array)
+      res
     end
 
     def ir_node_to_output(ir_node)
+      model_name = ir_node.keys.reject { |key| key == :results }.first.first.to_s
       t = ir_node[:results].first.each_with_object({}) do |(attribute, v), h|
-        h[attribute.gsub(ir_node.keys.reject { |key| key == :results }.first.first.to_s.pluralize + '.', '')] = v
+        h[attribute.gsub(model_name.pluralize + '.', '')] = v
       end
       relations = ir_node.values&.first&.map { |e| e&.first&.first&.first&.first }
       relations.zip(ir_node[ir_node.keys.reject { |key| key == :results }&.first]).to_h.map do |key, value|
@@ -65,6 +68,7 @@ module Graphql
         t[key] = res if value
         t[key].compact! if t[key].is_a?(Array)
       end
+      return unless @visibility_hash[model_name.singularize.to_sym]&.include?(t['id'])
       Struct.new(*t.keys.map(&:to_sym)).new(*t.values) if !t.keys.blank? && !t.values.compact.blank?
     end
 

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

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

data/lib/graphql/visibility_hash.rb

@@ -0,0 +1,26 @@
+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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql-rails-api
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - poilon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-27 00:00:00.000000000 Z
+date: 2018-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql
@@ -56,6 +56,7 @@ 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:
@@ -77,7 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Graphql rails api framework to create easily graphql api with rails