souls 0.22.0 → 0.22.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2860f5f4162c5e4521ee830905be96cc587fa51c8eb5cd764065891b8c22b3e4
-  data.tar.gz: 47cfa96279385eebf85cdb452e5261cd0d372ead13f48ae19a6d04649a39e04f
+  metadata.gz: 528a4d39a90460bdc9a89980c07ae18301013df362646bcc39fc2bb8f24e4c3e
+  data.tar.gz: 8eef3a84012274225e698c8abfdde1908a1b363f38b4356eca61974e05569553
 SHA512:
-  metadata.gz: 6764a62caa16de4f9979d1460efd6a81bd94cebb8e8c5a52bd2219b6c1c2f554ef1ddef87a028b756b5386a25205cf4c69c2a0a2fc06a21de7cb6592a8f84c07
-  data.tar.gz: 8f09f90a44f2eff3c13383df9e3518692c80de5fb9862a01991c7e02ebb2bc40ee5de52e455466fab21b0ef2279ba8200b493d788508d1c3f7f1cc070d755180
+  metadata.gz: da9769f157ced4c02c859d5630dc511c125136f7304796274a7717431bfa11c0788bf2db8dc9aacfe2757e953ae00619052a2199fedbc1be90192ed9fb4ad3f7
+  data.tar.gz: b1d6c97485513c180e47bf388fd4db863ece5fa657af211470025b3c796674e6894df6d6625cee41b125df51bc9f5da611217fa5b0750658f4b79e16b5e06253

data/.gitignore

@@ -12,5 +12,4 @@
 /config/keyfile.json
 .env
 .irb_history
-/spec/
 /app/

data/Gemfile

@@ -4,8 +4,9 @@ source "https://rubygems.org"
 gemspec
 
 gem "activesupport", "6.1.4"
-gem "parser", "3.0.1.1"
-gem "rake", "13.0.4"
+gem "paint", "2.2.1"
+gem "parser", "3.0.2.0"
+gem "rake", "13.0.6"
 gem "rspec", "3.10.0"
 gem "rubocop", "1.18.3"
 gem "steep", "0.44.1"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    souls (0.21.9)
+    souls (0.22.3)
 
 GEM
   remote: https://rubygems.org/
@@ -23,11 +23,12 @@ GEM
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     minitest (5.14.4)
+    paint (2.2.1)
     parallel (1.20.1)
-    parser (3.0.1.1)
+    parser (3.0.2.0)
       ast (~> 2.4.1)
     rainbow (3.0.0)
-    rake (13.0.4)
+    rake (13.0.6)
     rb-fsevent (0.11.0)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
@@ -80,12 +81,13 @@ PLATFORMS
 
 DEPENDENCIES
   activesupport (= 6.1.4)
-  parser (= 3.0.1.1)
-  rake (= 13.0.4)
+  paint (= 2.2.1)
+  parser (= 3.0.2.0)
+  rake (= 13.0.6)
   rspec (= 3.10.0)
   rubocop (= 1.18.3)
   souls!
   steep (= 0.44.1)
 
 BUNDLED WITH
-   2.2.21
+   2.2.23

data/README.md

@@ -21,9 +21,7 @@
 
 Welcome to SOULs Framework!
 
-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. 
+SOULs is a Serverless Application Framework. SOULs has four strains, API, Worker, Console, Media, and can be used in combination according to the purpose. SOULs Backend GraphQL Ruby & Frontend Relay are Scalable and Easy to deploy to Google Cloud and Amazon Web Services
 You can focus on business logic. No more infra problems.
 
 SOULs creates 4 types of framework.

data/exe/souls

@@ -47,6 +47,8 @@ begin
     Souls::Gcloud.send ARGV[1]
   when "-v", "--version"
     puts Souls::VERSION
+  when "gem:update", "gemfile:update"
+    Souls.update_gemfile
   when "add"
     case ARGV[1]
     when "mutation"
@@ -74,6 +76,10 @@ begin
       Souls::Generate.query class_name: ARGV[2]
     when "type"
       Souls::Generate.type class_name: ARGV[2]
+    when "edge"
+      Souls::Generate.edge class_name: ARGV[2]
+    when "connection"
+      Souls::Generate.connection class_name: ARGV[2]
     when "resolver"
       Souls::Generate.resolver class_name: ARGV[2]
     when "policy"
