souls 0.58.3 → 0.60.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7a256a7ea37aaad89e76c32abad7e7c0232eb21c627e03f00f14ab02f2d2d37
-  data.tar.gz: 11506d1ba70570d6e5e7114e80b01aff816f905ae2c1c8edd4efc9299cf8bcf8
+  metadata.gz: 70d25691a6e93376b3393efc7b95c0585995bf1611cce81b463a4db3f17497ca
+  data.tar.gz: 0a1fe1bcc547ad5c41d85a5bf814157f171eb5aec5f8b1ce5f847bf509a6a6fd
 SHA512:
-  metadata.gz: dd8c451629c39b3f6978946e74c5442f914c9c4d824abc1fd47e3a99fb5e99147ada481f066aa32887ab03f4ebbdfc6751df2faf06e37b756cfe372b19ba09ba
-  data.tar.gz: 795154142df5e334a7f66df0912216540a3ac0c713aa88061ef684e9bdf9835c132c7596936a68d8f0eb331b42abf4b209923e27f24359df58271f5eac7aab34
+  metadata.gz: 01fdbaa3e67ed0cfc1d4a78c56e55046f4e3bf3c413e7170eefb9b2ffb661cd86721140553e01807a9fe82db553003c7b108b90081ec9ca77b336e70c579577c
+  data.tar.gz: 8d83326353d091c5655ff463ee1d7e72582d8a66be7c40567206811b3b4b1a4f25c2796ec3362fa01f7142b8651f60a60c76cd4852e6b4032f3cabc49102bf08

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

@@ -12,7 +12,7 @@ module Souls
           f.write(<<~TEXT)
             module Types
               class #{singularized_class_name.camelize}Connection < Types::BaseConnection
-                def edge_type: (*untyped) -> untyped
+                def self.edge_type: (*untyped) -> untyped
               end
             end
           TEXT

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

@@ -31,6 +31,7 @@ module Souls
         TEXT
       end
       puts(Paint % ["Created file! : %{white_text}", :green, { white_text: [file_path.to_s, :white] }])
+      Souls::Generate.new.invoke(:manager_rbs, [singularized_class_name], { mutation: options[:mutation] })
       file_path
     rescue Thor::Error => e
       raise(Thor::Error, e)

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

@@ -0,0 +1,32 @@
+module Souls
+  class Generate < Thor
+    desc "manager_rbs [CLASS_NAME]", "Generate SOULs Manager RBS Template"
+    method_option :mutation, aliases: "--mutation", required: true, desc: "Mutation File Name"
+    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
+                end
+              end
+            end
+          end
+        TEXT
+        puts(Paint % ["Created file! : %{white_text}", :green, { white_text: [file_path.to_s, :white] }])
+      end
+      file_path
+    rescue Thor::Error => e
+      raise(Thor::Error, e)
+    end
+  end
+end

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

@@ -159,6 +159,7 @@ module Souls
                   new_line.write(<<-TEXT)
 
       def resolve args
+        params = args.dup
         _, params[:id] = SoulsApiSchema.from_global_id(args[:id])
                   TEXT
                 end

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

@@ -131,10 +131,11 @@ module Souls
             type = Souls.type_check(param[:type])
             rbs_type = Souls.rbs_type_check(param[:type])
             type = "[#{type}]" if param[:array]
+            required = param[:column_name] == "id" ? "required: true" : "required: false"
             if i.zero?
-              f.write("        def self.argument: (:#{param[:column_name]}, #{type}, required: false ) -> #{rbs_type}\n")
+              f.write("        def self.argument: (:#{param[:column_name]}, #{type}, #{required} ) -> #{rbs_type}\n")
             else
-              f.write("                         | (:#{param[:column_name]}, #{type}, required: false ) -> #{rbs_type}\n")
+              f.write("                         | (:#{param[:column_name]}, #{type}, #{required} ) -> #{rbs_type}\n")
             end
           end
         end

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

@@ -34,6 +34,7 @@ module Souls
                 Boolean: Boolean
                 Integer: Integer
               end
+            end
           TEXT
         end
       end

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

@@ -21,13 +21,13 @@ module Souls
         end
         File.open(file_path, "a") do |f|
           params[:params].each_with_index do |param, i|
-            type = Souls.rbs_type_check(param[:type])
+            type = Souls.type_check(param[:type])
             type = "[#{type}]" if param[:array]
             rbs_type = Souls.rbs_type_check(param[:type])
             if i.zero?
-              f.write("    def self.field: (:#{param[:column_name]}, #{type}, null: false) -> #{rbs_type}\n")
+              f.write("    def self.field: (:#{param[:column_name]}, #{type}, null: true) -> #{rbs_type}\n")
             else
