souls 0.14.7 → 0.14.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82a93c134d59e41d907e30a4784bc6d0713d20ec016e606b49f957aa699e1e82
-  data.tar.gz: 663dd3215bf74f74fa17e6178a4afface0c4a173334519c4e27af210261716f2
+  metadata.gz: 804fd65fe81c6419e3375ccd10cf74b25d6bdcb5e8d2aca7e3b89a3ad5312c42
+  data.tar.gz: 0b52eea2c5519ced9176e0c0004816cbd7b4e899e6b8c694ec8b2477455179b1
 SHA512:
-  metadata.gz: 182ee54e370af1f746a45613aeb1c78604701a2ac075e7de9e58e211ed8028a0a75dcc4ab0fddce1f870a17392c14a7fc0e1aede1bdc6d8c37bdf4e107457d23
-  data.tar.gz: d91eab772bd9ec65a0844df7fb363171a2a02c76d9300c60087c37fcc75a26d188e067ae36526d9401c09793aacbe16c46bb6968dc126884ef0ad7ea5649b93a
+  metadata.gz: 0eed1e0504165176a740e77e3d9d0b08154582b5b1aee47a11100d19edfa029002902870028bc669323d748645fbacadb627d92ee79933b3188f2cd813ade606
+  data.tar.gz: 6fcf0db4532e3a59b787e0c673522d2d2ca43e5bda3638799968e86b7664c95c21c2eb391aabbfff14cbb2ad8a4cd9ea89d885f2687824b1fd2a216147c09680

data/Gemfile

@@ -6,5 +6,5 @@ gemspec
 gem "activesupport", "6.1.0"
 gem "rake", "13.0.3"
 gem "rspec", "3.1.0"
+gem "rubocop", "1.7.0"
 gem "steep", "0.39.0"
-gem "rubocop", "1.7.0"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    souls (0.14.6)
+    souls (0.14.7)
 
 GEM
   remote: https://rubygems.org/
@@ -19,7 +19,7 @@ GEM
     concurrent-ruby (1.1.8)
     diff-lcs (1.4.4)
     ffi (1.14.2)
-    i18n (1.8.7)
+    i18n (1.8.8)
       concurrent-ruby (~> 1.0)
     language_server-protocol (3.15.0.1)
     listen (3.4.1)

data/exe/souls

@@ -48,7 +48,11 @@ begin
     when "test_dir"
       Souls::Init.test_dir
     when "test"
-      Souls::Init.single_migrate class_name: "user"
+      Souls::Init.node_type class_name: "user"
+    when "resolver"
+      Souls::Init.resolver class_name: "user"
+    when "job"
+      Souls::Init.job class_name: "user"
     when "model"
       Souls::Init.model class_name: ARGV[2]
     when "mutation"
@@ -76,6 +80,12 @@ begin
     else
       "SOULs!"
     end
+  when "db:create"
+    `rake db:create && rake db:create RACK_ENV=test`
+  when "db:migrate"
+    `rake db:migrate && rake db:migrate RACK_ENV=test`
+  when "db:migrate:reset"
+    `rake db:migrate:reset && rake db:migrate:reset RACK_ENV=test`
   when "t", "test"
     `rubocop`
     `bundle exec rspec`

data/lib/souls.rb

@@ -1,5 +1,6 @@
 require "souls/version"
 require "souls/init"
+require "souls/generate"
 require "json"
 require "active_support/core_ext/string/inflections"
 require "fileutils"

data/lib/souls/generate.rb

