souls 1.6.5 → 1.6.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ed4af3543c0bea6062467ddbf1929eeb98d7eb35395cb88258ebd255680777c
-  data.tar.gz: eb16453c0ea26b86bb808e7cebd907c2334bfa06ad36ee92a8a7ab226b1f0ad1
+  metadata.gz: aa32054209e5863c894e11a0ce98e18980db87bf16073d358823534df3f5b094
+  data.tar.gz: c16aabeb346be73735ada774b29d0ade014989b3ad9d4cf3abef136722991852
 SHA512:
-  metadata.gz: 720e9d40626f9bffbfc95b1f7cf9241d2e396a9710433da94d387dd6266ebe0b4fe9c5f887c081152f8d2889d1b0ad6e8949464d251d522c3105c98f4579d90f
-  data.tar.gz: 993bcb80e1310eb883a5ba30c0bd10510d639ef5353141d3605b8450b11317aa1c83ef6aaf222e54eab474e8c055cad9064e9e52fc0aea21d5dc43fb3ae45eff
+  metadata.gz: 612fd4196a2df781bcfc95e5b1f7a2a09c74dd6fd0e01c147e892f42053565f074aceca4c38603a5415fd1da8f5c4f2e5b31d033d2d8d8aa66cb99d25789877e
+  data.tar.gz: '0449bc1ca1495a818bbdf89b67f83d4a7e8cc9196b22e06a070f3c2de44df6f458a8942a0589292934343a94e558a43986e6403cba474f93eada2437a4cb1689'

data/lib/souls/cli/db/index.rb

@@ -27,7 +27,6 @@ module Souls
         system("rake db:create RACK_ENV=production")
       else
         system("rake db:create")
-        system("rake db:create RACK_ENV=test")
       end
     rescue Thor::Error => e
       raise(Thor::Error, e)

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

@@ -4,10 +4,13 @@ module Souls
     method_option :mailer, type: :boolean, aliases: "--mailer", default: false, desc: "Mailer Option"
     def job(class_name)
       if options[:mailer]
+        create_job_mailer_type(class_name)
         mailgun_mailer(class_name)
       else
-        create_job_mutation(class_name)
+        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
@@ -16,25 +19,20 @@ module Souls
 
     private
 
-    def create_job_mutation(class_name)
-      file_dir = "./app/graphql/mutations/"
+    def create_job(class_name)
+      file_dir = "./app/graphql/queries/"
       FileUtils.mkdir_p(file_dir) unless Dir.exist?(file_dir)
       file_path = "#{file_dir}#{class_name.singularize}.rb"
-      raise(StandardError, "Mutation already exist! #{file_path}") if File.exist?(file_path)
+      raise(StandardError, "Query already exist! #{file_path}") if File.exist?(file_path)
 
       File.open(file_path, "w") do |f|
         f.write(<<~TEXT)
-          module Mutations
-            class #{class_name.camelize} < BaseMutation
-              description "Job Description"
-              field :response, String, null: false
-
+          module Queries
+            class #{class_name.camelize} < BaseQuery
+              description ""
+              type Types::#{class_name.camelize}Type, null: false
+          
               def resolve
-                # Define Job Here
-
-                { response: "Job done!" }
-              rescue StandardError => e
-                GraphQL::ExecutionError.new(e.to_s)
               end
             end
           end
@@ -43,32 +41,50 @@ 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)
+      file_path = "#{file_dir}#{class_name.singularize}_type.rb"
+      raise(StandardError, "Type already exists! #{file_path}") if File.exist?(file_path)
+
+      File.open(file_path, "w") do |f|
+        f.write(<<~TEXT)
+          module Types
+            class #{class_name.camelize}Type < BaseObject
+            end
+          end
+        TEXT
+      end
+      puts(Paint % ["Created file! : %{white_text}", :green, { white_text: [file_path.to_s, :white] }])
+      file_path
+    end
 
     def mailgun_mailer(class_name)
-      file_dir = "./app/graphql/mutations/"
+      file_dir = "./app/graphql/queries/"
       FileUtils.mkdir_p(file_dir) unless Dir.exist?(file_dir)
       file_path = "#{file_dir}#{class_name.singularize}.rb"
-      raise(StandardError, "Mailer already exist! #{file_path}") if File.exist?(file_path)
+      raise(StandardError, "Mailer already exists! #{file_path}") if File.exist?(file_path)
 
       File.open(file_path, "w") do |f|
         f.write(<<~TEXT)
-          module Mutations
-            class #{class_name.camelize} < BaseMutation
-              description "Mail を送信します。"
-              field :response, String, null: false
-
+          module Queries
+            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@YOUR-DOMAIN",
+                  from: "postmaster@from.mail.com",
                   to: "sending@to.mail.com",
                   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!" }
@@ -82,5 +98,44 @@ module Souls
       puts(Paint % ["Created file! : %{white_text}", :green, { white_text: [file_path.to_s, :white] }])
       file_path
     end
