graphql-rails-api 0.4.5 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f0d802c95081098c189f0b5ee0fb282169533e275028429879ba4ceb218dca17
-  data.tar.gz: ae724c83294886154d99c56d711c1aaa5a64e333ee5a8def9c021b819a3fcbc8
+  metadata.gz: f6402207e57c8de721a10386de5110da04b1bfdacc4b5c81c86acae75ef45e65
+  data.tar.gz: f06272fc40c35d3c7f27df5fcec19e6ed967296fa739559df0d90ab8b21e6847
 SHA512:
-  metadata.gz: cf4529de02e31bb8a97b78c94fcc04a7b0e2230ceabcd8e32a49a72ac67233aa1f982ff542b01464038245429584f2ba7edbf1e351a940ba03d72cc84c42fcce
-  data.tar.gz: ea107d69a51fa296378a07864f4b05bb7aa46452e0d2fd63edabb9a93394cae6e185737f873e6f3bf304deae2f3016c9ddf83b836ac112b6ecce009b2888b6f2
+  metadata.gz: 403a79ef9705821684ed7d00283542db925d41ad6cfd40741c5d954d0cb9e0b682286745d01fc70ebf893ba002502133c56b58a21aa72e773e1b4119c96b3163
+  data.tar.gz: e388d99bd961ca380843d8d65b33beba46249373c70ef44d3793797bd5e7a63799b51eb59a62a730b535a879babd1f54033a3ea6bc33d2e75ab12c1d1844ce47

data/lib/generators/graphql_connections/graphql_all_connections_generator.rb

@@ -3,7 +3,7 @@ class GraphqlAllConnectionsGenerator < Rails::Generators::NamedBase
   def generate
     Graphql::Rails::Api::Config.query_resources.each do |resource|
       dir = "app/graphql/#{resource.pluralize}"
-      generate_connection(dir, resource)
+      generate_connection(dir, resource) if Dir.exist?(dir)
     end
   end
 

data/lib/generators/graphql_mutations/graphql_bulk_create_mutations_generator.rb

