souls 1.7.5 → 1.7.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d89f149b6ed7303f89fb3e269b599458b03632ef231ea4e5e16f759b89b20ac
-  data.tar.gz: fd0db8f94f5e15ff8530e620c99b2a58f0b1be080a5fe63656defb7314af9b61
+  metadata.gz: e561e4f0d34242b5c9038a1891be6e8afdfac703895e9f877e188f3de285d83c
+  data.tar.gz: 8efaf89f3c7c17f14e18e6d5d5e617d536a935a1642b60c630acfa1bea0caf75
 SHA512:
-  metadata.gz: ee48301b8981aa979ba83b87365e1a5c16486314b15b3908fb04e27ffede40ace96790b98085099df00a1aed8576e0b39761970e201a629e7ffadc27869a83d6
-  data.tar.gz: 9cabccc639b40edeb0f2d65af212cc3fcd4185bf07d78f87bdb7dfad4bc6433c493ca097faee81f8fcf4a80904650074f94af21fe0f2a2c8e9b538932e8c387a
+  metadata.gz: cd18288e94e51ad2264cb67bda1fab5904d9e1fb45a9c60e763e243564dabe6378560d9ec7c0e0f0ae2d3a7b5844c66cf24cd68f34cf72f951a63a4e0174523d
+  data.tar.gz: 87c3514e482f00d977031778778ee61557be85142b2eae12b52ee3e6ecfd8a443f34bc8c7a0f0717a3760d52246767113d1d003d5597809348d7ecd10a46e6a2

data/lib/souls/cli/gcloud/compute/index.rb

@@ -131,10 +131,11 @@ module Souls
         end
         puts(Paint % ["Updated file! : %{white_text}", :green, { white_text: [api_workflow_path.to_s, :white] }])
         worker_workflow_paths.each do |file_path|
-          File.open(file_path, "a") do |line|
-            line.write(" \\             --vpc-connector=#{app_name}-connector \\")
-            line.write("\n            --vpc-egress=all")
-          end
+          worker_workflow = File.readlines(file_path)
+          worker_workflow[worker_workflow.size - 1] = worker_workflow.last.chomp
+          worker_workflow << " \\ \n            --vpc-connector=#{app_name}-connector \\"
+          worker_workflow << "\n            --vpc-egress=all"
+          File.open(file_path, "w") { |f| f.write(worker_workflow.join) }
           puts(Paint % ["Updated file! : %{white_text}", :green, { white_text: [file_path.to_s, :white] }])
         end
       end

data/lib/souls/cli/generate/job.rb

@@ -10,7 +10,6 @@ module Souls
         create_job_type(class_name)
         create_job(class_name)
       end
-      update_query_type(class_name)
       Souls::Generate.new.invoke(:job_rbs, [class_name], {})
       Souls::Generate.new.invoke(:rspec_job, [class_name], { mailer: options[:mailer] })
     rescue Thor::Error => e
@@ -31,7 +30,7 @@ module Souls
             class #{class_name.camelize} < BaseQuery
               description ""
               type Types::#{class_name.camelize}Type, null: false
-          
+
               def resolve
               end
             end
@@ -41,7 +40,7 @@ module Souls
       puts(Paint % ["Created file! : %{white_text}", :green, { white_text: [file_path.to_s, :white] }])
       file_path
     end
-    
+
     def create_job_type(class_name)
       file_dir = "./app/graphql/types/"
       FileUtils.mkdir_p(file_dir) unless Dir.exist?(file_dir)
@@ -52,6 +51,7 @@ module Souls
         f.write(<<~TEXT)
           module Types
             class #{class_name.camelize}Type < BaseObject
+              field :response, String, null: true
             end
           end
         TEXT
@@ -72,11 +72,11 @@ module Souls
             class #{class_name.camelize} < BaseQuery
               description ""
               type Types::#{class_name.camelize}Type, null: false
-          
+
               def resolve
                 # First, instantiate the Mailgun Client with your API key
                 mg_client = ::Mailgun::Client.new("YOUR-API-KEY")
