souls 0.13.0 → 0.13.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e45fe52c745c15094df1a4fe179e8945f1eb3c966b99ea0d0f901bf2978523b
-  data.tar.gz: 71423312a03a1aef118b07978b1c6c6157226cc4957875ae989c9aaa091376d9
+  metadata.gz: 074c5b354d039e12a5e400190e8268ea463ca5cb16e0b2dd0939060298dab8ca
+  data.tar.gz: fbdc806f48d8eede59f2a811db864d6df35950864f3c8c655ea49c52ca29b02b
 SHA512:
-  metadata.gz: 4646780f03ce7f63cf703a404e5b2fa38b0aaaf1fb8b03bf872caaa6220599a60be1e171d21fd254758a99cc4cc09b3046db0a9f48de7596764e7ee043b96728
-  data.tar.gz: 3ef3074ddf2cae0581460c6dcca565fddb0204f89ac2c3d535c2e2b0ca6cce0ef0da14e4aa7a99a72ac576fcab058058c752d6a274c0fec56f4c95c724648f39
+  metadata.gz: a40cc9942ac7985c7015a99cf5ae542a8df1465cd0941e083c518ca625b31a0874e9b5d1ae3ce2de8777361e080c3c44bc8fc3a25f3fc8a7743d2795564018d1
+  data.tar.gz: badfbba685bdf59298195e2995a7c33577a5dadddb5580eb512d30d5ece1186e37806ba787aaf89ad41545159009de241f52827aefddf465fa504d6f6ec801be

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    souls (0.12.6)
+    souls (0.13.5)
 
 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

@@ -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

@@ -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,7 +723,7 @@ module Souls
           f.write <<~EOS
             RSpec.describe \"#{class_name.camelize} Mutation テスト\" do
               describe "#{class_name.camelize} データを登録する" do
-                let!(:#{class_name.singularize.underscore}) { FactoryBot.create(:#{class_name.singularize.underscore}) }
+                let(:#{class_name.singularize.underscore}) { FactoryBot.attributes_for(:#{class_name.singularize.underscore}) }
 
                 let(:mutation) do
                   %(mutation {
@@ -650,26 +736,32 @@ module 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 @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"
-                      new_line.write "          #{name.singularize.camelize(:lower)}: \"\#{#{class_name.singularize}.#{name.singularize.underscore}}\"\n"
+                    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"
-                    when "date", "datetime"
-                      new_line.write "          #{name.singularize.camelize(:lower)}: \#{Time.now}\n"
+                      new_line.write "          #{name.singularize.camelize(:lower)}: \#{#{class_name.singularize}[:#{name.singularize.underscore}]}\n"
                     end
                   end
                 end
@@ -690,7 +782,28 @@ module Souls
               f.each_line.with_index do |line, i|
                 if @on
                   if line.include?("end") || line.include?("t.index")
-                    new_line.write <<-EOS
+                    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
             }
           }
         }
@@ -705,15 +818,21 @@ 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
+                      EOS
+                    end
                     break
                   end
                   _, name = line.split(",")[0].gsub("\"", "").scan(/((?<=t\.).+(?=\s)) (.+)/)[0]
+                  array_true = line.include?("array: true")
                   case name
-                  when "created_at", "updated_at"
+                  when "user_id", "created_at", "updated_at"
                     next
                   else
-                    new_line.write "              #{name.singularize.camelize(:lower)}\n"
+                    if array_true
+                      new_line.write "              #{name.pluralize.camelize(:lower)}\n"
+                    else
+                      new_line.write "              #{name.singularize.camelize(:lower)}\n"
+                    end
                   end
                 end
                 if table_check(line: line, class_name: class_name)
@@ -733,11 +852,11 @@ module Souls
               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
+                    new_line.write <<~EOS
+                                  )
+                              end
+                            end
+                          end
                     EOS
                     break
                   end
@@ -745,22 +864,20 @@ end
                   field ||= type_check type
                   array_true = line.include?("array: true")
                   case name
-                  when "created_at", "updated_at"
+                  when "user_id", "created_at", "updated_at"
                     next
                   else
                     case type
-                    when "text"
+                    when "text", "date", "datetime"
                         if array_true
-                          new_line.write "        \"#{name.singularize.camelize(:lower)}\" => be_all(String),\n"
+                          new_line.write "        \"#{name.pluralize.camelize(:lower)}\" => be_all(String),\n"
                         else
-                          new_line.write "        \"#{name.singularize.camelize(:lower)}\" => be_a(#{field}),\n"
+                          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"
-                    when "date", "datetime"
-                      new_line.write "        \"#{name.singularize.camelize(:lower)}\" => be_a(DateTime),\n"
                     end
                   end
                 end
@@ -826,7 +943,7 @@ end
                   end
                   _, name = line.split(",")[0].gsub("\"", "").scan(/((?<=t\.).+(?=\s)) (.+)/)[0]
                   case name
-                  when "created_at", "updated_at"
+                  when "user_id", "created_at", "updated_at"
                     next
                   else
                     new_line.write "          #{name.singularize.camelize(:lower)}\n"
@@ -861,22 +978,20 @@ end
                   field ||= type_check type
                   array_true = line.include?("array: true")
                   case name
-                  when "created_at", "updated_at"
+                  when "user_id", "created_at", "updated_at"
                     next
                   else
                     case type
-                    when "text"
+                    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(#{field}),\n"
+                          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"
-                    when "date", "datetime"
-                      new_line.write "        \"#{name.singularize.camelize(:lower)}\" => be_a(DateTime),\n"
                     end
                   end
                 end

data/lib/souls/version.rb

@@ -1,3 +1,3 @@
 module Souls
-  VERSION = "0.13.0"
+  VERSION = "0.13.6"
 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.0
+  version: 0.13.6
 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-01-31 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,10 +69,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.4
 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: []