souls 0.15.2 → 0.15.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c7b44206555239cc385474416cbba36b9dddad92466891ee4c8854370c4ae817
-  data.tar.gz: 8f11b53691ecdc25c592470296230d4bfc1b65454d5bc1d5bb4467de32848f6a
+  metadata.gz: abe6a8a19db79936b013516a4d13714d8b5f40dbd1936b3348c84954b3464f46
+  data.tar.gz: 79b82ca41a79fdfcd56794b3bb329a905abfdac0fcecc5075973a53700b5a9c9
 SHA512:
-  metadata.gz: 393cc8a649f39858552f9ebcb72fbcd2c8c9973b9946def63ac73fafed150b0d55af307b5e4a14aec80771ae61019d49e9c5be73c585e2cfaa19256b7664911e
-  data.tar.gz: 71a1f70b1ef6ceb7853768685e7d05fe3193a838db649e6ae19486d022498a0ff2932a98876c5c52a3ad23495c31cf4afdd9be4182dce755b543faa85b9dbfa4
+  metadata.gz: 53e0e8479c8e0d935f55a5119ebc1af3f61b0ac40476dd36e291196c69bc025822eaa37213ef6ecdfcba182c163ecb3d1e2b76e1c6af497b3823c0f3e77b8115
+  data.tar.gz: b6216fca804c81d140712a9ee7c01c926d034a10c5d84d3990e83491bb0fbea2d8ab7896465b4267bfa4edf4f2330b109376d6a6125e6a749ef660c419ebb3a6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    souls (0.14.7)
+    souls (0.15.6)
 
 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,67 @@ 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
+# Version Check
+$ souls -v
 
-    $ souls -v
+# Init SOULs App
+$ souls new app_name
+$ cd app_name
+$ bundle
 
-Init Proto Files
+# Run Dev & Test DB
+$ souls i run_psql
 
-    $ souls p `service_name`
+# Create DB
+$ souls db:create
 
-Run Server
+# Migrate DB
+$ souls db:migrate
 
-    $ souls s
+# Create Test DB
+$ souls db:seed
 
-Run Console
+# Development (localhost:3000/playground)
+$ souls s
 
-    $ souls c
+# Development with Worker (localhost:3000/playground; localhost:3000/sidekiq)
+$ foreman start -f Procfile.dev
 
-Run Infra Command
+# Test
+$ bundle exec rspec
 
-    $ souls i `method_name`
+# Deploy (Edit: ./cloudbuild.yml)
+$ souls deploy
 
-Deploy
+# Run Infra Command
+$ souls i `method_name`
+```
+
+## SOULs Scaffold
+SOULs Scaffold creates CRUD API from `./db/schema.rb`
 
-    $ souls i deploy
+```bash
+# Create migration file
+$ souls g migration user
 
-※Only Initial
+# 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
-      system "bundle exec puma -p 3000"
+      `bundle exec puma -p 3000 -e development`
     end
   when "c", "console"
     strain = Souls.configuration.strain
@@ -33,7 +33,7 @@ begin
     when "media", "admin"
       system "yarn dev"
     else
-      system "bundle exec irb"
+      `bundle exec irb`
     end
   when "i", "infra"
     Souls.send ARGV[1]
@@ -66,7 +66,7 @@ begin
     when "migrate_all"
       Souls::Init.migrate_all
     when "migration"
-      `rake db:create_migration NAME=#{ARGV[2]}`
+      STDOUT.write `rake db:create_migration NAME=#{ARGV[2]}`
     when "rspec_factory"
       Souls::Init.rspec_factory class_name: ARGV[2]
     when "rspec_model"
@@ -77,24 +77,28 @@ begin
       Souls::Init.rspec_query class_name: ARGV[2]
     when "rspec_type"
       Souls::Init.rspec_type class_name: ARGV[2]
+    when "rspec_resolver"
+      Souls::Init.rspec_resolver class_name: ARGV[2]
     else
       "SOULs!"
     end
   when "db:create"
-    `rake db:create && rake db:create RACK_ENV=test`
+    STDOUT.write `rake db:create && rake db:create RACK_ENV=test`
   when "db:migrate"
-    `rake db:migrate && rake db:migrate RACK_ENV=test`
+    STDOUT.write `rake db:migrate && rake db:migrate RACK_ENV=test`
+  when "db:seed"
+    STDOUT.write `rake db:seed`
   when "db:migrate:reset"
-    `rake db:migrate:reset && rake db:migrate:reset RACK_ENV=test`
+    STDOUT.write `rake db:migrate:reset && rake db:migrate:reset RACK_ENV=test`
   when "t", "test"
