souls 0.67.2 → 0.68.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1956a56e9601478d0f86f691eccc63a237b277fc76d45ef56dfff8ab653c4ae0
-  data.tar.gz: 959596982f1747584447e1a3b7edc352a176eaece0f36732c85808606f1d3931
+  metadata.gz: 420bd82f0189ae76a1ff615426954b652d4459d913ba302d96e4be139df4cac0
+  data.tar.gz: 94d6355a219f279444b7de60585b9e95cfae580dcc378d9091f91248c75b2b5f
 SHA512:
-  metadata.gz: 7c1e2b2cf82a1c1375c68285cd96a9f405d36a0db4716adea0ce501cdd4c04afe6e1e5742276ba2199c94f292b7b72a418a5920344bea20fc027aaee7c4ade1f
-  data.tar.gz: bbb3eb9c5d6e1a8f41e168d39249ba60ef14aba6b326941527a59fa0b5164cea8023495ddac87fd3fefb5e49c0499327fe15e435d5e5be7b4107248aedabca14
+  metadata.gz: 516c7692c53c20a8a11d2aa1acc3524482b72a54022073cedb1ccc15e4a052be488fd0a6e42ebf60edc6b4002438067f193fdcc57579e11c8d418fdd9e46dc28
+  data.tar.gz: e9db926ca043aa388f5202a426e412a0c0cbf6d573f0eb9344a04f356cf47540fe21a577a572108eb417eae59f486e4ee9a808a76b672c07f6f06bb52741e2b6

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

@@ -11,13 +11,11 @@ module Souls
         file_path = "#{file_dir}#{singularized_class_name}.rbs"
         File.open(file_path, "w") do |f|
           f.write(<<~TEXT)
-            module Types
-              module Mutations
-                String: String
-                class #{singularized_class_name.camelize} < BaseMutation
-                  def self.description: (String) -> untyped
-                  def self.field: (:response, String, null: false) -> untyped
-                end
+            module Mutations
+              String: String
+              class #{singularized_class_name.camelize} < BaseMutation
+                def self.description: (String) -> untyped
+                def self.field: (:response, String, null: false) -> untyped
               end
             end
           TEXT

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

@@ -28,7 +28,7 @@ module Souls
 
               it "return StockSheet Data" do
                 begin
-                  a1 = result.dig("data", "#{singularized_class_name.camelize(:lower)}", "response")
+                  a1 = result.dig("data", "#{singularized_class_name.camelize(:lower)}")
                   raise unless a1.present?
                 rescue StandardError
                   raise(StandardError, result)

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

@@ -12,9 +12,8 @@ module Souls
     private
 
     def get_topics(workers: {})
-      app_name = Souls.configuration.app
       project_id = Souls.configuration.project_id
-      pubsub = Google::Cloud::Pubsub.new
+      pubsub = Google::Cloud::Pubsub.new(project_id: project_id)
       topics = pubsub.topics
 
       topic_names =
@@ -22,7 +21,7 @@ module Souls
           topic.name.gsub("projects/#{project_id}/topics/", "")
         end
 
-      souls_topics = topic_names.select { |n| n.include?("souls_#{app_name}_") }
+      souls_topics = topic_names.select { |n| n.include?("souls_") }
 
       souls_topics.each do |name|
         value = workers[name.to_sym] || 0
@@ -40,17 +39,16 @@ module Souls
     end
 
     def create_topic(topic_id: "mailer")
-      app_name = Souls.configuration.app
-      pubsub = Google::Cloud::Pubsub.new
-      topic_name = "souls_#{app_name}_#{topic_id}"
-      topic = pubsub.create_topic(topic_name.to_s)
+      project_id = Souls.configuration.project_id
+      pubsub = Google::Cloud::Pubsub.new(project_id: project_id)
+      topic = pubsub.create_topic(topic_id.to_s)
       puts("Topic #{topic.name} created.")
     end
 
     def delete_topic(topic_id: "mailer")
-      app_name = Souls.configuration.app
-      pubsub = Google::Cloud::Pubsub.new
-      topic_name = "souls_#{app_name}_#{topic_id}"
+      project_id = Souls.configuration.project_id
+      pubsub = Google::Cloud::Pubsub.new(project_id: project_id)
+      topic_name = "#{topic_id}_sub"
       topic = pubsub.topic(topic_name.to_s)
       topic.delete
       puts("Topic #{topic_name} deleted.")
@@ -58,20 +56,19 @@ module Souls
 
     def create_push_subscription(topic_id: "mailer")
       require("#{Souls.get_mother_path}/config/souls")
-      app_name = Souls.configuration.app
-      topic_name = "souls_#{app_name}_#{topic_id}"
-      worker_name = topic_id.split("_")[0]
+      worker_name = topic_id.split("_")[1]
 
-      subscription_id = "#{topic_name}_sub"
+      subscription_id = "#{topic_id}_sub"
       endpoint = ""
       worker_paths = Souls.configuration.workers
       worker_paths.each do |worker|
         endpoint = worker[:endpoint] if worker[:name] == worker_name
       end
 
-      pubsub = Google::Cloud::Pubsub.new
+      project_id = Souls.configuration.project_id
+      pubsub = Google::Cloud::Pubsub.new(project_id: project_id)
 
-      topic = pubsub.topic(topic_name)
+      topic = pubsub.topic(topic_id)
       sub = topic.subscribe(subscription_id, endpoint: endpoint, deadline: 20)
       sub.expires_in = nil
       puts("Push subscription #{subscription_id} created.")
@@ -83,19 +80,13 @@ module Souls
       response = {}
       Dir.chdir(Souls.get_mother_path.to_s) do
         worker_paths.each do |worker|
-          mailers =
-            Dir["apps/#{worker}/app/graphql/mutations/mailers/*.rb"].map do |file|
-              file.gsub("apps/#{worker}/app/graphql/mutations/mailers/", "").gsub(".rb", "")
-            end
-
           workers =
             Dir["apps/#{worker}/app/graphql/mutations/*.rb"].map do |file|
               file.gsub("apps/#{worker}/app/graphql/mutations/", "").gsub(".rb", "")
             end
           workers.delete("base_mutation")
-          local_files = mailers + workers
-          local_files.each do |file|
-            response[:"#{worker}_#{file}"] = 1
+          workers.each do |file|
+            response[:"souls_#{worker}_#{file}"] = 1
           end
         end
       end

data/lib/souls/version.rb

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

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-0.46.2
+0.47.2

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-0.46.2
+0.47.2

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 0.67.2
+  version: 0.68.2
 platform: ruby
 authors:
 - POPPIN-FUMI
 - KishiTheMechanic
 - James Neve
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-10-01 00:00:00.000000000 Z
+date: 2021-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -207,7 +207,7 @@ metadata:
   homepage_uri: https://souls.elsoul.nl
   source_code_uri: https://github.com/elsoul/souls
   changelog_uri: https://github.com/elsoul/souls
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -223,7 +223,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.2.22
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Welcome to SOULs Serverless Application Framework!  - Focus on business logic
   in serverless environment  - Maximize development efficiency with CI / CD standard