souls 0.58.2 → 0.59.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc268f6f98c88667269b2d3e81e45ffb8da2d77fab75560ac5946794b2f8b1c7
-  data.tar.gz: 9df29c1859e693feea435ac8ed64103c1192c49475b53bbbbb2987e34e2aa7f3
+  metadata.gz: 1034f25cfca4bc39ecf378335e4a42d9968c0f6e6e6489f68297c047954c1896
+  data.tar.gz: c7736a9966c434c866652ab3938d2c2abf9c11a7ed79ff5f02e8488e240a7e10
 SHA512:
-  metadata.gz: c92c1a31bdbbd8db8c2a23d014cdac654d925ad16323368d21364f2295c1f604c19bbb5d3e52ce3cd98a65fd9f06ffd8532c0df8fb3bdeeddcf21b1382a0d945
-  data.tar.gz: c7366ed35a93741a2bfdd3243935013333f0b182b497f6f22790b22af921be6369f2d84a255e3d1993590739cf535421e5bec677bbc9d2fed22bc829d66148b4
+  metadata.gz: ef7b5f771b35aa094f4fc65bc14cd927fde7aaf166c799a2e1164860bd1a96e9423b6c4e955166781fc5ac660d250748276b3d5627a7ea28ac8d5032400429d3
+  data.tar.gz: a345585731bd80f9ce3efb502d71afa1c3f5b0c3846fa64eb833051be6f673d4aa365396a73c2fd6dd1fa43cc15f6d8f7f111550ed9b22101d77cbc53c22e262

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

@@ -102,7 +102,11 @@ module Souls
               module Base
                 module #{class_name.camelize}
                   class Update#{class_name.camelize} < BaseMutation
+                    String: String
+                    Boolean: Boolean
+                    Integer: Integer
                     def resolve:  ({
+                                    id: String,
           TEXT
         end
         File.open(file_path, "a") do |f|
@@ -127,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

@@ -10,12 +10,15 @@ module Souls
         file_path = "#{file_dir}/#{singularized_class_name}_search.rbs"
         raise(Thor::Error, "Mutation RBS already exist! #{file_path}") if File.exist?(file_path)
 
-        params = Souls.get_relation_params(class_name: singularized_class_name)
         File.open(file_path, "w") do |f|
           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]]
               def self.type: (*untyped) -> String
               def self.option: (:filter, type: untyped, with: :apply_filter) -> String
@@ -25,33 +28,11 @@ module Souls
               def self.types: (*untyped) -> String
               def decode_global_key: (String value) -> Integer
               def apply_filter: (untyped scope, untyped value) -> untyped
-              def normalize_filters: (untyped value, ?Array[untyped] branches) -> Array[untyped]
 
               class #{singularized_class_name.camelize}Filter
                 String: String
                 Boolean: Boolean
                 Integer: Integer
-          TEXT
-        end
-        File.open(file_path, "a") do |f|
-          params[:params].each_with_index do |param, i|
-            type = Souls.rbs_type_check(param[:type])
-            type = "[#{type}]" if param[:array]
-            rbs_type = Souls.rbs_type_check(param[:type])
-            if i.zero?
-              f.write("    def self.argument: (:OR, [self], required: false) -> String\n")
-            else
-              f.write("                     | (:#{param[:column_name]}, #{type}, required: false) -> #{rbs_type}\n")
-            end
-          end
-        end
-
-        File.open(file_path, "a") do |f|
-          f.write(<<~TEXT)
-              end
-            end
-            module Types
-              class BaseBaseInputObject
               end
             end
           TEXT

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/upgrade/gemfile.rb

@@ -14,7 +14,7 @@ module Souls
 
     def update_gem
       file_path = "./Gemfile"
-      tmp_file = "./tmp/Gemfile"
+      tmp_file = "./config/Gemfile"
       new_gems = gemfile_latest_version
       logs = []
       message = Paint["\nAlready Up to date!", :green]
@@ -70,7 +70,7 @@ module Souls
       end
       FileUtils.rm("./Gemfile")
       FileUtils.rm("./Gemfile.lock")
-      FileUtils.mv("./tmp/Gemfile", "./Gemfile")
+      FileUtils.mv("./config/Gemfile", "./Gemfile")
       system("bundle update")
       success = Paint["\n\nSuccessfully Updated These Gems!\n", :green]
       puts(success)

data/lib/souls/version.rb

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

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-0.37.2
+0.38.2

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-0.37.2
+0.38.2

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

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

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

@@ -1,8 +1,13 @@
 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
     rescue Thor::Error => e
       raise(Thor::Error, e)
     end
@@ -36,5 +41,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

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 0.58.2
+  version: 0.59.2
 platform: ruby
 authors:
 - POPPIN-FUMI
 - KishiTheMechanic
 - James Neve
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-09-25 00:00:00.000000000 Z
+date: 2021-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -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:
@@ -200,7 +201,7 @@ metadata:
   homepage_uri: https://souls.elsoul.nl
   source_code_uri: https://github.com/elsoul/souls
   changelog_uri: https://github.com/elsoul/souls
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -216,7 +217,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.2.22
-signing_key: 
+signing_key:
 specification_version: 4
 summary: SOULs はサーバーレスフルスタックフレームワークです。柔軟な Ruby GraphQL API と Worker はルーティングの必要がありません。
   クラウド環境への自動デプロイ、CI/CD ワークフローを標準装備。開発者がビジネスロジックに集中し、楽しくコードが書けるような環境を目指しています。

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