souls 0.17.9 → 0.20.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 163a0612fcb59636db008669eb27569e63fe1e4a3701fc211ae5ff92690be49e
-  data.tar.gz: 3850ab3b22daedd286886373963807e46af14040d7a021d6dedb9968801c40e0
+  metadata.gz: c601eafb73b63d6e33669df897351013682a7f4f125654aa34a39cdbef50a620
+  data.tar.gz: 56535bdf58fad20856452b4334a4982964d6d413f83a06c0f47d8c32d11e0228
 SHA512:
-  metadata.gz: dd2cb7901bc22a359f6cced93fafe7f28ee4f978ab798c85eb8d39365270e8fb34bd193efb7614f3a6f550c3c062e9d2740ab8e70a51cc8b821c6b21af999baa
-  data.tar.gz: 1307838fc825c08cfc91b0f72bf4b28d0742c3c2594f4e3a7c07bd1e48058c323fe721c509cf9c1ca4657f4033e40ce100ca3ad123656fd94561ba175e3b7abf
+  metadata.gz: 367b0ea47850a460a2a75553019fa75864ae1563fbbf64d8228125ec395d1ad7715b9783a1426e65c7ce62dc114503ee3e330a18d06216885dbbcde429ea485f
+  data.tar.gz: 050d94b53177c274aef211c45c75f0224feb9cae55e5f2ede1c52b7468dd54a04698071ac1f216cf16a4bff543bccef576b88a9600e571d2bc3fb4cbb8bf030a

data/.gitignore

@@ -14,4 +14,3 @@
 .irb_history
 /spec/
 /app/
-/db/

data/.rubocop.yml

@@ -104,6 +104,9 @@ Style/FrozenStringLiteralComment:
 Style/RedundantReturn:
   AllowMultipleReturnValues: true
 
+Style/RedundantArgument:
+  Enabled: false
+
 Style/Semicolon:
   Exclude:
     - "spec/**/*"

data/Gemfile.lock

@@ -1,8 +1,7 @@
 PATH
   remote: .
   specs:
-    souls (0.17.8)
-
+    souls (0.20.2)
 GEM
   remote: https://rubygems.org/
   specs:
@@ -75,6 +74,7 @@ GEM
     zeitwerk (2.4.2)
 
 PLATFORMS
+  x86_64-darwin-20
   x86_64-linux
 
 DEPENDENCIES

data/README.md

@@ -26,13 +26,12 @@ 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 5 types of framework.
+SOULs creates 4 types of framework.
 
-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)
+1. API - GraphQL (Ruby) - Simple API - Cloud Run
+2. Worker - Google Pub/Sub Worker API (Ruby) - Cloud Run
+3. Media Web Client - Media web client with SSG (TypeScript)
+4. Admin Web Client - Admin Console and CMS (TypeScript)
 
 ## Dependency
 
@@ -71,10 +70,9 @@ And Create Your APP
 ### Choose SOULs Type:
 
 1. API
-2. API - gRPC
-3. Service
-4. Media Web
-5. Admin Web
+2. Worker
+3. Media Web
+4. Admin Web
 
 
 ## SOULs Document

data/Rakefile

@@ -1,6 +1,23 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
+require "./lib/souls"
 
 RSpec::Core::RakeTask.new(:spec)
 
 task :default => :spec
+
+namespace :task do
+  task :g do
+    file_path = "./lib/souls/generate/"
+    Souls::SOULS_METHODS.each do |f|
+      FileUtils.touch "#{file_path}#{f}.rb"
+    end
+  end
+
+  task :a do
+    file_path = "./spec/generate/"
+    Souls::SOULS_METHODS.each do |f|
+      FileUtils.touch "#{file_path}#{f}_spec.rb"
+    end
+  end
+end

data/config/souls.rb

@@ -0,0 +1,4 @@
+Souls.configure do |config|
+  config.app = "souls"
+  config.strain = "api"
+end

data/db/schema.rb