-          
+
                 # Define your message parameters
                 message_params = {
                   from: "postmaster@from.mail.com",
@@ -84,7 +84,7 @@ module Souls
                   subject: "SOULs Mailer test!",
                   text: "It is really easy to send a message!"
                 }
-          
+
                 # Send your message through the client
                 mg_client.send_message("YOUR-MAILGUN-DOMAIN", message_params)
                 { response: "Job done!" }
@@ -117,25 +117,5 @@ module Souls
       puts(Paint % ["Created file! : %{white_text}", :green, { white_text: [file_path.to_s, :white] }])
       file_path
     end
-    
-    def update_query_type(class_name)
-      file_dir = "./app/graphql/types/base/"
-      FileUtils.mkdir_p(file_dir) unless Dir.exist?(file_dir)
-      file_path = "#{file_dir}query_type.rb"
-      raise(StandardError, "Query type doesn't exist, please re-create it") unless File.exist?(file_path)
-
-      lines = File.readlines(file_path)
-      unless lines[-1].strip == "end" and lines[-2].strip == "end"
-        puts(Paint % ["Base query file has changed significantly and cannot be modified automatically, please update routes manually"], :yellow)
-        return
-      end
-
-      insert_string = "    field :#{class_name.singularize}, resolver: Queries::#{class_name.camelize}\n"
-      lines.insert(-3, insert_string)
-      File.open(file_path, "w") { |f| f.write(lines.join) }
-
-      puts(Paint % ["Updated file : %{white_text}", :green, { white_text: [file_path.to_s, :white] }])
-      file_path
-    end
   end
 end

data/lib/souls/cli/generate/job_rbs.rb

@@ -9,18 +9,30 @@ module Souls
         file_dir = "./sig/#{worker_name}/app/graphql/queries/"
         FileUtils.mkdir_p(file_dir) unless Dir.exist?(file_dir)
         file_path = "#{file_dir}#{singularized_class_name}.rbs"
+        type_file_path = "./sig/#{worker_name}/app/graphql/types/#{singularized_class_name}_type.rbs"
         File.open(file_path, "w") do |f|
           f.write(<<~TEXT)
-            module Mutations
+            module Queries
               String: String
-              class #{singularized_class_name.camelize} < BaseMutation
+              class #{singularized_class_name.camelize} < BaseQuery
                 def self.description: (String) -> untyped
                 def self.field: (:response, String, null: false) -> untyped
+                def self.type: (untyped, null: false) -> untyped
+              end
+            end
+          TEXT
+        end
+        File.open(type_file_path, "w") do |f|
+          f.write(<<~TEXT)
+            module Types
+              class #{singularized_class_name.camelize}Type < BaseObject
+                def self.field: (:response, String, null: true) -> untyped
               end
             end
           TEXT
         end
         puts(Paint % ["Created file! : %{white_text}", :green, { white_text: [file_path.to_s, :white] }])
+        puts(Paint % ["Created file! : %{white_text}", :green, { white_text: [type_file_path.to_s, :white] }])
       end
       file_path
     rescue Thor::Error => e

data/lib/souls/cli/generate/mutation.rb

