souls 0.15.5 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e72a21841cb1bad148b2b4fb2c9b6fc01fe55bf3b369bfb3aaf71df1393bd34f
-  data.tar.gz: 1e60f71a7d2ad5734d7f8a6f18cca6b437148c7f4f9d08145fe5eddef81be639
+  metadata.gz: 228bc348ee98475ded06a4f957c7ebd98d0b3cd7559fa6526df7b7ac8b587a19
+  data.tar.gz: 39ad6984a3317fb407a18ef4fe0acf32ead125edb03787e667f580cfdc334ec8
 SHA512:
-  metadata.gz: 0fbaa59c380970e79452516a7b049dd8815c0f65bd35dad5cd9f263adb700fe5b44b2e2b7ccd298ecfaf4c9e6c80966f1d955f9346a0799d8a2b242dbb305889
-  data.tar.gz: 2d7ab88bd16ac812b1e751faf5f924e75e01dcb7be5b181867083bfb60d2611aadd92247c7be4d8fcfe99361055214d668107d45b61caf8a7216524c998ad20c
+  metadata.gz: f70d561219a5443ffca7e717dfb1106c080090e1345991b9c3721b0cc61789527cb8e5b97dbab500f32bc6a15b71276dcb654a5f8822333103e36f1d4dc0e90c
+  data.tar.gz: 96ecddf8f92a715dec2be50ccffb327d5e0ec7f0d6427b6002414ed6f0a72f0313ca0e5793e2590efe61d5efa63a13f1e0ab78c7d73dece6a3b6c4d311b37017

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    souls (0.15.5)
+    souls (0.15.9)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -21,14 +21,18 @@
 
 Welcome to SOULs Framework!
 
-SOULS is a Web Application Framework for Microservices on Multi Cloud Platform such as Google Cloud Platform, Amazon Web Services, and Alibaba Cloud. Auto deploy with scalable condition. You can focus on business logic. No more infra problems.
+SOULS is a Web Application Framework based on GraphQL Relay ( Ruby )
+This is Cloud Based APP Framework. Easy Deployment.
+Microservices on Multi Cloud Platform such as Google Cloud Platform, Amazon Web Services, and Alibaba Cloud. Auto deploy with scalable condition. 
+You can focus on business logic. No more infra problems.
 
-SOULs creates 4 types of framework.
+SOULs creates 5 types of framework.
 
-1. Service - gRPC Serverless Scalable Service (Ruby)
-2. API - GraphQL to call gRPC (Ruby)
-3. Media Web Client - Media web client with SSG (TypeScript)
-4. Admin Web Client - Admin Console and CMS (TypeScript)
+1. API - GraphQL (Ruby) - Simple API 
+2. API - GraphQL to call gRPC (Ruby) - for heavy task processes
+3. Service - gRPC Serverless Scalable Service (Ruby)
+4. Media Web Client - Media web client with SSG (TypeScript)
+5. Admin Web Client - Admin Console and CMS (TypeScript)
 
 ## Dependency
 
@@ -66,42 +70,80 @@ And Create Your APP
 
 ### Choose SOULs Type:
 
-1. Service
-2. API
-3. Media Web
-4. Admin Web
+1. API
+2. API - gRPC
+3. Service
+4. Media Web
+5. Admin Web
 
-## Usage
+## Usage - 1. GraphQL API
 
-Version Check
+```bash
+# Ruby version (using rbenv)
+$ ruby -v
+ruby 3.0.0p0 (2020-12-25 revision 95aff21468) [x86_64-darwin20]
 
-    $ souls -v
+# Install xcode
+$ xcode-select --install
 
-Init Proto Files
+# Install PostgreSQL (Mac env)
+$ brew install postgresql
 
-    $ souls p `service_name`
+# Install redis
+$ brew install redis
 
-Run Server
+# Version Check
+$ souls -v
 
-    $ souls s
+# Init SOULs App
+$ souls new app_name
+$ cd app_name
+$ bundle
 
-Run Console
+# Run Dev & Test DB
+$ souls i run_psql
 
-    $ souls c
+# Create DB
+$ souls db:create
 
-Run Infra Command
+# Migrate DB
+$ souls db:migrate
 
-    $ souls i `method_name`
+# Create Test DB
+$ souls db:seed
 
-Deploy
+# Development (localhost:3000/playground)
+$ souls s
 
-    $ souls i deploy
+# Development with Worker (localhost:3000/playground; localhost:3000/sidekiq)
+$ foreman start -f Procfile.dev
 
-※Only Initial
+# Test
+$ bundle exec rspec
+
+# Deploy (Edit: ./cloudbuild.yml)
+$ souls deploy
+
+# Run Infra Command
+$ souls i `method_name`
+```
+
+## SOULs Scaffold
+SOULs Scaffold creates CRUD API from `./db/schema.rb`
+
+```bash
+# Create migration file
+$ souls g migration user
+
+# Edit migration file
+# Migrate DB
+$ souls db:migrate
+
+# SOULs Scaffold
+$ souls g migrate user
+```
 