@@ -0,0 +1,67 @@
+# This is Test Schema
+# All the files created by this schema.rb
+
+ActiveRecord::Schema.define(version: 20_210_308_070_947) do
+  enable_extension "plpgsql"
+
+  create_table "article_categories", force: :cascade do |t|
+    t.string "name", null: false
+    t.text "tags", default: [], array: true
+    t.boolean "is_deleted", default: false, null: false
+    t.datetime "created_at", precision: 6, null: false
+    t.datetime "updated_at", precision: 6, null: false
+    t.index ["is_deleted"], name: "index_article_categories_on_is_deleted"
+    t.index ["name"], name: "index_article_categories_on_name"
+  end
+
+  create_table "articles", force: :cascade do |t|
+    t.bigint "user_id"
+    t.string "title", null: false
+    t.text "body", default: "", null: false
+    t.string "thumnail_url", default: "", null: false
+    t.datetime "public_date", default: "2021-05-07 11:45:23", null: false
+    t.bigint "article_category_id", null: false
+    t.boolean "is_public", default: false, null: false
+    t.boolean "just_created", default: true, null: false
+    t.string "slag", null: false
+    t.text "tags", default: [], array: true
+    t.boolean "is_deleted", default: false, null: false
+    t.datetime "created_at", precision: 6, null: false
+    t.datetime "updated_at", precision: 6, null: false
+    t.index ["article_category_id"], name: "index_articles_on_article_category_id"
+    t.index ["is_deleted"], name: "index_articles_on_is_deleted"
+    t.index ["is_public"], name: "index_articles_on_is_public"
+    t.index ["slag"], name: "index_articles_on_slag", unique: true
+    t.index ["title"], name: "index_articles_on_title", unique: true
+    t.index ["user_id"], name: "index_articles_on_user_id"
+  end
+
+  create_table "users", force: :cascade do |t|
+    t.integer "retailer_uid"
+    t.string "uid", null: false
+    t.string "username", default: "", null: false
+    t.string "screen_name", default: "", null: false
+    t.string "last_name", default: "", null: false
+    t.string "first_name", default: "", null: false
+    t.string "last_name_kanji", default: "", null: false
+    t.string "first_name_kanji", default: "", null: false
+    t.string "last_name_kana", default: "", null: false
+    t.string "first_name_kana", default: "", null: false
+    t.string "email", null: false
+    t.string "tel", default: "", null: false
+    t.string "icon_url", default: "", null: false
+    t.string "birthday", default: "", null: false
+    t.string "gender", default: "", null: false
+    t.string "lang", default: "ja", null: false
+    t.string "category", default: "user", null: false
+    t.integer "user_role", default: 0, null: false
+    t.boolean "is_deleted", default: false, null: false
+    t.datetime "created_at", precision: 6, null: false
+    t.datetime "updated_at", precision: 6, null: false
+    t.index ["email"], name: "index_users_on_email", unique: true
+    t.index ["is_deleted"], name: "index_users_on_is_deleted"
+    t.index ["screen_name"], name: "index_users_on_screen_name"
+    t.index ["uid"], name: "index_users_on_uid"
+    t.index ["username"], name: "index_users_on_username"
+  end
+end

data/exe/souls

@@ -1,9 +1,14 @@
 #!/usr/bin/env ruby
 require "souls"
-STRAINS = ["graph", "worker", "media", "admin"]
+begin
+  require "./config/souls" unless ARGV[0] == "new" || ARGV[0] == "i" || ARGV[0] == "-v"
+rescue
+  puts "Make sure you are at SOULs APP directory!"
+end
 begin
   case ARGV[0]
   when "new"
+    STRAINS = ["api", "worker", "media", "admin"]
     if ARGV[1].nil?
       puts "you need to specify your app name \n `souls new app_name`"
       exit
@@ -12,6 +17,7 @@ begin
     strain = STDIN.gets.chomp.to_i
     (1..4).include?(strain) ? puts("Generating SOULs.. \n") : raise(StandardError, "Choose Number 1..4")
     Souls::Init.download_souls app_name: ARGV[1], repository_name: "souls_#{STRAINS[strain.to_i - 1]}"
+    Souls::Init.initial_config_init app_name: ARGV[1], strain: STRAINS[strain.to_i - 1]
   when "s", "server"
     strain = Souls.configuration.strain
     case strain
@@ -37,8 +43,6 @@ begin
     end
   when "i", "infra"
     Souls.send ARGV[1]
-  when "init"
-    Souls::Init.config_init
   when "-v", "--version"
     puts Souls::VERSION
   when "add"
@@ -59,51 +63,49 @@ begin
   when "g", "generate"
     case ARGV[1]
     when "test_dir"
