souls 1.7.6 → 1.7.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e741718ebcabb0d9a8f4e8845fe54fe43f1986f8f213943647976ef1c42fe29b
-  data.tar.gz: 3175f7064e569a2ea7d66a6658d0a0b228d5419023e9c8920a7776bef8c4d9a5
+  metadata.gz: 75e1e708375c27972c9ca860ae344a8fe5c30bb441f65ddec1ac34c790b1c0c2
+  data.tar.gz: a3a39f40c711fcd0ad2d32122a72cf40b53da5d4661ca127a3b4b631512a09ac
 SHA512:
-  metadata.gz: 543bb689d4f1ae0ae5f5d9225eddce463b9eafffa8b1fec51f2d291cb7fb650355b21ca057d7ab899cb84c91f40f1a51c2a48f833b0da61f34d58b2f4fd0f662
-  data.tar.gz: 6bc06c28e7756dc1be35b0732d67f057d5cd528ef9bfdbb422747f36190c59271526471566f2f80947c87e399b77154fdce46d4b1e1712fcbc8b961235e85f79
+  metadata.gz: 67ca8f18243ad49b60787b6b9166a0cb270bb71176000e081dde5fdbce9972050a31b513124d83c1f83fa819ed51e05eccd478a2aea72d647455f0211481e8a2
+  data.tar.gz: faedae1fe18e80fa45e78dd72c4f35c83413354502fae2285da2bc037ddb7c5f7302c983ff5e3ce099d9bb713a978bf61a6f33cb9def71ba6d74d07cdcd19e43

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)
 
@@ -38,7 +38,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)
 

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.6".freeze
+  VERSION = "1.7.7".freeze
   public_constant :VERSION
 end

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-1.7.6
+1.7.7

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-1.7.6
+1.7.7

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 1.7.6
+  version: 1.7.7
 platform: ruby
 authors:
 - POPPIN-FUMI
@@ -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.6
+  changelog_uri: https://github.com/elsoul/souls/releases/tag/v1.7.7
 post_install_message: 
 rdoc_options: []
 require_paths: