souls 0.65.4 → 0.66.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57f8f27aa8628383a5be6f93140a07aa1a7a386f6b42859a538339f1f719ff44
-  data.tar.gz: 445b08e504ad79fc36b3c6ca60ef26ea04e299496284cdd7fc0b6753b8662a13
+  metadata.gz: fea2c7809dbc16cba399be01133563e1770c6920edd33f366fc28628fbdde57d
+  data.tar.gz: 292b21da9bc2a3314410ddc29c72f22447b6a3f172c94e81ee48ab7a07531c05
 SHA512:
-  metadata.gz: f67a5b0cc1784a43f38c12bca5d37e1d7dba8a36676476a22f878bbc9f0c2c0a48e759c65d9d148cbc63b63939875b93cedb78ccd0698fae94a95c62c7d71c96
-  data.tar.gz: 19649c52d26137a06dc0b8eb5e7cc55489ca02df5653abd216cf72ca39e2bd8c10d945649c216b2dc5e74de618ed8bf01dbdd6acd47254abeb4866b030e293bd
+  metadata.gz: 9a5d3d8cdbe12fb9009d5cd8cbb5ba4f7627d6fb478de244aabd69ca1ac1bc72646fd47c217ac310452da561fce9d365c8778414de9bf17a7e26e1123b62461c
+  data.tar.gz: 8f24438d97d11a5e8cd70f5fa78c010bab2c4c07aa2feea268356f15d61d565df4278f29965e5381f643de8c6cdcf1965adb172a5187dbc9bc9c9622d1db8d42

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

@@ -45,7 +45,7 @@ module Souls
           type = Souls.type_check(param[:type])
           type = "[#{type}]" if param[:array]
           type = "String" if param[:column_name].match?(/$*_id\z/)
-          next if params[:column_name] == "user_id"
+          next if param[:column_name] == "user_id"
 
           if i == params[:params].size - 1
             f.write("      argument :#{param[:column_name]}, #{type}, required: false\n\n")
@@ -121,6 +121,7 @@ module Souls
           if i == params[:params].size - 1
             f.write("      argument :#{param[:column_name]}, #{type}, required: false\n\n")
             f.write("      def resolve(args)\n")
+            f.write("      _, data_id = SoulsApiSchema.from_global_id(args[:id])\n")
           else
             f.write("      argument :#{param[:column_name]}, #{type}, required: false\n")
           end
@@ -140,12 +141,11 @@ module Souls
               ", #{n[:column_name]}: #{n[:column_name]}"
             end
           f.write("        new_record = { **args #{relation_params.compact.join} }\n")
-          f.write("        data = ::#{singularized_class_name.camelize}.find(article_id)\n")
-          f.write("        data.update(new_record)\n")
         else
-          f.write("        data = ::#{singularized_class_name.camelize}.find(args[:id])\n")
-          f.write("        data.update(args)\n")
+          f.write("        new_record = args.except(:id)\n")
         end
+        f.write("        data = ::#{singularized_class_name.camelize}.find(data_id)\n")
+        f.write("        data.update(new_record)\n")
       end
       File.open(file_path, "a") do |new_line|
         new_line.write(<<~TEXT)

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

@@ -61,7 +61,11 @@ module Souls
             rbs_type = Souls.rbs_type_check(param[:type])
             type = "[#{type}]" if param[:array]
             if i.zero?
-              f.write("        def self.argument: (:#{param[:column_name]}, #{type}, required: false ) -> #{rbs_type}\n")
+              if param[:column_name].match?(/$*_id\z/)
+                f.write("        def self.argument: (:#{param[:column_name]}, String, required: false ) -> #{rbs_type}\n")
+              else
+                f.write("        def self.argument: (:#{param[:column_name]}, #{type}, required: false ) -> #{rbs_type}\n")
+              end
             elsif param[:column_name].match?(/$*_id\z/)
               f.write("                         | (:#{param[:column_name]}, String, required: false ) -> String\n")
             else
@@ -114,9 +118,12 @@ module Souls
           TEXT
         end
         File.open(file_path, "a") do |f|
-          params[:params].each_with_index do |param, i|
+          cols = params[:params].reject { |n| n[:column_name] == "user_id" }
+          cols.each_with_index do |param, i|
             type = Souls.rbs_type_check(param[:type])
             type = "[#{type}]" if param[:array]
+            type = "String" if param[:column_name].match?(/$*_id\z/)
+
             if i == params[:params].size - 1
               f.write("                          #{param[:column_name]}: #{type}?\n")
             else
@@ -131,10 +138,14 @@ module Souls
         # rubocop:enable Layout/LineLength
 
         File.open(file_path, "a") do |f|
-          params[:params].each_with_index do |param, i|
+          cols = params[:params].reject { |n| n[:column_name] == "user_id" }
+          cols.each_with_index do |param, i|
             type = Souls.type_check(param[:type])
             rbs_type = Souls.rbs_type_check(param[:type])
             type = "[#{type}]" if param[:array]
+            type = "String" if param[:column_name].match?(/$*_id\z/)
+            rbs_type = "String" if param[:column_name].match?(/$*_id\z/)
+
             required = param[:column_name] == "id" ? "required: true" : "required: false"
             if i.zero?
               f.write("        def self.argument: (:#{param[:column_name]}, #{type}, #{required} ) -> #{rbs_type}\n")

data/lib/souls/cli.rb

@@ -39,23 +39,27 @@ module Souls
     end
 
     desc "test", "Run Rspec & Rubocop"
+    method_option :all, type: :boolean, aliases: "--all", default: false, desc: "Run (Rspec & steep check & Rubocop)"
     def test
-      system("rubocop -A")
-      system("bundle exec rspec")
-    end
-
-    desc "test_all", "Run (Rspec & steep check & Rubocop)"
-    def test_all
-      Dir.chdir(Souls.get_mother_path.to_s) do
-        system("steep check")
+      if options[:all]
+        Dir.chdir(Souls.get_mother_path.to_s) do
+          system("steep check")
+        end
+        Dir.chdir(Souls.get_api_path.to_s) do
+          system("rubocop -A")
+          system("bundle exec rspec")
+        end
+      else
+        system("rubocop -A")
+        system("bundle exec rspec")
       end
-      system("rubocop -A")
-      system("bundle exec rspec")
     end
 
     desc "check", "Run steep check"
     def check
-      system("steep check")
+      Dir.chdir(Souls.get_mother_path.to_s) do
+        system("steep check")
+      end
     end
 
     def self.exit_on_failure?

data/lib/souls/version.rb

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

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-0.44.4
+0.45.2

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-0.44.4
+0.45.2

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 0.65.4
+  version: 0.66.2
 platform: ruby
 authors:
 - POPPIN-FUMI