-      Souls::Init.test_dir
-    when "policy"
-      Souls::Init.policy class_name: ARGV[2]
-    when "rspec_policy"
-      Souls::Init.rspec_policy class_name: ARGV[2]
-    when "node_type"
-      Souls::Init.node_type class_name: ARGV[2]
-    when "resolver"
-      Souls::Init.resolver class_name: ARGV[2]
-    when "job"
-      Souls::Init.job class_name: ARGV[2]
+      Souls::Generate.test_dir
     when "model"
-      Souls::Init.model class_name: ARGV[2]
+      Souls::Generate.model class_name: ARGV[2]
     when "mutation"
-      Souls::Init.mutation class_name: ARGV[2]
+      Souls::Generate.mutation class_name: ARGV[2]
     when "query"
-      Souls::Init.query class_name: ARGV[2]
+      Souls::Generate.query class_name: ARGV[2]
     when "type"
-      Souls::Init.type class_name: ARGV[2]
-    when "migrate"
-      Souls::Init.single_migrate class_name: ARGV[2]
-    when "migrate_all"
-      Souls::Init.migrate_all
-    when "migration"
-      system "rake db:create_migration NAME=create_#{ARGV[2]}"
+      Souls::Generate.type class_name: ARGV[2]
+    when "resolver"
+      Souls::Generate.resolver class_name: ARGV[2]
+    when "policy"
+      Souls::Generate.policy class_name: ARGV[2]
     when "rspec_factory"
-      Souls::Init.rspec_factory class_name: ARGV[2]
+      Souls::Generate.rspec_factory class_name: ARGV[2]
     when "rspec_model"
-      Souls::Init.rspec_model class_name: ARGV[2]
+      Souls::Generate.rspec_model class_name: ARGV[2]
     when "rspec_mutation"
-      Souls::Init.rspec_mutation class_name: ARGV[2]
+      Souls::Generate.rspec_mutation class_name: ARGV[2]
     when "rspec_query"
-      Souls::Init.rspec_query class_name: ARGV[2]
-    when "rspec_type"
-      Souls::Init.rspec_type class_name: ARGV[2]
+      Souls::Generate.rspec_query class_name: ARGV[2]
     when "rspec_resolver"
-      Souls::Init.rspec_resolver class_name: ARGV[2]
+      Souls::Generate.rspec_resolver class_name: ARGV[2]
+    when "rspec_policy"
+      Souls::Generate.rspec_policy class_name: ARGV[2]
+    when "node_type"
+      Souls::Generate.node_type class_name: ARGV[2]
+    when "job"
+      Souls::Generate.job class_name: ARGV[2]
+    when "migrate"
+      Souls::Generate.single_migrate class_name: ARGV[2]
+    when "migrate_all"
+      Souls::Generate.migrate_all
+    when "migration"
+      system "rake db:create_migration NAME=create_#{ARGV[2]}"
     else
       "SOULs!"
     end
   when "d"
-    Souls::Init.add_delete class_name: ARGV[1]
+    Souls::Generate.delete_all class_name: ARGV[1]
   when "update"
-    Souls::Init.add_delete class_name: ARGV[1]
-    Souls::Init.single_migrate class_name: ARGV[1]
+    Souls::Generate.add_delete class_name: ARGV[1]
+    Souls::Generate.single_migrate class_name: ARGV[1]
   when "db:create"
     system "rake db:create && rake db:create RACK_ENV=test"
   when "db:migrate"

data/lib/souls.rb

@@ -1,65 +1,43 @@
-require "souls/version"
+require_relative "souls/version"
 require "active_support/core_ext/string/inflections"
-require "souls/init"
-require "souls/generate"
+require_relative "souls/init"
 require "json"
 require "fileutils"
+Dir["./lib/souls/generate/*.rb"].each { |f| require f }
 
 module Souls
+  SOULS_METHODS = [
+    "model",
+    "query",
+    "mutation",
+    "type",
+    "resolver",
+    "policy",
+    "rspec_factory",
+    "rspec_model",
+    "rspec_query",
+    "rspec_mutation",
+    "rspec_resolver",
+    "rspec_policy"
+  ]
   class Error < StandardError; end
     class << self
       attr_accessor :configuration
 
       def run_psql
-        `docker run --rm -d \
+        system "docker run --rm -d \
           -p 5433:5432 \
           -v postgres-tmp:/var/lib/postgresql/data \
           -e POSTGRES_USER=postgres \
           -e POSTGRES_PASSWORD=postgres \
           -e POSTGRES_DB=souls_test \
-          postgres:13-alpine`
-        puts `docker ps`
+          postgres:13-alpine"
+        system "docker ps"
       end
 
