souls 0.29.8 → 0.30.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 850fd970ee0932d65bed38e8bc32570a029ad30f6a936d7cb38e0515659164e2
-  data.tar.gz: 79c5e659716710e31c369050de2dff5c8c8b36e9ff52f8a54cdbd43dfda4a5b9
+  metadata.gz: eeb1d10d6473bd7f8ca2cadc783485f74d42bd0e9b90ce2206b08041dcdbf546
+  data.tar.gz: eff44e2e5adcb4a545a336fb4c7600be28a8f85ddea03e475e58bf72a8dac0e9
 SHA512:
-  metadata.gz: 454d9847007e1390fb7fd0ee3a544a37c2a022e0fefa48b912efde577e2c8f897a03d0e3f5f57399fcefadaa320578090e7a6a0f23ee267caf4a2aaf2847d307
-  data.tar.gz: a6576810a7fb39d97fbc310039a643fd2dbc65124279965de480863f38163b0fa18bd7d1eb16713f04065834507984178bf5b6f3762de228158acf8ca99a30f1
+  metadata.gz: b5eab8bc9b90e26757ed3369305cc92de003edf4335a19cf36aae5e5f245bbc45a23b41a41e8525df4ef8d051413213f1a0db166092fab3e2b57fc9063683e3c
+  data.tar.gz: 1fb92dc68e9bd8674f9b749c1a8d043fdaaea54cb4cffd9bfa1bc8833fa6499a47e0013888d30e229f4f7ed362dfe89ef7e87b4f162566af5e896bff6b4b5b22

data/exe/souls

@@ -22,10 +22,16 @@ begin
       end
     when "schema:update"
       class_name = ARGV[2]
-      Souls::Api::Update.create_mutation(class_name: class_name)
-      Souls::Api::Update.update_mutation(class_name: class_name)
-      Souls::Api::Update.rspec_factory(class_name: class_name)
-      Souls::Api::Update.rspec_mutation(class_name: class_name)
+      status = Paint["Running SOULs Update Commands...", :yellow]
+      Whirly.start(spinner: "clock", interval: 420, stop: "🎉") do
+        Whirly.status = status
+        Souls::Api::Update.create_mutation(class_name: class_name)
+        Souls::Api::Update.update_mutation(class_name: class_name)
+        Souls::Api::Update.rspec_factory(class_name: class_name)
+        Souls::Api::Update.rspec_mutation(class_name: class_name)
+        Souls::Api::Update.rspec_resolver(class_name: class_name)
+        Whirly.status = "Done!"
+      end
     else
       puts(Paint["Comannd doesn't exist.Check you command again!...", :red])
     end

data/lib/souls/api/generate/rspec_mutation.rb

@@ -92,10 +92,10 @@ module Souls
                   "          #{camel}: \"\#{#{class_name.singularize}[:#{name.singularize.underscore}]}\"\n"
                 )
               else
+                camel = name.singularize.camelize(:lower)
+                camels = name.pluralize.camelize(:lower)
                 case type
                 when "string", "text", "date", "datetime"
