souls 0.10.8 → 0.11.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67c50236d6c17bc68456b3cd06c8b6a5421a52b0927f76eaa6660d4a38179343
-  data.tar.gz: f9f2255f2d73399248982c7bf8ef58232cfa5ce29e774c62cf4f94277f7c4ba2
+  metadata.gz: ac62e7ceab027e6712c2f49a1006467634b695c94277532d995abfe8b84b06d5
+  data.tar.gz: b9a7d9be1893112f1ed88c10246addcf65b1324fbe38c88341ea165e1dbfeb95
 SHA512:
-  metadata.gz: 4043bdc3548ab60b826e5c32f1a9c1b88997c3d574796c2caaa3ddad1a319cfd7fc569d9800c0f7bae4c0c1f2a69317720530d7b8f2fea8bc9301d5023495931
-  data.tar.gz: 0f64ce389e8d66bcc4a80172104b9a59319e0eb4a62f4905dacb87ccb6f7b89bcbe14e2a55fe7769d15b3c4b2815b7e9bd4747859a5730e8e95273501a88c901
+  metadata.gz: a8d541ba1c46c4419c0599a38be3ad060c3630e50768ac19d598d4324b9ed38c80be49e67aacb307179f091a0543c64853d1563a51b0bdaeefa1f2d3b4d9cf99
+  data.tar.gz: 2be11c59ff026d0cd1a33d897772e03a8e1839feba4d0b01ffb44f7ec8b37ac5b6d3e76dc7a7c2bdd8bd1edfc4bafa6fd5f039875d6b9aa5d9f204a2f8f639d2

data/.rubocop.yml

@@ -133,7 +133,7 @@ Metrics/AbcSize:
   Enabled: false
 
 Metrics/CyclomaticComplexity:
-  Max: 30
+  Max: 40
 
 Metrics/PerceivedComplexity:
   Enabled: false

data/Gemfile.lock

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

data/exe/souls

@@ -46,7 +46,7 @@ begin
   when "g", "generate"
     case ARGV[1]
     when "test"
-      Souls::Init.rspec_mutation class_name: "user"
+      Souls::Init.rspec_query class_name: "user"
     when "model"
       Souls::Init.model class_name: ARGV[2]
     when "mutation"

data/lib/souls/init.rb

@@ -460,7 +460,7 @@ module Souls
         ]
       end
 
-      def create_query class_name: "souls"
+      def create_queries class_name: "souls"
         file_path = "./app/graphql/queries/#{class_name.pluralize}.rb"
         File.open(file_path, "w") do |f|
           f.write <<~EOS
@@ -480,17 +480,18 @@ module Souls
         file_path
       end
 
-      def create_queries class_name: "souls"
+      def create_query class_name: "souls"
         file_path = "./app/graphql/queries/#{class_name}.rb"
         File.open(file_path, "w") do |f|
           f.write <<~EOS
             module Queries
               class #{class_name.camelize} < Queries::BaseQuery
                 type Types::#{class_name.camelize}Type, null: false
-                argument :id, Integer, required: true
+                argument :id, String, required: true
 
-                def resolve id:
-                  ::#{class_name.camelize}.find(id)
+                def resolve **args
+                  _, #{class_name.singularize.underscore}_id = SoulsApiSchema.from_global_id args[:id]
+                  ::#{class_name.camelize}.find(#{class_name.singularize.underscore}_id)
                 rescue StandardError => error
                   GraphQL::ExecutionError.new error
                 end
@@ -627,9 +628,9 @@ module Souls
         file_path = "./spec/mutations/#{class_name.pluralize}.rb"
         File.open(file_path, "w") do |f|
           f.write <<~EOS