-      def run_awake
+      def run_awake url
         app = Souls.configuration.app
-        `gcloud scheduler jobs create http #{app}-awake --schedule "0,10,20,30,40,50 * * * *" --uri "https://#{app}.el-soul.com" --http-method GET`
-      end
-
-      def deploy_local
-        `docker network create --driver bridge shared`
-
-        `docker run -d --name proxy \
-         -p 80:80 -p 443:443 \
-         -v "/var/run/docker.sock:/tmp/docker.sock:ro" \
-         -v "$pwd/certs:/etc/nginx/certs:ro" \
-         -v "/etc/nginx/vhost.d" \
-         -v "/usr/share/nginx/html" \
-         --network shared \
-         --restart always \
-         jwilder/nginx-proxy`
-
-        `docker run -d --name letsencrypt \
-        -v "/home/certs:/etc/nginx/certs" \
-        -v "/var/run/docker.sock:/var/run/docker.sock:ro" \
-        --volumes-from proxy \
-        --network shared \
-        --restart always \
-        jrcs/letsencrypt-nginx-proxy-companion`
-
-        `docker run -d --name nginx \
-        -p 80:80 \
-        -e VIRTUAL_HOST=souls.el-soul.com \
-        -e LETSENCRYPT_HOST=souls.el-soul.com \
-        -e LETSENCRYPT_EMAIL=info@gmail.com \
-        --network shared \
-        --link web \
-        poppinfumi/ruby-nginx:latest`
-
-        `docker run -d --name web \
-         -p 3000:3000 \
-         --network shared \
-         poppinfumi/souls_api`
+        system "gcloud scheduler jobs create http #{app}-awake --schedule '0,10,20,30,40,50 * * * *' --uri #{url} --http-method GET"
       end
     end
 
@@ -69,10 +47,11 @@ module Souls
   end
 
   class Configuration
-    attr_accessor :app
+    attr_accessor :app, :strain
 
     def initialize
       @app = nil
+      @strain = nil
     end
   end
 end

data/lib/souls/generate/app/policies/user_policy.rb

@@ -0,0 +1,31 @@
+class UserPolicy < ApplicationPolicy
+  def show?
+    admin_permissions?
+  end
+
+  def index?
+    admin_permissions?
+  end
+
+  def create?
+    admin_permissions?
+  end
+
+  def update?
+    admin_permissions?
+  end
+
+  def delete?
+    admin_permissions?
+  end
+
+  private
+
+  def staff_permissions?
+    @user.master? or @user.admin? or @user.staff?
+  end
+
+  def admin_permissions?
+    @user.master? or @user.admin?
+  end
+end

data/lib/souls/generate/application.rb

