souls 0.16.1 → 0.16.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c8579754eee9ff09aacd11cd34ec2226db30119240a65c76828abef617afe8a
-  data.tar.gz: 16ae0929960bec81e1117dce6c8dee35331680706283f189dfb982dea66317b2
+  metadata.gz: a327229d00231e3a106e8dd748d083b4fe4a5bc776960144b2eeeed15c0a5a4b
+  data.tar.gz: 6fc169ee068d88ac46f2673bd48d89c2e1afb4bfbf75a753a357fe2615166454
 SHA512:
-  metadata.gz: 9511ab49084de3324e0a065a468c2940d6fc27e8dd1e7ef6a602a03a22db9ca9a79b0110903869a0acf3b591e0493ed329284f8bdc6b7e2d48116a06c6e239a3
-  data.tar.gz: 546f6339a8ac3c5fd6b7661bdbce6befe0a9efd98dd1d3d1fac821ec5b5ff22d5d3a4b7be84b1d8bbba60ce0ceda4599bc62fde01fab6275abf7113d54ce0d41
+  metadata.gz: 05e475df2a78f94bfa8a3f55441ca563d30b17e7ef6c5c4b5bc39f95a4633864ea785f6b07d798667f6022980ab1bfa0d05f160f0c3a35d5b94444a8b2a46d44
+  data.tar.gz: 20b59cdf504c52fb19154f2fb9a89951f0220c0ba1a9fa27c02ccec2b32a2abf5946c253634427a699bcc3a5633f5e1016e21cd4971c3e214a8121c897a2f29e

data/.irbrc

@@ -0,0 +1 @@
+require "./lib/souls"

data/.rubocop.yml

@@ -79,6 +79,9 @@ Style/HashSyntax:
     - "**/*.rake"
     - "Rakefile"
 
+Layout/HeredocIndentation:
+    Enabled: false
+
 Style/IfUnlessModifier:
   Enabled: false
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    souls (0.15.9)
+    souls (0.16.6)
 
 GEM
   remote: https://rubygems.org/
@@ -19,13 +19,13 @@ GEM
     concurrent-ruby (1.1.8)
     diff-lcs (1.4.4)
     ffi (1.14.2)