+
+    def create_job_mailer_type(class_name)
+      file_dir = "./app/graphql/types/"
+      FileUtils.mkdir_p(file_dir) unless Dir.exist?(file_dir)
+      file_path = "#{file_dir}#{class_name.singularize}_type.rb"
+      raise(StandardError, "Type already exists! #{file_path}") if File.exist?(file_path)
+
+      File.open(file_path, "w") do |f|
+        f.write(<<~TEXT)
+          module Types
+            class #{class_name.camelize}Type < BaseObject
+              field :response, String, null: true
+            end
+          end
+        TEXT
+      end
+      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

@@ -6,7 +6,7 @@ module Souls
       worker_name = FileUtils.pwd.split("/").last
       Dir.chdir(Souls.get_mother_path.to_s) do
         singularized_class_name = class_name.underscore.singularize
-        file_dir = "./sig/#{worker_name}/app/graphql/mutations/"
+        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"
         File.open(file_path, "w") do |f|

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

@@ -4,7 +4,7 @@ module Souls
     method_option :mailer, type: :boolean, aliases: "--mailer", default: false, desc: "Mailgun Template"
     def rspec_job(class_name)
       singularized_class_name = class_name.underscore.singularize
-      file_dir = "./spec/mutations/jobs/"
+      file_dir = "./spec/queries/jobs/"
       FileUtils.mkdir_p(file_dir) unless Dir.exist?(file_dir)
       file_path = "#{file_dir}/#{singularized_class_name}_spec.rb"
       return "RspecJob already exist! #{file_path}" if File.exist?(file_path)
@@ -15,9 +15,9 @@ module Souls
             RSpec.describe("#{singularized_class_name.camelize}") do
               describe "Define #{singularized_class_name.camelize}" do
 
-                let(:mutation) do
-                  %(mutation {
-                    #{singularized_class_name.camelize(:lower)}(input: {}) {
+                let(:query) do
+                  %(query {
+                    #{singularized_class_name.camelize(:lower)} {
                         response
                       }
                     }
@@ -31,12 +31,9 @@ module Souls
                 it "return #{singularized_class_name.camelize} response" do
                   stub_request(:post, "https://api.mailgun.net/v3/YOUR-MAILGUN-DOMAIN/messages")
                     .to_return(status: 200, body: "", headers: {})
-                  begin
-                    a1 = result.dig("data", "#{singularized_class_name.camelize(:lower)}")
-                    raise unless a1.present?
-                  rescue StandardError
-                    raise(StandardError, result)
-                  end
+                  
+                  a1 = result.dig("data", "#{singularized_class_name.camelize(:lower)}")
+                  expect(a1).not_to be_empty
                   expect(a1).to(include("response" => be_a(String)))
                 end
               end
@@ -49,9 +46,9 @@ module Souls
             RSpec.describe("#{singularized_class_name.camelize}") do
               describe "Define #{singularized_class_name.camelize}" do
 
-                let(:mutation) do
-                  %(mutation {
-                    #{singularized_class_name.camelize(:lower)}(input: {}) {
+                let(:query) do
+                  %(query {
+                    #{singularized_class_name.camelize(:lower)} {
                         response
                       }
                     }
@@ -59,16 +56,12 @@ module Souls
                 end
 
                 subject(:result) do
-                  SoulsApiSchema.execute(mutation).as_json
+                  SoulsApiSchema.execute(query).as_json
                 end
 
                 it "return #{singularized_class_name.camelize} response" do
-                  begin
-                    a1 = result.dig("data", "#{singularized_class_name.camelize(:lower)}")
-                    raise unless a1.present?
-                  rescue StandardError
-                    raise(StandardError, result)
-                  end
+                  a1 = result.dig("data", "#{singularized_class_name.camelize(:lower)}")
+                  expect(a1).not_to be_empty
                   expect(a1).to(include("response" => be_a(String)))
                 end
               end

data/lib/souls/cli/release/release.rb

@@ -33,6 +33,11 @@ module Souls
         puts("before build")
         system("rake build")
         system("rake release")
+        system(
+          "git -c log.ShowSignature=false log v#{current_souls_ver}...v#{souls_new_ver} \
+            --reverse --merges --grep='Merge pull request' --pretty=format:%B > ./CHANGELOG.md"
+        )
+        system("gh release create v#{souls_new_ver} -t v#{souls_new_ver} -F ./CHANGELOG.md")
         system("gsutil -m -q cp -r coverage gs://souls-bucket/souls-coverage")
         Whirly.status = Paint["soul-v#{souls_new_ver} successfully updated!"]
       end

data/lib/souls/version.rb

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

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-1.6.5
+1.6.9

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-1.6.5
+1.6.9

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 1.6.5
+  version: 1.6.9
 platform: ruby
 authors:
 - POPPIN-FUMI
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-11-09 00:00:00.000000000 Z
+date: 2021-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -232,7 +232,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.6.5
+  changelog_uri: https://github.com/elsoul/souls/releases/tag/v1.6.9
 post_install_message: 
 rdoc_options: []
 require_paths: