souls 0.8.9 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a805d220db3a397f804739f3e1b23bd78b77e1ca23953abbf1b88a473a818967
-  data.tar.gz: b780848b2039100bccfd3afecec4b4bebe2a0656e7bd5e978f1aa553fddeb082
+  metadata.gz: d825fd34a0c8330fe7f2bb659061d47e5236f3026f3d48f2f47b53747dcecac2
+  data.tar.gz: 2e54fe6eb846ac78d53dc1cb5e4549e3af3f41fb2e8674477ac947e4563f8f55
 SHA512:
-  metadata.gz: 815c4d0fbfc43dd9844e8d995a667b52fcda667e1379be448a75ba70024a6c9ccae2efcb4059ecc713bf0a903a64e1b3cea3ad739807105b0a8299dda3714114
-  data.tar.gz: d7799896e331fcc85c6c33f66fc2890651b6933c046bb85f6d26396e62654dc16833c04c97ff52a9cb67745d8f7a62830750c1527aecafa71ccd1125d8ce73a1
+  metadata.gz: a461d07f08c1c838ef6b532145e02bd1770fd689353a4e7ddb69ff176ee60573eca6079e8c1fa2831e19f393ed9c9451bf00db23b25629d5f31aa8222a0a1eb2
+  data.tar.gz: 837cad066a089928ab0f2b86eb42249eac6bc580c6e01eb70fc288f33bb82828efb3be26193ce7a2e17355efe6b20b5a5ceffd3c0e2c3eaf500c73727730e0e1

data/.rubocop.yml

@@ -203,4 +203,6 @@ Style/DateTime:
   Enabled: false
 Layout/HeredocIndentation:
   Exclude: 
-    - "lib/souls/init.rb"
+    - "lib/souls/init.rb"
+Style/RaiseArgs:
+  Enabled: false

data/Gemfile

@@ -7,3 +7,4 @@ gem "activesupport", "6.1.0"
 gem "rake", "13.0.3"
 gem "rspec", "3.1.0"
 gem "steep", "0.39.0"
+gem "rubocop", "1.7.0"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    souls (0.8.8)
+    souls (0.9.3)
 
 GEM
   remote: https://rubygems.org/
@@ -26,6 +26,7 @@ GEM
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     minitest (5.14.2)
+    parallel (1.20.1)
     parser (2.7.2.0)
       ast (~> 2.4.1)
     rainbow (3.0.0)
@@ -34,6 +35,8 @@ GEM
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     rbs (1.0.0)
+    regexp_parser (2.0.3)
+    rexml (3.2.4)
     rspec (3.1.0)
       rspec-core (~> 3.1.0)
       rspec-expectations (~> 3.1.0)
@@ -46,6 +49,18 @@ GEM
     rspec-mocks (3.1.3)
       rspec-support (~> 3.1.0)
     rspec-support (3.1.2)
+    rubocop (1.7.0)
+      parallel (~> 1.10)
+      parser (>= 2.7.1.5)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.2.0, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 2.0)
+    rubocop-ast (1.4.0)
+      parser (>= 2.7.1.5)
+    ruby-progressbar (1.11.0)
     steep (0.39.0)
       activesupport (>= 5.1)
       ast_utils (~> 0.3.0)
@@ -57,6 +72,7 @@ GEM
     thor (1.0.1)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
+    unicode-display_width (1.7.0)
     zeitwerk (2.4.2)
 
 PLATFORMS
@@ -66,6 +82,7 @@ DEPENDENCIES
   activesupport (= 6.1.0)
   rake (= 13.0.3)
   rspec (= 3.1.0)
+  rubocop (= 1.7.0)
   souls!
   steep (= 0.39.0)
 

data/exe/souls

@@ -48,7 +48,7 @@ begin
   when "g", "generate"
     case ARGV[1]
     when "test"
-      Souls::Init.delete_mutation class_name: "article"
+      Souls::Init.get_tables
     when "model"
       Souls::Init.model class_name: ARGV[2]
     when "mutation"
@@ -59,6 +59,10 @@ begin
       Souls::Init.type class_name: ARGV[2]
     when "migrate"
       Souls::Init.migration class_name: ARGV[2]
+    when "migrate_all"
+      Souls::Init.get_tables.each do |class_name|
+        Souls::Init.migration class_name: class_name
+      end
     when "migration"
       `rake db:create_migration NAME=#{ARGV[3]}`
     when "rspec_factory"
@@ -74,22 +78,16 @@ begin
     else
     end
   when "t", "test"
-    case ARGV[1]
-    when "-r"
-      `bundle exec rspec`
-    when "-s"
-      `bundle exec steep check`
-    else
-      `bundle exec steep check`
-      `bundle exec rspec`
-    end
+    puts `rubocop`
+    puts `bundle exec rspec`
   when "deploy"
     project_id = Souls.configuration.project_id
     `gcloud builds submit --config=cloudbuild.yml --project #{project_id}`
   else
-    puts "Welcome to Souls!Yeah!"
+    puts "Welcome to SOULs!"
   end
 rescue StandardError => error
   puts error
-  puts "Thank you!Souls!"
+  puts "Thank you!!"
+  puts "SOULs"
 end

data/lib/souls.rb

@@ -2,6 +2,7 @@ require "souls/version"
 require "souls/init"
 require "json"
 require "active_support/core_ext/string/inflections"
+require "fileutils"
 
 module Souls
   class Error < StandardError; end

data/lib/souls/init.rb

@@ -284,20 +284,21 @@ module Souls
       end
 
       def create_mutation_head class_name: "souls"
-        file_path = "./app/graphql/mutations/create_#{class_name}.rb"
+        file_path = "./app/graphql/mutations/#{class_name}/create_#{class_name}.rb"
         File.open(file_path, "w") do |new_line|
           new_line.write <<~EOS
             module Mutations
-              class Create#{class_name.camelize} < BaseMutation
-                field :#{class_name}, Types::#{class_name.camelize}Type, null: false
-                field :error, String, null: true
+              module #{class_name.camelize}
+                class Create#{class_name.camelize} < BaseMutation
+                  field :#{class_name}, Types::#{class_name.camelize}Type, null: false
+                  field :error, String, null: true
 
           EOS
         end
       end
 
       def create_mutation_params class_name: "souls"
-        file_path = "./app/graphql/mutations/create_#{class_name}.rb"
+        file_path = "./app/graphql/mutations/#{class_name}/create_#{class_name}.rb"
         path = "./db/schema.rb"
         @on = false
         File.open(file_path, "a") do |new_line|
@@ -311,7 +312,7 @@ module Souls
                 when "created_at", "updated_at"
                   next
                 else
-                  new_line.write "    argument :#{name}, #{field}, required: false\n"
+                  new_line.write "      argument :#{name}, #{field}, required: false\n"
                 end
               end
               @on = true if table_check(line: line, class_name: class_name)
@@ -321,19 +322,20 @@ module Souls
       end
 
       def create_mutation_end class_name: "souls"
