RubyGems - souls - Versions diffs - 0.16.3 → 0.16.8 - Mend

souls 0.16.3 → 0.16.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (9) hide show

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 95c7d5667fa4486a23b0feb0cd5f394baaf90940b9926afde3ac6f28aecff6d9
-  data.tar.gz: cc1486ff2c54dc5050e1f190fa0dd7ddac28db4f3c1e849013aee46d6a8ee686
+  metadata.gz: '09d37b12a50b54d68e40410a8c69b930cc091553515f735df7575fa6daa88abb'
+  data.tar.gz: 770c7f445b61f046d1a2a166004dd4c4e42272aab1192636a4596db0753cb316
 SHA512:
-  metadata.gz: 9cb1991fa03238cc123023aed9e147b97f978138cb1f3bd0560fa652dabe4af39379e22f38fea51d5de17817eadb5e050309fec5c4d5acbd14801a828ed981bc
-  data.tar.gz: 70284bcb318f210b8b1010d03c70c65e13b966dd25b0801e531a68e4f18674b37eb41bb9ff9f9e2e83f09be76f72fb578c41da790d0c3ee9284225571c53e16b
+  metadata.gz: d15a89dae81309eeaacee343f636ab4fef4cf04ddc7a287a5ba9fd76e094a9a89c48ad6c42feee91a2f3c70ff09979eecfbf4d63ec882d01d970bc9340047410
+  data.tar.gz: 56c5ec546f7e536bbf72b87bba895b292a1b79daebceb2b4037a97729cc8f9c4a91736449872943c1cde940eb829b5087423f18399e649c0272ec9979bf24106

data/.rubocop.yml CHANGED Viewed

@@ -79,6 +79,7 @@ Style/HashSyntax:
     - "**/*.rake"
     - "Rakefile"
 Style/IfUnlessModifier:
   Enabled: false

data/Gemfile.lock CHANGED Viewed

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    souls (0.16.3)
+    souls (0.16.7)
 GEM
   remote: https://rubygems.org/

data/exe/souls CHANGED Viewed

@@ -33,7 +33,12 @@ begin
     when "media", "admin"
       system "yarn dev"
     else
-      system "bundle exec irb"
+      case ARGV[1]
+      when "RACK_ENV=production"
+        system "bundle exec irb RACK_ENV=production"
+      else
+        system "bundle exec irb"
+      end
     end
   when "i", "infra"
     Souls.send ARGV[1]
@@ -43,6 +48,21 @@ begin
     Souls::Init.config_init
   when "-v", "--version"
     puts Souls::VERSION
+  when "add"
+    case ARGV[1]
+    when "mutation"
+      Souls::Init.add_mutation class_name: "user", file_name: "hoi"
+    when "type"
+      Souls::Init.add_type class_name: "user", file_name: "hoi"
+    when "connection"
+      Souls::Init.add_connection class_name: "user", file_name: "hoi"
+    when "edge"
+      Souls::Init.add_edge class_name: "user", file_name: "hoi"
+    when "rspec_mutation"
+      Souls::Init.add_rspec_mutation class_name: "user", file_name: "hoi"
+    else
+      puts "HOI!"
+    end
   when "g", "generate"
     case ARGV[1]
     when "test_dir"
@@ -87,11 +107,21 @@ begin
   when "db:create"
     system "rake db:create && rake db:create RACK_ENV=test"
   when "db:migrate"
-    system "rake db:migrate && rake db:migrate RACK_ENV=test"
+    case ARGV[1]
+    when "RACK_ENV=production"
+      system "rake db:migrate RACK_ENV=production"
+    else
+      system "rake db:migrate && rake db:migrate RACK_ENV=test"
+    end
   when "db:seed"
     system "rake db:seed"
   when "db:migrate:reset"
-    system "rake db:migrate:reset && rake db:migrate:reset RACK_ENV=test"
+    case ARGV[1]
+    when "RACK_ENV=production"
+      system "rake db:migrate:reset RACK_ENV=production DISABLE_DATABASE_ENVIRONMENT_CHECK=1"
+    else
+      system "rake db:migrate:reset && rake db:migrate:reset RACK_ENV=test"
+    end
   when "t", "test"
     system "rubocop -a"
     system "bundle exec rspec"

data/lib/souls/generate.rb CHANGED Viewed

@@ -1,6 +1,10 @@
 module Souls
   module Init
     class << self
+      def get_type_and_name line
+        line.split(",")[0].gsub("\"", "").scan(/((?<=t\.).+(?=\s)) (.+)/)[0]
+      end
       def node_type class_name: "souls"
         file_path = "./app/graphql/types/#{class_name.singularize}_node_type.rb"
         File.open(file_path, "w") do |f|
@@ -15,9 +19,10 @@ module Souls
         [file_path]
       end
-      def resolver class_name: "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"
+        @relation_params = []
         return ["Resolver already exist! #{file_path}"] if File.exist? file_path
         File.open(file_path, "w") do |f|
           f.write <<~EOS
@@ -30,63 +35,145 @@ module Souls
                 class #{class_name.camelize}Filter < ::Types::BaseInputObject
                   argument :OR, [self], required: false
+          EOS
+        end
+      end
-                  argument :is_deleted, Boolean, required: false
-                  argument :start_date, String, required: false
-                  argument :end_date, String, required: false
+      def resolver_params class_name: "souls"
+        file_path = "./app/graphql/resolvers/#{class_name.singularize}_search.rb"
+        path = "./db/schema.rb"
+        @on = false
+        @user_exist = false
+        @relation_params = []
+        File.open(file_path, "a") do |new_line|
+          File.open(path, "r") do |f|
+            f.each_line.with_index do |line, i|
+              if @on
+                if line.include?("end") || line.include?("t.index")
+                  break
+                end
+                field = "[String]" if line.include?("array: true")
+                type, name = get_type_and_name(line)
+                field ||= type_check type
+                case name
+                when "user_id"
+                  @user_exist = true
+                when /$*_id\z/
+                  @relation_params << name
+                  new_line.write "      argument :#{name}, String, required: false\n"
+                when "created_at", "updated_at"
+                  next
+                else
+                  new_line.write "      argument :#{name}, #{field}, required: false\n"
                 end
+              end
+              @on = true if table_check(line: line, class_name: class_name)
+            end
+          end
+        end
+      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 resolver_after_params class_name: "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
-                def apply_filter(scope, value)
-                  branches = normalize_filters(value).inject { |a, b| a.or(b) }
-                  scope.merge branches
-                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_first(scope, value)
-                  scope.limit(value)
-                end
+    def apply_filter(scope, value)
+      branches = normalize_filters(value).inject { |a, b| a.or(b) }
+      scope.merge branches
+    end
-                def apply_skip(scope, value)
-                  scope.offset(value)
-                end
+    def normalize_filters(value, branches = [])
+      scope = ::#{class_name.camelize}.all
+          EOS
+        end
+      end
-                def decode_global_key id
-                  _, data_id = SoulsApiSchema.from_global_id id
-                  data_id
+      def resolver_before_end class_name: "souls"
+        file_path = "./app/graphql/resolvers/#{class_name.singularize}_search.rb"
+        path = "./db/schema.rb"
+        @on = false
+        @user_exist = false
+        @relation_params = []
+        File.open(file_path, "a") do |new_line|
+          File.open(path, "r") do |f|
+            f.each_line.with_index do |line, i|
+              if @on
+                if line.include?("end") || line.include?("t.index")
+                  break
                 end