-    i18n (1.8.8)
+    i18n (1.8.9)
       concurrent-ruby (~> 1.0)
     language_server-protocol (3.15.0.1)
     listen (3.4.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    minitest (5.14.3)
+    minitest (5.14.4)
     parallel (1.20.1)
     parser (2.7.2.0)
       ast (~> 2.4.1)
@@ -34,8 +34,8 @@ GEM
     rb-fsevent (0.10.4)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rbs (1.0.4)
-    regexp_parser (2.0.3)
+    rbs (1.0.6)
+    regexp_parser (2.1.1)
     rexml (3.2.4)
     rspec (3.1.0)
       rspec-core (~> 3.1.0)
@@ -76,7 +76,7 @@ GEM
     zeitwerk (2.4.2)
 
 PLATFORMS
-  ruby
+  x86_64-darwin-20
 
 DEPENDENCIES
   activesupport (= 6.1.0)
@@ -87,4 +87,4 @@ DEPENDENCIES
   steep (= 0.39.0)
 
 BUNDLED WITH
-   2.2.4
+   2.2.11

data/README.md

@@ -76,72 +76,10 @@ And Create Your APP
 4. Media Web
 5. Admin Web
 
-## Usage - 1. GraphQL API
 
-```bash
-# Ruby version (using rbenv)
-$ ruby -v
-ruby 3.0.0p0 (2020-12-25 revision 95aff21468) [x86_64-darwin20]
+## SOULs Document
 
-# Install xcode
-$ xcode-select --install
-
-# Install PostgreSQL (Mac env)
-$ brew install postgresql
-
-# Install redis
-$ brew install redis
-
-# Version Check
-$ souls -v
-
-# Init SOULs App
-$ souls new app_name
-$ cd app_name
-$ bundle
-
-# Run Dev & Test DB
-$ souls i run_psql
-
-# Create DB
-$ souls db:create
-
-# Migrate DB
-$ souls db:migrate
-
-# Create Test DB
-$ souls db:seed
-
-# Development (localhost:3000/playground)
-$ souls s
-
-# Development with Worker (localhost:3000/playground; localhost:3000/sidekiq)
-$ foreman start -f Procfile.dev
-
-# 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
-```
+- [SOULs Document](https://elsoul.github.io/souls_doc/)
 
 
 

data/exe/souls

@@ -25,7 +25,7 @@ begin
     when "service"
       system "bundle exec rake run_server"
     else
-      `bundle exec puma -p 3000 -e development`
+      system "foreman start -f Procfile.dev"
     end
   when "c", "console"
     strain = Souls.configuration.strain
@@ -33,7 +33,12 @@ begin
     when "media", "admin"
       system "yarn dev"
     else
-      `bundle exec irb`
+      case ARGV[1]
+      when "RACK_ENV=production"
+        system "bundle exec irb RACK_ENV=production"
+      else
+        system "bundle exec irb"
+      end
     end
   when "i", "infra"
     Souls.send ARGV[1]
@@ -66,7 +71,7 @@ begin
     when "migrate_all"
       Souls::Init.migrate_all
     when "migration"
-      STDOUT.write `rake db:create_migration NAME=#{ARGV[2]}`
+      system "rake db:create_migration NAME=create_#{ARGV[2]}"
     when "rspec_factory"
       Souls::Init.rspec_factory class_name: ARGV[2]
     when "rspec_model"
@@ -82,23 +87,35 @@ begin
     else
       "SOULs!"
     end
+  when "d"
+    Souls::Init.delete_all class_name: ARGV[1]
   when "db:create"
-    STDOUT.write `rake db:create && rake db:create RACK_ENV=test`
+    system "rake db:create && rake db:create RACK_ENV=test"
   when "db:migrate"
-    STDOUT.write `rake db:migrate && rake db:migrate RACK_ENV=test`
+    case ARGV[1]
+    when "RACK_ENV=production"
+      system "rake db:migrate RACK_ENV=production"
+    else
+      system "rake db:migrate && rake db:migrate RACK_ENV=test"
+    end
   when "db:seed"
-    STDOUT.write `rake db:seed`
+    system "rake db:seed"
   when "db:migrate:reset"
-    STDOUT.write `rake db:migrate:reset && rake db:migrate:reset RACK_ENV=test`
+    case ARGV[1]
+    when "RACK_ENV=production"
+      system "rake db:migrate:reset RACK_ENV=production DISABLE_DATABASE_ENVIRONMENT_CHECK=1"
+    else
+      system "rake db:migrate:reset && rake db:migrate:reset RACK_ENV=test"
+    end
   when "t", "test"
-    STDOUT.write `rubocop`
-    STDOUT.write `bundle exec rspec`
+    system "rubocop -a"
+    system "bundle exec rspec"
   when "run"
-    STDOUT.write `docker build . -t souls:latest`
-    STDOUT.write `docker run --rm -p 3000:3000 souls:latest`
+    system "docker build . -t souls:latest"
+    system "docker run --rm -p 3000:3000 souls:latest"
   when "deploy"
     project_id = Souls.configuration.project_id
-    STDOUT.write `gcloud builds submit --config=cloudbuild.yml --project #{project_id}`
+    system "gcloud builds submit --config=cloudbuild.yml --project #{project_id}"
   else
     puts "Welcome to SOULs!"
   end

data/lib/souls.rb

@@ -1,8 +1,8 @@
 require "souls/version"
+require "active_support/core_ext/string/inflections"
 require "souls/init"
 require "souls/generate"
 require "json"
-require "active_support/core_ext/string/inflections"
 require "fileutils"
 
 module Souls

data/lib/souls/generate.rb

@@ -1,6 +1,10 @@
 module Souls
   module Init
     class << self
+      def get_type_and_name line
+        line.split(",")[0].gsub("\"", "").scan(/((?<=t\.).+(?=\s)) (.+)/)[0]
+      end
+
       def node_type class_name: "souls"
         file_path = "./app/graphql/types/#{class_name.singularize}_node_type.rb"
         File.open(file_path, "w") do |f|
@@ -15,9 +19,10 @@ module Souls
         [file_path]
       end
 
-      def resolver class_name: "souls"
+      def resolver_head 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"
+        @relation_params = []
         return ["Resolver already exist! #{file_path}"] if File.exist? file_path
         File.open(file_path, "w") do |f|
           f.write <<~EOS
@@ -30,54 +35,147 @@ module Souls
 
                 class #{class_name.camelize}Filter < ::Types::BaseInputObject
                   argument :OR, [self], required: false
+          EOS
+        end
+      end
 
-                  argument :is_deleted, Boolean, required: false
-                  argument :start_date, String, required: false
-                  argument :end_date, String, required: false
+      def resolver_params class_name: "souls"
+        file_path = "./app/graphql/resolvers/#{class_name.singularize}_search.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")
+                  break
                 end
-
-                option :filter, type: #{class_name.camelize}Filter, with: :apply_filter
-                option :first, type: types.Int, with: :apply_first
-                option :skip, type: types.Int, with: :apply_skip
-
-                def apply_filter(scope, value)
-                  branches = normalize_filters(value).inject { |a, b| a.or(b) }
-                  scope.merge branches
+                field = "[String]" if line.include?("array: true")
+                type, name = get_type_and_name(line)
+                field ||= type_check type
+                case name
+                when "user_id"
+                  @user_exist = true
+                when /$*_id\z/
+                  @relation_params << name
+                  new_line.write "      argument :#{name}, String, required: false\n"
+                when "created_at", "updated_at"
+                  next
+                else
+                  new_line.write "      argument :#{name}, #{field}, required: false\n"
                 end
+              end
+              @on = true if table_check(line: line, class_name: class_name)
+            end
+          end
+        end
+      end
 
-                def apply_first(scope, value)
-                  scope.limit(value)
-                end
+      def resolver_after_params class_name: "souls"
+        file_path = "./app/graphql/resolvers/#{class_name.singularize}_search.rb"
+        File.open(file_path, "a") do |f|
+          f.write <<-EOS
+      argument :is_deleted, Boolean, required: false
+      argument :start_date, String, required: false
+      argument :end_date, String, required: false
+    end
 
-                def apply_skip(scope, value)
-                  scope.offset(value)
-                end
+    option :filter, type: #{class_name.camelize}Filter, with: :apply_filter
+    option :first, type: types.Int, with: :apply_first
+    option :skip, type: types.Int, with: :apply_skip
 
-                def decode_global_key id
-                  _, data_id = SoulsApiSchema.from_global_id id
-                  data_id
-                end
+    def apply_filter(scope, value)
+      branches = normalize_filters(value).inject { |a, b| a.or(b) }
+      scope.merge branches
+    end
 
-                def normalize_filters(value, branches = [])
-                  scope = ::#{class_name.camelize}.all
+    def apply_first(scope, value)
+      scope.limit(value)
+    end
 
-                  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]
+    def apply_skip(scope, value)
+      scope.offset(value)
+    end
 