-        file_path = "./app/graphql/mutations/create_#{class_name}.rb"
+        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} }
-                  else
-                    { error: #{class_name}.errors.full_messages }
+                  def resolve **args
+                    #{class_name} = #{class_name.camelize}.new args
+                    if #{class_name}.save
+                      { #{class_name}: #{class_name} }
+                    else
+                      { error: #{class_name}.errors.full_messages }
+                    end
+                  rescue StandardError => error
+                    GraphQL::ExecutionError.new error
                   end
-                rescue StandardError => error
-                  GraphQL::ExecutionError.new error
                 end
               end
             end
@@ -343,19 +345,20 @@ module Souls
       end
 
       def update_mutation_head class_name: "souls"
-        file_path = "./app/graphql/mutations/update_#{class_name}.rb"
+        file_path = "./app/graphql/mutations/#{class_name}/update_#{class_name}.rb"
         File.open(file_path, "w") do |new_line|
           new_line.write <<~EOS
             module Mutations
-              class Update#{class_name.camelize} < BaseMutation
-                field :#{class_name}, Types::#{class_name.camelize}Type, null: false
+              module #{class_name.camelize}
+                class Update#{class_name.camelize} < BaseMutation
+                  field :#{class_name}, Types::#{class_name.camelize}Type, null: false
 
           EOS
         end
       end
 
       def update_mutation_params class_name: "souls"
-        file_path = "./app/graphql/mutations/update_#{class_name}.rb"
+        file_path = "./app/graphql/mutations/#{class_name}/update_#{class_name}.rb"
         path = "./db/schema.rb"
         @on = false
         File.open(file_path, "a") do |new_line|
@@ -369,7 +372,7 @@ module Souls
                 when "created_at", "updated_at"
                   next
                 else
-                  new_line.write "    argument :#{name}, #{field}, required: false\n"
+                  new_line.write "      argument :#{name}, #{field}, required: false\n"
                 end
               end
               @on = true if table_check(line: line, class_name: class_name)
@@ -379,16 +382,17 @@ module Souls
       end
 
       def update_mutation_end class_name: "souls"
-        file_path = "./app/graphql/mutations/update_#{class_name}.rb"
+        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]) }
-                rescue StandardError => error
-                  GraphQL::ExecutionError.new error
+                  def resolve **args
+                    #{class_name} = #{class_name.camelize}.find args[:id]
+                    #{class_name}.update args
+                    { #{class_name}: #{class_name.camelize}.find(args[:id]) }
+                  rescue StandardError => error
+                    GraphQL::ExecutionError.new error
+                  end
                 end
               end
             end
@@ -404,20 +408,22 @@ module Souls
       end
 
       def delete_mutation class_name: "souls"
-        file_path = "./app/graphql/mutations/delete_#{class_name}.rb"
+        file_path = "./app/graphql/mutations/#{class_name}/delete_#{class_name}.rb"
         File.open(file_path, "w") do |f|
           f.write <<~EOS
             module Mutations
-              class Delete#{class_name.camelize} < BaseMutation
-                field :#{class_name}, Types::#{class_name.camelize}Type, null: false
-                argument :id, Integer, required: true
-
-                def resolve id:
-                  #{class_name} = #{class_name.camelize}.find id
-                  #{class_name}.destroy
-                  { #{class_name}: #{class_name} }
-                rescue StandardError => error
-                  GraphQL::ExecutionError.new error
+              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
+
+                  def resolve id:
+                    #{class_name} = #{class_name.camelize}.find id
+                    #{class_name}.destroy
+                    { #{class_name}: #{class_name} }
+                  rescue StandardError => error
+                    GraphQL::ExecutionError.new error
+                  end
                 end
               end
             end
@@ -426,12 +432,32 @@ module Souls
         puts "Mutation create_#{class_name}.rb Auto Generated from schema.rb!: `#{file_path}`"
       end
 
+      def create_confirm
+        puts "Directory already exists, Overwrite?? (Y/N)"
+        input = STDIN.gets.chomp
+        return true if input == "Y"
+        raise StandardError.new "Directory Already Exist!"
+      end
+
       def mutation class_name: "souls"
-        create_mutation_head class_name: class_name
-        create_mutation_params class_name: class_name
-        create_mutation_end class_name: class_name
-        update_mutation class_name: class_name
-        delete_mutation class_name: class_name
+        singularized_class_name = class_name.singularize
+        if Dir.exist? "./app/graphql/mutations/#{singularized_class_name}"
+          create_confirm
+          FileUtils.rm_r("./app/graphql/mutations/#{singularized_class_name}")
+        end
+        Dir.mkdir "./app/graphql/mutations/#{singularized_class_name}"
+        create_mutation_head class_name: singularized_class_name
+        create_mutation_params class_name: singularized_class_name
+        create_mutation_end class_name: singularized_class_name
+        update_mutation class_name: singularized_class_name
+        delete_mutation class_name: singularized_class_name
+        puts "\n#############################################################################################################"
+        puts "\nAdd these lines at `./app/graphql/types/mutation_type.rb`"
+        puts "\n\n"
+        puts "field :create_#{singularized_class_name}, mutation: Mutations::#{singularized_class_name.camelize}::Create#{singularized_class_name.camelize}"
+        puts "field :update_#{singularized_class_name}, mutation: Mutations::#{singularized_class_name.camelize}::Update#{singularized_class_name.camelize}"
+        puts "field :delete_#{singularized_class_name}, mutation: Mutations::#{singularized_class_name.camelize}::Delete#{singularized_class_name.camelize}"
+        puts "\n\n#############################################################################################################"
       end
 
       def create_query class_name: "souls"
@@ -476,8 +502,15 @@ module Souls
       end
 
       def query class_name: "souls"
-        create_query class_name: class_name
-        create_queries class_name: class_name
+        singularized_class_name = class_name.singularize
+        create_query class_name: singularized_class_name
+        create_queries class_name: singularized_class_name
+        puts "\n#############################################################################################################"
+        puts "\nAdd these lines at `./app/graphql/types/query_type.rb`"
+        puts "\n\n"
+        puts "field :#{singularized_class_name}, resolber: Queries::#{singularized_class_name.camelize}"
+        puts "field :#{singularized_class_name.pluralize}, Types::#{singularized_class_name.camelize}Type.connection_type, null: true"
+        puts "\n\n#############################################################################################################"
       end
 
       def create_type_head class_name: "souls"
@@ -526,9 +559,10 @@ module Souls
       end
 
       def type class_name: "souls"
-        create_type_head class_name: class_name
-        create_type_params class_name: class_name
-        create_type_end class_name: class_name
+        singularized_class_name = class_name.singularize
+        create_type_head class_name: singularized_class_name
+        create_type_params class_name: singularized_class_name
+        create_type_end class_name: singularized_class_name
       end
 
       def rspec_factory_head class_name: "souls"
@@ -574,9 +608,10 @@ module Souls
       end
 
       def rspec_factory class_name: "souls"
-        rspec_factory_head class_name: class_name
-        rspec_factory_params class_name: class_name
-        rspec_factory_end class_name: class_name
+        singularized_class_name = class_name.singularize
+        rspec_factory_head class_name: singularized_class_name
+        rspec_factory_params class_name: singularized_class_name
+        rspec_factory_end class_name: singularized_class_name
       end
 
       def rspec_model class_name: "souls"
@@ -619,6 +654,17 @@ module Souls
         end
       end
 
+      def get_tables
+        path = "./db/schema.rb"
+        tables = []
+        File.open(path, "r") do |f|
+          f.each_line.with_index do |line, i|
+              tables << line.split("\"")[1] if line.include?("create_table")
+          end
+        end
+        tables
+      end
+
       def add_mutation_type class_name: "souls"
         # let's do this later
       end
@@ -630,11 +676,11 @@ module Souls
       def migration class_name: "souls"
         # `rake db:migrate`
         model class_name: class_name
-        mutation class_name: class_name
-        query class_name: class_name
         type class_name: class_name
         rspec_factory class_name: class_name
         rspec_model class_name: class_name
+        query class_name: class_name
+        mutation class_name: class_name
       end
     end
   end

data/lib/souls/version.rb

@@ -1,3 +1,3 @@
 module Souls
-  VERSION = "0.8.9"
+  VERSION = "0.9.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 0.8.9
+  version: 0.9.4
 platform: ruby
 authors:
 - POPPIN-FUMI
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-01-21 00:00:00.000000000 Z
+date: 2021-01-22 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.