souls 0.21.1 → 0.21.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78b49dde67014e3798a6f1f9404a6700be255abc69d604427cc490eee0c2974a
-  data.tar.gz: 5a1ea6a86a8be16f340c28c8bebb046ee758a436c8bd9cd6f4461c9af80e1dd3
+  metadata.gz: 78d9e2a7d00d0a8d4089ef534c67a1389d19274548f121d106cd3e3cc09aff0f
+  data.tar.gz: 0ae0546a47fdbedbc348fa333ca6563958e7902ac08b0f2b79170031321829b0
 SHA512:
-  metadata.gz: 1bb85405181d2280c1a13547b5f2f9e171e48dc053eb596810076f6c79860b19e792cda9bb52e9d5a3ce2c21def0e3bdd7b1b762e50b2387e59fbe3cd1a033bf
-  data.tar.gz: 1a3857edb0b9d8ef914b8012bb51688d1fcdd7740929255c04eb5c92852d37ab426a08074eebb3baeff5f3a656a5621d1a0bd795f0ba833f689344d161a8fef0
+  metadata.gz: 03b04be4d7334667d60874fb49982d279c0dfe055e8322d66d4ed924ded0d00d63c81dda241aed706f12d5692e18c626a42100382a67c4662a6cc0e96a5d6c9a
+  data.tar.gz: 5d3d0d212fd42181e5e50ca309b1f156f3ebe9b7bd5f9da0eab0e39f387938040755b89173a2b3de3ca8d6c45749db7ce87fd6115003f7430b6c1405f055938a

data/Gemfile

@@ -7,5 +7,5 @@ gem "activesupport", "6.1.3.2"
 gem "parser", "3.0.1.1"
 gem "rake", "13.0.3"
 gem "rspec", "3.10.0"
-gem "rubocop", "1.15.0"
+gem "rubocop", "1.16.1"
 gem "steep", "0.44.1"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    souls (0.21.1)
+    souls (0.21.5)
 
 GEM
   remote: https://rubygems.org/
@@ -13,7 +13,7 @@ GEM
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
     ast (2.4.2)
-    concurrent-ruby (1.1.8)
+    concurrent-ruby (1.1.9)
     diff-lcs (1.4.4)
     ffi (1.15.1)
     i18n (1.8.10)
@@ -47,16 +47,16 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.2)
-    rubocop (1.15.0)
+    rubocop (1.16.1)
       parallel (~> 1.10)
       parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.5.0, < 2.0)
+      rubocop-ast (>= 1.7.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.6.0)
+    rubocop-ast (1.7.0)
       parser (>= 3.0.1.1)
     ruby-progressbar (1.11.0)
     steep (0.44.1)
@@ -76,7 +76,6 @@ GEM
     zeitwerk (2.4.2)
 
 PLATFORMS
-  x86_64-darwin-20
   x86_64-linux
 
 DEPENDENCIES
@@ -84,9 +83,9 @@ DEPENDENCIES
   parser (= 3.0.1.1)
   rake (= 13.0.3)
   rspec (= 3.10.0)
-  rubocop (= 1.15.0)
+  rubocop (= 1.16.1)
   souls!
   steep (= 0.44.1)
 
 BUNDLED WITH
-   2.2.18
+   2.2.19

data/README.md

@@ -1,4 +1,4 @@
-[![SOULs](https://firebasestorage.googleapis.com/v0/b/el-quest.appspot.com/o/mediaLibrary%2F1605615287402_souls-ogp.jpg?alt=media&token=1115aa76-6863-469d-acc8-9815ca7fac37)](https://rubygems.org/gems/souls)
+[![SOULs](https://storage.googleapis.com/souls/souls-ogp-vertical.jpg)](https://rubygems.org/gems/souls)
 
 <p align="center">
   <a aria-label="Ruby logo" href="https://el-soul.com">

data/exe/souls

@@ -99,7 +99,7 @@ begin
     when "migration"
       system "rake db:create_migration NAME=create_#{ARGV[2]}"
     when "update"
-      Souls::Generate.delete_all class_name: ARGV[2]
+      Souls::Generate.update_delete class_name: ARGV[2]
       Souls::Generate.single_migrate class_name: ARGV[2]
     else
       "SOULs!"
@@ -138,8 +138,8 @@ begin
     system "rubocop -a"
     system "bundle exec rspec"
   when "run"
-    system "docker build . -t souls:latest"
-    system "docker run --rm -p 3000:3000 souls:latest"
+    system "docker build . -t souls -f Dockerfile.dev"
+    system "docker run --rm --env-file .env -p 3000:3000 souls:latest"
   when "deploy"
     system "gcloud builds submit --config=cloudbuild.yml --project #{ARGV[1]}"
   else

data/lib/souls/generate/application.rb

@@ -134,6 +134,23 @@ module Souls
         puts error
       end
 
+      def update_delete class_name: "souls"
+        singularized_class_name = class_name.singularize.underscore
+        pluralized_class_name = class_name.pluralize.underscore
+        FileUtils.rm_rf "./app/graphql/mutations/#{singularized_class_name}"
+        FileUtils.rm "./app/graphql/queries/#{singularized_class_name}.rb"
+        FileUtils.rm "./app/graphql/queries/#{pluralized_class_name}.rb"
+        FileUtils.rm "./app/graphql/resolvers/#{singularized_class_name}_search.rb"
+        FileUtils.rm "./app/graphql/types/#{singularized_class_name}_type.rb"
+        FileUtils.rm "./app/graphql/types/#{singularized_class_name}_node_type.rb"
+        FileUtils.rm "./spec/mutations/#{singularized_class_name}_spec.rb"
+        FileUtils.rm "./spec/queries/#{singularized_class_name}_spec.rb"
+        FileUtils.rm "./spec/resolvers/#{singularized_class_name}_search_spec.rb"
+        puts "deleted #{class_name.camelize} CRUD!"
+      rescue StandardError => error
+        puts error
+      end
+
       def single_migrate class_name: "user"
         puts "◆◆◆ Let's Auto Generate CRUD API SET ◆◆◆\n"
         migrate class_name: class_name

data/lib/souls/generate/mutation.rb

@@ -113,6 +113,7 @@ module Souls
                   argument :id, String, required: true
           EOS
         end
+        file_path
       end
 
       def update_mutation_params class_name: "souls"
@@ -194,6 +195,8 @@ module Souls
       end
 
       def update_mutation class_name: "souls"
+        file_path = "./app/graphql/mutations/#{class_name}/update_#{class_name}.rb"
+        return "Mutation already exist! #{file_path}" if File.exist? file_path
         update_mutation_head 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
@@ -203,6 +206,7 @@ module Souls
       # 3. Mutation - Delete
       def delete_mutation class_name: "souls"
         file_path = "./app/graphql/mutations/#{class_name}/delete_#{class_name}.rb"
+        return "Mutation already exist! #{file_path}" if File.exist? file_path
         File.open(file_path, "w") do |f|
           f.write <<~EOS
             module Mutations
@@ -230,6 +234,7 @@ module Souls
       # 4. Mutation - Destroy Delete
       def destroy_delete_mutation class_name: "souls"
         file_path = "./app/graphql/mutations/#{class_name}/destroy_delete_#{class_name}.rb"
+        return "Mutation already exist! #{file_path}" if File.exist? file_path
         File.open(file_path, "w") do |f|
           f.write <<~EOS
             module Mutations
@@ -258,7 +263,8 @@ module Souls
 
       def mutation class_name: "souls"
         singularized_class_name = class_name.singularize
-
+        file_path = "./app/graphql/mutations/#{singularized_class_name}/create_#{singularized_class_name}.rb"
+        return "Mutation already exist! #{file_path}" if File.exist? file_path
         create_mutation_head 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

data/lib/souls/generate/query.rb

@@ -25,6 +25,7 @@ module Souls
 
       def create_query class_name: "souls"
         file_path = "./app/graphql/queries/#{class_name}.rb"
+        return "Query already exist! #{file_path}" if File.exist? file_path
         File.open(file_path, "w") do |f|
           f.write <<~EOS
             module Queries

data/lib/souls/generate/resolver.rb

@@ -5,9 +5,7 @@ module Souls
       def resolver_head 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"
-        return "Resolver already exist! #{file_path}" if File.exist? file_path
         @relation_params = []
-        return ["Resolver already exist! #{file_path}"] if File.exist? file_path
         File.open(file_path, "w") do |f|
           f.write <<~EOS
             module Resolvers
@@ -61,6 +59,7 @@ module Souls
         file_path = "./app/graphql/resolvers/#{class_name.singularize}_search.rb"
         File.open(file_path, "a") do |f|
           f.write <<-EOS
+      argument :is_deleted, Boolean, required: false
       argument :start_date, String, required: false
       argument :end_date, String, required: false
     end
@@ -125,17 +124,15 @@ module Souls
         file_path = "./app/graphql/resolvers/#{class_name.singularize}_search.rb"
         File.open(file_path, "a") do |f|
           f.write <<~EOS
-                              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
+                  scope = scope.where(is_deleted: value[:is_deleted]) unless value[:is_deleted].nil?
+                  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
@@ -143,6 +140,8 @@ module Souls
 
       def resolver class_name: "souls"
         singularized_class_name = class_name.singularize.underscore
+        file_path = "./app/graphql/resolvers/#{singularized_class_name}_search.rb"
+        return "Resolver already exist! #{file_path}" if File.exist? file_path
         resolver_head class_name: singularized_class_name
         resolver_params class_name: singularized_class_name
         resolver_after_params class_name: singularized_class_name

data/lib/souls/generate/rspec_factory.rb

@@ -4,7 +4,6 @@ module Souls
       ## Generate Rspec Factory
       def rspec_factory_head class_name: "souls"
         file_path = "./spec/factories/#{class_name.pluralize}.rb"
-        return "RspecFactory already exist! #{file_path}" if File.exist? file_path
         File.open(file_path, "w") do |f|
           f.write <<~EOS
             FactoryBot.define do
@@ -53,6 +52,7 @@ module Souls
 
       def rspec_factory class_name: "souls"
         file_path = "./spec/factories/#{class_name.pluralize}.rb"
+        return "RspecFactory already exist! #{file_path}" if File.exist? file_path
         singularized_class_name = class_name.singularize
         rspec_factory_head class_name: singularized_class_name
         rspec_factory_params class_name: singularized_class_name

data/lib/souls/generate/rspec_mutation.rb

@@ -4,7 +4,6 @@ module Souls
       ## Generate  Rspec Mutation
       def rspec_mutation_head class_name: "souls"
         file_path = "./spec/mutations/#{class_name.singularize}_spec.rb"
-        return "RspecMutation already exist! #{file_path}" if File.exist? file_path
         File.open(file_path, "w") do |f|
           f.write <<~EOS
             RSpec.describe \"#{class_name.camelize} Mutation テスト\" do
@@ -237,6 +236,8 @@ module Souls
 
       def rspec_mutation class_name: "souls"
         singularized_class_name = class_name.singularize
+        file_path = "./spec/mutations/#{singularized_class_name}_spec.rb"
+        return "RspecMutation already exist! #{file_path}" if File.exist? file_path
         rspec_mutation_head class_name: singularized_class_name
         rspec_mutation_after_head class_name: singularized_class_name
         rspec_mutation_params class_name: singularized_class_name

data/lib/souls/generate/rspec_policy.rb

@@ -33,7 +33,7 @@ module Souls
               context "being a staff" do
                 let(:user) { FactoryBot.create(:user, user_role: 3) }
 
-                it { is_expected.to permit_actions([:create, :update, :delete]) }
+                it { is_expected.to permit_actions([:create, :update]) }
               end
 
               context "being an administrator" do

data/lib/souls/generate/rspec_query.rb

@@ -4,7 +4,6 @@ module Souls
       ## Generate Rspec Query
       def rspec_query_head class_name: "souls"
         file_path = "./spec/queries/#{class_name.singularize}_spec.rb"
-        return "RspecQuery already exist! #{file_path}" if File.exist? file_path
         File.open(file_path, "w") do |f|
           f.write <<~EOS
             RSpec.describe \"#{class_name.camelize} Query テスト\" do
@@ -160,6 +159,8 @@ module Souls
 
       def rspec_query class_name: "souls"
         singularized_class_name = class_name.singularize
+        file_path = "./spec/queries/#{singularized_class_name}_spec.rb"
+        return "RspecQuery already exist! #{file_path}" if File.exist? file_path
         rspec_query_head class_name: singularized_class_name
         rspec_query_after_head class_name: singularized_class_name
         rspec_query_params class_name: singularized_class_name

data/lib/souls/generate/type.rb

@@ -71,6 +71,8 @@ module Souls
 
       def type class_name: "souls"
         singularized_class_name = class_name.singularize
+        file_path = "./app/graphql/types/#{singularized_class_name}_node_type.rb"
+        return "Type already exist! #{file_path}" if File.exist? file_path
         create_type_head class_name: singularized_class_name
         create_type_params class_name: singularized_class_name
         [

data/lib/souls/version.rb

@@ -1,3 +1,3 @@
 module Souls
-  VERSION = "0.21.1"
+  VERSION = "0.21.6"
 end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 0.21.1
+  version: 0.21.6
 platform: ruby
 authors:
 - POPPIN-FUMI
 - KishiTheMechanic
 - James Neve
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-05-27 00:00:00.000000000 Z
+date: 2021-06-14 00:00:00.000000000 Z
 dependencies: []
 description: SOULS is a GraphQL Based Web Application Framework for Microservices
   on Multi Cloud Platform such as Google Cloud Platform, Amazon Web Services, and
@@ -69,7 +69,7 @@ metadata:
   homepage_uri: https://github.com/elsoul/souls
   source_code_uri: https://github.com/elsoul/souls
   changelog_uri: https://github.com/elsoul/souls
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -85,7 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.2.15
-signing_key:
+signing_key: 
 specification_version: 4
 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.