souls 0.13.1 → 0.13.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d10b6acc73f15b4343693d33175f8760fdf99732db02241e295cb4bd9fd58917
-  data.tar.gz: 8f06ebec49df0846e9063cd61bb10f8f5a4ae3216f677bc2214841aa67803dfa
+  metadata.gz: 53da6d8b3f84df3136e5e557035f68d23aa4cb97eb42648d7219ad521a58ec93
+  data.tar.gz: c12200d5439b99d52d3beef650f1513e21a8709d503fe2b3641f507bac278b86
 SHA512:
-  metadata.gz: 0cdc7a8bdf048f1bcc7f61d660e97c90b7523c667b571b945a07101408e3a13821bb9a36383dc2861ce1353f4611f639d2ec9acb55b91706807e7ac5acbda189
-  data.tar.gz: 776ace1a2f12216ce1df1e3469967b385f343e87a9684ea908be66650fe31245f08f6ee66b615b34fd2a9bbd6975a2aba9c84bbbaa2965ace983ae4b8ce2ef1c
+  metadata.gz: a28d17def0684d6622fd13d4979bdb855fc8ef0f69a2e425fbf0380e79751a0e4119cc597380879a21289d78463e7960a770ac1d50ba17c0c43592e6c683fee1
+  data.tar.gz: 1ce61c0bd694cfe6401c339cea92e0fa34ff1a5b15f40fb040b3d550a08af164b984fbbb6eee2c907d924f9750e1ad8eee0bc043f19f61dbfe6e5cff0dc08c39

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    souls (0.13.0)
+    souls (0.13.6)
 
 GEM
   remote: https://rubygems.org/
@@ -12,20 +12,20 @@ GEM
       minitest (>= 5.1)
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
-    ast (2.4.1)
+    ast (2.4.2)
     ast_utils (0.3.0)
       parser (~> 2.4)
       thor (>= 0.19)
-    concurrent-ruby (1.1.7)
+    concurrent-ruby (1.1.8)
     diff-lcs (1.4.4)
     ffi (1.14.2)
     i18n (1.8.7)
       concurrent-ruby (~> 1.0)
     language_server-protocol (3.15.0.1)
