souls 0.15.1 → 0.15.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53de40efd144cd448a857b6137f1769b3666b561682395892440cc469cea45a2
-  data.tar.gz: 9a25d0ee2b989d0b43305462c05991e829ace194f34b7ce4b0b52b0271ba425b
+  metadata.gz: 822cc3c17c118abe445b06166b676238c722060af7379ba7620ac7e38603810f
+  data.tar.gz: 84923f26838b78d83c79c50d4703c6a19f6c49c1bc9048345332286813d2e178
 SHA512:
-  metadata.gz: 578a24022e14528fdfd8809269f69f6b4c02f6c27660ecb9e1d3752861518ffa7150f31a28fa4661cb380ead5cb157b3855b0434efcc471b529946891498c623
-  data.tar.gz: 3774afb512a034298bca690f6ffb2d41ae71fd8407d97095409c55488f6d8b86eb2946f587c1e9dc0bdec69f8fe41c8f49882e9d70e7f87d121f182e97616519
+  metadata.gz: 077a258b9306c9b53bf17ca7d2d969f18369c43ce39c01d29dc1db7befc3d5cbf9fa8d0a69946b9fe242cfe4bba6d1e3c5627329741ec91fe5408fe4191e4446
+  data.tar.gz: c9265785646fe4bed96d999d21c75042be26e72f97cffaf2bade4427c084dd55e3453b2593dfcf2a0ce0c227b233b13f6937567729e03187216a3d1451ffae67

data/Gemfile.lock

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

data/exe/souls

@@ -25,7 +25,7 @@ begin
     when "service"
       system "bundle exec rake run_server"
     else
-      system "bundle exec puma -p 3000"
+      `foreman start -f Procfile.dev`
     end
   when "c", "console"
     strain = Souls.configuration.strain
@@ -33,7 +33,7 @@ begin
     when "media", "admin"
       system "yarn dev"
     else
-      system "bundle exec irb"
+      `bundle exec irb`
     end
   when "i", "infra"
     Souls.send ARGV[1]
@@ -47,12 +47,12 @@ begin
     case ARGV[1]
     when "test_dir"
       Souls::Init.test_dir
-    when "test"
-      Souls::Init.node_type class_name: "user"
+    when "node_type"
+      Souls::Init.node_type class_name: ARGV[2]
     when "resolver"
-      Souls::Init.resolver class_name: "user"
+      Souls::Init.resolver class_name: ARGV[2]
     when "job"
-      Souls::Init.job class_name: "user"
+      Souls::Init.job class_name: ARGV[2]
     when "model"
       Souls::Init.model class_name: ARGV[2]
     when "mutation"
@@ -66,7 +66,7 @@ begin
     when "migrate_all"
       Souls::Init.migrate_all
     when "migration"
-      `rake db:create_migration NAME=#{ARGV[2]}`
+      STDOUT.write `rake db:create_migration NAME=#{ARGV[2]}`
     when "rspec_factory"
       Souls::Init.rspec_factory class_name: ARGV[2]
     when "rspec_model"
@@ -77,24 +77,26 @@ begin
       Souls::Init.rspec_query class_name: ARGV[2]
     when "rspec_type"
       Souls::Init.rspec_type class_name: ARGV[2]
+    when "rspec_resolver"
+      Souls::Init.rspec_resolver class_name: ARGV[2]
     else
       "SOULs!"
     end
   when "db:create"
-    `rake db:create && rake db:create RACK_ENV=test`
+    STDOUT.write `rake db:create && rake db:create RACK_ENV=test`
   when "db:migrate"
-    `rake db:migrate && rake db:migrate RACK_ENV=test`
+    STDOUT.write `rake db:migrate && rake db:migrate RACK_ENV=test`
   when "db:migrate:reset"
-    `rake db:migrate:reset && rake db:migrate:reset RACK_ENV=test`
+    STDOUT.write `rake db:migrate:reset && rake db:migrate:reset RACK_ENV=test`
   when "t", "test"
-    `rubocop`
-    `bundle exec rspec`
+    STDOUT.write `rubocop`
+    STDOUT.write `bundle exec rspec`
   when "run"
-    `docker build . -t souls:latest`
-    `docker run --rm -p 3000:3000 souls:latest`
+    STDOUT.write `docker build . -t souls:latest`
+    STDOUT.write `docker run --rm -p 3000:3000 souls:latest`
   when "deploy"
     project_id = Souls.configuration.project_id
-    `gcloud builds submit --config=cloudbuild.yml --project #{project_id}`
+    STDOUT.write `gcloud builds submit --config=cloudbuild.yml --project #{project_id}`
   else
     puts "Welcome to SOULs!"
   end

data/lib/souls/generate.rb

@@ -18,6 +18,7 @@ module Souls
       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"
+        return ["Aleady Exist!"] if File.exist? file_path
         File.open(file_path, "w") do |f|
           f.write <<~EOS
             module Resolvers
@@ -30,6 +31,7 @@ module Souls
                 class #{class_name.camelize}Filter < ::Types::BaseInputObject
                   argument :OR, [self], required: false
 
+                  argument :is_deleted, Boolean, required: false
                   argument :start_date, String, required: false
                   argument :end_date, String, required: false
                 end
@@ -57,8 +59,9 @@ module Souls
                 end
 
                 def normalize_filters(value, branches = [])
-                  scope = ::Article.all
+                  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]
 
@@ -75,24 +78,207 @@ module Souls
         [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
+      def job class_name: "send_mail"
+        file_path = "./app/jobs/#{class_name.singularize}_job.rb"
+        return ["Aleady Exist!"] 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
+              end
+            end
+          EOS
+        end
+        [file_path]
+      end
+
+      def rspec_resolver_head class_name: "souls"
+        file_path = "./spec/resolvers/#{class_name.singularize}_search_spec.rb"
+        File.open(file_path, "w") do |f|
+          f.write <<~EOS
+            RSpec.describe \"#{class_name.camelize}Search Resolver テスト\" do
+              describe "削除フラグ false の #{class_name.camelize} を返却する" do
+          EOS
+        end
+      end
+
+      def rspec_resolver_after_head class_name: "souls"
+        file_path = "./spec/resolvers/#{class_name.singularize}_search_spec.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")
+                  if @relation_params.empty?
+                    new_line.write <<-EOS
+    let!(:#{class_name}) { FactoryBot.create(:#{class_name}) }
+
+    let(:query) do
+      %(query {
+        #{class_name.singularize.camelize(:lower)}Search(filter: {
+          isDeleted: false
+      }) {
+          edges {
+            cursor
+            node {
+              id
+                    EOS
+                  else
+                    new_line.write <<-EOS
+    let(:#{class_name}) { FactoryBot.create(:#{class_name}, #{@relation_params.join(", ")}) }
+
+    let(:query) do
+      %(query {
+        #{class_name.singularize.camelize(:lower)}Search(filter: {
+          isDeleted: false
+      }) {
+          edges {
+            cursor
+            node {
+              id
+                    EOS
+                  end
+                  break
+                end
+                _, name = line.split(",")[0].gsub("\"", "").scan(/((?<=t\.).+(?=\s)) (.+)/)[0]
+                case name
+                when /$*_id\z/
+                  relation_col = name.gsub("_id", "")
+                  @relation_params << "#{name}: #{relation_col}.id"
+                  new_line.write "    let(:#{relation_col}) { FactoryBot.create(:#{relation_col}) }\n"
+                end
+              end
+              if table_check(line: line, class_name: class_name)
+                @on = true
+              end
             end
           end
-        EOS
+        end
       end
-      [file_path]
+
+      def rspec_resolver_params class_name: "souls"
+        file_path = "./spec/resolvers/#{class_name.singularize}_search_spec.rb"
+        path = "./db/schema.rb"
+        @on = false
+        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")
+                  new_line.write <<-EOS
+              }
+            }
+            nodes {
+              id
+            }
+            pageInfo {
+              endCursor
+              hasNextPage
+              startCursor
+              hasPreviousPage
+            }
+          }
+        }
+      )
     end
 
+    subject(:result) do
+      SoulsApiSchema.execute(query).as_json
+    end
+
+    it "return #{class_name.camelize} Data" do
+      begin
+        a1 = result.dig("data", "#{class_name.singularize.camelize(:lower)}Search", "edges")[0]["node"]
+        raise unless a1.present?
+      rescue
+        raise StandardError, result
+      end
+      expect(a1).to include(
+        "id" => be_a(String),
+                  EOS
+                  break
+                end
+                _, name = line.split(",")[0].gsub("\"", "").scan(/((?<=t\.).+(?=\s)) (.+)/)[0]
+                case name
+                when "user_id", "created_at", "updated_at", /$*_id\z/
+                  next
+                else
+                  new_line.write "              #{name.camelize(:lower)}\n"
+                end
+              end
+              if table_check(line: line, class_name: class_name)
+                @on = true
+              end
+            end
+          end
+        end
+      end
+
+      def rspec_resolver_end class_name: "souls"
+        file_path = "./spec/resolvers/#{class_name.singularize}_search_spec.rb"
+        path = "./db/schema.rb"
+        @on = false
+        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")
+                  new_line.write <<-EOS
+      )
+    end
+  end
+end
+                  EOS
+                  break
+                end
+                type, name = line.split(",")[0].gsub("\"", "").scan(/((?<=t\.).+(?=\s)) (.+)/)[0]
+                field ||= type_check type
+                array_true = line.include?("array: true")
+                case name
+                when "user_id", "created_at", "updated_at", /$*_id\z/
+                  next
+                else
+                  case type
+                  when "text", "date", "datetime"
+                      if array_true
+                        new_line.write "        \"#{name.camelize(:lower)}\" => be_all(String),\n"
+                      else
+                        new_line.write "        \"#{name.camelize(:lower)}\" => be_a(String),\n"
+                      end
+                  when "boolean"
+                    new_line.write "        \"#{name.singularize.camelize(:lower)}\" => be_in([true, false]),\n"
+                  when "string", "bigint", "integer", "float"
+                    new_line.write "        \"#{name.singularize.camelize(:lower)}\" => be_a(#{field}),\n"
+                  end
+                end
+              end
+              if table_check(line: line, class_name: class_name)
+                @on = true
+              end
+            end
+          end
+        end
+        [file_path]
+      end
+
+      def rspec_resolver class_name: "souls"
+        singularized_class_name = class_name.singularize
+        file_path = "#{Dir.pwd}/spec/resolvers/#{singularized_class_name}_search_spec.rb"
+        return ["Aleady Exist!"] if File.exist? file_path
+        rspec_resolver_head class_name: singularized_class_name
+        rspec_resolver_after_head class_name: singularized_class_name
+        rspec_resolver_params class_name: singularized_class_name
+        rspec_resolver_end class_name: singularized_class_name
+      end
     end
   end
-end
+end

data/lib/souls/init.rb

@@ -114,11 +114,11 @@ module Souls
         system "cp -r #{repository_name}-#{folder}/ #{app_name}/"
         system "rm -rf #{version}.tar.gz && rm -rf #{repository_name}-#{folder}"
         txt = <<~TEXT
-           _____ ____  __  ____#{'        '}
-          / ___// __ \\/ / / / /   _____
-          \\__ \\/ / / / / / / /   / ___/
-         ___/ / /_/ / /_/ / /___(__  )#{' '}
-        /____/\\____/\\____/_____/____/#{'  '}
+             _____ ____  __  ____#{'        '}
+            / ___// __ \\/ / / / /   _____
+            \\__ \\/ / / / / / / /   / ___/
+           ___/ / /_/ / /_/ / /___(__  )#{' '}
+          /____/\\____/\\____/_____/____/#{'  '}
         TEXT
         puts txt
         puts "=============================="
@@ -724,7 +724,7 @@ module Souls
       end
 
       def rspec_factory class_name: "souls"
-        return ["Aleady Exist!"] unless File.exist? "./spec/factories/#{class_name.singularize}"
+        return ["Aleady Exist!"] if File.exist? "./spec/factories/#{class_name.singularize}"
         singularized_class_name = class_name.singularize
         rspec_factory_head class_name: singularized_class_name
         rspec_factory_params class_name: singularized_class_name
@@ -733,7 +733,7 @@ module Souls
 
       def rspec_model class_name: "souls"
         file_path = "./spec/models/#{class_name}_spec.rb"
-        return ["Aleady Exist!"] unless File.exist? file_path
+        return ["Aleady Exist!"] if File.exist? file_path
         File.open(file_path, "w") do |f|
           f.write <<~EOS
             RSpec.describe "#{class_name.camelize} Model テスト", type: :model do
@@ -881,7 +881,12 @@ module Souls
     end
 
     it "return #{class_name.camelize} Data" do
-      a1 = result.dig("data", "create#{class_name.singularize.camelize}", "#{class_name.singularize.camelize(:lower)}Edge", "node")
+      begin
+        a1 = result.dig("data", "create#{class_name.singularize.camelize}", "#{class_name.singularize.camelize(:lower)}Edge", "node")
+        raise unless a1.present?
+      rescue
+        raise StandardError, result
+      end
       expect(a1).to include(
         "id" => be_a(String),
                     EOS
@@ -899,7 +904,12 @@ module Souls
     end
 
     it "return #{class_name.camelize} Data" do
-      a1 = result.dig("data", "create#{class_name.singularize.camelize}", "#{class_name.singularize.camelize(:lower)}Edge", "node")
+      begin
+        a1 = result.dig("data", "create#{class_name.singularize.camelize}", "#{class_name.singularize.camelize(:lower)}Edge", "node")
+        raise unless a1.present?
+      rescue
+        raise StandardError, result
+      end
       expect(a1).to include(
         "id" => be_a(String),
                     EOS
@@ -934,13 +944,13 @@ module Souls
         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 @on
                 if line.include?("end") || line.include?("t.index")
                   new_line.write <<~EOS
-                                )
-                            end
-                          end
+                            )
                         end
+                      end
+                    end
                   EOS
                   break
                 end
@@ -1006,7 +1016,7 @@ module Souls
                 if line.include?("end") || line.include?("t.index")
                   if @relation_params.empty?
                   new_line.write <<-EOS
-    let(:#{class_name}) { FactoryBot.create(:#{class_name}) }
+    let!(:#{class_name}) { FactoryBot.create(:#{class_name}) }
 
     let(:query) do
       data_id = Base64.encode64("#{class_name.camelize}:\#{#{class_name.singularize.underscore}.id}")
@@ -1051,7 +1061,7 @@ module Souls
         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 @on
                 if line.include?("end") || line.include?("t.index")
                   new_line.write <<-EOS
         }
@@ -1064,7 +1074,12 @@ module Souls
   end
 
   it "return #{class_name.camelize} Data" do
-    a1 = result.dig("data", "#{class_name.singularize.camelize(:lower)}")
+    begin
+      a1 = result.dig("data", "#{class_name.singularize.camelize(:lower)}")
+      raise unless a1.present?
+    rescue
+      raise StandardError, result
+    end
     expect(a1).to include(
       "id" => be_a(String),
                   EOS
@@ -1093,13 +1108,13 @@ module Souls
         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 @on
                 if line.include?("end") || line.include?("t.index")
-                  new_line.write <<-EOS
-        )
-    end
-  end
-end
+                  new_line.write <<~EOS
+                            )
+                        end
+                      end
+                    end
                   EOS
                   break
                 end
@@ -1174,20 +1189,24 @@ end
         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
+        resolver_paths = resolver 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
         rspec_query_paths = rspec_query class_name: singularized_class_name
+        rspec_resolver_paths = rspec_resolver class_name: singularized_class_name
         query_path = query class_name: singularized_class_name
         mutation_path = mutation class_name: singularized_class_name
         [
           model: model_paths,
           type: type_paths,
+          resolver: resolver_paths,
           node_type: node_type_paths,
           rspec_factory: rspec_factory_paths,
           rspec_model: rspec_model_paths,
           rspec_mutation: rspec_mutation_paths,
           rspec_query: rspec_query_paths,
+          rspec_resolver: rspec_resolver_paths,
           query: query_path,
           mutation: mutation_path,
           add_query_type: [
@@ -1208,11 +1227,13 @@ end
         result = migrate class_name: class_name
         puts result[0][:model]
         puts result[0][:type]
+        puts result[0][:resolver]
         puts result[0][:node_type]
         puts result[0][:rspec_factory]
         puts result[0][:rspec_model]
         puts result[0][:rspec_mutation]
         puts result[0][:rspec_query]
+        puts result[0][:rspec_resolver]
         puts result[0][:query]
         puts result[0][:mutation]
 
@@ -1258,6 +1279,12 @@ end
             path[:type].each { |line| puts line }
           end
         end
+        puts "\n============== Resolver =======================\n\n"
+        paths.each do |class_name|
+          class_name.each do |path|
+            path[:resovler].each { |line| puts line }
+          end
+        end
         puts "\n============== NodeType =======================\n\n"
         paths.each do |class_name|
           class_name.each do |path|
@@ -1288,6 +1315,12 @@ end
             path[:rspec_query].each { |line| puts line }
           end
         end
+        puts "\n============== RspecResolver =================\n\n"
+        paths.each do |class_name|
+          class_name.each do |path|
+            path[:rspec_resolver].each { |line| puts line }
+          end
+        end
         puts "\n============== Query ======================\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.15.1"
+  VERSION = "0.15.6"
 end

metadata

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