-Update
 
-    $ souls i update
 
 ## Development
 

data/exe/souls

@@ -13,9 +13,9 @@ begin
       puts "you need to specify your app name \n `souls new app_name`"
       exit
     end
-    puts "Which framework:   \n 1. SOULS GraphQL API \n 2. SOULS GraphQL API gRPC compatible \n 3. SOULS gRPC Service \n 4. SOULS Media Web \n 5. SOULS Admin Web \n Enter Number: "
+    puts "Which framework:   \n 1. SOULs GraphQL API \n 2. SOULs GraphQL API gRPC compatible \n 3. SOULs gRPC Service \n 4. SOULs Media Web \n 5. SOULs Admin Web \n Enter Number: "
     strain = STDIN.gets.chomp.to_i
-    (1..5).include?(strain) ? puts("Generating Souls.. \n") : raise(StandardError, "Choose Number 1..5")
+    (1..5).include?(strain) ? puts("Generating SOULs.. \n") : raise(StandardError, "Choose Number 1..5")
     Souls::Init.create_souls strain: strain, app_name: ARGV[1]
   when "s", "server"
     strain = Souls.configuration.strain
@@ -25,7 +25,7 @@ begin
     when "service"
       system "bundle exec rake run_server"
     else
-      `foreman start -f Procfile.dev`
+      `bundle exec puma -p 3000 -e development`
     end
   when "c", "console"
     strain = Souls.configuration.strain
@@ -86,6 +86,8 @@ begin
     STDOUT.write `rake db:create && rake db:create RACK_ENV=test`
   when "db:migrate"
     STDOUT.write `rake db:migrate && rake db:migrate RACK_ENV=test`
+  when "db:seed"
+    STDOUT.write `rake db:seed`
   when "db:migrate:reset"
     STDOUT.write `rake db:migrate:reset && rake db:migrate:reset RACK_ENV=test`
   when "t", "test"

data/lib/souls/generate.rb

@@ -18,7 +18,7 @@ module Souls
       def resolver class_name: "souls"
         FileUtils.mkdir_p "./app/graphql/resolvers" unless Dir.exist? "./app/graphql/resolvers"
         file_path = "./app/graphql/resolvers/#{class_name.singularize}_search.rb"
-        return ["Aleady Exist!"] if File.exist? file_path
+        return ["Resolver already exist! #{file_path}"] if File.exist? file_path
         File.open(file_path, "w") do |f|
           f.write <<~EOS
             module Resolvers
@@ -80,7 +80,7 @@ module Souls
 
       def job class_name: "send_mail"
         file_path = "./app/jobs/#{class_name.singularize}_job.rb"
-        return ["Aleady Exist!"] if File.exist? file_path
+        return ["Job already exist! #{file_path}"] if File.exist? file_path
         File.open(file_path, "w") do |f|
           f.write <<~EOS
             class #{class_name.camelize}
@@ -99,6 +99,7 @@ module Souls
 
       def rspec_resolver_head class_name: "souls"
         file_path = "./spec/resolvers/#{class_name.singularize}_search_spec.rb"
+        puts file_path
         File.open(file_path, "w") do |f|
           f.write <<~EOS
             RSpec.describe \"#{class_name.camelize}Search Resolver テスト\" do
@@ -120,7 +121,7 @@ module Souls
                 if line.include?("end") || line.include?("t.index")
                   if @relation_params.empty?
                     new_line.write <<-EOS
