souls 0.13.4 → 0.13.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f8b1300fc4644e24954fa9d46aa50ecc86731f9fb982ea3f198c9b57e017838
-  data.tar.gz: c3144d0eb3dfd8521f9ea2f76da354809dd791a571052ec9b45fb586cebc5985
+  metadata.gz: 708f22e2d3efc407f65326eedb0ea4b8958e812b713b8e0a738b22ec9166660f
+  data.tar.gz: f5eaa355fd1123c0c8e99ee4e9a591169716766c5f32667dd8c0ed3baa5ce2a5
 SHA512:
-  metadata.gz: b7c6e656cbb4aeec299eda315fda2f68ce08beb2010d160e20966eb1371e5ebc1deb2d143ecfc5b9c0210baf83ed10a807a5e04464ade080235dd13ccc857c7b
-  data.tar.gz: 248b0e01f35edcf49bc4d887d3cf7468c9967012c011adf092d898d6538554deaecd46c14cbae4ca0364e6c7cacaf68a29836f2900b9bc5db9b63fcbd715abd5
+  metadata.gz: ebf255d21f902c2ad11d7f4869fc5d671e59065861f7865b4d0365f972a2336d8b92cfbd069ced29ab59f79cf3d824412a1fca119cb230e38f8bb9f467feb25d
+  data.tar.gz: c2aa3e77d9f73278a5e1f4a73ebb4377de3e6e2d1f8451075df63b8158e85d6422f65c7f28d53fbcc0bb081060446b385040279899151fb4bcc29c78ac257f03

data/Gemfile.lock

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

data/lib/souls/init.rb

@@ -304,15 +304,32 @@ module Souls
         file_path = "./app/graphql/mutations/#{class_name}/create_#{class_name}.rb"
         path = "./db/schema.rb"
         @on = false
+        @user_exist = 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
-                break if line.include?("end") || line.include?("t.index")
+                if line.include?("end") || line.include?("t.index")
+                  if @user_exist
+                    new_line.write <<-EOS
+
+      def resolve **args
+        args[:user_id] = context[:user].id
+                    EOS
+                  else
+                    new_line.write <<-EOS
+
+      def resolve **args
+                    EOS
+                  end
+                  break
+                end
                 field = "[String]" if line.include?("array: true")
                 type, name = line.split(",")[0].gsub("\"", "").scan(/((?<=t\.).+(?=\s)) (.+)/)[0]
                 field ||= type_check type
                 case name
+                when "user_id"
+                  @user_exist = true
                 when "created_at", "updated_at"
                   next
                 else
@@ -329,8 +346,6 @@ module Souls
         file_path = "./app/graphql/mutations/#{class_name}/create_#{class_name}.rb"
         File.open(file_path, "a") do |new_line|
           new_line.write <<~EOS
-
-                  def resolve **args
                     #{class_name} = ::#{class_name.camelize}.new args
                     if #{class_name}.save
                       { #{class_name}: #{class_name} }
@@ -365,15 +380,32 @@ module Souls
         file_path = "./app/graphql/mutations/#{class_name}/update_#{class_name}.rb"
         path = "./db/schema.rb"
         @on = false
+        @user_exist = 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
-                break if line.include?("end") || line.include?("t.index")
+                if line.include?("end") || line.include?("t.index")
+                  if @user_exist
+                    new_line.write <<-EOS
+
+      def resolve **args
+        args[:user_id] = context[:user].id
+                    EOS
+                  else
+                    new_line.write <<-EOS
+
+      def resolve **args
+                    EOS
+                  end
+                  break
+                end
                 field = "[String]" if line.include?("array: true")
                 type, name = line.split(",")[0].gsub("\"", "").scan(/((?<=t\.).+(?=\s)) (.+)/)[0]
                 field ||= type_check type
                 case name
+                when "user_id"
+                  @user_exist = true
                 when "created_at", "updated_at"
                   next
                 else
@@ -390,8 +422,6 @@ module Souls
         file_path = "./app/graphql/mutations/#{class_name}/update_#{class_name}.rb"
         File.open(file_path, "a") do |new_line|
           new_line.write <<~EOS
-
-                  def resolve **args
                     #{class_name} = ::#{class_name.camelize}.find args[:id]
                     #{class_name}.update args
                     { #{class_name}: ::#{class_name.camelize}.find(args[:id]) }
@@ -420,10 +450,11 @@ module Souls
               module #{class_name.camelize}
                 class Delete#{class_name.camelize} < BaseMutation
                   field :#{class_name}, Types::#{class_name.camelize}Type, null: false
-                  argument :id, Integer, required: true
+                  argument :id, String, required: true
 
-                  def resolve id:
-                    #{class_name} = ::#{class_name.camelize}.find id
+                  def resolve **args
+                    _, data_id = SoulsApiSchema.from_global_id args[:id]
+                    #{class_name} = ::#{class_name.camelize}.find data_id
                     #{class_name}.destroy
                     { #{class_name}: #{class_name} }
                   rescue StandardError => error
@@ -490,8 +521,8 @@ module Souls
                 argument :id, String, required: true
 
                 def resolve **args
-                  _, #{class_name.singularize.underscore}_id = SoulsApiSchema.from_global_id args[:id]
-                  ::#{class_name.camelize}.find(#{class_name.singularize.underscore}_id)
+                  _, data_id = SoulsApiSchema.from_global_id args[:id]
+                  ::#{class_name.camelize}.find(data_id)
                 rescue StandardError => error
                   GraphQL::ExecutionError.new error
                 end
@@ -650,10 +681,11 @@ module Souls
           file_path = "./spec/mutations/#{class_name.singularize}_spec.rb"
           path = "./db/schema.rb"
           @on = false
+          @user_exist = 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 @on
                   if line.include?("end") || line.include?("t.index")
                     new_line.write "        }) {\n            #{class_name.singularize.camelize(:lower)} {\n              id\n"
                     break
@@ -663,6 +695,8 @@ module Souls
                   case name
                   when "created_at", "updated_at"
                     next
+                  when "user_id"
+                    @user_exist = true
                   else
                     case type
                     when "string", "text", "date", "datetime"
@@ -693,7 +727,28 @@ 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 @user_exist
+                      new_line.write <<-EOS
+            }
+          }
+        }
+      )
+    end
+
+    subject(:result) do
+      context = {
+        user: user
+      }
+      SoulsApiSchema.execute(mutation, context: context).as_json
+    end
+
+    it "return #{class_name.camelize} Data" do
+      a1 = result.dig("data", "create#{class_name.singularize.camelize}", "#{class_name.singularize.camelize(:lower)}")
+      expect(a1).to include(
+        "id" => be_a(String),
+                      EOS
+                    else
+                      new_line.write <<-EOS
             }
           }
         }
@@ -708,13 +763,14 @@ module Souls
       a1 = result.dig("data", "create#{class_name.singularize.camelize}", "#{class_name.singularize.camelize(:lower)}")
       expect(a1).to include(
         "id" => be_a(String),
-                    EOS
+                      EOS
+                    end
                     break
                   end
                   _, name = line.split(",")[0].gsub("\"", "").scan(/((?<=t\.).+(?=\s)) (.+)/)[0]
                   array_true = line.include?("array: true")
                   case name
-                  when "created_at", "updated_at"
+                  when "user_id", "created_at", "updated_at"
                     next
                   else
                     if array_true
@@ -741,11 +797,11 @@ module Souls
               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
+                    new_line.write <<~EOS
+                                  )
+                              end
+                            end
+                          end
                     EOS
                     break
                   end
@@ -753,7 +809,7 @@ end
                   field ||= type_check type
                   array_true = line.include?("array: true")
                   case name
-                  when "created_at", "updated_at"
+                  when "user_id", "created_at", "updated_at"
                     next
                   else
                     case type
@@ -832,7 +888,7 @@ end
                   end
                   _, name = line.split(",")[0].gsub("\"", "").scan(/((?<=t\.).+(?=\s)) (.+)/)[0]
                   case name
-                  when "created_at", "updated_at"
+                  when "user_id", "created_at", "updated_at"
                     next
                   else
                     new_line.write "          #{name.singularize.camelize(:lower)}\n"
@@ -867,7 +923,7 @@ end
                   field ||= type_check type
                   array_true = line.include?("array: true")
                   case name
-                  when "created_at", "updated_at"
+                  when "user_id", "created_at", "updated_at"
                     next
                   else
                     case type

data/lib/souls/version.rb

@@ -1,3 +1,3 @@
 module Souls
-  VERSION = "0.13.4"
+  VERSION = "0.13.5"
 end

metadata

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