-              f.write("                  | (:#{param[:column_name]}, #{type}, null: false) -> #{rbs_type}\n")
+              f.write("                  | (:#{param[:column_name]}, #{type}, null: true) -> #{rbs_type}\n")
             end
           end
         end

data/lib/souls/cli/create/index.rb

@@ -19,6 +19,9 @@ module Souls
         procfile(worker_name: options[:name], port: port)
         mother_procfile(worker_name: options[:name])
         souls_config_init(worker_name: options[:name])
+        steepfile(worker_name: options[:name])
+        souls_helper_rbs(worker_name: options[:name])
+        souls_worker_credit(worker_name: options[:name])
       end
       true
     rescue Thor::Error => e
@@ -27,6 +30,26 @@ module Souls
 
     private
 
+    def steepfile(worker_name: "mailer")
+      file_path = "./Steepfile"
+      new_file_path = "config/Steepfile"
+      File.open(new_file_path, "w") do |new_line|
+        File.open(file_path, "r") do |f|
+          f.each_line do |line|
+            case line.strip.to_s
+            when "end"
+              ["app", "db", "constants", "app.rb"].each do |path|
+                new_line.write("  check \"apps/#{worker_name}/#{path}\"\n")
+              end
+              new_line.write("end\n")
+            else
+              new_line.write(line)
+            end
+          end
+        end
+      end
+    end
+
     def procfile(worker_name: "mailer", port: 3000)
       file_dir = "apps/#{worker_name}"
       file_path = "#{file_dir}/Procfile.dev"
@@ -212,6 +235,47 @@ end
       puts(e)
     end
 
+    def souls_helper_rbs(worker_name: "mailer")
+      file_dir = "./sig/#{worker_name}/app/utils/"
+      FileUtils.mkdir_p(file_dir) unless Dir.exist?(file_dir)
+      file_path = "#{file_dir}/souls_helper.rbs"
+      File.open(file_path, "w") do |f|
+        f.write(<<~TEXT)
+          module SoulsHelper
+            def self.export_csv: (untyped model_name) -> (String? | StandardError )
+            def self.export_model_to_csv: (untyped model_name) -> (untyped | StandardError )
+            def self.upload_to_gcs: (String file_path, String upload_path) -> untyped
+            def self.get_selenium_driver: (?:chrome mode) -> untyped
+          end
+          module CSV
+            def self.open: (*untyped){(untyped) -> nil} -> untyped
+          end
+          module Selenium
+            module WebDriver
+              def self.for: (*untyped) -> untyped
+              module Chrome
+                module Options
+                  def self.new: ()-> untyped
+                end
+              end
+              module Remote
+                module Capabilities
+                  def self.firefox: ()-> untyped
+                end
+              end
+            end
+          end
+          module Google
+            module Cloud
+              module Storage
+                def self.new: ()-> untyped
+              end
+            end
+          end
+        TEXT
+      end
+    end
+
     def download_worker(worker_name: "mailer")
       version = Souls.get_latest_version_txt(service_name: "worker").join(".")
       file_name = "worker-v#{version}.tgz"

data/lib/souls/version.rb

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

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-0.37.3
+0.39.0

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-0.37.3
+0.39.0

data/lib/souls/worker/generate/index.rb

@@ -1,2 +1,2 @@
-require_relative "./mailer"
 require_relative "./job"
+require_relative "./job_rbs"

data/lib/souls/worker/generate/job.rb

@@ -1,8 +1,14 @@
 module Souls
   class Generate < Thor
     desc "job [CLASS_NAME]", "Generate Job File in Worker"
+    method_option :mutation, type: :boolean, aliases: "--mailer", default: false, desc: "Mailer Option"
     def job(class_name)
-      create_mutation(class_name: class_name)
+      if options[:mailer]
+        mailgun_mailer(class_name: class_name)
+      else
+        create_mutation(class_name: class_name)
+      end
+      Souls::Generate.new.invoke(:job_rbs, [class_name], {})
     rescue Thor::Error => e
       raise(Thor::Error, e)
     end
@@ -36,5 +42,44 @@ module Souls
       puts(Paint % ["Created file! : %{white_text}", :green, { white_text: [file_path.to_s, :white] }])
       file_path
     end