+                type, name = get_type_and_name(line)
+                if line.include?("array: true")
+                  new_line.write "      scope = scope.where(\"#{name} @> ARRAY[?]::text[]\", value[:#{name}]) if value[:#{name}]\n"
+                  next
+                end
+                case name
+                when "user_id"
+                  @user_exist = true
+                when /$*_id\z/
+                  @relation_params << name
+                  new_line.write "      scope = scope.where(#{name}: decode_global_key(value[:#{name}])) if value[:#{name}]\n"
+                when "created_at", "updated_at"
+                  next
+                else
+                  case type
+                  when "boolean"
+                    new_line.write "      scope = scope.where(#{name}: value[:#{name}]) unless value[:#{name}].nil?\n"
+                  else
+                    new_line.write "      scope = scope.where(#{name}: value[:#{name}]) if value[:#{name}]\n"
+                  end
+                end
+              end
+              @on = true if table_check(line: line, class_name: class_name)
+            end
+          end
+        end
+      end
-                def normalize_filters(value, branches = [])
-                  scope = ::#{class_name.camelize}.all
-                  scope = scope.where(is_deleted: value[:is_deleted]) if value[:is_deleted]
-                  scope = scope.where("created_at >= ?", value[:start_date]) if value[:start_date]
-                  scope = scope.where("created_at <= ?", value[:end_date]) if value[:end_date]
+      def resolver_end class_name: "souls"
+        file_path = "./app/graphql/resolvers/#{class_name.singularize}_search.rb"
+        File.open(file_path, "a") do |f|
+          f.write <<-EOS
+      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
+      branches << scope
-                  value[:OR].inject(branches) { |s, v| normalize_filters(v, s) } if value[:OR].present?
+      value[:OR].inject(branches) { |s, v| normalize_filters(v, s) } if value[:OR].present?
-                  branches
-                end
-              end
-            end
+      branches
+    end
+  end
+end
           EOS
         end
         [file_path]
       end
+      def resolver class_name: "souls"
+        singularized_class_name = class_name.singularize.underscore
+        resolver_head class_name: singularized_class_name
+        resolver_params class_name: singularized_class_name
+        resolver_after_params class_name: singularized_class_name
+        resolver_before_end class_name: singularized_class_name
+        resolver_end class_name: singularized_class_name
+      end
       def job class_name: "send_mail"
         file_path = "./app/jobs/#{class_name.singularize}_job.rb"
         return ["Job already exist! #{file_path}"] if File.exist? file_path
         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
@@ -300,6 +387,36 @@ end
       rescue StandardError => error
         puts error
       end
+      def add_mutation class_name: "souls", file_name: "hoi"
+        singularized_class_name = class_name.singularize.underscore
+        file_path = "./app/graphql/mutations/#{singularized_class_name}/#{file_name}.rb"
+        file_path
+      end
+      def add_type class_name: "souls", file_name: "hoi"
+        singularized_class_name = class_name.singularize.underscore
+        file_path = "./app/graphql/types/#{file_name}.rb"
+        file_path
+      end
+      def add_edge class_name: "souls", file_name: "hoi"
+        singularized_class_name = class_name.singularize.underscore
+        file_path = "./app/graphql/types/#{file_name}.rb"
+        file_path
+      end
+      def add_connection class_name: "souls", file_name: "hoi"
+        singularized_class_name = class_name.singularize.underscore
+        file_path = "./app/graphql/types/#{file_name}.rb"
+        file_path
+      end
+      def add_rspec_mutation class_name: "souls", file_name: "hoi"
+        singularized_class_name = class_name.singularize.underscore
+        file_path = "./app/graphql/types/#{file_name}.rb"
+        file_path
+      end
     end
   end
 end

data/lib/souls/init.rb CHANGED Viewed

@@ -780,10 +780,6 @@ module Souls
                     EOS
                   else
                     new_line.write <<-EOS
-    def get_global_key class_name, id
-      Base64.encode64(\"\#{class_name}:\#{id}\")
-    end
     let(:#{class_name}) { FactoryBot.attributes_for(:#{class_name}, #{@relation_params.join(", ")}) }
     let(:mutation) do

data/lib/souls/version.rb CHANGED Viewed

@@ -1,3 +1,3 @@
 module Souls
-  VERSION = "0.16.3"
+  VERSION = "0.16.8"
 end

data/souls.gemspec CHANGED Viewed

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.description   = "SOULS is a Web Application Framework for Microservices on Multi Cloud Platform such as Google Cloud Platform, Amazon Web Services, and Alibaba Cloud. Auto deploy with scalable condition. You can focus on business logic. No more infra problems."
   spec.homepage      = "https://github.com/elsoul/souls"
   spec.license       = "Apache-2.0"
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 3.0.0")
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = "https://github.com/elsoul/souls"

metadata CHANGED Viewed

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 0.16.3
+  version: 0.16.8
 platform: ruby
 authors:
 - POPPIN-FUMI
 - KishiTheMechanic
 - James Neve
-autorequire:
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-01 00:00:00.000000000 Z
+date: 2021-03-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.
@@ -55,7 +55,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
@@ -63,7 +63,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -71,7 +71,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.2.3
-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.