souls 0.22.1 → 0.22.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ed1419274709415872b990749a5dd762770c3402f8d3f1e9c41316ff0e9183a
-  data.tar.gz: 93e27a694e02707a9ea31aee17ae04c4ed820159f1a9e3cd933db46aaff9a1f5
+  metadata.gz: 31d8488e511d45874592ff305a5a77da39ec599b44afb2d3629bb151dd0e1e33
+  data.tar.gz: 046501ad71ad1ea73aa1f5fa313c426b1addae671205bcf616270e35726b3e91
 SHA512:
-  metadata.gz: 50d56fa17253a3bf4a9261ae10ea6fc1a6bbbe29d62634dcf8e700143781f5f03b84f1debad8f6d408be7bda25e31c3d2400d7e7c0321176d53af53689d8a221
-  data.tar.gz: 70d579d01565e30a96861305e04f0fef4fd5de1f078499366ddd55d68896d9332f85fc9d73e9c5e8c247532979b444674e801423ee5107ed4b5084b02cdb2282
+  metadata.gz: b3bd14e22d6a08d6df13b3c797cdb3d9a146b2ac41cd3114f8bb8c45f11b394168f7c4f8bfeb08ed64f0644e757a4647207e69229c5cb8171ec1dbeb7c7f5ee8
+  data.tar.gz: 8badb5f86ff514c1e5e1d8bc1136d1eb96dd335d56dca2dab2b96961cfe7471aab150b477d5c9ab7521732bae3b7592dff19cda7211f8483eaad4dfddd63843f

data/.gitignore

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

data/Gemfile.lock

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

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

@@ -74,6 +74,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 +103,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 +141,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

@@ -59,12 +59,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/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.1"
+  VERSION = "0.22.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 0.22.1
+  version: 0.22.2
 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-13 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