souls 0.10.7 → 0.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c64bef1b432a5f2480396310ec48cd750fc14e8a8f967e93562be1a80427b8f
-  data.tar.gz: a7d0a7583c9ab2b58b681ea9a98bde609ce1c416497453493396572124883c5c
+  metadata.gz: e4ee7091ee3b3710a439d778f389997e2c97d9bce2a8a26bf67cd5024d365666
+  data.tar.gz: 0fe0a2633ffdd26a56d5b41a090917d792e4e4af742dda24106fc9e0e51c89ab
 SHA512:
-  metadata.gz: ce644c04d72c80221459cae9687395bf8ef7e72616d941fde20ebc0cf54405966556db30a50babd779792012317c1e904f0dc491535de6a076d80742b58d57f6
-  data.tar.gz: 468e1d6118ba79e01c24eba45339e76090f566eddd2969bbb71edff51c02304db981cd54fa8c111420115b545d15d41239be59a05e74814ca2d6e3e1655a2da1
+  metadata.gz: 442fb56b727b1e13a25b437302b81b8913c0d3498a52b8196e849a57b40149194e10159569d46dff6686df6569cc3168f8cc57f3269ba384c0b08e871f5955bc
+  data.tar.gz: f7d5f4fafff936beb6da5de3d083a67d377b92a841f7d74765dabfda58dd4016cf4f4bdd213d9e101aa6953add2dd43793f59c6ee80f99366a6fa3b9106ab5da

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.1)
 
 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
@@ -685,6 +684,7 @@ module Souls
                 if @on
                   if line.include?("end") || line.include?("t.index")
                     new_line.write <<-EOS
+            }
           }
         }
       )
@@ -697,7 +697,7 @@ module Souls
     it "return #{class_name.camelize} Data" do
       a1 = result.dig("data", "create#{class_name.camelize}", "#{class_name.singularize}")
       expect(a1).to include(
-        "id" => be_a(Integer),
+        "id" => be_a(String),
                     EOS
                     break
                   end
@@ -706,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)
@@ -760,6 +760,7 @@ end
               end
             end
           end
+          [file_path]
         end
 
       def rspec_mutation class_name: "souls"
@@ -770,8 +771,116 @@ 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!(:#{class_name.singularize.underscore}_id) { Base64.encode64 "User:\#{user.id}" }
+
+                let(:query) do
+                  %(query {
+                    #{class_name.singularize.underscore}(id: \#{#{class_name.singularize.underscore}_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
@@ -808,6 +917,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
         [
@@ -815,6 +926,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: [
@@ -859,6 +972,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.7"
+  VERSION = "0.11.2"
 end

metadata

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