-    `rubocop`
-    `bundle exec rspec`
+    STDOUT.write `rubocop`
+    STDOUT.write `bundle exec rspec`
   when "run"
-    `docker build . -t souls:latest`
-    `docker run --rm -p 3000:3000 souls:latest`
+    STDOUT.write `docker build . -t souls:latest`
+    STDOUT.write `docker run --rm -p 3000:3000 souls:latest`
   when "deploy"
     project_id = Souls.configuration.project_id
-    `gcloud builds submit --config=cloudbuild.yml --project #{project_id}`
+    STDOUT.write `gcloud builds submit --config=cloudbuild.yml --project #{project_id}`
   else
     puts "Welcome to SOULs!"
   end

data/lib/souls/generate.rb

@@ -18,6 +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 ["Resolver already exist! #{file_path}"] if File.exist? file_path
         File.open(file_path, "w") do |f|
           f.write <<~EOS
             module Resolvers
@@ -30,6 +31,7 @@ module Souls
                 class #{class_name.camelize}Filter < ::Types::BaseInputObject
                   argument :OR, [self], required: false
 
+                  argument :is_deleted, Boolean, required: false
                   argument :start_date, String, required: false
                   argument :end_date, String, required: false
                 end
@@ -57,8 +59,9 @@ module Souls
                 end
 
                 def normalize_filters(value, branches = [])
-                  scope = ::Article.all
+                  scope = ::#{class_name.camelize}.all
 
+                  scope = scope.where(is_deleted: value[:is_deleted]) if value[:is_deleted]
                   scope = scope.where("created_at >= ?", value[:start_date]) if value[:start_date]
                   scope = scope.where("created_at <= ?", value[:end_date]) if value[:end_date]
 
@@ -75,24 +78,207 @@ module Souls
         [file_path]
       end
 