@@ -0,0 +1,156 @@
+module Souls
+  module Generate
+    class << self
+      ## Common Methods
+      def generated_paths class_name: "user"
+        singularized_class_name = class_name.singularize.underscore
+        pluralized_class_name = class_name.pluralize.underscore
+        [
+          "./app/models/#{singularized_class_name}.rb",
+          "./app/policies/#{singularized_class_name}_policy.rb",
+          "./app/graphql/mutations/create_#{singularized_class_name}.rb",
+          "./app/graphql/mutations/delete_#{singularized_class_name}.rb",
+          "./app/graphql/mutations/destroy_delete_#{singularized_class_name}.rb",
+          "./app/graphql/mutations/update_#{singularized_class_name}.rb",
+          "./app/graphql/queries/#{singularized_class_name}.rb",
+          "./app/graphql/queries/#{pluralized_class_name}.rb",
+          "./app/graphql/resolvers/#{singularized_class_name}_search.rb",
+          "./app/graphql/types/#{singularized_class_name}_type.rb",
+          "./app/graphql/types/#{singularized_class_name}_node_type.rb",
+          "./spec/factories/#{pluralized_class_name}.rb",
+          "./spec/mutations/#{singularized_class_name}_spec.rb",
+          "./spec/models/#{singularized_class_name}_spec.rb",
+          "./spec/queries/#{singularized_class_name}_spec.rb",
+          "./spec/policies/#{singularized_class_name}_policy_spec.rb",
+          "./spec/resolvers/#{singularized_class_name}_search_spec.rb"
+        ]
+      end
+
+      def get_type_and_name line
+        line.split(",")[0].gsub("\"", "").scan(/((?<=t\.).+(?=\s)) (.+)/)[0]
+      end
+
+      def get_tables
+        path = "./db/schema.rb"
+        tables = []
+        File.open(path, "r") do |f|
+          f.each_line.with_index do |line, i|
+              tables << line.split("\"")[1] if line.include?("create_table")
+          end
+        end
+        tables
+      end
+
+      def test_dir
+        FileUtils.mkdir_p "./app/graphql/mutations"
+        FileUtils.mkdir_p "./app/graphql/queries"
+        FileUtils.mkdir_p "./app/graphql/types"
+        FileUtils.mkdir_p "./app/graphql/resolvers"
+        FileUtils.mkdir_p "./app/models"
+        FileUtils.mkdir_p "./app/policies"
+        FileUtils.mkdir_p "./spec/factories"
+        FileUtils.mkdir_p "./spec/queries"
+        FileUtils.mkdir_p "./spec/mutations"
+        FileUtils.mkdir_p "./spec/models"
+        FileUtils.mkdir_p "./spec/resolvers"
+        FileUtils.mkdir_p "./spec/policies"
+        FileUtils.mkdir_p "./config"
+        FileUtils.touch "./config/souls.rb"
+        FileUtils.mkdir_p "./db/"
+        FileUtils.touch "./db/schema.rb"
+        puts "test dir created!"
+      end
+
+      def type_check type
+        {
+          bigint: "Integer",
+          string: "String",
+          float: "Float",
+          text: "String",
+          datetime: "GraphQL::Types::ISO8601DateTime",
+          date: "GraphQL::Types::ISO8601DateTime",
+          boolean: "Boolean",
+          integer: "Integer"
+        }[type.to_sym]
+      end
+
+      def get_test_type type
+        {
+          bigint: 1,
+          float: 4.2,
+          string: '"MyString"',
+          text: '"MyString"',
+          datetime: "Time.now",
+          date: "Time.now",
+          boolean: false,
+          integer: 1
+        }[type.to_sym]
+      end
+
+      def table_check line: "", class_name: ""
+        if line.include?("create_table") && (line.split(" ")[1].gsub("\"", "").gsub(",", "") == class_name.pluralize.to_s)
+          return true
+        end
+        false
+      end
+
+      def migrate class_name: "souls"
+        singularized_class_name = class_name.singularize
+        [
+          model: model(class_name: singularized_class_name),
+          types: type(class_name: singularized_class_name),
+          resolver: resolver(class_name: singularized_class_name),
+          rspec_factory: rspec_factory(class_name: singularized_class_name),
+          rspec_model: rspec_model(class_name: singularized_class_name),
+          rspec_mutation: rspec_mutation(class_name: singularized_class_name),
+          rspec_query: rspec_query(class_name: singularized_class_name),
+          rspec_resolver: rspec_resolver(class_name: singularized_class_name),
+          queries: query(class_name: singularized_class_name),
+          mutations: mutation(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 "./app/policies/#{singularized_class_name}_policy.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/policies/#{singularized_class_name}_policy_spec.rb"
+        FileUtils.rm "./spec/resolvers/#{singularized_class_name}_search_spec.rb"
+        puts "deleted #{class_name.camelize} CRUD!"
+      rescue StandardError => error
+        puts error
+      end
+
+      def single_migrate class_name: "user"
+        puts "◆◆◆ Let's Auto Generate CRUD API SET ◆◆◆\n"
+        migrate class_name: class_name
+        puts "Generated #{class_name.camelize} CRUD Files\n"
+        Souls::Generate.generated_paths(class_name: class_name).each { |f| puts f }
+        puts "\nAll files created from ./db/schema.rb"
+        puts "\n\n"
+      end
+
+      def migrate_all
+        puts "◆◆◆ Let's Auto Generate CRUD API SET ◆◆◆\n"
+        get_tables.each do |class_name|
+          migrate class_name: class_name.singularize
+          puts "Generated #{class_name.camelize} CRUD Files\n"
+          Souls::Generate.generated_paths(class_name: class_name).each { |f| puts f }
+          puts "\n"
+        end
+        puts "\nAll files created from ./db/schema.rb"
+      end
+    end
+  end
+end