+
+    def mailgun_mailer(class_name: "mailer")
+      file_dir = "./app/graphql/mutations/"
+      FileUtils.mkdir_p(file_dir) unless Dir.exist?(file_dir)
+      file_path = "#{file_dir}#{class_name.singularize}.rb"
+      raise(StandardError, "Mailer already exist! #{file_path}") if File.exist?(file_path)
+
+      File.open(file_path, "w") do |f|
+        f.write(<<~TEXT)
+          module Mutations
+            class #{class_name.camelize} < BaseMutation
+              description "Mail を送信します。"
+              field :response, String, null: false
+
+              def resolve
+                # First, instantiate the Mailgun Client with your API key
+                mg_client = ::Mailgun::Client.new("YOUR-API-KEY")
+
+                # Define your message parameters
+                message_params = {
+                  from: "postmaster@YOUR-DOMAIN",
+                  to: "sending@to.mail.com",
+                  subject: "SOULs Mailer test!",
+                  text: "It is really easy to send a message!"
+                }
+
+                # Send your message through the client
+                mg_client.send_message("YOUR-MAILGUN-DOMAIN", message_params)
+                { response: "Job done!" }
+              rescue StandardError => e
+                GraphQL::ExecutionError.new(e.to_s)
+              end
+            end
+          end
+        TEXT
+      end
+      puts(Paint % ["Created file! : %{white_text}", :green, { white_text: [file_path.to_s, :white] }])
+      file_path
+    end
   end
 end

data/lib/souls/worker/generate/job_rbs.rb

@@ -0,0 +1,31 @@
+module Souls
+  class Generate < Thor
+    desc "job_rbs [CLASS_NAME]", "Generate SOULs Job Mutation RBS Template"
+    def job_rbs(class_name)
+      file_path = ""
+      Dir.chdir(Souls.get_mother_path.to_s) do
+        singularized_class_name = class_name.underscore.singularize
+        file_dir = "./sig/#{singularized_class_name}/app/graphql/mutations/"
+        FileUtils.mkdir_p(file_dir) unless Dir.exist?(file_dir)
+        file_path = "#{file_dir}#{singularized_class_name}.rbs"
+        File.open(file_path, "w") do |f|
+          f.write(<<~TEXT)
+            module Types
+              module Mutations
+                String: String
+                class #{singularized_class_name.camelize} < BaseMutation
+                  def self.description: (String) -> untyped
+                  def self.field: (:response, String, null: false) -> untyped
+                end
+              end
+            end
+          TEXT
+        end
+        puts(Paint % ["Created file! : %{white_text}", :green, { white_text: [file_path.to_s, :white] }])
+      end
+      file_path
+    rescue Thor::Error => e
+      raise(Thor::Error, e)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 0.58.3
+  version: 0.60.0
 platform: ruby
 authors:
 - POPPIN-FUMI
@@ -134,6 +134,7 @@ files:
 - lib/souls/api/generate/edge_rbs.rb
 - lib/souls/api/generate/index.rb
 - lib/souls/api/generate/manager.rb
+- lib/souls/api/generate/manager_rbs.rb
 - lib/souls/api/generate/model.rb
 - lib/souls/api/generate/model_rbs.rb
 - lib/souls/api/generate/mutation.rb
@@ -191,7 +192,7 @@ files:
 - lib/souls/versions/.souls_worker_version
 - lib/souls/worker/generate/index.rb
 - lib/souls/worker/generate/job.rb
-- lib/souls/worker/generate/mailer.rb
+- lib/souls/worker/generate/job_rbs.rb
 - lib/souls/worker/index.rb
 homepage: https://souls.elsoul.nl
 licenses:

data/lib/souls/worker/generate/mailer.rb

@@ -1,51 +0,0 @@
-module Souls
-  class Generate < Thor
-    desc "mailer [MAILER_NAME]", "Generate Mailer Template in Worker"
-    def mailer(class_name)
-      mailgun_mailer(class_name: class_name)
-    rescue Thor::Error => e
-      raise(Thor::Error, e)
-    end
-
-    private
-
-    def mailgun_mailer(class_name: "mailer")
-      file_dir = "./app/graphql/mutations/"
-      FileUtils.mkdir_p(file_dir) unless Dir.exist?(file_dir)
-      file_path = "#{file_dir}#{class_name.singularize}.rb"
-      raise(StandardError, "Mailer already exist! #{file_path}") if File.exist?(file_path)
-
-      File.open(file_path, "w") do |f|
-        f.write(<<~TEXT)
-          module Mutations
-            class #{class_name.camelize} < BaseMutation
-              description "Mail を送信します。"
-              field :response, String, null: false
-
-              def resolve
-                # First, instantiate the Mailgun Client with your API key
-                mg_client = ::Mailgun::Client.new("YOUR-API-KEY")
-
-                # Define your message parameters
-                message_params = {
-                  from: "postmaster@YOUR-DOMAIN",
-                  to: "sending@to.mail.com",
-                  subject: "SOULs Mailer test!",
-                  text: "It is really easy to send a message!"
-                }
-
-                # Send your message through the client
-                mg_client.send_message("YOUR-MAILGUN-DOMAIN", message_params)
-                { response: "Job done!" }
-              rescue StandardError => e
-                GraphQL::ExecutionError.new(e.to_s)
-              end
-            end
-          end
-        TEXT
-      end
-      puts(Paint % ["Created file! : %{white_text}", :green, { white_text: [file_path.to_s, :white] }])
-      file_path
-    end
-  end
-end