souls 0.11.1 → 0.11.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae7581dc9bdd5395bcf08caaa70221c6a16dadf92260f983b6322e69210f4ef2
-  data.tar.gz: 9b6948571a0324e31ce4189a0c304e33ddf0d4a60cdd4f122b9a4e84ed5f8c6b
+  metadata.gz: b747eb0e08952160caac3d82ead74a6b34edc888b3eb70daa3b14ad68af71d32
+  data.tar.gz: 92b397aefa6281bc880067825be471fb88b600b54ec48bdfeba23e3821375a1f
 SHA512:
-  metadata.gz: df7192f836e9696628dcdd22d81de018cf6f9f6e5cb746f5e9cdd44d5d959e757fcbf89c57d8d7e34207f9b1180db2cac2104d79aea1198af3030d47522326c1
-  data.tar.gz: f1a56524a566aee14ed3bd61598d839c3f495cc0d3f29db529b33a505ade6323d0fb04800df0f5622dca1aab5568d2212edd0356a6678551d70e32ca6d3a734d
+  metadata.gz: 475336d2d3b71384447c25c013e7393e9b8f2e18d0296776c593199d865fbe54461bb96cad0c785e05cf5bf4b5c519272efddca96b499cd7f99e5a8237608ff6
+  data.tar.gz: fbb79ab9c131547f8834c63f093cd055f568ee0bbd42b884b1c5f99193ed56f701fb60ee57c4cdb48d2f5390d5c08fc04e9c659ac3c10ead377dda4586557a1c

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.11.0)
+    souls (0.11.5)
 
 GEM
   remote: https://rubygems.org/

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
@@ -624,7 +625,7 @@ module Souls
       end
 
       def rspec_mutation_head class_name: "souls"
-        file_path = "./spec/mutations/#{class_name.pluralize}.rb"
+        file_path = "./spec/mutations/#{class_name.singularize}_spec.rb"
         File.open(file_path, "w") do |f|
           f.write <<~EOS
             RSpec.describe \"#{class_name.camelize} Mutation テスト\" do
@@ -639,7 +640,7 @@ module Souls
       end
 
         def rspec_mutation_params class_name: "souls"
-          file_path = "./spec/mutations/#{class_name.pluralize}.rb"
+          file_path = "./spec/mutations/#{class_name.singularize}_spec.rb"
           path = "./db/schema.rb"
           @on = false
           File.open(file_path, "a") do |new_line|
@@ -674,7 +675,7 @@ module Souls
         end
 
         def rspec_mutation_params_response class_name: "souls"
-          file_path = "./spec/mutations/#{class_name.pluralize}.rb"
+          file_path = "./spec/mutations/#{class_name.singularize}_spec.rb"
           path = "./db/schema.rb"
           @on = false
           File.open(file_path, "a") do |new_line|
@@ -717,7 +718,7 @@ module Souls
         end
 
         def rspec_mutation_end class_name: "souls"
-          file_path = "./spec/mutations/#{class_name.pluralize}.rb"
+          file_path = "./spec/mutations/#{class_name.singularize}_spec.rb"
           path = "./db/schema.rb"
           @on = false
           File.open(file_path, "a") do |new_line|
@@ -771,7 +772,7 @@ end
       end
 
       def rspec_query_head class_name: "souls"
-        file_path = "./spec/queries/#{class_name.pluralize}.rb"
+        file_path = "./spec/queries/#{class_name.singularize}_spec.rb"
         File.open(file_path, "w") do |f|
           f.write <<~EOS
             RSpec.describe \"#{class_name.camelize} Query テスト\" do
@@ -780,14 +781,14 @@ end
 
                 let(:query) do
                   %(query {
-                    #{class_name.camelize}(id: 1) {
+                    #{class_name.singularize.underscore}(id:  \#{Base64.encode64("#{class_name.camelize}:\#{#{class_name.underscore}.id}")}) {
                       id
           EOS
         end
       end
 
         def rspec_query_params class_name: "souls"
-          file_path = "./spec/queries/#{class_name.pluralize}.rb"
+          file_path = "./spec/queries/#{class_name.singularize}_spec.rb"
           path = "./db/schema.rb"
           @on = false
           File.open(file_path, "a") do |new_line|
@@ -829,7 +830,7 @@ end
         end
 
         def rspec_query_end class_name: "souls"
-          file_path = "./spec/queries/#{class_name.pluralize}.rb"
+          file_path = "./spec/queries/#{class_name.singularize}_spec.rb"
           path = "./db/schema.rb"
           @on = false
           File.open(file_path, "a") do |new_line|
@@ -916,6 +917,7 @@ end
         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
         [
@@ -924,6 +926,7 @@ end
           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: [
@@ -940,7 +943,6 @@ end
 
       def migrate_all
         puts "◆◆◆ Let's Auto Generate CRUD API ◆◆◆\n"
-        `rake db:migrate`
         paths = get_tables.map do |class_name|
           migrate class_name: class_name.singularize
         end
@@ -974,6 +976,12 @@ end
             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.11.1"
+  VERSION = "0.11.6"
 end

metadata

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