-                  camel = name.singularize.camelize(:lower)
-                  camels = name.pluralize.camelize(:lower)
                   if array_true
                     new_line.write(
                       "          #{camels}: \#{#{class_name.singularize}[:#{name.pluralize.underscore}]}\n"

data/lib/souls/api/update.rb

@@ -3,6 +3,7 @@ require_relative "./update/resolver"
 require_relative "./update/type"
 require_relative "./update/rspec_factory"
 require_relative "./update/rspec_mutation"
+require_relative "./update/rspec_resolver"
 
 module Souls
   module Api::Update

data/lib/souls/api/update/mutation.rb

@@ -4,7 +4,7 @@ module Souls
       class << self
         def create_mutation(class_name: "user")
           singularized_class_name = class_name.singularize.underscore
-          new_cols = Souls.get_last_migration_type(class_name: singularized_class_name, action: "add")
+          new_cols = Souls.get_columns_num(class_name: singularized_class_name)
           dir_name = "./app/graphql/mutations/base/#{singularized_class_name}"
           new_file_path = "tmp/create_mutation.rb"
           file_path = "#{dir_name}/create_#{singularized_class_name}.rb"
@@ -17,7 +17,7 @@ module Souls
 
                 new_cols.each do |col|
                   type = col[:array] ? "[#{col[:type].camelize}]" : col[:type].camelize
-                  args = check__mutation_argument(class_name: class_name)
+                  args = check_mutation_argument(class_name: class_name)
                   unless args.include?(col[:column_name])
                     new_line.write("      argument :#{col[:column_name]}, #{type}, required: false\n")
                   end
@@ -31,9 +31,9 @@ module Souls
           puts(Paint % ["Updated file! : %{white_text}", :green, { white_text: [file_path.to_s, :white] }])
         end
 
-        def update_update_mutation(class_name: "user")
+        def update_mutation(class_name: "user")
           singularized_class_name = class_name.singularize.underscore
-          new_cols = Souls.get_last_migration_type(class_name: singularized_class_name, action: "add")
+          new_cols = Souls.get_columns_num(class_name: singularized_class_name)
           dir_name = "./app/graphql/mutations/base/#{singularized_class_name}"
           new_file_path = "tmp/update_mutation.rb"
           file_path = "#{dir_name}/update_#{singularized_class_name}.rb"
@@ -47,7 +47,7 @@ module Souls
                 new_cols.each do |col|
                   type = Souls::Api::Generate.type_check(col[:type])
                   type = "[#{type}]" if col[:array]
-                  args = check__mutation_argument(class_name: class_name, action: "update")
+                  args = check_mutation_argument(class_name: class_name, action: "update")
                   unless args.include?(col[:column_name])
                     new_line.write("      argument :#{col[:column_name]}, #{type}, required: false\n")
                   end
@@ -61,14 +61,14 @@ module Souls
           puts(Paint % ["Updated file! : %{white_text}", :green, { white_text: [file_path.to_s, :white] }])
         end
 
-        def check__mutation_argument(class_name: "user", action: "create")
+        def check_mutation_argument(class_name: "user", action: "create")
           singularized_class_name = class_name.singularize.underscore
           dir_name = "./app/graphql/mutations/base/#{singularized_class_name}"
           file_path = "#{dir_name}/#{action}_#{singularized_class_name}.rb"
           args = []
           File.open(file_path) do |f|
             f.each_line do |line|
-              args << line.split(",")[0].gsub("argument :", "").strip if line.include?("argument")
+              args << line.split(",")[0].gsub("argument :", "").strip.underscore if line.include?("argument")
             end
           end
           args

data/lib/souls/api/update/resolver.rb

@@ -4,7 +4,7 @@ module Souls
       class << self
         def resolver(class_name: "user")
           singularized_class_name = class_name.singularize.underscore
-          new_cols = Souls.get_last_migration_type(class_name: singularized_class_name, action: "add")
+          new_cols = Souls.get_columns_num(class_name: singularized_class_name)
           dir_name = "./app/graphql/resolvers"
           new_file_path = "tmp/update_resolver.rb"
           file_path = "#{dir_name}/#{singularized_class_name}_search.rb"
@@ -57,10 +57,10 @@ module Souls
                 args << if line.include?("is_deleted")
                           "is_deleted"
                         else
-                          line.to_s.match(/if value\[:(.+)\]/)[1]
+                          line.to_s.match(/if value\[:(.+)\]/)[1].underscore
                         end
               elsif action == "argument" && line.include?("argument")
-                args << line.split(",")[0].gsub("argument :", "").strip
+                args << line.split(",")[0].gsub("argument :", "").strip.underscore
               end
             end
           end

data/lib/souls/api/update/rspec_factory.rb

@@ -5,7 +5,7 @@ module Souls
         def rspec_factory(class_name: "user")
           singularized_class_name = class_name.singularize.underscore
           pluralized_class_name = class_name.pluralize.underscore
-          new_cols = Souls.get_last_migration_type(class_name: singularized_class_name, action: "add")
+          new_cols = Souls.get_columns_num(class_name: singularized_class_name)
           dir_name = "./spec/factories"
           new_file_path = "tmp/create_factory.rb"
           file_path = "#{dir_name}/#{pluralized_class_name}.rb"
@@ -39,7 +39,7 @@ module Souls
           args = []
           File.open(file_path) do |f|
             f.each_line do |line|
-              args << line.split("{")[0].strip if line.include?("{")
+              args << line.split("{")[0].strip.underscore if line.include?("{")
             end
           end
           args

data/lib/souls/api/update/rspec_mutation.rb

@@ -4,7 +4,7 @@ module Souls
       class << self
         def rspec_mutation(class_name: "user")
           singularized_class_name = class_name.singularize.underscore
-          new_cols = Souls.get_last_migration_type(class_name: singularized_class_name, action: "add")
+          new_cols = Souls.get_columns_num(class_name: singularized_class_name)
           dir_name = "./spec/mutations/base"
           new_file_path = "tmp/rspec_mutation.rb"
           file_path = "#{dir_name}/#{singularized_class_name}_spec.rb"
@@ -83,7 +83,7 @@ module Souls
               if action == "node_args"
                 args << line.strip.underscore if node_res && !line.include?("{")
               elsif action == "test_args"
-                args << line.split("\"")[1] if test_res && line.include?("=> be_")
+                args << line.split("\"")[1].underscore if test_res && line.include?("=> be_")
               elsif line.include?('#{')
                 args << line.split(":")[0].strip.underscore
               end

data/lib/souls/api/update/rspec_resolver.rb

@@ -0,0 +1,86 @@
+module Souls
+  module Api
+    module Update
+      class << self
+        def rspec_resolver(class_name: "user")
+          singularized_class_name = class_name.singularize.underscore
+          new_cols = Souls.get_columns_num(class_name: singularized_class_name)
+          dir_name = "./spec/resolvers"
+          new_file_path = "tmp/rspec_resolver.rb"
+          file_path = "#{dir_name}/#{singularized_class_name}_search_spec.rb"
+          node_res = false
+          test_res = false
+          File.open(file_path) do |f|
+            File.open(new_file_path, "w") do |new_line|
+              f.each_line do |line|
+                new_line.write(line)
+                node_res = true if line.include?("node {")
+                test_res = true if line.include?("include(")
+                node_res = false if node_res && line.include?("}")
+                test_res = false if test_res && line.strip == ")"
+
+                if node_res && !line.include?("{")
+                  node_args = check_rspec_resolver_argument(class_name: class_name, action: "node_args")
+                  new_cols.each do |col|
+                    unless node_args.include?(col[:column_name])
+                      new_line.write("              #{col[:column_name].camelize}\n")
+                    end
+                  end
+                  node_res = false
+                elsif test_res && line.include?("=> be_")
+                  test_args = check_rspec_resolver_argument(class_name: class_name, action: "test_args")
+                  new_cols.each do |col|
+                    type = Souls::Api::Generate.type_check(col[:type])
+                    text =
+                      case type
+                      when "String"
+                        col[:array] ? "be_all(String)" : "be_a(String)"
+                      when "Integer", "Float"
+                        col[:array] ? "be_all(Integer)" : "be_a(Integer)"
+                      when "Boolean"
+                        col[:array] ? "be_all([true, false])" : "be_in([true, false])"
+                      else
+                        col[:array] ? "be_all(String)" : "be_a(String)"
+                      end
+                    unless test_args.include?(col[:column_name])
+                      new_line.write("          \"#{col[:column_name]}\" => #{text},\n")
+                    end
+                  end
+                  test_res = false
+                end
+              end
+            end
+          end
+          FileUtils.rm(file_path)
+          FileUtils.mv(new_file_path, file_path)
+          puts(Paint % ["Updated file! : %{white_text}", :green, { white_text: [file_path.to_s, :white] }])
+        end
+
+        def check_rspec_resolver_argument(class_name: "user", action: "node_args")
+          singularized_class_name = class_name.singularize.underscore
+          dir_name = "./spec/resolvers"
+          file_path = "#{dir_name}/#{singularized_class_name}_search_spec.rb"
+          node_res = false
+          test_res = false
+          args = []
+          File.open(file_path) do |f|
+            f.each_line do |line|
+              node_res = true if line.include?("node {")
+              test_res = true if line.include?("include(")
+              node_res = false if node_res && line.include?("}")
+              test_res = false if test_res && line.strip == ")"
+              if action == "node_args"
+                args << line.strip.underscore if node_res && !line.include?("{")
+              elsif action == "test_args"
+                args << line.split("\"")[1].underscore if test_res && line.include?("=> be_")
+              elsif line.include?('#{')
+                args << line.split(":")[0].strip.underscore
+              end
+            end
+          end
+          args
+        end
+      end
+    end
+  end
+end

data/lib/souls/api/update/type.rb

@@ -4,7 +4,7 @@ module Souls
       class << self
         def type(class_name: "user")
           singularized_class_name = class_name.singularize.underscore
-          new_cols = Souls.get_last_migration_type(class_name: singularized_class_name, action: "add")
+          new_cols = Souls.get_columns_num(class_name: singularized_class_name)
           dir_name = "./app/graphql/types"
           new_file_path = "tmp/create_type.rb"
           file_path = "#{dir_name}/#{singularized_class_name}_type.rb"

data/lib/souls/version.rb

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

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-0.8.8
+0.9.1

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-0.8.8
+0.9.1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 0.29.8
+  version: 0.30.1
 platform: ruby
 authors:
 - POPPIN-FUMI
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-08-17 00:00:00.000000000 Z
+date: 2021-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -125,6 +125,7 @@ files:
 - lib/souls/api/update/resolver.rb
 - lib/souls/api/update/rspec_factory.rb
 - lib/souls/api/update/rspec_mutation.rb
+- lib/souls/api/update/rspec_resolver.rb
 - lib/souls/api/update/type.rb
 - lib/souls/docker.rb
 - lib/souls/docker/docker.rb