@@ -79,8 +79,6 @@ module Souls
                   raise(StandardError, data.errors.full_messages) unless data.save
 
                   { #{singularized_class_name}_edge: { node: data } }
-                rescue StandardError => error
-                  GraphQL::ExecutionError.new(error.message)
                 end
               end
             end
@@ -152,8 +150,6 @@ module Souls
                   raise(StandardError, data.errors.full_messages) unless data.save
 
                   { #{singularized_class_name}_edge: { node: data } }
-                rescue StandardError => error
-                  GraphQL::ExecutionError.new(error.message)
                 end
               end
             end
@@ -182,8 +178,6 @@ module Souls
                   #{class_name} = ::#{class_name.camelize}.find data_id
                   #{class_name}.update(is_deleted: true)
                   { #{class_name}: ::#{class_name.camelize}.find(data_id) }
-                rescue StandardError => error
-                  GraphQL::ExecutionError.new(error.message)
                 end
               end
             end
@@ -212,8 +206,6 @@ module Souls
                   #{class_name} = ::#{class_name.camelize}.find data_id
                   #{class_name}.destroy
                   { #{class_name}: #{class_name} }
-                rescue StandardError => error
-                  GraphQL::ExecutionError.new(error.message)
                 end
               end
             end

data/lib/souls/cli/generate/query.rb

@@ -5,15 +5,15 @@ module Souls
       file_dir = "./app/graphql/queries/"
       FileUtils.mkdir_p(file_dir) unless Dir.exist?(file_dir)
       singularized_class_name = class_name.singularize
-      create_query(class_name: singularized_class_name)
-      create_queries(class_name: singularized_class_name)
+      create_individual_query(class_name: singularized_class_name)
+      create_index_query(class_name: singularized_class_name)
     rescue Thor::Error => e
       raise(Thor::Error, e)
     end
 
     private
 
-    def create_queries(class_name: "user")
+    def create_index_query(class_name: "user")
       file_path = "./app/graphql/queries/#{class_name.pluralize}.rb"
       return "Query already exist! #{file_path}" if File.exist?(file_path)
 
@@ -25,8 +25,6 @@ module Souls
 
               def resolve
                 ::#{class_name.camelize}.all
-              rescue StandardError => error
-                GraphQL::ExecutionError.new(error.message)
               end
             end
           end
@@ -38,7 +36,7 @@ module Souls
       raise(StandardError, e)
     end
 
-    def create_query(class_name: "user")
+    def create_individual_query(class_name: "user")
       file_path = "./app/graphql/queries/#{class_name}.rb"
       return "Query already exist! #{file_path}" if File.exist?(file_path)
 
@@ -52,8 +50,6 @@ module Souls
               def resolve args
                 _, data_id = SoulsApiSchema.from_global_id args[:id]
                 ::#{class_name.camelize}.find(data_id)
-              rescue StandardError => error
-                GraphQL::ExecutionError.new(error.message)
               end
             end
           end

data/lib/souls/cli/sync/model.rb

@@ -1,5 +1,9 @@
 module Souls
   class Sync < Thor
+    # rubocop:disable Style/StringHashKeys
+    map "models" => :model
+    # rubocop:enable Style/StringHashKeys
+
     desc "model", "Sync Model, DB, Factory Files with API"
     def model
       cp_dir = %w[db app/models spec/factories]

data/lib/souls/cli/sync/pubsub.rb

@@ -90,10 +90,10 @@ module Souls
       Dir.chdir(Souls.get_mother_path.to_s) do
         worker_paths.each do |worker|
           workers =
-            Dir["apps/#{worker}/app/graphql/mutations/*.rb"].map do |file|
-              file.gsub("apps/#{worker}/app/graphql/mutations/", "").gsub(".rb", "")
+            Dir["apps/#{worker}/app/graphql/queries/*.rb"].map do |file|
+              file.gsub("apps/#{worker}/app/graphql/queries/", "").gsub(".rb", "")
             end
-          workers.delete("base_mutation")
+          workers.delete("base_query")
           workers.each do |file|
             response[:"souls_#{worker}_#{file}"] = 1
           end

data/lib/souls/cli/update/mutation_rbs.rb

@@ -8,58 +8,53 @@ module Souls
         new_cols = Souls.get_columns_num(class_name: singularized_class_name)
       end
       dir_name = "./sig/api/app/graphql/mutations/base/#{singularized_class_name}"
-      new_file_path = "config/create_mutation.rbs"
       file_path = "#{dir_name}/create_#{singularized_class_name}.rbs"
       argument = false
       resolve = false
-      File.open(file_path) do |f|
-        File.open(new_file_path, "w") do |new_line|
-          f.each_line do |line|
-            next if line.include?("| (:") && argument
+      write_txt = ""
+      File.open(file_path, "r") do |f|
+        f.each_line do |line|
+          next if line.include?("| (:") && argument
 
-            if line.include?("{ :node => String } } | ::GraphQL::ExecutionError )")
-              new_line.write(line)
-              resolve = false
-            elsif resolve
-              next
-            elsif line.include?("def resolve:") && !resolve
-              new_cols.each_with_index do |col, i|
-                type = Souls.type_check(col[:type])
-                type = "[#{type}]" if col[:array]
-                next if col[:column_name] == "created_at" || col[:column_name] == "updated_at"
+          if line.include?("{ :node => String } } | ::GraphQL::ExecutionError )")
+            write_txt += line
+            resolve = false
+          elsif resolve
+            next
+          elsif line.include?("def resolve:") && !resolve
+            new_cols.each_with_index do |col, i|
+              type = Souls.type_check(col[:type])
+              type = "[#{type}]" if col[:array]
+              next if col[:column_name] == "created_at" || col[:column_name] == "updated_at"
 
-                if i.zero?
-                  new_line.write(line)
-                else
-                  new_line.write("                          #{col[:column_name]}: #{type}?,\n")
-                end
+              if i.zero?
+                write_txt += line
+              else
+                write_txt += "                          #{col[:column_name]}: #{type}?,\n"
               end
-              resolve = true
-            elsif line.include?("def self.argument:") && !argument
-              new_cols.each_with_index do |col, i|
-                type = Souls.type_check(col[:type])
-                type = "[#{type}]" if col[:array]
-                next if col[:column_name] == "created_at" || col[:column_name] == "updated_at"
+            end
+            resolve = true
+          elsif line.include?("def self.argument:") && !argument
+            new_cols.each_with_index do |col, i|
+              type = Souls.type_check(col[:type])
+              type = "[#{type}]" if col[:array]
+              next if col[:column_name] == "created_at" || col[:column_name] == "updated_at"
 
-                if i.zero?
-                  new_line.write(
-                    "        def self.argument: (:#{col[:column_name]}, #{type}, required: false ) -> #{type}\n"
-                  )
-                else
-                  new_line.write(
-                    "                         | (:#{col[:column_name]}, #{type}, required: false ) -> #{type}\n"
-                  )
-                end
+              if i.zero?
+                write_txt +=
+                  "        def self.argument: (:#{col[:column_name]}, #{type}, required: false ) -> #{type}\n"
+              else
+                write_txt +=
+                  "                         | (:#{col[:column_name]}, #{type}, required: false ) -> #{type}\n"
               end
-              argument = true
-            else
-              new_line.write(line)
             end
+            argument = true
+          else
+            write_txt += line
           end
         end
       end
-      FileUtils.rm(file_path)
-      FileUtils.mv(new_file_path, file_path)
+      File.open(file_path, "w") { |f| f.write(write_txt) }
       puts(Paint % ["Updated file! : %{white_text}", :green, { white_text: [file_path.to_s, :white] }])
     rescue Thor::Error => e
       raise(Thor::Error, e)

data/lib/souls/version.rb

@@ -1,4 +1,4 @@
 module Souls
-  VERSION = "1.7.5".freeze
+  VERSION = "1.7.9".freeze
   public_constant :VERSION
 end

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-1.7.5
+1.7.9

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-1.7.5
+1.7.9

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 1.7.5
+  version: 1.7.9
 platform: ruby
 authors:
 - POPPIN-FUMI
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-11-12 00:00:00.000000000 Z
+date: 2021-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -226,7 +226,7 @@ licenses:
 metadata:
   homepage_uri: https://souls.elsoul.nl
   source_code_uri: https://github.com/elsoul/souls
-  changelog_uri: https://github.com/elsoul/souls/releases/tag/v1.7.5
+  changelog_uri: https://github.com/elsoul/souls/releases/tag/v1.7.9
 post_install_message: 
 rdoc_options: []
 require_paths: