souls 0.21.2 → 0.21.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b5d1173eefe9342b59f6b403dbc575a08df5c422ec3e7818da37438b87694b5
-  data.tar.gz: dda825a1c7e89125354a42d8930a54ac9ed59ab5f9138694ba0ac4290248eda9
+  metadata.gz: 499a395ac34e3e202310dbe492af5735bf57244af647ca9aea839c29636ca1b8
+  data.tar.gz: 0122ccd831be8640e4ba0faa010a9bc3229dbe0dcefb9eedc42a5d5a33cb2ad9
 SHA512:
-  metadata.gz: d86172233a071be4ad87fbe6cf8db1845c4a2f5b82f08f2e2f963b2a3290b79f4242e4316fd09d48646d4fac4907d7afbd5f5766ab884eb9f2910d9877a50f40
-  data.tar.gz: 60549c9c85efa3572492fb9a7afbbb14c2cd4d7ffc78f8f55bd4c546fd7d637d4d7c401733e673c9df12bdb3ac34272331e577aa4e55ac7261f2706d2e5851e6
+  metadata.gz: 0f31eda96afd418bb9dbb61cf020c3518f1183ce019aa28fa977755f1c0074f806b4ced0b0355727cf59b9cd9e1c287e734769aff632f17b722846e54570ddf2
+  data.tar.gz: 2b1d1774879089a7dd4584751508a2831bc914219dc68d680f92ae5d75371204875c239393d7dafad7eb9086e1341aaa2dc0b51319e0ae9c14de2b856eaefe27

data/Gemfile

@@ -3,9 +3,9 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in souls.gemspec
 gemspec
 
-gem "activesupport", "6.1.3.2"
+gem "activesupport", "6.1.4"
 gem "parser", "3.0.1.1"
-gem "rake", "13.0.3"
+gem "rake", "13.0.4"
 gem "rspec", "3.10.0"
-gem "rubocop", "1.15.0"
+gem "rubocop", "1.18.3"
 gem "steep", "0.44.1"

data/Gemfile.lock

@@ -1,21 +1,21 @@
 PATH
   remote: .
   specs:
-    souls (0.21.2)
+    souls (0.21.6)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.3.2)
+    activesupport (6.1.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       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)
+    ffi (1.15.3)
     i18n (1.8.10)
       concurrent-ruby (~> 1.0)
     language_server-protocol (3.16.0.1)
@@ -27,7 +27,7 @@ GEM
     parser (3.0.1.1)
       ast (~> 2.4.1)
     rainbow (3.0.0)
-    rake (13.0.3)
+    rake (13.0.4)
     rb-fsevent (0.11.0)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
@@ -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.18.3)
       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,17 +76,16 @@ GEM
     zeitwerk (2.4.2)
 
 PLATFORMS
-  x86_64-darwin-20
   x86_64-linux
 
 DEPENDENCIES
-  activesupport (= 6.1.3.2)
+  activesupport (= 6.1.4)
   parser (= 3.0.1.1)
-  rake (= 13.0.3)
+  rake (= 13.0.4)
   rspec (= 3.10.0)
-  rubocop (= 1.15.0)
+  rubocop (= 1.18.3)
   souls!
   steep (= 0.44.1)
 
 BUNDLED WITH
-   2.2.18
+   2.2.21

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">
@@ -77,7 +77,7 @@ And Create Your APP
 
 ## SOULs Document
 
-- [SOULs Document](https://elsoul.github.io/souls_doc/)
+- [SOULs Document](https://souls-doc.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

@@ -5,9 +5,9 @@ module Souls
       ## 1.Mutation - Create
       def create_mutation_head class_name: "user"
         singularized_class_name = class_name.singularize.underscore
-        dir_name = "./app/graphql/mutations/#{singularized_class_name}"
+        dir_name = "./app/graphql/mutations/base/#{singularized_class_name}"
         FileUtils.mkdir_p dir_name unless Dir.exist? dir_name
-        file_path = "./app/graphql/mutations/#{singularized_class_name}/create_#{singularized_class_name}.rb"
+        file_path = "./app/graphql/mutations/base/#{singularized_class_name}/create_#{singularized_class_name}.rb"
         File.open(file_path, "w") do |new_line|
           new_line.write <<~EOS
             module Mutations
@@ -22,7 +22,7 @@ module Souls
       end
 
       def create_mutation_params class_name: "souls"
-        file_path = "./app/graphql/mutations/#{class_name}/create_#{class_name}.rb"
+        file_path = "./app/graphql/mutations/base/#{class_name}/create_#{class_name}.rb"
         path = "./db/schema.rb"
         @on = false
         @user_exist = false
@@ -70,7 +70,7 @@ module Souls
 
       def create_mutation_after_params class_name: "article", relation_params: []
         return false if relation_params.empty?
-        file_path = "./app/graphql/mutations/#{class_name}/create_#{class_name}.rb"
+        file_path = "./app/graphql/mutations/base/#{class_name}/create_#{class_name}.rb"
         relation_params.each do |params_name|
           File.open(file_path, "a") do |new_line|
             new_line.write "        _, args[:#{params_name}] = SoulsApiSchema.from_global_id(args[:#{params_name}])\n"
@@ -80,7 +80,7 @@ module Souls
       end
 
       def create_mutation_end class_name: "souls"
-        file_path = "./app/graphql/mutations/#{class_name}/create_#{class_name}.rb"
+        file_path = "./app/graphql/mutations/base/#{class_name}/create_#{class_name}.rb"
         File.open(file_path, "a") do |new_line|
           new_line.write <<~EOS
                     #{class_name} = ::#{class_name.camelize}.new args
@@ -102,7 +102,7 @@ module Souls
 
       ## 2.Mutation - Update
       def update_mutation_head class_name: "souls"
-        file_path = "./app/graphql/mutations/#{class_name}/update_#{class_name}.rb"
+        file_path = "./app/graphql/mutations/base/#{class_name}/update_#{class_name}.rb"
         File.open(file_path, "w") do |new_line|
           new_line.write <<~EOS
             module Mutations
@@ -113,10 +113,11 @@ module Souls
                   argument :id, String, required: true
           EOS
         end
+        file_path
       end
 
       def update_mutation_params class_name: "souls"
-        file_path = "./app/graphql/mutations/#{class_name}/update_#{class_name}.rb"
+        file_path = "./app/graphql/mutations/base/#{class_name}/update_#{class_name}.rb"
         path = "./db/schema.rb"
         @on = false
         @user_exist = false
@@ -166,7 +167,7 @@ module Souls
 
       def update_mutation_after_params class_name: "article", relation_params: []
         return false if relation_params.empty?
-        file_path = "./app/graphql/mutations/#{class_name}/update_#{class_name}.rb"
+        file_path = "./app/graphql/mutations/base/#{class_name}/update_#{class_name}.rb"
         relation_params.each do |params_name|
           File.open(file_path, "a") do |new_line|
             new_line.write "        _, args[:#{params_name}] = SoulsApiSchema.from_global_id(args[:#{params_name}])\n"
@@ -176,7 +177,7 @@ module Souls
       end
 
       def update_mutation_end class_name: "souls"
-        file_path = "./app/graphql/mutations/#{class_name}/update_#{class_name}.rb"
+        file_path = "./app/graphql/mutations/base/#{class_name}/update_#{class_name}.rb"
         File.open(file_path, "a") do |new_line|
           new_line.write <<~EOS
                     #{class_name} = ::#{class_name.camelize}.find args[:id]
@@ -194,7 +195,7 @@ module Souls
       end
 
       def update_mutation class_name: "souls"
-        file_path = "./app/graphql/mutations/#{class_name}/update_#{class_name}.rb"
+        file_path = "./app/graphql/mutations/base/#{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
@@ -204,7 +205,7 @@ module Souls
 
       # 3. Mutation - Delete
       def delete_mutation class_name: "souls"
-        file_path = "./app/graphql/mutations/#{class_name}/delete_#{class_name}.rb"
+        file_path = "./app/graphql/mutations/base/#{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
@@ -232,7 +233,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"
+        file_path = "./app/graphql/mutations/base/#{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
@@ -262,11 +263,12 @@ 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"
+        file_path = "./app/graphql/mutations/base/#{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
+        # puts "File Created!\n#{file_path}"
         [
           create_mutation_end(class_name: singularized_class_name),
           update_mutation(class_name: singularized_class_name),

data/lib/souls/generate/resolver.rb

@@ -123,17 +123,14 @@ 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("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
@@ -147,6 +144,7 @@ module Souls
         resolver_params class_name: singularized_class_name
         resolver_after_params class_name: singularized_class_name
         resolver_before_end class_name: singularized_class_name
+        # puts "File Created!\n#{file_path}"
         resolver_end class_name: singularized_class_name
       end
     end

data/lib/souls/generate/rspec_factory.rb

@@ -4,6 +4,7 @@ module Souls
       ## Generate Rspec Factory
       def rspec_factory_head class_name: "souls"
         file_path = "./spec/factories/#{class_name.pluralize}.rb"
+        FileUtils.mkdir_p "./spec/factories/" unless Dir.exist? "./spec/factories/"
         File.open(file_path, "w") do |f|
           f.write <<~EOS
             FactoryBot.define do

data/lib/souls/generate/rspec_mutation.rb

@@ -3,7 +3,7 @@ module Souls
     class << self
       ## Generate  Rspec Mutation
       def rspec_mutation_head class_name: "souls"
-        file_path = "./spec/mutations/#{class_name.singularize}_spec.rb"
+        file_path = "./spec/mutations/base/#{class_name.singularize}_spec.rb"
         File.open(file_path, "w") do |f|
           f.write <<~EOS
             RSpec.describe \"#{class_name.camelize} Mutation テスト\" do
@@ -13,7 +13,7 @@ module Souls
       end
 
       def rspec_mutation_after_head class_name: "souls"
-        file_path = "./spec/mutations/#{class_name.singularize}_spec.rb"
+        file_path = "./spec/mutations/base/#{class_name.singularize}_spec.rb"
         path = "./db/schema.rb"
         @on = false
         @user_exist = false
@@ -62,7 +62,7 @@ module Souls
       end
 
       def rspec_mutation_params class_name: "souls"
-        file_path = "./spec/mutations/#{class_name.singularize}_spec.rb"
+        file_path = "./spec/mutations/base/#{class_name.singularize}_spec.rb"
         path = "./db/schema.rb"
         @on = false
         @user_exist = false
@@ -106,7 +106,7 @@ module Souls
       end
 
       def rspec_mutation_params_response class_name: "souls"
-        file_path = "./spec/mutations/#{class_name.singularize}_spec.rb"
+        file_path = "./spec/mutations/base/#{class_name.singularize}_spec.rb"
         path = "./db/schema.rb"
         @on = false
         File.open(file_path, "a") do |new_line|
@@ -188,7 +188,7 @@ module Souls
       end
 
       def rspec_mutation_end class_name: "souls"
-        file_path = "./spec/mutations/#{class_name.singularize}_spec.rb"
+        file_path = "./spec/mutations/base/#{class_name.singularize}_spec.rb"
         path = "./db/schema.rb"
         @on = false
         File.open(file_path, "a") do |new_line|
@@ -236,7 +236,7 @@ module Souls
 
       def rspec_mutation class_name: "souls"
         singularized_class_name = class_name.singularize
-        file_path = "./spec/mutations/#{singularized_class_name}_spec.rb"
+        file_path = "./spec/mutations/base/#{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

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

@@ -33,7 +33,6 @@ module Souls
         #{class_name.singularize.camelize(:lower)}(id: \\"\#{data_id}\\") {
           id
                   EOS
-                  break
                   else
                   new_line.write <<-EOS
     let(:#{class_name}) { FactoryBot.create(:#{class_name}, #{@relation_params.join(", ")}) }
@@ -44,8 +43,8 @@ module Souls
         #{class_name.singularize.camelize(:lower)}(id: \\"\#{data_id}\\") {
           id
                   EOS
-                  break
                   end
+break
                 end
                 _, name = line.split(",")[0].gsub("\"", "").scan(/((?<=t\.).+(?=\s)) (.+)/)[0]
                 case name

data/lib/souls/version.rb

@@ -1,3 +1,3 @@
 module Souls
-  VERSION = "0.21.2"
+  VERSION = "0.21.7"
 end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 0.21.2
+  version: 0.21.7
 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-07-07 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.