souls 0.13.8 → 0.14.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f017a0b2dc2d05a5e78b857b3e437a931d976c0ab0b6c83625ee62f7109092b1
-  data.tar.gz: 23bfc89940d3018c6626d38f4cef322829f224acd541100e92f696a3040155c9
+  metadata.gz: 6d23a325d465a04acf398abbe43f7b437a2bf80b9f9d6781e7dce9e6d2869e3f
+  data.tar.gz: 0461a1b6872078e0c2df3e63376676c1158d928df2058ed72598b077b95bc789
 SHA512:
-  metadata.gz: c228b2dcf307527d6732a37e1b6f8694de43a1641e092a2cee49d1cf3a19595bd52581bb2842e0703e4316ca62335856e4e73960487a2be57dda3d632dd4c424
-  data.tar.gz: 70b3e91e48d84161cf97210a8adc360c7266fafef31729a4e18eee2adad7470c0cfaa3c37e40ebca7dc9acac178208dac734d002e87fe93c52d0d6c57a8531b8
+  metadata.gz: 6fb6c07afbc8dbc4652e77e4ef65d414e1a4041dddc72bf71e8b8ce54cad84cbf450bda3e4f5876dadb5ebdc63993de280c29648aafe575c0d603ea10054b985
+  data.tar.gz: 518118fef287de1dfcf33b7fcf9a9bdfac97d6c470337640bb6d72562f01bdbee6c02a682c6e7044a7d74f8e7d5ded67bdde98a96d8cd57537f82bee5663bdc1

data/Gemfile.lock

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

data/lib/souls/init.rb

@@ -723,7 +723,6 @@ module Souls
           f.write <<~EOS
             RSpec.describe \"#{class_name.camelize} Mutation テスト\" do
               describe "#{class_name.camelize} データを登録する" do
-                get_global_key = proc {|class_name, id| Base64.encode64(\"\#{class_name}:\#{id}\")}
           EOS
         end
       end
@@ -739,20 +738,37 @@ module Souls
             f.each_line.with_index do |line, i|
               if @on
                 if line.include?("end") || line.include?("t.index")
-                  new_line.write <<-EOS
+                  if @relation_params.empty?
+                    new_line.write <<-EOS
+    let(:#{class_name}) { FactoryBot.attributes_for(:#{class_name}) }
+
+    let(:mutation) do
+      %(mutation {
+        create#{class_name.camelize}(input: {
+                    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
       %(mutation {
         create#{class_name.camelize}(input: {
-                  EOS
+                    EOS
+                  end
                   break
                 end
                 _, name = line.split(",")[0].gsub("\"", "").scan(/((?<=t\.).+(?=\s)) (.+)/)[0]
                 case name
+                when "user_id"
+                  relation_col = name.gsub("_id", "")
+                  new_line.write "    let(:#{relation_col}) { FactoryBot.create(:#{relation_col}) }\n"
                 when /$*_id\z/
                   relation_col = name.gsub("_id", "")
-                  @relation_params << "#{name}: get_global_key.call(\"#{name.singularize.camelize.gsub("Id", "")}\", #{relation_col}.id)"
+                  @relation_params << "#{name}: get_global_key(\"#{name.singularize.camelize.gsub("Id", "")}\", #{relation_col}.id)"
                   new_line.write "    let(:#{relation_col}) { FactoryBot.create(:#{relation_col}) }\n"
                 end
               end
@@ -789,7 +805,7 @@ module Souls
                 else
                   case type
                   when "string", "text", "date", "datetime"
-                    if array_true && name != "tag"
+                    if array_true
                       new_line.write "          #{name.pluralize.camelize(:lower)}: \#{#{class_name.singularize}[:#{name.pluralize.underscore}]}\n"
                     else
                       new_line.write "          #{name.singularize.camelize(:lower)}: \"\#{#{class_name.singularize}[:#{name.singularize.underscore}]}\"\n"
@@ -954,6 +970,18 @@ module Souls
             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
+      data_id = Base64.encode64("#{class_name.camelize}:\#{#{class_name.singularize.underscore}.id}")
+      %(query {
+        #{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(", ")}) }
 
@@ -964,6 +992,7 @@ module Souls
           id
                   EOS
                   break
+                  end
                 end
                 _, name = line.split(",")[0].gsub("\"", "").scan(/((?<=t\.).+(?=\s)) (.+)/)[0]
                 case name
@@ -1012,7 +1041,7 @@ module Souls
                 when "user_id", "created_at", "updated_at", /$*_id\z/
                   next
                 else
-                  new_line.write "          #{name.singularize.camelize(:lower)}\n"
+                  new_line.write "          #{name.camelize(:lower)}\n"
                 end
               end
               if table_check(line: line, class_name: class_name)
@@ -1050,9 +1079,9 @@ end
                   case type
                   when "text", "date", "datetime"
                       if array_true
-                        new_line.write "        \"#{name.singularize.camelize(:lower)}\" => be_all(String),\n"
+                        new_line.write "        \"#{name.camelize(:lower)}\" => be_all(String),\n"
                       else
-                        new_line.write "        \"#{name.singularize.camelize(:lower)}\" => be_a(String),\n"
+                        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"

data/lib/souls/version.rb

@@ -1,3 +1,3 @@
 module Souls
-  VERSION = "0.13.8"
+  VERSION = "0.14.3"
 end

metadata

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