souls 0.13.6 → 0.13.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 074c5b354d039e12a5e400190e8268ea463ca5cb16e0b2dd0939060298dab8ca
-  data.tar.gz: fbdc806f48d8eede59f2a811db864d6df35950864f3c8c655ea49c52ca29b02b
+  metadata.gz: 53da6d8b3f84df3136e5e557035f68d23aa4cb97eb42648d7219ad521a58ec93
+  data.tar.gz: c12200d5439b99d52d3beef650f1513e21a8709d503fe2b3641f507bac278b86
 SHA512:
-  metadata.gz: a40cc9942ac7985c7015a99cf5ae542a8df1465cd0941e083c518ca625b31a0874e9b5d1ae3ce2de8777361e080c3c44bc8fc3a25f3fc8a7743d2795564018d1
-  data.tar.gz: badfbba685bdf59298195e2995a7c33577a5dadddb5580eb512d30d5ece1186e37806ba787aaf89ad41545159009de241f52827aefddf465fa504d6f6ec801be
+  metadata.gz: a28d17def0684d6622fd13d4979bdb855fc8ef0f69a2e425fbf0380e79751a0e4119cc597380879a21289d78463e7960a770ac1d50ba17c0c43592e6c683fee1
+  data.tar.gz: 1ce61c0bd694cfe6401c339cea92e0fa34ff1a5b15f40fb040b3d550a08af164b984fbbb6eee2c907d924f9750e1ad8eee0bc043f19f61dbfe6e5cff0dc08c39

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    souls (0.13.5)
+    souls (0.13.6)
 
 GEM
   remote: https://rubygems.org/

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]

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"
@@ -723,67 +723,101 @@ 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
-          @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
-                  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"
+      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")
-                    if @user_exist
-                      new_line.write <<-EOS
+      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
             }
           }
         }
@@ -801,9 +835,9 @@ module Souls
       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
+                    EOS
+                  else
+                    new_line.write <<-EOS
             }
           }
         }
@@ -818,81 +852,82 @@ module Souls
       a1 = result.dig("data", "create#{class_name.singularize.camelize}", "#{class_name.singularize.camelize(:lower)}")
       expect(a1).to include(
         "id" => be_a(String),
-                      EOS
-                    end
-                    break
+                    EOS
                   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"
-                    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
+      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
-                    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 "user_id", "created_at", "updated_at"
-                    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
+                  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
@@ -904,109 +939,141 @@ module Souls
           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 "user_id", "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 "user_id", "created_at", "updated_at"
-                    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
+                  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.6"
+  VERSION = "0.13.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 0.13.6
+  version: 0.13.7
 platform: ruby
 authors:
 - POPPIN-FUMI
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-01-31 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.
@@ -69,7 +69,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.4
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: SOULS is a GraphQL Based Web Application Framework for Microservices on Multi