@@ -0,0 +1,30 @@
+class GraphqlBulkCreateMutationsGenerator < Rails::Generators::NamedBase
+
+  def generate
+    Graphql::Rails::Api::Config.query_resources.each do |resource|
+      dir = "#{Rails.root}/app/graphql/#{resource.pluralize}/mutations"
+      generate_bulk_create_mutation(dir, resource) if Dir.exist?(dir)
+    end
+  end
+
+  def generate_bulk_create_mutation(dir, resource)
+    File.write(
+      "#{dir}/bulk_create.rb",
+      <<~STRING
+        #{resource_class(resource)}::Mutations::BulkCreate = GraphQL::Field.define do
+          description 'creates some #{resource_class(resource).pluralize}'
+          type types[#{resource_class(resource)}::Type]
+
+          argument :#{resource}, types[#{resource_class(resource)}::Mutations::InputType]
+
+          resolve ApplicationService.call(:#{resource}, :bulk_create)
+        end
+      STRING
+    )
+  end
+
+  def resource_class(resource)
+    resource.pluralize.camelize
+  end
+
+end

data/lib/generators/graphql_mutations/graphql_bulk_update_mutations_generator.rb

@@ -0,0 +1,43 @@
+class GraphqlBulkUpdateMutationsGenerator < Rails::Generators::NamedBase
+
+  def generate
+    Graphql::Rails::Api::Config.query_resources.each do |resource|
+      dir = "#{Rails.root}/app/graphql/#{resource.pluralize}/mutations"
+      generate_bulk_update_mutation(dir, resource) if Dir.exist?(dir)
+    end
+  end
+
+  def generate_bulk_update_mutation(dir, resource)
+    File.write(
+      "#{dir}/bulk_update.rb",
+      <<~STRING
+        #{resource_class(resource)}::Mutations::BulkUpdate = GraphQL::Field.define do
+          description 'Updates some #{resource_class(resource).pluralize}'
+          type types[#{resource_class(resource)}::Type]
+
+          argument :#{resource}, types[#{resource_class(resource)}::Mutations::InputType]
+
+          resolve ApplicationService.call(:#{resource}, :bulk_update)
+        end
+      STRING
+    )
+  end
+
+  def resource_class(resource)
+    resource.pluralize.camelize
+  end
+
+  def write_at(file_name, line, data)
+    open(file_name, 'r+') do |f|
+      while (line -= 1).positive?
+        f.readline
+      end
+      pos = f.pos
+      rest = f.read
+      f.seek pos
+      f.write data
+      f.write rest
+    end
+  end
+
+end

data/lib/generators/graphql_resource/graphql_resource_generator.rb

@@ -86,11 +86,11 @@ class GraphqlResourceGenerator < Rails::Generators::NamedBase
 
   def generate_create_migration(resource, fields)
     system("bundle exec rails generate migration create_#{resource} --skip")
-    migration_file = Dir.glob("db/migrate/*create_#{resource}*").last
+    migration_file = Dir.glob("db/migrate/*create_#{resource}.rb").last
     File.write(
       migration_file,
       <<~STRING
-        class Create#{resource.camelize} < ActiveRecord::Migration[5.1]
+        class Create#{resource.camelize} < ActiveRecord::Migration[5.2]
           def change
             create_table :#{resource.pluralize}, #{'id: :uuid ' if Graphql::Rails::Api::Config.instance.id_type == :uuid}do |t|
               #{fields}
@@ -290,19 +290,29 @@ t.#{@id_db_type} :#{resource.underscore.singularize}_id
 
   def add_to_model(model, line)
     file_name = "app/models/#{model.underscore.singularize}.rb"
-    return unless File.exist?(file_name)
-    return if File.read(file_name).include?(line)
-    write_at(file_name, 3, "  #{line}\n")
+    return if !File.exist?(file_name) || File.read(file_name).include?(line)
+
+    line_count = `wc -l "#{file_name}"`.strip.split(' ')[0].to_i
+
+    line_nb = 0
+    File.open(file_name).each do |l|
+      line_nb += 1
+      break if l.include?('ApplicationRecord')
+    end
+    raise 'Your model must inherit from ApplicationRecord to make it work' if line_nb >= line_count
+
+    write_at(file_name, line_nb + 2, "  #{line}\n")
   end
 
   def generate_has_many_migration(resource, has_many:)
     return if has_many.singularize.camelize.constantize.new.respond_to?("#{resource.singularize}_id")
+
     system("bundle exec rails generate migration add_#{resource.singularize}_id_to_#{has_many}")
-    migration_file = Dir.glob("db/migrate/*add_#{resource.singularize}_id_to_#{has_many}*").last
+    migration_file = Dir.glob("db/migrate/*add_#{resource.singularize}_id_to_#{has_many}.rb").last
     File.write(
       migration_file,
       <<~STRING
-        class Add#{resource.singularize.camelize}IdTo#{has_many.camelize} < ActiveRecord::Migration[5.1]
+        class Add#{resource.singularize.camelize}IdTo#{has_many.camelize} < ActiveRecord::Migration[5.2]
           def change
             add_column :#{has_many.pluralize}, :#{resource.singularize}_id, :#{@id_db_type}
           end

data/lib/graphql/hydrate_query.rb

@@ -14,7 +14,7 @@ module Graphql
 
     def run
       @model = @model.where(id: @id) if @id
-      plucked = @model.deep_pluck(*hash_to_array_of_hashes(parse_fields(@fields), @model))
+      plucked = @model.deep_pluck(*hash_to_array_of_hashes(fields_to_hash(@fields), @model))
       result = plucked_attr_to_structs(plucked, model_name.singularize.camelize.constantize)&.compact
       @id ? result.first : result
     end
@@ -30,8 +30,10 @@ module Graphql
       end
 
       hash.each_with_object(OpenStruct.new) do |(k, v), struct|
-        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)
+        m = evaluate_model(parent_model, k)
+        next struct[k.to_sym] = plucked_attr_to_structs(v, m) if v.is_a?(Array) && m
+
+        next struct[k.to_sym] = hash_to_struct(v, m) if v.is_a?(Hash) && m
 
         struct[k.to_sym] = v
       end
@@ -39,10 +41,10 @@ module Graphql
 
     def visibility_hash
       @visibility_hash ||= @models.reject(&:blank?).each_with_object({}) do |model, hash|
-        visible = model.constantize.visible_for(user: @user)
-        next if visible.blank?
+        visible_ids = model.constantize.visible_for(user: @user)&.pluck(:id)
+        next if visible_ids.blank?
 
-        hash[model.constantize] = visible.pluck(:id)
+        hash[model.constantize] = visible_ids
       end
     end
 
@@ -50,8 +52,10 @@ module Graphql
       return if parent_class.nil?
 
       hash['id'] = nil if hash['id'].blank?
+      fetch_ids_from_relation(hash)
+
       hash.each_with_object([]) do |(k, v), arr|
-        next arr << k if v.blank? && parent_class.new.attributes.key?(k)
+        next arr << k if parent_class.new.attributes.key?(k)
 
         klass = evaluate_model(parent_class, k)
         @models << klass.to_s unless @models.include?(klass.to_s)
@@ -59,6 +63,17 @@ module Graphql
       end
     end
 
+    def fetch_ids_from_relation(hash)
+      hash.select { |k, _| k.ends_with?('_ids') }.each do |(k, _)|
+        collection_name = k.gsub('_ids', '').pluralize
+        if hash[collection_name].blank?
+          hash[collection_name] = { 'id' => nil }
+        else
+          hash[collection_name]['id'] = nil
+        end
+      end
+    end
+
     def activerecord_model?(name)
       class_name = name.to_s.singularize.camelize
       begin
@@ -77,9 +92,9 @@ module Graphql
       parent_class_name.constantize.reflections[child.to_s.underscore]&.klass
     end
 
-    def parse_fields(fields)
+    def fields_to_hash(fields)
       fields.each_with_object({}) do |(k, v), h|
-        h[k] = v.scoped_children == {} ? nil : parse_fields(v.scoped_children.values.first)
+        h[k] = v.scoped_children == {} ? nil : fields_to_hash(v.scoped_children.values.first)
       end
     end
 

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql-rails-api
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.5.0
 platform: ruby
 authors:
 - poilon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-04 00:00:00.000000000 Z
+date: 2018-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql
@@ -76,6 +76,8 @@ files:
 - README.md
 - Rakefile
 - lib/generators/graphql_connections/graphql_all_connections_generator.rb
+- lib/generators/graphql_mutations/graphql_bulk_create_mutations_generator.rb
+- lib/generators/graphql_mutations/graphql_bulk_update_mutations_generator.rb
 - lib/generators/graphql_mutations/graphql_mutations_generator.rb
 - lib/generators/graphql_rails_api/install_generator.rb
 - lib/generators/graphql_resource/USAGE