-                  branches << scope
+    def decode_global_key id
+      _, data_id = SoulsApiSchema.from_global_id id
+      data_id
+    end
 
-                  value[:OR].inject(branches) { |s, v| normalize_filters(v, s) } if value[:OR].present?
+    def normalize_filters(value, branches = [])
+      scope = ::#{class_name.camelize}.all
+          EOS
+        end
+      end
 
-                  branches
+      def resolver_before_end class_name: "souls"
+        file_path = "./app/graphql/resolvers/#{class_name.singularize}_search.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")
+                  break
+                end
+                _, name = get_type_and_name(line)
+                if line.include?("array: true")
+                  new_line.write "      scope = scope.where(\"#{name} @> ARRAY[?]::text[]\", value[:#{name}]) if value[:#{name}]\n"
+                  next
+                end
+                case name
+                when "user_id"
+                  @user_exist = true
+                when /$*_id\z/
+                  @relation_params << name
+                  new_line.write "      scope = scope.where(#{name}: decode_global_key(value[:#{name}])) if value[:#{name}]\n"
+                when "created_at", "updated_at"
+                  next
+                else
+                  new_line.write "      scope = scope.where(#{name}: value[:#{name}]) if value[:#{name}]\n"
                 end
               end
+              @on = true if table_check(line: line, class_name: class_name)
             end