@@ -99,7 +105,8 @@ begin
     when "migrate_all"
       Souls::Generate.migrate_all
     when "migration"
-      system "rake db:create_migration NAME=create_#{ARGV[2]}"
+      class_name = ARGV[2].underscore.pluralize
+      system "rake db:create_migration NAME=create_#{class_name}"
     when "update"
       Souls::Generate.update_delete class_name: ARGV[2]
       Souls::Generate.single_migrate class_name: ARGV[2]
@@ -136,6 +143,18 @@ begin
     else
       system "rake db:migrate:reset && rake db:migrate:reset RACK_ENV=test"
     end
+  when "db:update"
+    strain = Souls.configuration.strain
+    case strain
+    when "api"
+      other_app = Souls.configuration.worker_name
+    when "worker"
+      other_app = Souls.configuration.api_name
+    else
+      raise StandardError, "Unknown app name!"
+    end
+    system "rm -rf ../#{other_app}/db/*"
+    system "cp -r ./db/* ../#{other_app}/db/*"
   when "t", "test"
     system "rubocop -a"
     system "bundle exec rspec"

data/lib/souls.rb

@@ -5,6 +5,8 @@ require_relative "souls/generate"
 require_relative "souls/gcloud"
 require "json"
 require "fileutils"
+require "net/http"
+require "paint"
 
 module Souls
   SOULS_METHODS = [
@@ -39,9 +41,9 @@ module Souls
       def run_mysql
         system "docker run --rm -d \
           -p 3306:3306 \
-          -v mysql-tmp:/var/lib/mysqlql/data \
+          -v mysql-tmp:/var/lib/mysql \
           -e MYSQL_USER=mysql \
-          -e MYSQL_PASSWORD=mysql \
+          -e MYSQL_ROOT_PASSWORD=mysql \
           -e MYSQL_DB=souls_test \
           mysql:latest"
         system "docker ps"
@@ -51,6 +53,80 @@ module Souls
         app = Souls.configuration.app
         system "gcloud scheduler jobs create http #{app}-awake --schedule '0,10,20,30,40,50 * * * *' --uri #{url} --http-method GET"
       end
+
+      def gemfile_latest_version
+        file_path = "./Gemfile"
+        updated_gems = []
+        updated_gem_versions = []
+        updated_lines = []
+        console_log = []
+        from_dev = false
+        File.open(file_path, "r") do |f|
+          f.each_line do |line|
+            from_dev = true if line.include? "group"
+            next unless line.include? "gem "
+            gem = line.gsub("gem ", "").gsub("\"", "").gsub("\n", "").gsub(" ", "").split(",")
+            url = URI("https://rubygems.org/api/v1/versions/#{gem[0]}/latest.json")
+            res = Net::HTTP.get_response(url)
+            data = JSON.parse res.body
+            next if data["version"].to_s == gem[1].to_s
+            updated_lines << if from_dev
+              "  gem \"#{gem[0]}\", \"#{data["version"]}\""
+                             else
+              "gem \"#{gem[0]}\", \"#{data["version"]}\""
+                             end
+            updated_gems << (gem[0]).to_s
+            updated_gem_versions << data["version"]
+            system "gem update #{gem[0]}"
+            console_log << "#{gem[0]} v#{gem[1]} →　v#{data["version"]}"
+          end
+        end
+        {
+          gems: updated_gems,
+          lines: updated_lines,
+          console_log: console_log,
+          updated_gem_versions: updated_gem_versions
+        }
+      end
+
+      def update_gemfile
+        file_path = "./Gemfile"
+        tmp_file = "./tmp/Gemfile"
+        new_gems = gemfile_latest_version
+        logs = []
+        return "Already Up to date!" && puts("Already Up to date!") if new_gems[:gems].blank?
+        @i = 0
+        File.open(file_path, "r") do |f|
+          File.open(tmp_file, "w") do |new_line|
+            f.each_line do |line|
+              gem = line.gsub("gem ", "").gsub("\"", "").gsub("\n", "").gsub(" ", "").split(",")
+              if new_gems[:gems].include? gem[0]
+                logs << Paint % [
+                  "#{gem[0]} %{yellow_text} → %{green_text}",
+                  :blue,
+                  {
+                    yellow_text: ["v#{gem[1]}", :yellow],
+                    green_text: ["v#{new_gems[:updated_gem_versions][@i]}", :green]
+                  }
+                ]
+                new_line.write "#{new_gems[:lines][@i]}\n"
+                @i += 1
+              else
+                new_line.write line
+              end
+            end
+          end
+        end
+        FileUtils.rm "./Gemfile"
+        FileUtils.rm "./Gemfile.lock"
+        FileUtils.mv "./tmp/Gemfile", "./Gemfile"
+        system "bundle update"
+        success = Paint["\n\nSuccessfully Updated These Gems!\n", :green]
+        puts success
+        logs.each do |line|
+          puts line
+        end
+      end
     end
 
   def self.configure
@@ -59,12 +135,14 @@ module Souls
   end
 
   class Configuration
-    attr_accessor :app, :strain, :project_id
+    attr_accessor :app, :strain, :project_id, :worker_name, :api_name
 
     def initialize
       @app = nil
       @project_id = nil
       @strain = nil
+      @worker_name = nil
+      @api_name = nil
     end
   end
 end

data/lib/souls/gcloud/compute.rb

@@ -1,15 +1,29 @@
 module Souls
   module Gcloud
     class << self
+      def auth_login
+        project_id = Souls.configuration.project_id
+        system "gcloud config set project #{project_id}"
+        system "gcloud auth login"
+      end
+
       def enable_permissions
         system "gcloud services enable compute.googleapis.com"
         puts "Operating permission to compute.googleapis.com ..."
+        system "gcloud services enable iam.googleapis.com"
+        puts "Operating permission to iam.googleapis.com ..."
+        system "gcloud services enable dns.googleapis.com"
+        puts "Operating permission to dns.googleapis.com ..."
         system "gcloud services enable sqladmin.googleapis.com"
         puts "Operating permission to sqladmin.googleapis.com ..."
         system "gcloud services enable sql-component.googleapis.com"
         puts "Operating permission to sql-component.googleapis.com ..."
         system "gcloud services enable servicenetworking.googleapis.com"
         puts "Operating permission to servicenetworking.googleapis.com ..."
+        system "gcloud services enable containerregistry.googleapis.com"
+        puts "Operating permission to containerregistry.googleapis.com"
+        system "gcloud services enable run.googleapis.com"
+        puts "Operating permission to run.googleapis.com"
       end
 
       def create_network

data/lib/souls/gcloud/iam.rb

@@ -19,6 +19,14 @@ module Souls
         --member="serviceAccount:#{service_account}@#{project_id}.iam.gserviceaccount.com" \
         --role="#{role}"`
       end
+
+      def add_permissions service_account: "souls-app"
+        self.add_service_account_role service_account: service_account, role: "roles/cloudsql.serviceAgent"
+        self.add_service_account_role service_account: service_account, role: "roles/containerregistry.ServiceAgent"
+        self.add_service_account_role service_account: service_account, role: "roles/pubsub.serviceAgent"
+        self.add_service_account_role service_account: service_account, role: "roles/firestore.serviceAgent"
+        self.add_service_account_role service_account: service_account, role: "roles/iam.serviceAccountUser"
+      end
     end
   end
 end

data/lib/souls/generate.rb

@@ -12,6 +12,8 @@ require_relative "./generate/rspec_policy"
 require_relative "./generate/rspec_query"
 require_relative "./generate/rspec_resolver"
 require_relative "./generate/type"
+require_relative "./generate/edge"
+require_relative "./generate/connection"
 require_relative "./generate/application"
 
 module Souls

data/lib/souls/generate/application.rb

@@ -16,7 +16,8 @@ module Souls
           "./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",
+          "./app/graphql/types/edges/#{singularized_class_name}_edge.rb",
+          "./app/graphql/types/connections/#{singularized_class_name}_connection.rb",
           "./spec/factories/#{pluralized_class_name}.rb",
           "./spec/mutations/#{singularized_class_name}_spec.rb",
           "./spec/models/#{singularized_class_name}_spec.rb",
@@ -67,8 +68,8 @@ module Souls
           string: "String",
           float: "Float",
           text: "String",
-          datetime: "GraphQL::Types::ISO8601DateTime",
-          date: "GraphQL::Types::ISO8601DateTime",
+          datetime: "String",
+          date: "String",
           boolean: "Boolean",
           integer: "Integer"
         }[type.to_sym]
@@ -96,20 +97,22 @@ module Souls
 
       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),
-          policies: policy(class_name: singularized_class_name),
-          rspec_policies: rspec_policy(class_name: singularized_class_name)
-        ]
+        model(class_name: singularized_class_name)
+        type(class_name: singularized_class_name)
+        edge(class_name: singularized_class_name)
+        connection(class_name: singularized_class_name)
+        resolver(class_name: singularized_class_name)
+        rspec_factory(class_name: singularized_class_name)
+        rspec_model(class_name: singularized_class_name)
+        rspec_mutation(class_name: singularized_class_name)
+        rspec_query(class_name: singularized_class_name)
+        rspec_resolver(class_name: singularized_class_name)
+        query(class_name: singularized_class_name)
+        mutation(class_name: singularized_class_name)
+        policy(class_name: singularized_class_name)
+        rspec_policy(class_name: singularized_class_name)
+      rescue StandardError => e
+        raise StandardError, e
       end
 
       def delete_all class_name: "souls"
@@ -122,7 +125,8 @@ module Souls
         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 "./app/graphql/types/edges/#{singularized_class_name}_edge.rb"
+        FileUtils.rm "./app/graphql/types/connections/#{singularized_class_name}_connection.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"
@@ -142,7 +146,8 @@ module Souls
         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 "./app/graphql/types/edges/#{singularized_class_name}_edge.rb"
+        FileUtils.rm "./app/graphql/types/connections/#{singularized_class_name}_connection.rb"
         FileUtils.rm "./spec/mutations/#{singularized_class_name}_spec.rb"
         FileUtils.rm "./spec/queries/#{singularized_class_name}_spec.rb"
         FileUtils.rm "./spec/resolvers/#{singularized_class_name}_search_spec.rb"
@@ -161,14 +166,14 @@ module Souls
       end
 
       def migrate_all
-        puts "◆◆◆ Let's Auto Generate CRUD API SET ◆◆◆\n"
+        puts "◆◆◆ SOULs CRUD Assist  ◆◆◆\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"
+        puts "\nAll files created from ./db/schema.rb\n\n You're all set ;)"
       end
     end
   end

data/lib/souls/generate/connection.rb

@@ -0,0 +1,21 @@
+module Souls
+  module Generate
+    class << self
+      def connection class_name: "souls"
+        singularized_class_name = class_name.underscore.singularize
+        file_path = "./app/graphql/types/connections/#{singularized_class_name}_connection.rb"
+        File.open(file_path, "w") do |f|
+          f.write <<~EOS
+            class Types::#{singularized_class_name.camelize}Connection < Types::BaseConnection
+              edge_type(Types::#{singularized_class_name.camelize}Edge)
+            end
+          EOS
+        end
+        puts "Created file! : #{file_path}"
+        file_path
+      rescue StandardError => e
+        raise StandardError, e
+      end
+    end
+  end
+end

data/lib/souls/generate/edge.rb

@@ -0,0 +1,21 @@
+module Souls
+  module Generate
+    class << self
+      def edge class_name: "souls"
+        singularized_class_name = class_name.underscore.singularize
+        file_path = "./app/graphql/types/edges/#{singularized_class_name}_edge.rb"
+        File.open(file_path, "w") do |f|
+          f.write <<~EOS
+            class Types::#{singularized_class_name.camelize}Edge < Types::BaseEdge
+              node_type(Types::#{singularized_class_name.camelize}Type)
+            end
+          EOS
+        end
+        puts "Created file! : #{file_path}"
+        file_path
+      rescue StandardError => e
+        raise StandardError, e
+      end
+    end
+  end
+end

data/lib/souls/generate/model.rb

@@ -13,7 +13,10 @@ module Souls
             end
           EOS
         end
+        puts "Created file! : #{file_path}"
         file_path
+      rescue StandardError => e
+        raise StandardError, e
       end
     end
   end

data/lib/souls/generate/mutation.rb

@@ -13,7 +13,7 @@ module Souls
             module Mutations
               module #{singularized_class_name.camelize}
                 class Create#{singularized_class_name.camelize} < BaseMutation
-                  field :#{singularized_class_name}_edge, Types::#{singularized_class_name.camelize}NodeType, null: false
+                  field :#{singularized_class_name}_edge, Types::#{singularized_class_name.camelize}.edge_type, null: false
                   field :error, String, null: true
 
           EOS
@@ -108,7 +108,7 @@ module Souls
             module Mutations
               module #{class_name.camelize}
                 class Update#{class_name.camelize} < BaseMutation
-                  field :#{class_name}_edge, Types::#{class_name.camelize}NodeType, null: false
+                  field :#{class_name}_edge, Types::#{class_name.camelize}.edge_type, null: false
 
                   argument :id, String, required: true
           EOS
@@ -268,15 +268,14 @@ module Souls
         create_mutation_head class_name: singularized_class_name
         relation_params = create_mutation_params class_name: singularized_class_name
         create_mutation_after_params class_name: singularized_class_name, relation_params: relation_params
-        # puts "File Created!\n#{file_path}"
-        [
-          create_mutation_end(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)
-        ]
-      rescue StandardError => error
-        puts error
+        create_mutation_end(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 "Created file! : #{file_path}"
+        file_path
+      rescue StandardError => e
+        raise StandardError, e
       end
     end
   end

data/lib/souls/generate/policy.rb

@@ -19,11 +19,11 @@ module Souls
               end
 
               def create?
-                staff_permissions?
+                user_permissions?
               end
 
               def update?
-                staff_permissions?
+                user_permissions?
               end
 
               def delete?
@@ -32,8 +32,8 @@ module Souls
 
               private
 
-              def staff_permissions?
-                @user.master? or @user.admin? or @user.staff?
+              def user_permissions?
+                @user.master? or @user.admin? or @user.user?
               end
 
               def admin_permissions?
@@ -42,10 +42,10 @@ module Souls
             end
           EOS
         end
+        puts "Created file! : #{file_path}"
         file_path
-      rescue StandardError => error
-        puts "method error"
-        puts error.backtrace
+      rescue StandardError => e
+        raise StandardError, e
       end
     end
   end

data/lib/souls/generate/query.rb

@@ -20,7 +20,10 @@ module Souls
             end
           EOS
         end
+        puts "Created file! : #{file_path}"
         file_path
+      rescue StandardError => e
+        raise StandardError, e
       end
 
       def create_query class_name: "souls"
@@ -42,16 +45,19 @@ module Souls
               end
             end
           EOS
+          puts "Created file! : #{file_path}"
           file_path
+        rescue StandardError => e
+          raise StandardError, e
         end
       end
 
       def query class_name: "souls"
         singularized_class_name = class_name.singularize
-        [
-          create_query(class_name: singularized_class_name),
-          create_queries(class_name: singularized_class_name)
-        ]
+        create_query(class_name: singularized_class_name)
+        create_queries(class_name: singularized_class_name)
+      rescue StandardError => e
+        raise StandardError, e
       end
     end
   end

data/lib/souls/generate/resolver.rb

@@ -144,8 +144,11 @@ module Souls
         resolver_params class_name: singularized_class_name
         resolver_after_params class_name: singularized_class_name
         resolver_before_end class_name: singularized_class_name
-        # puts "File Created!\n#{file_path}"
         resolver_end class_name: singularized_class_name
+        puts "Created file! : #{file_path}"
+        file_path
+      rescue StandardError => e
+        raise StandardError, e
       end
     end
   end

data/lib/souls/generate/rspec_factory.rb

@@ -58,6 +58,10 @@ module Souls
         rspec_factory_head class_name: singularized_class_name
         rspec_factory_params class_name: singularized_class_name
         rspec_factory_end class_name: singularized_class_name
+        puts "Created file! : #{file_path}"
+        file_path
+      rescue StandardError => e
+        raise StandardError, e
       end
     end
   end

data/lib/souls/generate/rspec_model.rb

@@ -16,7 +16,10 @@ module Souls
             end
           EOS
         end
+        puts "Created file! : #{file_path}"
         file_path
+      rescue StandardError => e
+        raise StandardError, e
       end
     end
   end

data/lib/souls/generate/rspec_mutation.rb

@@ -243,6 +243,10 @@ module Souls
         rspec_mutation_params class_name: singularized_class_name
         rspec_mutation_params_response class_name: singularized_class_name
         rspec_mutation_end class_name: singularized_class_name
+        puts "Created file! : #{file_path}"
+        file_path
+      rescue StandardError => e
+        raise StandardError, e
       end
     end
   end

data/lib/souls/generate/rspec_policy.rb

@@ -15,36 +15,31 @@ module Souls
               let(:#{class_name.underscore}) { FactoryBot.create(:#{class_name.underscore}) }
 
               context "being a visitor" do
-                let(:user) { FactoryBot.create(:user) }
+                let(:user) { FactoryBot.create(:user, user_role: :normal) }
 
                 it { is_expected.to permit_action(:index) }
                 it { is_expected.to permit_action(:show) }
                 it { is_expected.to forbid_actions([:create, :update, :delete]) }
               end
 
-              context "being a retailer" do
-                let(:user) { FactoryBot.create(:user, user_role: 1) }
-
-                it { is_expected.to permit_action(:index) }
-                it { is_expected.to permit_action(:show) }
-                it { is_expected.to forbid_actions([:create, :update, :delete]) }
-              end
-
-              context "being a staff" do
-                let(:user) { FactoryBot.create(:user, user_role: 3) }
+              context "being a user" do
+                let(:user) { FactoryBot.create(:user, user_role: :user) }
 
                 it { is_expected.to permit_actions([:create, :update]) }
               end
 
-              context "being an administrator" do
-                let(:user) { FactoryBot.create(:user, user_role: 4) }
+              context "being an admin" do
+                let(:user) { FactoryBot.create(:user, user_role: :admin) }
 
                 it { is_expected.to permit_actions([:create, :update, :delete]) }
               end
             end
           EOS
         end
+        puts "Created file! : #{file_path}"
         file_path
+      rescue StandardError => e
+        raise StandardError, e
       end
     end
   end

data/lib/souls/generate/rspec_query.rb

@@ -164,6 +164,10 @@ break
         rspec_query_after_head class_name: singularized_class_name
         rspec_query_params class_name: singularized_class_name
         rspec_query_end class_name: singularized_class_name
+        puts "Created file! : #{file_path}"
+        file_path
+      rescue StandardError => e
+        raise StandardError, e
       end
     end
   end

data/lib/souls/generate/rspec_resolver.rb

@@ -183,6 +183,10 @@ module Souls
         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
+        puts "Created file! : #{file_path}"
+        file_path
+      rescue StandardError => e
+        raise StandardError, e
       end
     end
   end

data/lib/souls/generate/type.rb

@@ -1,9 +1,7 @@
 module Souls
   module Generate
     class << self
-      ## Generate 2 Types
-      ## 1. Type
-      ## 2. Node Type
+      ## Generate Type
       def create_type_head class_name: "souls"
         file_path = "./app/graphql/types/#{class_name}_type.rb"
           File.open(file_path, "w") do |f|
@@ -55,30 +53,17 @@ module Souls
         file_path
       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|
-          f.write <<~EOS
-            module Types
-              class #{class_name.camelize}NodeType < BaseObject
-                field :node, Types::#{class_name.camelize}Type, null: true
-              end
-            end
-          EOS
-        end
-        file_path
-      end
-
       def type class_name: "souls"
         singularized_class_name = class_name.singularize
-        file_path = "./app/graphql/types/#{singularized_class_name}_node_type.rb"
+        file_path = "./app/graphql/types/#{singularized_class_name}_type.rb"
         return "Type already exist! #{file_path}" if File.exist? file_path
         create_type_head class_name: singularized_class_name
         create_type_params class_name: singularized_class_name
-        [
-          create_type_end(class_name: singularized_class_name),
-          node_type(class_name: singularized_class_name)
-        ]
+        create_type_end class_name: singularized_class_name
+        puts "Created file! : #{file_path}"
+        file_path
+      rescue StandardError => e
+        raise StandardError, e
       end
     end
   end

data/lib/souls/version.rb

@@ -1,3 +1,3 @@
 module Souls
-  VERSION = "0.22.0"
+  VERSION = "0.22.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 0.22.0
+  version: 0.22.4
 platform: ruby
 authors:
 - POPPIN-FUMI
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-07-12 00:00:00.000000000 Z
+date: 2021-07-14 00:00:00.000000000 Z
 dependencies: []
 description: SOULs is a Serverless Application Framework. SOULs has four strains,
   API, Worker, Console, Media, and can be used in combination according to the purpose.
@@ -49,6 +49,8 @@ files:
 - lib/souls/gcloud/iam.rb
 - lib/souls/generate.rb
 - lib/souls/generate/application.rb
+- lib/souls/generate/connection.rb
+- lib/souls/generate/edge.rb
 - lib/souls/generate/model.rb
 - lib/souls/generate/mutation.rb
 - lib/souls/generate/policy.rb