-            RSpec.describe #{class_name.camelize} Mutation do
-              describe "#{class_name.camelize} を作成する" do
-                let!(:#{class_name.singularize.downcase}) { FactoryBot.create(:#{class_name.singularize.downcase}) }
+            RSpec.describe \"#{class_name.camelize} Mutation テスト\" do
+              describe "#{class_name.camelize} データを登録する" do
+                let!(:#{class_name.singularize.underscore}) { FactoryBot.create(:#{class_name.singularize.underscore}) }
 
                 let(:mutation) do
                   %(mutation {
@@ -647,23 +648,21 @@ module Souls
               f.each_line.with_index do |line, i|
                 if @on 
                   if line.include?("end") || line.include?("t.index")
-                    new_line.write "        }) {\n            user {\n              id\n"
+                    new_line.write "        }) {\n            #{class_name.singularize.camelize} {\n              id\n"
                     break
                   end
-                  field = '["tag1", "tag2", "tag3"]' if line.include?("array: true")
                   type, name = line.split(",")[0].gsub("\"", "").scan(/((?<=t\.).+(?=\s)) (.+)/)[0]
-                  field ||= get_test_type type
                   case name
                   when "created_at", "updated_at"
                     next
                   else
                     case type
                     when "string", "text"
-                      new_line.write "          #{name.camelize(:lower)}: \"\#{#{class_name.singularize}.#{name.underscore}}\"\n"
+                      new_line.write "          #{name.singularize.camelize(:lower)}: \"\#{#{class_name.singularize}.#{name.singularize.underscore}}\"\n"
                     when "bigint", "integer", "float", "boolean"
-                      new_line.write "          #{name.camelize(:lower)}: \#{#{class_name.singularize}.#{name.underscore}}\n"
+                      new_line.write "          #{name.singularize.camelize(:lower)}: \#{#{class_name.singularize}.#{name.singularize.underscore}}\n"
                     when "date", "datetime"
-                      new_line.write "          #{name.camelize(:lower)}: \#{Time.now}\n"
+                      new_line.write "          #{name.singularize.camelize(:lower)}: \#{Time.now}\n"
                     end
                   end
                 end
@@ -707,7 +706,7 @@ module Souls
                   when "created_at", "updated_at"
                     next
                   else
-                    new_line.write "              #{name.camelize(:lower)}\n"
+                    new_line.write "              #{name.singularize.camelize(:lower)}\n"
                   end
                 end
                 if table_check(line: line, class_name: class_name)
@@ -761,6 +760,7 @@ end
               end
             end
           end
+          [file_path]
         end
 
       def rspec_mutation class_name: "souls"
@@ -771,8 +771,115 @@ end
         rspec_mutation_end class_name: singularized_class_name
       end
 
+      def rspec_query_head class_name: "souls"
+        file_path = "./spec/queries/#{class_name.pluralize}.rb"
+        File.open(file_path, "w") do |f|
+          f.write <<~EOS
+            RSpec.describe \"#{class_name.camelize} Query テスト\" do
+              describe "#{class_name.camelize} データを取得する" do
+                let!(:#{class_name.singularize.underscore}) { FactoryBot.create(:#{class_name.singularize.underscore}) }
+
+                let(:query) do
+                  %(query {
+                    #{class_name.singularize.underscore}(id:  \#{Base64.encode64("#{class_name.camelize}:\#{user.id}")}) {
+                      id
+          EOS
+        end
+      end
+
+        def rspec_query_params class_name: "souls"
+          file_path = "./spec/queries/#{class_name.pluralize}.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
+
+    subject(:result) do
+      SoulsApiSchema.execute(query).as_json
+    end
+
+    it "return #{class_name.camelize} Data" do
+      a1 = result.dig("data", "#{class_name.singularize.underscore}")
+      expect(a1).to include(
+        "id" => be_a(String),
+                    EOS
+                    break
+                  end
+                  _, name = line.split(",")[0].gsub("\"", "").scan(/((?<=t\.).+(?=\s)) (.+)/)[0]
+                  case name
+                  when "created_at", "updated_at"
+                    next
+                  else
+                    new_line.write "          #{name.singularize.camelize(:lower)}\n"
+                  end
+                end
+                if table_check(line: line, class_name: class_name)
+                  @on = true
+                end
+              end
+            end
+          end
+        end
+
+        def rspec_query_end class_name: "souls"
+          file_path = "./spec/queries/#{class_name.pluralize}.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 "created_at", "updated_at"
+                    next
+                  else
+                    case type
+                    when "text"
+                        if array_true
+                          new_line.write "        \"#{name.singularize.camelize(:lower)}\" => be_all(String),\n"
+                        end
+                        new_line.write "        \"#{name.singularize.camelize(:lower)}\" => be_a(#{field}),\n"
+                    when "string", "bigint", "integer", "float", "boolean"
+                      new_line.write "        \"#{name.singularize.camelize(:lower)}\" => be_a(#{field}),\n"
+                    when "date", "datetime"
+                      new_line.write "        \"#{name.singularize.camelize(:lower)}\" => be_a(DateTime),\n"
+                    end
+                  end
+                end
+                if table_check(line: line, class_name: class_name)
+                  @on = true
+                end
+              end
+            end
+          end
+          [file_path]
+        end
+
       def rspec_query class_name: "souls"
-        # if needed
+        singularized_class_name = class_name.singularize
+        rspec_query_head class_name: singularized_class_name
+        rspec_query_params class_name: singularized_class_name
+        rspec_query_end class_name: singularized_class_name
       end
 
       def get_end_point
@@ -809,6 +916,8 @@ end
         type_paths = 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
+        rspec_query_paths = rspec_query class_name: singularized_class_name
         query_path = query class_name: singularized_class_name
         mutation_path = mutation class_name: singularized_class_name
         [
@@ -816,6 +925,8 @@ end
           type: type_paths,
           rspec_factory: rspec_factory_paths,
           rspec_model: rspec_model_paths,
+          rspec_mutation: rspec_mutation_paths,
+          rspec_query: rspec_query_paths,
           query: query_path,
           mutation: mutation_path,
           add_query_type: [
@@ -860,6 +971,18 @@ end
             path[:rspec_model].each { |line| puts line }
           end
         end
+        puts "\n============== RspecMutation =================\n\n"
+        paths.each do |class_name|
+          class_name.each do |path|
+            path[:rspec_mutation].each { |line| puts line }
+          end
+        end
+        puts "\n============== RspecQuery =================\n\n"
+        paths.each do |class_name|
+          class_name.each do |path|
+            path[:rspec_query].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.10.8"
+  VERSION = "0.11.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 0.10.8
+  version: 0.11.3
 platform: ruby
 authors:
 - POPPIN-FUMI