-    let(:#{class_name}) { FactoryBot.create(:#{class_name}) }
+    let!(:#{class_name}) { FactoryBot.create(:#{class_name}) }
 
     let(:query) do
       %(query {
@@ -196,8 +197,12 @@ module Souls
     end
 
     it "return #{class_name.camelize} Data" do
-      a1 = result.dig("data", "#{class_name.singularize.camelize(:lower)}Search", "edges")[0]["node"]
-      p result if a1.nil?
+      begin
+        a1 = result.dig("data", "#{class_name.singularize.camelize(:lower)}Search", "edges")[0]["node"]
+        raise unless a1.present?
+      rescue
+        raise StandardError, result
+      end
       expect(a1).to include(
         "id" => be_a(String),
                   EOS
@@ -269,7 +274,7 @@ end
       def rspec_resolver class_name: "souls"
         singularized_class_name = class_name.singularize
         file_path = "#{Dir.pwd}/spec/resolvers/#{singularized_class_name}_search_spec.rb"
-        return ["Aleady Exist!"] if File.exist? file_path
+        return ["Resolver already exist! #{file_path}"] if File.exist? file_path
         rspec_resolver_head class_name: singularized_class_name
         rspec_resolver_after_head class_name: singularized_class_name
         rspec_resolver_params class_name: singularized_class_name

data/lib/souls/init.rb

@@ -724,7 +724,8 @@ module Souls
       end
 
       def rspec_factory class_name: "souls"
-        return ["Aleady Exist!"] if File.exist? "./spec/factories/#{class_name.singularize}"
+        file_path = "./spec/factories/#{class_name.pluralize}.rb"
+        return ["Factory aleady exist! #{file_path}"] if File.exist? file_path
         singularized_class_name = class_name.singularize
         rspec_factory_head class_name: singularized_class_name
         rspec_factory_params class_name: singularized_class_name
@@ -881,7 +882,12 @@ module Souls
     end
 
     it "return #{class_name.camelize} Data" do
-      a1 = result.dig("data", "create#{class_name.singularize.camelize}", "#{class_name.singularize.camelize(:lower)}Edge", "node")
+      begin
+        a1 = result.dig("data", "create#{class_name.singularize.camelize}", "#{class_name.singularize.camelize(:lower)}Edge", "node")
+        raise unless a1.present?
+      rescue
+        raise StandardError, result
+      end
       expect(a1).to include(
         "id" => be_a(String),
                     EOS
@@ -899,7 +905,12 @@ module Souls
     end
 
     it "return #{class_name.camelize} Data" do
-      a1 = result.dig("data", "create#{class_name.singularize.camelize}", "#{class_name.singularize.camelize(:lower)}Edge", "node")
+      begin
+        a1 = result.dig("data", "create#{class_name.singularize.camelize}", "#{class_name.singularize.camelize(:lower)}Edge", "node")
+        raise unless a1.present?
+      rescue
+        raise StandardError, result
+      end
       expect(a1).to include(
         "id" => be_a(String),
                     EOS
@@ -1006,7 +1017,7 @@ module Souls
                 if line.include?("end") || line.include?("t.index")
                   if @relation_params.empty?
                   new_line.write <<-EOS
-    let(:#{class_name}) { FactoryBot.create(:#{class_name}) }
+    let!(:#{class_name}) { FactoryBot.create(:#{class_name}) }
 
     let(:query) do
       data_id = Base64.encode64("#{class_name.camelize}:\#{#{class_name.singularize.underscore}.id}")
@@ -1064,7 +1075,12 @@ module Souls
   end
 
   it "return #{class_name.camelize} Data" do
-    a1 = result.dig("data", "#{class_name.singularize.camelize(:lower)}")
+    begin
+      a1 = result.dig("data", "#{class_name.singularize.camelize(:lower)}")
+      raise unless a1.present?
+    rescue
+      raise StandardError, result
+    end
     expect(a1).to include(
       "id" => be_a(String),
                   EOS
@@ -1203,6 +1219,9 @@ module Souls
             "    field :update_#{singularized_class_name}, mutation: Mutations::#{singularized_class_name.camelize}::Update#{singularized_class_name.camelize}",
             "    field :delete_#{singularized_class_name}, mutation: Mutations::#{singularized_class_name.camelize}::Delete#{singularized_class_name.camelize}",
             "    field :destroy_delete_#{singularized_class_name}, mutation: Mutations::#{singularized_class_name.camelize}::DestroyDelete#{singularized_class_name.camelize}"
+          ],
+          add_resolver: [
+            "    field :#{singularized_class_name}_search, resolver: Resolvers::#{singularized_class_name.camelize}Search"
           ]
         ]
       end
@@ -1232,6 +1251,10 @@ module Souls
         result[0][:add_query_type].each do |path|
           puts path
         end
+        puts "\n    ## Resolvers\n\n"
+        result[0][:add_resolver].each do |path|
+          puts path
+        end
         puts "\n    ## Connection Type\n\n"
         puts "    def #{class_name.pluralize}"
         puts "      #{class_name.singularize.camelize}.all.order(id: :desc)"
@@ -1267,7 +1290,7 @@ module Souls
         puts "\n============== Resolver =======================\n\n"
         paths.each do |class_name|
           class_name.each do |path|
-            path[:resovler].each { |line| puts line }
+            path[:resolver].each { |line| puts line }
           end
         end
         puts "\n============== NodeType =======================\n\n"
@@ -1330,6 +1353,12 @@ module Souls
             path[:add_query_type].each { |line| puts line }
           end
         end
+        puts "\n    ## Resolvers\n\n"
+        paths.each do |class_name|
+          class_name.each do |path|
+            path[:add_resolver].each { |line| puts line }
+          end
+        end
         puts "\n    ## Connection Type\n\n"
         get_tables.each do |class_name|
           puts "    def #{class_name.pluralize}"

data/lib/souls/version.rb

@@ -1,3 +1,3 @@
 module Souls
-  VERSION = "0.15.5"
+  VERSION = "0.16.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 0.15.5
+  version: 0.16.0
 platform: ruby
 authors:
 - POPPIN-FUMI
@@ -70,7 +70,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.4
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: SOULS is a GraphQL Based Web Application Framework for Microservices on Multi