-    listen (3.4.0)
+    listen (3.4.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    minitest (5.14.2)
+    minitest (5.14.3)
     parallel (1.20.1)
     parser (2.7.2.0)
       ast (~> 2.4.1)
@@ -34,7 +34,7 @@ GEM
     rb-fsevent (0.10.4)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rbs (1.0.0)
+    rbs (1.0.4)
     regexp_parser (2.0.3)
     rexml (3.2.4)
     rspec (3.1.0)
@@ -58,7 +58,7 @@ GEM
       rubocop-ast (>= 1.2.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (1.4.0)
+    rubocop-ast (1.4.1)
       parser (>= 2.7.1.5)
     ruby-progressbar (1.11.0)
     steep (0.39.0)
@@ -69,7 +69,7 @@ GEM
       parser (~> 2.7.0)
       rainbow (>= 2.2.2, < 4.0)
       rbs (~> 1.0.0)
-    thor (1.0.1)
+    thor (1.1.0)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
     unicode-display_width (1.7.0)

data/exe/souls

@@ -3,7 +3,7 @@ require "souls"
 
 begin
   begin
-    require "./config/initializers/souls" unless ARGV[0] == "new" || ARGV[0] == "init"
+    require "./config/initializers/souls" unless ARGV[0] == "new" || ARGV[0] == "init" || ARGV[0] == "s"
   rescue
     Souls::Init.config_init
   end
@@ -13,27 +13,27 @@ begin
       puts "you need to specify your app name \n `souls new app_name`"
       exit
     end
-    puts "Which framework:   \n 1. SOULS gRPC Service \n 2. SOULS GraphQL API gRPC compatible \n 3. SOULS GraphQL API \n 4. SOULS Media Web \n 5. SOULS Admin Web \n Enter Number: "
+    puts "Which framework:   \n 1. SOULS GraphQL API \n 2. SOULS GraphQL API gRPC compatible \n 3. SOULS gRPC Service \n 4. SOULS Media Web \n 5. SOULS Admin Web \n Enter Number: "
     strain = STDIN.gets.chomp.to_i
     (1..5).include?(strain) ? puts("Generating Souls.. \n") : raise(StandardError, "Choose Number 1..5")
     Souls::Init.create_souls strain: strain, app_name: ARGV[1]
   when "s", "server"
     strain = Souls.configuration.strain
     case strain
-    when "api", "graph"
-      system "bundle exec puma -p 3000"
+    when "media", "admin"
+      system "yarn dev"
     when "service"
       system "bundle exec rake run_server"
     else
-      system "yarn dev"
+      system "bundle exec puma -p 3000"
     end
   when "c", "console"
     strain = Souls.configuration.strain
     case strain
-    when "api", "graph", "service"
-      system "bundle exec irb"
-    else
+    when "media", "admin"
       system "yarn dev"
+    else
+      system "bundle exec irb"
     end
   when "i", "infra"
     Souls.send ARGV[1]
@@ -45,6 +45,8 @@ begin
     puts Souls::VERSION
   when "g", "generate"
     case ARGV[1]
+    when "test_dir"
+      Souls::Init.test_dir
     when "test"
       Souls::Init.single_migrate class_name: "user"
     when "model"

data/lib/souls/init.rb

@@ -1,5 +1,5 @@
 module Souls
-  STRAINS = ["service", "api", "graph", "media", "admin"]
+  STRAINS = ["graph", "api", "service", "media", "admin"]
   module Init
     class << self
       def create_souls strain: 1, app_name: "souls"
@@ -253,6 +253,19 @@ module Souls
         [file_path]
       end
 
+      def test_dir
+        FileUtils.mkdir_p "./app/graphql/mutations"
+        FileUtils.mkdir_p "./app/graphql/queries"
+        FileUtils.mkdir_p "./app/graphql/types"
+        FileUtils.mkdir_p "./spec/factories"
+        FileUtils.mkdir_p "./spec/queries"
+        FileUtils.mkdir_p "./spec/mutations"
+        FileUtils.mkdir_p "./spec/models"
+        FileUtils.mkdir_p "./db/"
+        FileUtils.touch "./db/schema.rb"
+        puts "test dir created!"
+      end
+
       def type_check type
         {
           bigint: "Integer",
@@ -272,8 +285,8 @@ module Souls
           float: 4.2,
           string: '"MyString"',
           text: '"MyString"',
-          datetime: "Time.now",
-          date: "Time.now",
+          datetime: "DateTime.now",
+          date: "DateTime.now",
           boolean: false,
           integer: 1
         }[type.to_sym]
@@ -304,15 +317,36 @@ module Souls
         file_path = "./app/graphql/mutations/#{class_name}/create_#{class_name}.rb"
         path = "./db/schema.rb"
         @on = false
+        @user_exist = false
+        @relation_params = []
         File.open(file_path, "a") do |new_line|
           File.open(path, "r") do |f|
             f.each_line.with_index do |line, i|
               if @on
-                break if line.include?("end") || line.include?("t.index")
+                if line.include?("end") || line.include?("t.index")
+                  if @user_exist
+                    new_line.write <<-EOS
+
+      def resolve **args
+        args[:user_id] = context[:user].id
+                    EOS
+                  else
+                    new_line.write <<-EOS
+
+      def resolve **args
+                    EOS
+                  end
+                  break
+                end
                 field = "[String]" if line.include?("array: true")
                 type, name = line.split(",")[0].gsub("\"", "").scan(/((?<=t\.).+(?=\s)) (.+)/)[0]
                 field ||= type_check type
                 case name
+                when "user_id"
+                  @user_exist = true
+                when /$*_id\z/
+                  @relation_params << name
+                  new_line.write "      argument :#{name}, String, required: false\n"
                 when "created_at", "updated_at"
                   next
                 else
@@ -323,14 +357,24 @@ module Souls
             end
           end
         end
+        @relation_params
+      end
+
+      def create_mutation_after_params class_name: "article", relation_params: []
+        return false if relation_params.empty?
+        file_path = "./app/graphql/mutations/#{class_name}/create_#{class_name}.rb"
+        relation_params.each do |params_name|
+          File.open(file_path, "a") do |new_line|
+            new_line.write "        _, args[:#{params_name}] = SoulsApiSchema.from_global_id(args[:#{params_name}])\n"
+          end
+        end
+        true
       end
 
       def create_mutation_end class_name: "souls"
         file_path = "./app/graphql/mutations/#{class_name}/create_#{class_name}.rb"
         File.open(file_path, "a") do |new_line|
           new_line.write <<~EOS
-
-                  def resolve **args
                     #{class_name} = ::#{class_name.camelize}.new args
                     if #{class_name}.save
                       { #{class_name}: #{class_name} }
@@ -357,6 +401,7 @@ module Souls
                 class Update#{class_name.camelize} < BaseMutation
                   field :#{class_name}, Types::#{class_name.camelize}Type, null: false
 
+                  argument :id, String, required: true
           EOS
         end
       end
@@ -365,15 +410,38 @@ module Souls
         file_path = "./app/graphql/mutations/#{class_name}/update_#{class_name}.rb"
         path = "./db/schema.rb"
         @on = false
+        @user_exist = false
+        @relation_params = []
         File.open(file_path, "a") do |new_line|
           File.open(path, "r") do |f|
             f.each_line.with_index do |line, i|
               if @on
-                break if line.include?("end") || line.include?("t.index")
+                if line.include?("end") || line.include?("t.index")
+                  if @user_exist
+                    new_line.write <<-EOS
+
+      def resolve **args
+        args[:user_id] = context[:user].id
+        _, args[:id] = SoulsApiSchema.from_global_id(args[:id])
+                    EOS
+                  else
+                    new_line.write <<-EOS
+
+      def resolve **args
+        _, args[:id] = SoulsApiSchema.from_global_id(args[:id])
+                    EOS
+                  end
+                  break
+                end
                 field = "[String]" if line.include?("array: true")
                 type, name = line.split(",")[0].gsub("\"", "").scan(/((?<=t\.).+(?=\s)) (.+)/)[0]
                 field ||= type_check type
                 case name
+                when "user_id"
+                  @user_exist = true
+                when /$*_id\z/
+                  @relation_params << name
+                  new_line.write "      argument :#{name}, String, required: false\n"
                 when "created_at", "updated_at"
                   next
                 else
@@ -384,14 +452,24 @@ module Souls
             end
           end
         end
+        @relation_params
+      end
+
+      def update_mutation_after_params class_name: "article", relation_params: []
+        return false if relation_params.empty?
+        file_path = "./app/graphql/mutations/#{class_name}/update_#{class_name}.rb"
+        relation_params.each do |params_name|
+          File.open(file_path, "a") do |new_line|
+            new_line.write "        _, args[:#{params_name}] = SoulsApiSchema.from_global_id(args[:#{params_name}])\n"
+          end
+        end
+        true
       end
 
       def update_mutation_end class_name: "souls"
         file_path = "./app/graphql/mutations/#{class_name}/update_#{class_name}.rb"
         File.open(file_path, "a") do |new_line|
           new_line.write <<~EOS
-
-                  def resolve **args
                     #{class_name} = ::#{class_name.camelize}.find args[:id]
                     #{class_name}.update args
                     { #{class_name}: ::#{class_name.camelize}.find(args[:id]) }
@@ -408,7 +486,8 @@ module Souls
 
       def update_mutation class_name: "souls"
         update_mutation_head class_name: class_name
-        update_mutation_params class_name: class_name
+        relation_params = update_mutation_params class_name: class_name
+        update_mutation_after_params class_name: class_name, relation_params: relation_params
         update_mutation_end class_name: class_name
       end
 
@@ -420,10 +499,11 @@ module Souls
               module #{class_name.camelize}
                 class Delete#{class_name.camelize} < BaseMutation
                   field :#{class_name}, Types::#{class_name.camelize}Type, null: false
-                  argument :id, Integer, required: true
+                  argument :id, String, required: true
 
-                  def resolve id:
-                    #{class_name} = ::#{class_name.camelize}.find id
+                  def resolve **args
+                    _, data_id = SoulsApiSchema.from_global_id args[:id]
+                    #{class_name} = ::#{class_name.camelize}.find data_id
                     #{class_name}.destroy
                     { #{class_name}: #{class_name} }
                   rescue StandardError => error
@@ -452,7 +532,8 @@ module Souls
           Dir.mkdir "./app/graphql/mutations/#{singularized_class_name}"
         end
         create_mutation_head class_name: singularized_class_name
-        create_mutation_params 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
         [
           create_mutation_end(class_name: singularized_class_name),
           update_mutation(class_name: singularized_class_name),
@@ -490,8 +571,8 @@ module Souls
                 argument :id, String, required: true
 
                 def resolve **args
-                  _, #{class_name.singularize.underscore}_id = SoulsApiSchema.from_global_id args[:id]
-                  ::#{class_name.camelize}.find(#{class_name.singularize.underscore}_id)
+                  _, data_id = SoulsApiSchema.from_global_id args[:id]
+                  ::#{class_name.camelize}.find(data_id)
                 rescue StandardError => error
                   GraphQL::ExecutionError.new error
                 end
@@ -531,7 +612,12 @@ module Souls
                 field = "[String]" if line.include?("array: true")
                 type, name = line.split(",")[0].gsub("\"", "").scan(/((?<=t\.).+(?=\s)) (.+)/)[0]
                 field ||= type_check type
-                new_line.write "    field :#{name}, #{field}, null: true\n"
+                case name
+                when /$*_id\z/
+                  new_line.write "    field :#{name.gsub("_id", "")}, Types::#{name.gsub("_id", "").singularize.camelize}Type, null: false\n"
+                else
+                  new_line.write "    field :#{name}, #{field}, null: true\n"
+                end
               end
               if table_check(line: line, class_name: class_name)
                 @on = true
@@ -637,64 +723,120 @@ module Souls
           f.write <<~EOS
             RSpec.describe \"#{class_name.camelize} Mutation テスト\" do
               describe "#{class_name.camelize} データを登録する" do
-                let!(:#{class_name.singularize.underscore}) { FactoryBot.attributes_for(:#{class_name.singularize.underscore}) }
-
-                let(:mutation) do
-                  %(mutation {
-                    create#{class_name.camelize}(input: {
+                get_global_key = proc {|class_name, id| Base64.encode64(\"\#{class_name}:\#{id}\")}
           EOS
         end
       end
 
-        def rspec_mutation_params class_name: "souls"
-          file_path = "./spec/mutations/#{class_name.singularize}_spec.rb"
-          path = "./db/schema.rb"
-          @on = false
-          File.open(file_path, "a") do |new_line|
-            File.open(path, "r") do |f|
-              f.each_line.with_index do |line, i|
-                if @on 
-                  if line.include?("end") || line.include?("t.index")
-                    new_line.write "        }) {\n            #{class_name.singularize.camelize(:lower)} {\n              id\n"
-                    break
-                  end
-                  type, name = line.split(",")[0].gsub("\"", "").scan(/((?<=t\.).+(?=\s)) (.+)/)[0]
-                  array_true = line.include?("array: true")
-                  case name
-                  when "created_at", "updated_at"
-                    next
-                  else
-                    case type
-                    when "string", "text"
-                      if array_true
-                        new_line.write "          #{name.pluralize.camelize(:lower)}: \#{#{class_name.pluralize}[:#{name.pluralize.underscore}]}\n"
-                      else
-                        new_line.write "          #{name.singularize.camelize(:lower)}: \"\#{#{class_name.singularize}[:#{name.singularize.underscore}]}\"\n"
-                      end
-                    when "bigint", "integer", "float", "boolean"
-                      new_line.write "          #{name.singularize.camelize(:lower)}: \#{#{class_name.singularize}[:#{name.singularize.underscore}]}\n"
-                    when "date", "datetime"
-                      new_line.write "          #{name.singularize.camelize(:lower)}: \#{Time.now}\n"
+      def rspec_mutation_after_head class_name: "souls"
+        file_path = "./spec/mutations/#{class_name.singularize}_spec.rb"
+        path = "./db/schema.rb"
+        @on = false
+        @user_exist = false
+        @relation_params = []
+        File.open(file_path, "a") do |new_line|
+          File.open(path, "r") do |f|
+            f.each_line.with_index do |line, i|
+              if @on
+                if line.include?("end") || line.include?("t.index")
+                  new_line.write <<-EOS
+    let(:#{class_name}) { FactoryBot.attributes_for(:#{class_name}, #{@relation_params.join(", ")}) }
+
+    let(:mutation) do
+      %(mutation {
+        create#{class_name.camelize}(input: {
+                  EOS
+                  break
+                end
+                _, name = line.split(",")[0].gsub("\"", "").scan(/((?<=t\.).+(?=\s)) (.+)/)[0]
+                case name
+                when /$*_id\z/
+                  relation_col = name.gsub("_id", "")
+                  @relation_params << "#{name}: get_global_key.call(\"#{name.singularize.camelize.gsub("Id", "")}\", #{relation_col}.id)"
+                  new_line.write "    let(:#{relation_col}) { FactoryBot.create(:#{relation_col}) }\n"
+                end
+              end
+              if table_check(line: line, class_name: class_name)
+                @on = true
+              end
+            end
+          end
+        end
+      end
+
+      def rspec_mutation_params class_name: "souls"
+        file_path = "./spec/mutations/#{class_name.singularize}_spec.rb"
+        path = "./db/schema.rb"
+        @on = false
+        @user_exist = false
+        File.open(file_path, "a") do |new_line|
+          File.open(path, "r") do |f|
+            f.each_line.with_index do |line, i|
+              if @on
+                if line.include?("end") || line.include?("t.index")
+                  new_line.write "        }) {\n            #{class_name.singularize.camelize(:lower)} {\n              id\n"
+                  break
+                end
+                type, name = line.split(",")[0].gsub("\"", "").scan(/((?<=t\.).+(?=\s)) (.+)/)[0]
+                array_true = line.include?("array: true")
+                case name
+                when "created_at", "updated_at"
+                  next
+                when "user_id"
+                  @user_exist = true
+                when /$*_id\z/
+                  new_line.write "          #{name.singularize.camelize(:lower)}: \"\#{#{class_name.singularize}[:#{name.singularize.underscore}]}\"\n"
+                else
+                  case type
+                  when "string", "text", "date", "datetime"
+                    if array_true && name != "tag"
+                      new_line.write "          #{name.pluralize.camelize(:lower)}: \#{#{class_name.singularize}[:#{name.pluralize.underscore}]}\n"
+                    else
+                      new_line.write "          #{name.singularize.camelize(:lower)}: \"\#{#{class_name.singularize}[:#{name.singularize.underscore}]}\"\n"
                     end
+                  when "bigint", "integer", "float", "boolean"
+                    new_line.write "          #{name.singularize.camelize(:lower)}: \#{#{class_name.singularize}[:#{name.singularize.underscore}]}\n"
                   end
                 end
-                if table_check(line: line, class_name: class_name)
-                  @on = true
-                end
+              end
+              if table_check(line: line, class_name: class_name)
+                @on = true
               end
             end
           end
         end
+      end
 
-        def rspec_mutation_params_response class_name: "souls"
-          file_path = "./spec/mutations/#{class_name.singularize}_spec.rb"
-          path = "./db/schema.rb"
-          @on = false
-          File.open(file_path, "a") do |new_line|
-            File.open(path, "r") do |f|
-              f.each_line.with_index do |line, i|
-                if @on
-                  if line.include?("end") || line.include?("t.index")
+      def rspec_mutation_params_response class_name: "souls"
+        file_path = "./spec/mutations/#{class_name.singularize}_spec.rb"
+        path = "./db/schema.rb"
+        @on = false
+        File.open(file_path, "a") do |new_line|
+          File.open(path, "r") do |f|
+            f.each_line.with_index do |line, i|
+              if @on
+                if line.include?("end") || line.include?("t.index")
+                  if @user_exist
+                    new_line.write <<-EOS
+            }
+          }
+        }
+      )
+    end
+
+    subject(:result) do
+      context = {
+        user: user
+      }
+      SoulsApiSchema.execute(mutation, context: context).as_json
+    end
+
+    it "return #{class_name.camelize} Data" do
+      a1 = result.dig("data", "create#{class_name.singularize.camelize}", "#{class_name.singularize.camelize(:lower)}")
+      expect(a1).to include(
+        "id" => be_a(String),
+                    EOS
+                  else
                     new_line.write <<-EOS
             }
           }
@@ -711,81 +853,81 @@ module Souls
       expect(a1).to include(
         "id" => be_a(String),
                     EOS
-                    break
                   end
-                  _, name = line.split(",")[0].gsub("\"", "").scan(/((?<=t\.).+(?=\s)) (.+)/)[0]
-                  array_true = line.include?("array: true")
-                  case name
-                  when "created_at", "updated_at"
-                    next
+                  break
+                end
+                _, name = line.split(",")[0].gsub("\"", "").scan(/((?<=t\.).+(?=\s)) (.+)/)[0]
+                array_true = line.include?("array: true")
+                case name
+                when "user_id", "created_at", "updated_at", /$*_id\z/
+                  next
+                else
+                  if array_true
+                    new_line.write "              #{name.pluralize.camelize(:lower)}\n"
                   else
-                    if array_true
-                      new_line.write "              #{name.pluralize.camelize(:lower)}\n"
-                    else
-                      new_line.write "              #{name.singularize.camelize(:lower)}\n"
-                    end
+                    new_line.write "              #{name.singularize.camelize(:lower)}\n"
                   end
                 end
-                if table_check(line: line, class_name: class_name)
-                  @on = true
-                end
+              end
+              if table_check(line: line, class_name: class_name)
+                @on = true
               end
             end
           end
         end
+      end
 
-        def rspec_mutation_end class_name: "souls"
-          file_path = "./spec/mutations/#{class_name.singularize}_spec.rb"
-          path = "./db/schema.rb"
-          @on = false
-          File.open(file_path, "a") do |new_line|
-            File.open(path, "r") do |f|
-              f.each_line.with_index do |line, i|
-                if @on 
-                  if line.include?("end") || line.include?("t.index")
-                    new_line.write <<-EOS
-        )
-    end
-  end
-end
-                    EOS
-                    break
-                  end
-                  type, name = line.split(",")[0].gsub("\"", "").scan(/((?<=t\.).+(?=\s)) (.+)/)[0]
-                  field ||= type_check type
-                  array_true = line.include?("array: true")
-                  case name
-                  when "created_at", "updated_at"
-                    next
-                  else
-                    case type
-                    when "text"
-                        if array_true
-                          new_line.write "        \"#{name.pluralize.camelize(:lower)}\" => be_all(String),\n"
-                        else
-                          new_line.write "        \"#{name.singularize.camelize(:lower)}\" => be_a(#{field}),\n"
+      def rspec_mutation_end class_name: "souls"
+        file_path = "./spec/mutations/#{class_name.singularize}_spec.rb"
+        path = "./db/schema.rb"
+        @on = false
+        File.open(file_path, "a") do |new_line|
+          File.open(path, "r") do |f|
+            f.each_line.with_index do |line, i|
+              if @on 
+                if line.include?("end") || line.include?("t.index")
+                  new_line.write <<~EOS
+                                )
+                            end
+                          end
                         end
-                    when "boolean"
-                      new_line.write "        \"#{name.singularize.camelize(:lower)}\" => be_in([true, false]),\n"
-                    when "string", "bigint", "integer", "float"
-                      new_line.write "        \"#{name.singularize.camelize(:lower)}\" => be_a(#{field}),\n"
-                    when "date", "datetime"
-                      new_line.write "        \"#{name.singularize.camelize(:lower)}\" => be_a(DateTime),\n"
-                    end
-                  end
+                  EOS
+                  break
                 end
-                if table_check(line: line, class_name: class_name)
-                  @on = true
+                type, name = line.split(",")[0].gsub("\"", "").scan(/((?<=t\.).+(?=\s)) (.+)/)[0]
+                field ||= type_check type
+                array_true = line.include?("array: true")
+                case name
+                when "user_id", "created_at", "updated_at", /$*_id\z/
+                  next
+                else
+                  case type
+                  when "text", "date", "datetime"
+                      if array_true
+                        new_line.write "        \"#{name.pluralize.camelize(:lower)}\" => be_all(String),\n"
+                      else
+                        new_line.write "        \"#{name.singularize.camelize(:lower)}\" => be_a(String),\n"
+                      end
+                  when "boolean"
+                    new_line.write "        \"#{name.singularize.camelize(:lower)}\" => be_in([true, false]),\n"
+                  when "string", "bigint", "integer", "float"
+                    new_line.write "        \"#{name.singularize.camelize(:lower)}\" => be_a(#{field}),\n"
+                  end
                 end
               end
+              if table_check(line: line, class_name: class_name)
+                @on = true
+              end
             end
           end
-          [file_path]
         end
+        [file_path]
+      end
 
       def rspec_mutation class_name: "souls"
         singularized_class_name = class_name.singularize
         rspec_mutation_head class_name: singularized_class_name
+        rspec_mutation_after_head class_name: singularized_class_name
         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
@@ -797,111 +939,141 @@ end
           f.write <<~EOS
             RSpec.describe \"#{class_name.camelize} Query テスト\" do
               describe "#{class_name.camelize} データを取得する" do
-                let!(:#{class_name.singularize.underscore}) { FactoryBot.create(:#{class_name.singularize.underscore}) }
-
-                let(:query) do
-                  data_id = Base64.encode64("#{class_name.camelize}:\#{#{class_name.singularize.underscore}.id}")
-                  %(query {
-                    #{class_name.singularize.camelize(:lower)}(id: \\"\#{data_id}\\") {
-                      id
           EOS
         end
       end
 
-        def rspec_query_params class_name: "souls"
-          file_path = "./spec/queries/#{class_name.singularize}_spec.rb"
-          path = "./db/schema.rb"
-          @on = false
-          File.open(file_path, "a") do |new_line|
-            File.open(path, "r") do |f|
-              f.each_line.with_index do |line, i|
-                if @on 
-                  if line.include?("end") || line.include?("t.index")
-                    new_line.write <<-EOS
-          }
+      def rspec_query_after_head class_name: "souls"
+        file_path = "./spec/queries/#{class_name.singularize}_spec.rb"
+        path = "./db/schema.rb"
+        @on = false
+        @user_exist = false
+        @relation_params = []
+        File.open(file_path, "a") do |new_line|
+          File.open(path, "r") do |f|
+            f.each_line.with_index do |line, i|
+              if @on
+                if line.include?("end") || line.include?("t.index")
+                  new_line.write <<-EOS
+    let(:#{class_name}) { FactoryBot.create(:#{class_name}, #{@relation_params.join(", ")}) }
+
+    let(:query) do
+      data_id = Base64.encode64("#{class_name.camelize}:\#{#{class_name.singularize.underscore}.id}")
+      %(query {
+        #{class_name.singularize.camelize(:lower)}(id: \\"\#{data_id}\\") {
+          id
+                  EOS
+                  break
+                end
+                _, name = line.split(",")[0].gsub("\"", "").scan(/((?<=t\.).+(?=\s)) (.+)/)[0]
+                case name
+                when /$*_id\z/
+                  relation_col = name.gsub("_id", "")
+                  @relation_params << "#{name}: #{relation_col}.id"
+                  new_line.write "    let(:#{relation_col}) { FactoryBot.create(:#{relation_col}) }\n"
+                end
+              end
+              if table_check(line: line, class_name: class_name)
+                @on = true
+              end
+            end
+          end
+        end
+      end
+
+      def rspec_query_params class_name: "souls"
+        file_path = "./spec/queries/#{class_name.singularize}_spec.rb"
+        path = "./db/schema.rb"
+        @on = false
+        File.open(file_path, "a") do |new_line|
+          File.open(path, "r") do |f|
+            f.each_line.with_index do |line, i|
+              if @on 
+                if line.include?("end") || line.include?("t.index")
+                  new_line.write <<-EOS
         }
-      )
-    end
+      }
+    )
+  end
 
-    subject(:result) do
-      SoulsApiSchema.execute(query).as_json
-    end
+  subject(:result) do
+    SoulsApiSchema.execute(query).as_json
+  end
 
-    it "return #{class_name.camelize} Data" do
-      a1 = result.dig("data", "#{class_name.singularize.camelize(:lower)}")
-      expect(a1).to include(
-        "id" => be_a(String),
-                    EOS
-                    break
-                  end
-                  _, name = line.split(",")[0].gsub("\"", "").scan(/((?<=t\.).+(?=\s)) (.+)/)[0]
-                  case name
-                  when "created_at", "updated_at"
-                    next
-                  else
-                    new_line.write "          #{name.singularize.camelize(:lower)}\n"
-                  end
+  it "return #{class_name.camelize} Data" do
+    a1 = result.dig("data", "#{class_name.singularize.camelize(:lower)}")
+    expect(a1).to include(
+      "id" => be_a(String),
+                  EOS
+                  break
                 end
-                if table_check(line: line, class_name: class_name)
-                  @on = true
+                _, name = line.split(",")[0].gsub("\"", "").scan(/((?<=t\.).+(?=\s)) (.+)/)[0]
+                case name
+                when "user_id", "created_at", "updated_at", /$*_id\z/
+                  next
+                else
+                  new_line.write "          #{name.singularize.camelize(:lower)}\n"
                 end
               end
+              if table_check(line: line, class_name: class_name)
+                @on = true
+              end
             end
           end
         end
+      end
 
-        def rspec_query_end class_name: "souls"
-          file_path = "./spec/queries/#{class_name.singularize}_spec.rb"
-          path = "./db/schema.rb"
-          @on = false
-          File.open(file_path, "a") do |new_line|
-            File.open(path, "r") do |f|
-              f.each_line.with_index do |line, i|
-                if @on 
-                  if line.include?("end") || line.include?("t.index")
-                    new_line.write <<-EOS
+      def rspec_query_end class_name: "souls"
+        file_path = "./spec/queries/#{class_name.singularize}_spec.rb"
+        path = "./db/schema.rb"
+        @on = false
+        File.open(file_path, "a") do |new_line|
+          File.open(path, "r") do |f|
+            f.each_line.with_index do |line, i|
+              if @on 
+                if line.include?("end") || line.include?("t.index")
+                  new_line.write <<-EOS
         )
     end
   end
 end
-                    EOS
-                    break
-                  end
-                  type, name = line.split(",")[0].gsub("\"", "").scan(/((?<=t\.).+(?=\s)) (.+)/)[0]
-                  field ||= type_check type
-                  array_true = line.include?("array: true")
-                  case name
-                  when "created_at", "updated_at"
-                    next
-                  else
-                    case type
-                    when "text"
-                        if array_true
-                          new_line.write "        \"#{name.singularize.camelize(:lower)}\" => be_all(String),\n"
-                        else
-                          new_line.write "        \"#{name.singularize.camelize(:lower)}\" => be_a(#{field}),\n"
-                        end
-                    when "boolean"
-                      new_line.write "        \"#{name.singularize.camelize(:lower)}\" => be_in([true, false]),\n"
-                    when "string", "bigint", "integer", "float"
-                      new_line.write "        \"#{name.singularize.camelize(:lower)}\" => be_a(#{field}),\n"
-                    when "date", "datetime"
-                      new_line.write "        \"#{name.singularize.camelize(:lower)}\" => be_a(DateTime),\n"
-                    end
-                  end
+                  EOS
+                  break
                 end
-                if table_check(line: line, class_name: class_name)
-                  @on = true
+                type, name = line.split(",")[0].gsub("\"", "").scan(/((?<=t\.).+(?=\s)) (.+)/)[0]
+                field ||= type_check type
+                array_true = line.include?("array: true")
+                case name
+                when "user_id", "created_at", "updated_at", /$*_id\z/
+                  next
+                else
+                  case type
+                  when "text", "date", "datetime"
+                      if array_true
+                        new_line.write "        \"#{name.singularize.camelize(:lower)}\" => be_all(String),\n"
+                      else
+                        new_line.write "        \"#{name.singularize.camelize(:lower)}\" => be_a(String),\n"
+                      end
+                  when "boolean"
+                    new_line.write "        \"#{name.singularize.camelize(:lower)}\" => be_in([true, false]),\n"
+                  when "string", "bigint", "integer", "float"
+                    new_line.write "        \"#{name.singularize.camelize(:lower)}\" => be_a(#{field}),\n"
+                  end
                 end
               end
+              if table_check(line: line, class_name: class_name)
+                @on = true
+              end
             end
           end
-          [file_path]
         end
+        [file_path]
+      end
 
       def rspec_query class_name: "souls"
         singularized_class_name = class_name.singularize
         rspec_query_head class_name: singularized_class_name
+        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
       end

data/lib/souls/version.rb

@@ -1,3 +1,3 @@
 module Souls
-  VERSION = "0.13.1"
+  VERSION = "0.13.7"
 end

data/souls.gemspec

@@ -1,4 +1,4 @@
-require_relative 'lib/souls/version'
+require_relative "lib/souls/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "souls"
@@ -6,7 +6,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ["POPPIN-FUMI", "KishiTheMechanic", "James Neve"]
   spec.email         = ["fumitake.kawasaki@el-soul.com", "shota.kishi@el-soul.com", "jamesoneve@gmail.com"]
 
-  spec.summary       = "SOULS is a Web Application Framework for Microservices on Multi Cloud Platform such as Google Cloud Platform, Amazon Web Services, and Alibaba Cloud. Auto deploy with scalable condition. You can focus on business logic. No more infra problems."
+  spec.summary       = "SOULS is a GraphQL Based Web Application Framework for Microservices on Multi Cloud Platform such as Google Cloud Platform, Amazon Web Services, and Alibaba Cloud. Auto deploy with scalable condition. You can focus on business logic. No more infra problems."
   spec.description   = "SOULS is a Web Application Framework for Microservices on Multi Cloud Platform such as Google Cloud Platform, Amazon Web Services, and Alibaba Cloud. Auto deploy with scalable condition. You can focus on business logic. No more infra problems."
   spec.homepage      = "https://github.com/elsoul/souls"
   spec.license       = "Apache-2.0"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 0.13.1
+  version: 0.13.7
 platform: ruby
 authors:
 - POPPIN-FUMI
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-01-28 00:00:00.000000000 Z
+date: 2021-02-02 00:00:00.000000000 Z
 dependencies: []
 description: SOULS is a Web Application Framework for Microservices on Multi Cloud
   Platform such as Google Cloud Platform, Amazon Web Services, and Alibaba Cloud.
@@ -72,7 +72,8 @@ requirements: []
 rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
-summary: SOULS is a Web Application Framework for Microservices on Multi Cloud Platform
-  such as Google Cloud Platform, Amazon Web Services, and Alibaba Cloud. Auto deploy
-  with scalable condition. You can focus on business logic. No more infra problems.
+summary: SOULS is a GraphQL Based Web Application Framework for Microservices on Multi
+  Cloud Platform such as Google Cloud Platform, Amazon Web Services, and Alibaba Cloud.
+  Auto deploy with scalable condition. You can focus on business logic. No more infra
+  problems.
 test_files: []