-    def job class_name: "send_mail"
-      file_path = "./app/jobs/#{class_name.singularize}_job.rb"
-      File.open(file_path, "w") do |f|
-        f.write <<~EOS
-          class #{class_name.camelize}
-            include Sidekiq::Status::Worker
-            include Sidekiq::Worker
-            sidekiq_options queue: "default"
-
-            def perform **args
-              # write task code here
+      def job class_name: "send_mail"
+        file_path = "./app/jobs/#{class_name.singularize}_job.rb"
+        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}
+              include Sidekiq::Status::Worker
+              include Sidekiq::Worker
+              sidekiq_options queue: "default"
+
+              def perform **args
+                # write task code here
+              end
+            end
+          EOS
+        end
+        [file_path]
+      end
+
+      def rspec_resolver_head class_name: "souls"
+        file_path = "./spec/resolvers/#{class_name.singularize}_search_spec.rb"
+        File.open(file_path, "w") do |f|
+          f.write <<~EOS
+            RSpec.describe \"#{class_name.camelize}Search Resolver テスト\" do
+              describe "削除フラグ false の #{class_name.camelize} を返却する" do
+          EOS
+        end
+      end
+
+      def rspec_resolver_after_head class_name: "souls"
+        file_path = "./spec/resolvers/#{class_name.singularize}_search_spec.rb"
+        path = "./db/schema.rb"
+        @on = false
+        @user_exist = false
+        @relation_params = []
+        File.open(file_path, "a") do |new_line|
+          File.open(path, "r") do |f|
+            f.each_line.with_index do |line, i|
+              if @on
+                if line.include?("end") || line.include?("t.index")
+                  if @relation_params.empty?
+                    new_line.write <<-EOS
+    let!(:#{class_name}) { FactoryBot.create(:#{class_name}) }
+
+    let(:query) do
+      %(query {
+        #{class_name.singularize.camelize(:lower)}Search(filter: {
+          isDeleted: false
+      }) {
+          edges {
+            cursor
+            node {
+              id
+                    EOS
+                  else
+                    new_line.write <<-EOS
+    let(:#{class_name}) { FactoryBot.create(:#{class_name}, #{@relation_params.join(", ")}) }
+
+    let(:query) do
+      %(query {
+        #{class_name.singularize.camelize(:lower)}Search(filter: {
+          isDeleted: false
+      }) {
+          edges {
+            cursor
+            node {
+              id
+                    EOS
+                  end
+                  break
+                end
+                _, name = line.split(",")[0].gsub("\"", "").scan(/((?<=t\.).+(?=\s)) (.+)/)[0]
+                case name
+                when /$*_id\z/
+                  relation_col = name.gsub("_id", "")
+                  @relation_params << "#{name}: #{relation_col}.id"
+                  new_line.write "    let(:#{relation_col}) { FactoryBot.create(:#{relation_col}) }\n"
+                end
+              end
+              if table_check(line: line, class_name: class_name)
+                @on = true
+              end
             end
           end
-        EOS
+        end
       end
-      [file_path]
+
+      def rspec_resolver_params class_name: "souls"
+        file_path = "./spec/resolvers/#{class_name.singularize}_search_spec.rb"
+        path = "./db/schema.rb"
+        @on = false
+        File.open(file_path, "a") do |new_line|
+          File.open(path, "r") do |f|
+            f.each_line.with_index do |line, i|
+              if @on
+                if line.include?("end") || line.include?("t.index")
+                  new_line.write <<-EOS
+              }
+            }
+            nodes {
+              id
+            }
+            pageInfo {
+              endCursor
+              hasNextPage
+              startCursor
+              hasPreviousPage
+            }
+          }
+        }
+      )
     end
 
+    subject(:result) do
+      SoulsApiSchema.execute(query).as_json
+    end
+
+    it "return #{class_name.camelize} Data" do
+      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
+                  break
+                end
+                _, name = line.split(",")[0].gsub("\"", "").scan(/((?<=t\.).+(?=\s)) (.+)/)[0]
+                case name
+                when "user_id", "created_at", "updated_at", /$*_id\z/
+                  next
+                else
+                  new_line.write "              #{name.camelize(:lower)}\n"
+                end
+              end
+              if table_check(line: line, class_name: class_name)
+                @on = true
+              end
+            end
+          end
+        end
+      end
+
+      def rspec_resolver_end class_name: "souls"
+        file_path = "./spec/resolvers/#{class_name.singularize}_search_spec.rb"
+        path = "./db/schema.rb"
+        @on = false
+        File.open(file_path, "a") do |new_line|
+          File.open(path, "r") do |f|
+            f.each_line.with_index do |line, i|
+              if @on
+                if line.include?("end") || line.include?("t.index")
+                  new_line.write <<-EOS
+      )
+    end
+  end
+end
+                  EOS
+                  break
+                end
+                type, name = line.split(",")[0].gsub("\"", "").scan(/((?<=t\.).+(?=\s)) (.+)/)[0]
+                field ||= type_check type
+                array_true = line.include?("array: true")
+                case name
+                when "user_id", "created_at", "updated_at", /$*_id\z/
+                  next
+                else
+                  case type
+                  when "text", "date", "datetime"
+                      if array_true
+                        new_line.write "        \"#{name.camelize(:lower)}\" => be_all(String),\n"
+                      else
+                        new_line.write "        \"#{name.camelize(:lower)}\" => be_a(String),\n"
+                      end
+                  when "boolean"
+                    new_line.write "        \"#{name.singularize.camelize(:lower)}\" => be_in([true, false]),\n"
+                  when "string", "bigint", "integer", "float"
+                    new_line.write "        \"#{name.singularize.camelize(:lower)}\" => be_a(#{field}),\n"
+                  end
+                end
+              end
+              if table_check(line: line, class_name: class_name)
+                @on = true
+              end
+            end
+          end
+        end
+        [file_path]
+      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 ["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
+        rspec_resolver_end class_name: singularized_class_name
+      end
     end
   end
-end
+end

data/lib/souls/init.rb

@@ -114,11 +114,11 @@ module Souls
         system "cp -r #{repository_name}-#{folder}/ #{app_name}/"
         system "rm -rf #{version}.tar.gz && rm -rf #{repository_name}-#{folder}"
         txt = <<~TEXT
-           _____ ____  __  ____#{'        '}
-          / ___// __ \\/ / / / /   _____
-          \\__ \\/ / / / / / / /   / ___/
-         ___/ / /_/ / /_/ / /___(__  )#{' '}
-        /____/\\____/\\____/_____/____/#{'  '}
+             _____ ____  __  ____#{'        '}
+            / ___// __ \\/ / / / /   _____
+            \\__ \\/ / / / / / / /   / ___/
+           ___/ / /_/ / /_/ / /___(__  )#{' '}
+          /____/\\____/\\____/_____/____/#{'  '}
         TEXT
         puts txt
         puts "=============================="
@@ -724,7 +724,8 @@ module Souls
       end
 
       def rspec_factory class_name: "souls"
-        return ["Aleady Exist!"] unless 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
@@ -733,7 +734,7 @@ module Souls
 
       def rspec_model class_name: "souls"
         file_path = "./spec/models/#{class_name}_spec.rb"
-        return ["Aleady Exist!"] unless File.exist? file_path
+        return ["Aleady Exist!"] if File.exist? file_path
         File.open(file_path, "w") do |f|
           f.write <<~EOS
             RSpec.describe "#{class_name.camelize} Model テスト", type: :model do
@@ -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
@@ -934,13 +945,13 @@ module Souls
         File.open(file_path, "a") do |new_line|
           File.open(path, "r") do |f|
             f.each_line.with_index do |line, i|
-              if @on 
+              if @on
                 if line.include?("end") || line.include?("t.index")
                   new_line.write <<~EOS
-                                )
-                            end
-                          end
+                            )
                         end
+                      end
+                    end
                   EOS
                   break
                 end
@@ -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}")
@@ -1051,7 +1062,7 @@ module Souls
         File.open(file_path, "a") do |new_line|
           File.open(path, "r") do |f|
             f.each_line.with_index do |line, i|
-              if @on 
+              if @on
                 if line.include?("end") || line.include?("t.index")
                   new_line.write <<-EOS
         }
@@ -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
@@ -1093,13 +1109,13 @@ module Souls
         File.open(file_path, "a") do |new_line|
           File.open(path, "r") do |f|
             f.each_line.with_index do |line, i|
-              if @on 
+              if @on
                 if line.include?("end") || line.include?("t.index")
-                  new_line.write <<-EOS
-        )
-    end
-  end
-end
+                  new_line.write <<~EOS
+                            )
+                        end
+                      end
+                    end
                   EOS
                   break
                 end
@@ -1174,20 +1190,24 @@ end
         model_paths = model class_name: singularized_class_name
         type_paths = type class_name: singularized_class_name
         node_type_paths = node_type class_name: singularized_class_name
+        resolver_paths = resolver class_name: singularized_class_name
         rspec_factory_paths = rspec_factory class_name: singularized_class_name
         rspec_model_paths = rspec_model class_name: singularized_class_name
         rspec_mutation_paths = rspec_mutation class_name: singularized_class_name
         rspec_query_paths = rspec_query class_name: singularized_class_name
+        rspec_resolver_paths = rspec_resolver class_name: singularized_class_name
         query_path = query class_name: singularized_class_name
         mutation_path = mutation class_name: singularized_class_name
         [
           model: model_paths,
           type: type_paths,
+          resolver: resolver_paths,
           node_type: node_type_paths,
           rspec_factory: rspec_factory_paths,
           rspec_model: rspec_model_paths,
           rspec_mutation: rspec_mutation_paths,
           rspec_query: rspec_query_paths,
+          rspec_resolver: rspec_resolver_paths,
           query: query_path,
           mutation: mutation_path,
           add_query_type: [
@@ -1208,11 +1228,13 @@ end
         result = migrate class_name: class_name
         puts result[0][:model]
         puts result[0][:type]
+        puts result[0][:resolver]
         puts result[0][:node_type]
         puts result[0][:rspec_factory]
         puts result[0][:rspec_model]
         puts result[0][:rspec_mutation]
         puts result[0][:rspec_query]
+        puts result[0][:rspec_resolver]
         puts result[0][:query]
         puts result[0][:mutation]
 
@@ -1258,6 +1280,12 @@ end
             path[:type].each { |line| puts line }
           end
         end
+        puts "\n============== Resolver =======================\n\n"
+        paths.each do |class_name|
+          class_name.each do |path|
+            path[:resovler].each { |line| puts line }
+          end
+        end
         puts "\n============== NodeType =======================\n\n"
         paths.each do |class_name|
           class_name.each do |path|
@@ -1288,6 +1316,12 @@ end
             path[:rspec_query].each { |line| puts line }
           end
         end
+        puts "\n============== RspecResolver =================\n\n"
+        paths.each do |class_name|
+          class_name.each do |path|
+            path[:rspec_resolver].each { |line| puts line }
+          end
+        end
         puts "\n============== Query ======================\n\n"
         paths.each do |class_name|
           class_name.each do |path|

data/lib/souls/version.rb

@@ -1,3 +1,3 @@
 module Souls
-  VERSION = "0.15.2"
+  VERSION = "0.15.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 0.15.2
+  version: 0.15.7
 platform: ruby
 authors:
 - POPPIN-FUMI
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-02-12 00:00:00.000000000 Z
+date: 2021-02-15 00:00:00.000000000 Z
 dependencies: []
 description: SOULS is a Web Application Framework for Microservices on Multi Cloud
   Platform such as Google Cloud Platform, Amazon Web Services, and Alibaba Cloud.