souls 0.63.5 → 0.64.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8443218b427d92c7252f85d69661f9a6ca9dc8e720caea130c587ecdb3273869
-  data.tar.gz: cbec1e6d277c379740a1b17beb6cead17538173f21a3236b81157ab7ccc24c68
+  metadata.gz: 4116d719f65e047b7d7ff350356aff1184379c1c226d4420db68b5cabd8cc117
+  data.tar.gz: a2f616541e1e43383432399a7443a406597d6e4b62d7db8fa64a46624f87b61d
 SHA512:
-  metadata.gz: ad677a57d73d5a7f72520c1af9dad3b1967778a3447f15b5a7df4fa74b7c4b1b609b187ddc15a1c3be6d24da15beae2430cc0ec8fdc920f1ceed436cc001ec34
-  data.tar.gz: 6e7a7aa9dd491f03c05ee2d011e6f2b965db33fc3ec052211771ff016b20d49a95db6e2aea6e36e0467800b6829feec29de0475cb87447739ac790a7af90ca02
+  metadata.gz: 02bad8c88110af97b5522b302c16285b491dc39d27dc8a3cf711ce8a5584693dc947edd96264d1ac3047fe479b8746df9dcd068c14960bfb03ebfa53be51d86f
+  data.tar.gz: 5d6d1243cceefaa77a7e6f65135416e8e67c995190af853490acef41abc12dd1c3a591d0137ce4ae6530ef132d9d8f6e062ec2743d4ea061d07bb32b7bf55979

data/README.md

@@ -25,7 +25,7 @@ Welcome to SOULs Serverless Application Framework!
 - Maximize development efficiency with CI / CD standard schema-driven Scaffold
 - Achieve global scale with lower management costs
 
