souls 0.60.2 → 0.60.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d2a12904fa0b9dd7fc558dcb8bff291ea14302fa9aa14cf87ade8092e27f6cc
-  data.tar.gz: 9142fb468c45f4fd65930bba9f29f1c796c85a0d62c29059f3fc0184ba7c1956
+  metadata.gz: ec823772e4849a995e22414890aff5a90c6521e369c9e1c31974204b6f82d65a
+  data.tar.gz: b78d324b3ff93c2e3350d2c059020995e7c8a8479dd3293aead47041b5aa3d5f
 SHA512:
-  metadata.gz: 2448ff57ad0c5e940994d81217de376f669d7a33fccf1c8fa0eb65f53a091e8ee0ca9a5aa29521596173554c820ac6584ed2d02071841c9709aca0a5e8781ebb
-  data.tar.gz: ca45ef93f5db68edffec37f2dd5b915b4070d9ec8204342085da5c3c42a1544075c1b29cbeac3fb0682f9dd8e0971e9c0625d5f558e900223ea1c9163c309cee
+  metadata.gz: 18d97704c8db8e3befb5aafadcf19eec3c92bd7472811063295fe26df2d63e5da3153f1337b6d40983b60d13049cb3ebc16d885c146726bf714f05e6506abf77
+  data.tar.gz: 8ad57a789e18a2bce598705e5a4d296b73c35b3dbecabccec68cd1acdf75abb3147f55fee4efb1f1d0c9ba7d27869d158b5657936d7803da26a798a354642071

data/lib/souls/api/generate/application.rb

@@ -1,6 +1,7 @@
 module Souls
   class Generate < Thor
     desc "scaffold [CLASS_NAME]", "Generate Scaffold from schema.rb"
+    method_option :mutation, type: :boolean, aliases: "--rbs", desc: "Mutation File Name"
     def scaffold(class_name)
       singularized_class_name = class_name.singularize
       model(singularized_class_name)

data/lib/souls/api/generate/manager_rbs.rb

@@ -5,24 +5,26 @@ module Souls
     def manager_rbs(class_name)
       file_path = ""
       singularized_class_name = class_name.underscore.singularize
-      file_dir = "./sig/api/app/graphql/mutations/managers/#{singularized_class_name}_manager"
-      FileUtils.mkdir_p(file_dir) unless Dir.exist?(file_dir)
-      file_path = "#{file_dir}/#{options[:mutation]}.rbs"
-      File.open(file_path, "w") do |f|
-        f.write(<<~TEXT)
-          module Mutations
-            module Managers
-              module #{singularized_class_name.camelize}Manager
-                class #{singularized_class_name.camelize}Login
-                  def self.description: (String)-> untyped
-                  def self.argument: (untyped, untyped, untyped)-> untyped
-                  def self.field: (untyped, untyped, untyped)-> untyped
+      Dir.chdir(Souls.get_mother_path.to_s) do
+        file_dir = "./sig/api/app/graphql/mutations/managers/#{singularized_class_name}_manager"
+        FileUtils.mkdir_p(file_dir) unless Dir.exist?(file_dir)
+        file_path = "#{file_dir}/#{options[:mutation]}.rbs"
+        File.open(file_path, "w") do |f|
+          f.write(<<~TEXT)
+            module Mutations
+              module Managers
+                module #{singularized_class_name.camelize}Manager
+                  class #{options[:mutation].singularize.camelize}
+                    def self.description: (String)-> untyped
+                    def self.argument: (untyped, untyped, untyped)-> untyped
+                    def self.field: (untyped, untyped, untyped)-> untyped
+                  end
                 end
               end
             end
-          end
-        TEXT
-        puts(Paint % ["Created file! : %{white_text}", :green, { white_text: [file_path.to_s, :white] }])
+          TEXT
+          puts(Paint % ["Created file! : %{white_text}", :green, { white_text: [file_path.to_s, :white] }])
+        end
       end
       file_path
     rescue Thor::Error => e

data/lib/souls/api/generate/model_rbs.rb

@@ -4,15 +4,13 @@ module Souls
     def model_rbs(class_name)
       file_path = ""
       Dir.chdir(Souls.get_mother_path.to_s) do
-        file_dir = "./sig/api/app/graphql/types/models/"
+        file_dir = "./sig/api/app/models/"
         FileUtils.mkdir_p(file_dir) unless Dir.exist?(file_dir)
         singularized_class_name = class_name.underscore.singularize
         file_path = "#{file_dir}#{singularized_class_name}_model.rbs"
         File.open(file_path, "w") do |f|
           f.write(<<~TEXT)
-            module Types
-              class #{singularized_class_name.camelize} < ActiveRecord::Base
-              end
+            class #{singularized_class_name.camelize} < ActiveRecord::Base
             end
           TEXT
         end

data/lib/souls/api/generate/mutation.rb

@@ -55,14 +55,17 @@ module Souls
                 if @user_exist
                   new_line.write(<<-TEXT)
 
-      def resolve args
+      def resolve(args)
         params = args.dup
         params[:user_id] = context[:user][:id]
+        data = ::#{class_name.camelize}.new(args)
                   TEXT
                 else
                   new_line.write(<<-TEXT)
 
-      def resolve args
+      def resolve(args)
+        params = args.dup
+        data = ::#{class_name.camelize}.new(args)
                   TEXT
                 end
                 break
@@ -93,9 +96,11 @@ module Souls
       return false if relation_params.empty?
 
       file_path = "./app/graphql/mutations/base/#{class_name}/create_#{class_name}.rb"
-      relation_params.each do |params_name|
-        File.open(file_path, "a") do |new_line|
-          new_line.write("        _, args[:#{params_name}] = SoulsApiSchema.from_global_id(args[:#{params_name}])\n")
+
+      File.open(file_path, "a") do |new_line|
+        relation_params.each_with_index do |params_name, i|
+          new_line.write("        params = args.dup\n") if @user_exist && i.zero?
+          new_line.write("        _, params[:#{params_name}] = SoulsApiSchema.from_global_id(args[:#{params_name}])\n")
         end
       end
       true
@@ -105,7 +110,6 @@ module Souls
       file_path = "./app/graphql/mutations/base/#{class_name}/create_#{class_name}.rb"
       File.open(file_path, "a") do |new_line|
         new_line.write(<<~TEXT)
-                  data = ::#{class_name.camelize}.new args
                   raise(StandardError, data.errors.full_messages) unless data.save
 
                   { #{class_name}_edge: { node: data } }

data/lib/souls/api/generate/resolver_rbs.rb

@@ -14,9 +14,6 @@ module Souls
           f.write(<<~TEXT)
             class Base
             end
-            module SearchObject
-              def self.module: (Symbol) -> untyped
-            end
             class #{singularized_class_name.camelize}Search < Base
               include SearchObject
               def self.scope: () ?{ () -> nil } -> [Hash[Symbol, untyped]]

data/lib/souls/version.rb

@@ -1,4 +1,4 @@
 module Souls
-  VERSION = "0.60.2".freeze
+  VERSION = "0.60.3".freeze
   public_constant :VERSION
 end

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-0.39.2
+0.39.3

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-0.39.2
+0.39.3

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 0.60.2
+  version: 0.60.3
 platform: ruby
 authors:
 - POPPIN-FUMI