@@ -0,0 +1,98 @@
+module Souls
+  module Init
+    class << self
+      def node_type class_name: "souls"
+        file_path = "./app/graphql/types/#{class_name.singularize}_node_type.rb"
+        File.open(file_path, "w") do |f|
+          f.write <<~EOS
+            module Types
+              class #{class_name.camelize}NodeType < GraphQL::Schema::Object
+                field :node, Types::#{class_name.camelize}, null: true
+              end
+            end
+          EOS
+        end
+        [file_path]
+      end
+
+      def resolver class_name: "souls"
+        FileUtils.mkdir_p "./app/graphql/resolvers" unless Dir.exist? "./app/graphql/resolvers"
+        file_path = "./app/graphql/resolvers/#{class_name.singularize}_search.rb"
+        File.open(file_path, "w") do |f|
+          f.write <<~EOS
+            module Resolvers
+              class #{class_name.camelize}Search < Base
+                include SearchObject.module(:graphql)
+                scope { ::#{class_name.camelize}.all }
+                type Types::#{class_name.camelize}Type.connection_type, null: false
+                description "Search #{class_name.camelize}"
+
+                class #{class_name.camelize}Filter < ::Types::BaseInputObject
+                  argument :OR, [self], required: false
+
+                  argument :start_date, String, required: false
+                  argument :end_date, String, required: false
+                end
+
+                option :filter, type: #{class_name.camelize}Filter, with: :apply_filter
+                option :first, type: types.Int, with: :apply_first
+                option :skip, type: types.Int, with: :apply_skip
+
+                def apply_filter(scope, value)
+                  branches = normalize_filters(value).inject { |a, b| a.or(b) }
+                  scope.merge branches
+                end
+
+                def apply_first(scope, value)
+                  scope.limit(value)
+                end
+
+                def apply_skip(scope, value)
+                  scope.offset(value)
+                end
+
+                def decode_global_key id
+                  _, data_id = SoulsApiSchema.from_global_id id
+                  data_id
+                end
+
+                def normalize_filters(value, branches = [])
+                  scope = ::Article.all
+
+                  scope = scope.where("created_at >= ?", value[:start_date]) if value[:start_date]
+                  scope = scope.where("created_at <= ?", value[:end_date]) if value[:end_date]
+
+                  branches << scope
+
+                  value[:OR].inject(branches) { |s, v| normalize_filters(v, s) } if value[:OR].present?
+
+                  branches
+                end
+              end
+            end
+          EOS
+        end
+        [file_path]
+      end
+
+    def job class_name: "send_mail"
+      file_path = "./app/jobs/#{class_name.singularize}_job.rb"
+      File.open(file_path, "w") do |f|
+        f.write <<~EOS
+          class #{class_name.camelize}
+            include Sidekiq::Status::Worker
+            include Sidekiq::Worker
+            sidekiq_options queue: "default"
+
+            def perform **args
+              # write task code here
+            end
+          end
+        EOS
+      end
+      [file_path]
+    end
+
+    end
+  end
+end

data/lib/souls/init.rb

@@ -258,6 +258,8 @@ module Souls
         FileUtils.mkdir_p "./app/graphql/mutations"
         FileUtils.mkdir_p "./app/graphql/queries"
         FileUtils.mkdir_p "./app/graphql/types"
+        FileUtils.mkdir_p "./app/graphql/resolvers"
+        FileUtils.mkdir_p "./app/jobs"
         FileUtils.mkdir_p "./app/models"
         FileUtils.mkdir_p "./spec/factories"
         FileUtils.mkdir_p "./spec/queries"
@@ -310,7 +312,7 @@ module Souls
             module Mutations
               module #{class_name.camelize}
                 class Create#{class_name.camelize} < BaseMutation
-                  field :#{class_name}, Types::#{class_name.camelize}Type, null: false
+                  field :#{class_name}_edge, Types::#{class_name.camelize}NodeType, null: false
                   field :error, String, null: true
 
           EOS
@@ -381,7 +383,7 @@ module Souls
           new_line.write <<~EOS
                     #{class_name} = ::#{class_name.camelize}.new args
                     if #{class_name}.save
-                      { #{class_name}: #{class_name} }
+                      { #{class_name}_edge: { node: #{class_name} } }
                     else
                       { error: #{class_name}.errors.full_messages }
                     end
@@ -403,7 +405,7 @@ module Souls
             module Mutations
               module #{class_name.camelize}
                 class Update#{class_name.camelize} < BaseMutation
-                  field :#{class_name}, Types::#{class_name.camelize}Type, null: false
+                  field :#{class_name}_edge, Types::#{class_name.camelize}NodeType, null: false
 
                   argument :id, String, required: true
           EOS
@@ -476,7 +478,7 @@ module Souls
           new_line.write <<~EOS
                     #{class_name} = ::#{class_name.camelize}.find args[:id]
                     #{class_name}.update args
-                    { #{class_name}: ::#{class_name.camelize}.find(args[:id]) }
+                    { #{class_name}_edge: { node: ::#{class_name.camelize}.find(args[:id]) } }
                   rescue StandardError => error
                     GraphQL::ExecutionError.new error
                   end
@@ -505,6 +507,32 @@ module Souls
                   field :#{class_name}, Types::#{class_name.camelize}Type, null: false
                   argument :id, String, required: true
 
+                  def resolve **args
+                    _, data_id = SoulsApiSchema.from_global_id args[:id]
+                    #{class_name} = ::#{class_name.camelize}.find data_id
+                    #{class_name}.update(is_deleted: true)
+                    { #{class_name}: ::#{class_name.camelize}.find(data_id) }
+                  rescue StandardError => error
+                    GraphQL::ExecutionError.new error
+                  end
+                end
+              end
+            end
+          EOS
+        end
+        file_path
+      end
+
+      def destroy_delete_mutation class_name: "souls"
+        file_path = "./app/graphql/mutations/#{class_name}/destroy_delete_#{class_name}.rb"
+        File.open(file_path, "w") do |f|
+          f.write <<~EOS
+            module Mutations
+              module #{class_name.camelize}
+                class DestroyDelete#{class_name.camelize} < BaseMutation
+                  field :#{class_name}, Types::#{class_name.camelize}Type, null: false
+                  argument :id, String, required: true
+
                   def resolve **args
                     _, data_id = SoulsApiSchema.from_global_id args[:id]
                     #{class_name} = ::#{class_name.camelize}.find data_id
@@ -537,7 +565,8 @@ module Souls
         [
           create_mutation_end(class_name: singularized_class_name),
           update_mutation(class_name: singularized_class_name),
-          delete_mutation(class_name: singularized_class_name)
+          delete_mutation(class_name: singularized_class_name),
+          destroy_delete_mutation(class_name: singularized_class_name)
         ]
       end
 
@@ -790,7 +819,8 @@ module Souls
             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"
+                  new_line.write "        }) {\n            #{class_name.singularize.camelize(:lower)}Edge {\n          node {\n"
+                  new_line.write "              id\n"
                   break
                 end
                 type, name = line.split(",")[0].gsub("\"", "").scan(/((?<=t\.).+(?=\s)) (.+)/)[0]
@@ -834,6 +864,7 @@ module Souls
                 if line.include?("end") || line.include?("t.index")
                   if @user_exist
                     new_line.write <<-EOS
+              }
             }
           }
         }
@@ -848,7 +879,7 @@ module Souls
     end
 
     it "return #{class_name.camelize} Data" do
-      a1 = result.dig("data", "create#{class_name.singularize.camelize}", "#{class_name.singularize.camelize(:lower)}")
+      a1 = result.dig("data", "create#{class_name.singularize.camelize}", "#{class_name.singularize.camelize(:lower)}Edge", "node")
       expect(a1).to include(
         "id" => be_a(String),
                     EOS
@@ -865,7 +896,7 @@ module Souls
     end
 
     it "return #{class_name.camelize} Data" do
-      a1 = result.dig("data", "create#{class_name.singularize.camelize}", "#{class_name.singularize.camelize(:lower)}")
+      a1 = result.dig("data", "create#{class_name.singularize.camelize}", "#{class_name.singularize.camelize(:lower)}Edge", "node")
       expect(a1).to include(
         "id" => be_a(String),
                     EOS
@@ -1139,6 +1170,7 @@ end
         singularized_class_name = class_name.singularize
         model_paths = model class_name: singularized_class_name
         type_paths = type class_name: singularized_class_name
+        node_type_paths = node_type class_name: singularized_class_name
         rspec_factory_paths = rspec_factory class_name: singularized_class_name
         rspec_model_paths = rspec_model class_name: singularized_class_name
         rspec_mutation_paths = rspec_mutation class_name: singularized_class_name
@@ -1148,6 +1180,7 @@ end
         [
           model: model_paths,
           type: type_paths,
+          node_type: node_type_paths,
           rspec_factory: rspec_factory_paths,
           rspec_model: rspec_model_paths,
           rspec_mutation: rspec_mutation_paths,
@@ -1161,7 +1194,8 @@ end
           add_mutation_type: [
             "    field :create_#{singularized_class_name}, mutation: Mutations::#{singularized_class_name.camelize}::Create#{singularized_class_name.camelize}",
             "    field :update_#{singularized_class_name}, mutation: Mutations::#{singularized_class_name.camelize}::Update#{singularized_class_name.camelize}",
-            "    field :delete_#{singularized_class_name}, mutation: Mutations::#{singularized_class_name.camelize}::Delete#{singularized_class_name.camelize}"
+            "    field :delete_#{singularized_class_name}, mutation: Mutations::#{singularized_class_name.camelize}::Delete#{singularized_class_name.camelize}",
+            "    field :destroy_delete_#{singularized_class_name}, mutation: Mutations::#{singularized_class_name.camelize}::DestroyDelete#{singularized_class_name.camelize}"
           ]
         ]
       end
@@ -1171,6 +1205,7 @@ end
         result = migrate class_name: class_name
         puts result[0][:model]
         puts result[0][:type]
+        puts result[0][:node_type]
         puts result[0][:rspec_factory]
         puts result[0][:rspec_model]
         puts result[0][:rspec_mutation]
@@ -1220,6 +1255,12 @@ end
             path[:type].each { |line| puts line }
           end
         end
+        puts "\n============== NodeType =======================\n\n"
+        paths.each do |class_name|
+          class_name.each do |path|
+            path[:node_type].each { |line| puts line }
+          end
+        end
         puts "\n============== FactoryBot =================\n\n"
         paths.each do |class_name|
           class_name.each do |path|

data/lib/souls/version.rb

@@ -1,3 +1,3 @@
 module Souls
-  VERSION = "0.14.7"
+  VERSION = "0.14.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 0.14.7
+  version: 0.14.8
 platform: ruby
 authors:
 - POPPIN-FUMI
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-02-04 00:00:00.000000000 Z
+date: 2021-02-12 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.
@@ -43,6 +43,7 @@ files:
 - config/initializers/souls.rb
 - exe/souls
 - lib/souls.rb
+- lib/souls/generate.rb
 - lib/souls/init.rb
 - lib/souls/version.rb
 - rbs/init.rbs