souls 0.63.3 → 0.64.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37e9d8ea6b8b2cbd761768d2d81b7a3f1da0cf1bb9426cbcaa7845ded51b8120
-  data.tar.gz: beac9476e5d9399386a1eb2b3f7f8c30ed7f9ab967c5de941912a62d15dc091d
+  metadata.gz: 23d8aab2a3e72d2c2f77b43659b3761f33c485c61365ffc1917ec45df7098511
+  data.tar.gz: 4220a7d02bc34809ed5089b4ad9a89ee2bda32e9def06a4abb8bd99583e1bce2
 SHA512:
-  metadata.gz: 2bb2efa5abfd292da21e0e145e21901d1dd67e17479a5ca257d47cd7312ef111e7aba864e95400c3ad7c6710eb554cd8e15ff11a6186a7f293d1ff12637eef41
-  data.tar.gz: 34c114dfe873f3bf41dca13400d5b5f248979344776335c689ba290bf6340f93c1bae339ecd5a52254897384fdad3eaf50164442b25346f9f09903e0961be373
+  metadata.gz: acac2e0a5c746fd6420834a8fe03f25dd0eda1de887d9526e474b6ff6f78ecc13b06918ac057ff4939b56367014340ceef2963392d6a3770dabc497fdd6e1636
+  data.tar.gz: c756718c2c35fb7f8e02951a90be8d73a13c126c25814e47868328b16145b01baed9a028eb839107c264f679a4228552c2cc1d3267f4f5caa582513dbb82fe75

data/README.md

@@ -21,17 +21,12 @@
 
 Welcome to SOULs Serverless Application Framework!
 
-SOULs はサーバーレスフルスタックフレームワークです。柔軟な Ruby GraphQL API と Worker はルーティングの必要がありません。
-クラウド環境への自動デプロイ、CI/CD ワークフローを標準装備。開発者がビジネスロジックに集中し、楽しくコードが書けるような環境を目指しています。
+- Focus on business logic in serverless environment
+- Maximize development efficiency with CI / CD standard schema-driven Scaffold
+- Achieve global scale with lower management costs
 
-SOULs バックエンドには `API` と `Worker` の 2 つのタイプがあります。
-`API` は主にデータをフロントエンドへ提供します。`Worker` は主に `タスク` の処理を行います
+![画像](https://souls.elsoul.nl/imgs/docs/SOULs-architecture.jpg)
 
-![画像](https://souls.elsoul.nl/imgs/docs/SOULs.jpg)
-
-現在のバージョンでは SOULs `API` と `Worker` を Github Actions を使って Google Cloud Run へそれぞれデプロイします。
-
-SOULs フレームワークでは [Monorepo](https://en.wikipedia.org/wiki/Monorepo) によって一つのパッケージでアプリケーションを管理します。
 
 SOULs creates 2 types of framework.
 
@@ -79,41 +74,15 @@ And Create Your APP
 
     $ souls new app_name
     $ cd apps/api/app_name
-    $ bundle
     $ souls s
 
 Check your GraphQL PlayGround
 
 [localhost:4000/playground](localhost:4000/playground)
 
-## Gemfile 自動更新アップデート
-
-`Gemfile`, `Gemfile.lock` を最新のバージョンに自動更新します。
-
-```
-souls upgrade gemfile
-```
-
-除外したい `gem` は `config/souls.rb` 内の
-`config.fixed_gems` の配列に追加します。
-
-```ruby
-Souls.configure do |config|
-  config.app = "souls-api"
-  config.project_id = "souls-api"
-  config.region = "asia-northeast1"
-  config.endpoint = "/endpoint"
-  config.strain = "api"
-  config.fixed_gems = ["selenium-webdriver"]
-  config.workers = []
-end
-```
 
 ## SOULs Serverless Application Framework Document
 
-SOULs サーバーレスアプリケーションフレームワーク
-ドキュメントはこちらから
-
 - [SOULs Document](https://souls.elsoul.nl/)
 
 ## Development

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.rbs_type_check(param[:type])
+          type = "[#{type}]" if param[:array]
+          if i == params[:params].size - 1
+            f.write("      argument :#{param[:column_name]}, #{type}, null: true\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}, null: true\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/cli/init/index.rb

@@ -14,9 +14,11 @@ module Souls
       download_github_actions(app_name: app_name)
       initial_config_init(app_name: app_name, service_name: service_name)
       system("cd #{app_name} && git init --initial-branch=main")
+
       system(
         "
-        cd #{app_name} && git submodule add https://github.com/ruby/gem_rbs_collection.git vendor/rbs/gem_rbs_collection
+        cd #{app_name} &&
+        git submodule add -f https://github.com/ruby/gem_rbs_collection.git vendor/rbs/gem_rbs_collection
         "
       )
       souls_api_credit(app_name: app_name, service_name: service_name)

data/lib/souls/version.rb

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

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-0.42.3
+0.43.0

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-0.42.3
+0.43.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 0.63.3
+  version: 0.64.0
 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
@@ -111,8 +111,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.1.0
 description: |-
-  SOULs はサーバーレスフルスタックフレームワークです。柔軟な Ruby GraphQL API と Worker はルーティングの必要がありません。
-    クラウド環境への自動デプロイ、CI/CD ワークフローを標準装備。開発者がビジネスロジックに集中し、楽しくコードが書けるような環境を目指しています。
+  Welcome to SOULs Serverless Application Framework!
+
+  - Focus on business logic in serverless environment
+
+  - Maximize development efficiency with CI / CD standard schema-driven Scaffold
+
+  - Achieve global scale with lower management costs
 email:
 - f.kawasaki@elsoul.nl
 - s.kishi@elsoul.nl
@@ -220,6 +225,7 @@ requirements: []
 rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
-summary: SOULs はサーバーレスフルスタックフレームワークです。柔軟な Ruby GraphQL API と Worker はルーティングの必要がありません。
-  クラウド環境への自動デプロイ、CI/CD ワークフローを標準装備。開発者がビジネスロジックに集中し、楽しくコードが書けるような環境を目指しています。
+summary: Welcome to SOULs Serverless Application Framework!  - Focus on business logic
+  in serverless environment  - Maximize development efficiency with CI / CD standard
+  schema-driven Scaffold  - Achieve global scale with lower management costs
 test_files: []