+          end
+        end
+      end
+
+      def resolver_end class_name: "souls"
+        file_path = "./app/graphql/resolvers/#{class_name.singularize}_search.rb"
+        File.open(file_path, "a") do |f|
+          f.write <<-EOS
+      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]
+
+      branches << scope
+
+      value[:OR].inject(branches) { |s, v| normalize_filters(v, s) } if value[:OR].present?
+
+      branches
+    end
+  end
+end
           EOS
         end
         [file_path]
       end
 
+      def resolver class_name: "souls"
+        singularized_class_name = class_name.singularize.underscore
+        resolver_head class_name: singularized_class_name
+        resolver_params class_name: singularized_class_name
+        resolver_after_params class_name: singularized_class_name
+        resolver_before_end class_name: singularized_class_name
+        resolver_end class_name: singularized_class_name
+      end
+
       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
@@ -280,6 +378,26 @@ end
         rspec_resolver_params class_name: singularized_class_name
         rspec_resolver_end class_name: singularized_class_name
       end
+
+      def delete_all class_name: "souls"
+        singularized_class_name = class_name.singularize.underscore
+        pluralized_class_name = class_name.pluralize.underscore
+        FileUtils.rm "./app/models/#{singularized_class_name}.rb"
+        FileUtils.rm_rf "./app/graphql/mutations/#{singularized_class_name}"
+        FileUtils.rm "./app/graphql/queries/#{singularized_class_name}.rb"
+        FileUtils.rm "./app/graphql/queries/#{pluralized_class_name}.rb"
+        FileUtils.rm "./app/graphql/resolvers/#{singularized_class_name}_search.rb"
+        FileUtils.rm "./app/graphql/types/#{singularized_class_name}_type.rb"
+        FileUtils.rm "./app/graphql/types/#{singularized_class_name}_node_type.rb"
+        FileUtils.rm "./spec/factories/#{pluralized_class_name}.rb"
+        FileUtils.rm "./spec/mutations/#{singularized_class_name}_spec.rb"
+        FileUtils.rm "./spec/models/#{singularized_class_name}_spec.rb"
+        FileUtils.rm "./spec/queries/#{singularized_class_name}_spec.rb"
+        FileUtils.rm "./spec/resolvers/#{singularized_class_name}_search_spec.rb"
+        puts "deleted #{class_name.camelize} CRUD!"
+      rescue StandardError => error
+        puts error
+      end
     end
   end
 end

data/lib/souls/version.rb

@@ -1,3 +1,3 @@
 module Souls
-  VERSION = "0.16.1"
+  VERSION = "0.16.6"
 end

data/souls.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.description   = "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."
   spec.homepage      = "https://github.com/elsoul/souls"
   spec.license       = "Apache-2.0"
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 3.0.0")
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = "https://github.com/elsoul/souls"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 0.16.1
+  version: 0.16.6
 platform: ruby
 authors:
 - POPPIN-FUMI
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-02-15 00:00:00.000000000 Z
+date: 2021-03-02 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.
@@ -63,7 +63,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="