-![画像](https://souls.elsoul.nl/imgs/docs/SOULs.jpg)
+![画像](https://souls.elsoul.nl/imgs/docs/SOULs-architecture.jpg)
 
 
 SOULs creates 2 types of framework.

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

@@ -3,17 +3,18 @@ module Souls
     desc "mutation [CLASS_NAME]", "Generate GraphQL Mutation from schema.rb"
     def mutation(class_name)
       singularized_class_name = class_name.singularize
-      file_dir = "./app/graphql/mutations/base"
-      FileUtils.mkdir_p(file_dir) unless Dir.exist?(file_dir)
-      file_path = "./app/graphql/mutations/base/#{singularized_class_name}/create_#{singularized_class_name}.rb"
-      return "Mutation already exist! #{file_path}" if File.exist?(file_path)
 
-      create_mutation(class_name: singularized_class_name)
-      update_mutation(class_name: singularized_class_name)
-      delete_mutation(class_name: singularized_class_name)
-      destroy_delete_mutation(class_name: singularized_class_name)
-      puts(Paint % ["Created file! : %{white_text}", :green, { white_text: [file_path.to_s, :white] }])
-      file_path
+      Dir.chdir(Souls.get_api_path.to_s) do
+        file_dir = "./app/graphql/mutations/base"
+        FileUtils.mkdir_p(file_dir) unless Dir.exist?(file_dir)
+        file_path = "./app/graphql/mutations/base/#{singularized_class_name}/create_#{singularized_class_name}.rb"
+        return "Mutation already exist! #{file_path}" if File.exist?(file_path)
+
+        create_mutation(class_name: singularized_class_name)
+        update_mutation(class_name: singularized_class_name)
+        delete_mutation(class_name: singularized_class_name)
+        destroy_delete_mutation(class_name: singularized_class_name)
+      end
     rescue Thor::Error => e
       raise(Thor::Error, e)
     end
@@ -21,64 +22,77 @@ module Souls
     private
 
     def create_mutation(class_name: "user")
-      file_path = ""
       singularized_class_name = class_name.singularize.underscore
-      Dir.chdir(Souls.get_api_path.to_s) do
-        file_dir = "./app/graphql/mutations/base/#{singularized_class_name}"
-        FileUtils.mkdir_p(file_dir) unless Dir.exist?(file_dir)
-        file_path = "#{file_dir}/create_#{singularized_class_name}.rb"
-        raise(Thor::Error, "Mutation RBS already exist! #{file_path}") if File.exist?(file_path)
-
-        params = Souls.get_relation_params(class_name: singularized_class_name, col: "mutation")
-        File.open(file_path, "w") do |f|
-          f.write(<<~TEXT)
-            module Mutations
-              module Base::#{singularized_class_name.camelize}
-                class Create#{singularized_class_name.camelize} < BaseMutation
-                  field :#{singularized_class_name}_edge, Types::#{singularized_class_name.camelize}Type.edge_type, null: false
-                  field :error, String, null: true
-
-                  def resolve(args)
-          TEXT
-        end
-        File.open(file_path, "a") do |f|
-          if params[:relation_params]
-            f.write("        user_id = context[:user][:id]\n") if params[:user_exist]
-            params[:relation_params].each_with_index do |col, _i|
-              next if col[:column_name] == "user_id"
+      file_dir = "./app/graphql/mutations/base/#{singularized_class_name}"
+      FileUtils.mkdir_p(file_dir) unless Dir.exist?(file_dir)
+      file_path = "#{file_dir}/create_#{singularized_class_name}.rb"
+      raise(Thor::Error, "Mutation RBS already exist! #{file_path}") if File.exist?(file_path)
 
-              f.write("        #{col[:column_name]} = SoulsApiSchema.from_global_id(args[:#{col[:column_name]}])\n")
-            end
-            relation_params =
-              params[:relation_params].map do |n|
-                ", #{n[:column_name]}: #{n[:column_name]}"
-              end
-            f.write("        new_record = { **args #{relation_params.compact.join} }\n")
-            f.write("        data = ::#{singularized_class_name.camelize}.new(new_record)\n")
+      params = Souls.get_relation_params(class_name: singularized_class_name, col: "mutation")
+      File.open(file_path, "w") do |f|
+        f.write(<<~TEXT)
+          module Mutations
+            module Base::#{singularized_class_name.camelize}
+              class Create#{singularized_class_name.camelize} < BaseMutation
+                field :#{singularized_class_name}_edge, Types::#{singularized_class_name.camelize}Type.edge_type, null: false
+                field :error, String, null: true
+
+        TEXT
+      end
+
+      File.open(file_path, "a") do |f|
+        params[:params].each_with_index do |param, i|
+          type = Souls.type_check(param[:type])
+          type = "[#{type}]" if param[:array]
+          if i == params[:params].size - 1
+            f.write("      argument :#{param[:column_name]}, #{type}, required: false\n\n")
+            f.write("      def resolve(args)\n")
           else
-            f.write("        data = ::#{singularized_class_name.camelize}.new(args)\n")
+            f.write("      argument :#{param[:column_name]}, #{type}, required: false\n")
           end
         end
-        File.open(file_path, "a") do |new_line|
-          new_line.write(<<~TEXT)
-                    raise(StandardError, data.errors.full_messages) unless data.save
+      end
+
+      File.open(file_path, "a") do |f|
+        if params[:relation_params]
+          f.write("        user_id = context[:user][:id]\n") if params[:user_exist]
+          params[:relation_params].each_with_index do |col, _i|
+            next if col[:column_name] == "user_id"
 
-                    { #{singularized_class_name}_edge: { node: data } }
-                  rescue StandardError => error
-                    GraphQL::ExecutionError.new(error.message)
-                  end
+            f.write("        #{col[:column_name]} = SoulsApiSchema.from_global_id(args[:#{col[:column_name]}])\n")
+          end
+          relation_params =
+            params[:relation_params].map do |n|
+              ", #{n[:column_name]}: #{n[:column_name]}"
+            end
+          f.write("        new_record = { **args #{relation_params.compact.join} }\n")
+          f.write("        data = ::#{singularized_class_name.camelize}.new(new_record)\n")
+        else
+          f.write("        data = ::#{singularized_class_name.camelize}.new(args)\n")
+        end
+      end
+      File.open(file_path, "a") do |new_line|
+        new_line.write(<<~TEXT)
+                  raise(StandardError, data.errors.full_messages) unless data.save
+
+                  { #{singularized_class_name}_edge: { node: data } }
+                rescue StandardError => error
+                  GraphQL::ExecutionError.new(error.message)
                 end
               end
             end
-          TEXT
-        end
+          end
+        TEXT
       end
+      puts(Paint % ["Created file! : %{white_text}", :green, { white_text: [file_path.to_s, :white] }])
       file_path
     end
 
     ## 2.Mutation - Update
     def update_mutation_head(class_name: "user")
-      file_path = "./app/graphql/mutations/base/#{class_name}/update_#{class_name}.rb"
+      singularized_class_name = class_name.singularize.underscore
+      file_dir = "./app/graphql/mutations/base/#{singularized_class_name}"
+      file_path = "#{file_dir}/update_#{class_name}.rb"
       File.open(file_path, "w") do |new_line|
         new_line.write(<<~TEXT)
           module Mutations
@@ -170,6 +184,7 @@ module Souls
           end
         TEXT
       end
+      puts(Paint % ["Created file! : %{white_text}", :green, { white_text: [file_path.to_s, :white] }])
       file_path
     end
 
@@ -209,6 +224,7 @@ module Souls
           end
         TEXT
       end
+      puts(Paint % ["Created file! : %{white_text}", :green, { white_text: [file_path.to_s, :white] }])
       file_path
     end
 
@@ -238,6 +254,7 @@ module Souls
           end
         TEXT
       end
+      puts(Paint % ["Created file! : %{white_text}", :green, { white_text: [file_path.to_s, :white] }])
       file_path
     rescue StandardError => e
       puts(e)

data/lib/souls/version.rb

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

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-0.42.5
+0.43.2

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-0.42.5
+0.43.2

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 0.63.5
+  version: 0.64.2
 platform: ruby
 authors:
 - POPPIN-FUMI
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-09-30 00:00:00.000000000 Z
+date: 2021-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport