souls 0.8.7 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46e7d4670ab49a147d4f62b0dbf14872051c8c30bf3bdc01f49cf30d48f91205
-  data.tar.gz: bb3be9fcb27284432fd0052c71769f131af513a1a606e201f21dc9601b97c043
+  metadata.gz: 75064881212497375ac7f55321f3fdc9c795b51b0d7b3cd17964efa744acf8a9
+  data.tar.gz: 14fd24e84cd0bd2062bc3644eb543e542dbe89d60c51c18e657e2f32d02866c9
 SHA512:
-  metadata.gz: 4f906bfa46081147867fc125f8dc8dd3806cbf39fce4605f9454481d0299ecefa77e0faad71941f9d7ab3dd6d48225bde24d6998e79458ce8773274d2b42fd95
-  data.tar.gz: b84307ee1d465c28e6296a091a470b5fe3a8b8e8dd24d38ac773cb2de3b4bdb9c01f7b40c92b62e540441a3c2b7ee6f1ec775fb777c8b1b0ff444085a26c71f1
+  metadata.gz: 141abafb886a0edd0b4b98a76f13547974244c9847fa028553617c730098bcec839a653dbc84e1e78a025cda4cd5e8f09cc9d3dafdce4bbdff4a6af02897dfe5
+  data.tar.gz: edd609ace5b59bd45a92245dc481ab14289cf5d4a234883af8533bef6176ce4ce156b056af7aaedcfe853796ac30665755ef313c223c45eeb1c02e5eacba7f72

data/Gemfile

@@ -3,6 +3,8 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in souls.gemspec
 gemspec
 
+gem "activesupport", "6.1.0"
 gem "rake", "13.0.3"
 gem "rspec", "3.1.0"
 gem "steep", "0.39.0"
+gem "rubocop", "1.7.0"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    souls (0.8.6)
+    souls (0.9.1)
 
 GEM
   remote: https://rubygems.org/
@@ -26,6 +26,7 @@ GEM
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     minitest (5.14.2)
+    parallel (1.20.1)
     parser (2.7.2.0)
       ast (~> 2.4.1)
     rainbow (3.0.0)
@@ -34,6 +35,8 @@ GEM
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     rbs (1.0.0)
+    regexp_parser (2.0.3)
+    rexml (3.2.4)
     rspec (3.1.0)
       rspec-core (~> 3.1.0)
       rspec-expectations (~> 3.1.0)
@@ -46,6 +49,18 @@ GEM
     rspec-mocks (3.1.3)
       rspec-support (~> 3.1.0)
     rspec-support (3.1.2)
+    rubocop (1.7.0)
+      parallel (~> 1.10)
+      parser (>= 2.7.1.5)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.2.0, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 2.0)
+    rubocop-ast (1.4.0)
+      parser (>= 2.7.1.5)
+    ruby-progressbar (1.11.0)
     steep (0.39.0)
       activesupport (>= 5.1)
       ast_utils (~> 0.3.0)
@@ -57,14 +72,17 @@ GEM
     thor (1.0.1)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
+    unicode-display_width (1.7.0)
     zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  activesupport (= 6.1.0)
   rake (= 13.0.3)
   rspec (= 3.1.0)
+  rubocop (= 1.7.0)
   souls!
   steep (= 0.39.0)
 

data/exe/souls

@@ -57,8 +57,10 @@ begin
       Souls::Init.query class_name: ARGV[2]
     when "type"
       Souls::Init.type class_name: ARGV[2]
-    when "migration"
+    when "migrate"
       Souls::Init.migration class_name: ARGV[2]
+    when "migration"
+      `rake db:create_migration NAME=#{ARGV[3]}`
     when "rspec_factory"
       Souls::Init.rspec_factory class_name: ARGV[2]
     when "rspec_model"
@@ -78,7 +80,7 @@ begin
     when "-s"
       `bundle exec steep check`
     else
-      `bundle exec steep check`
+      `rubocop`
       `bundle exec rspec`
     end
   when "deploy"

data/lib/souls.rb

@@ -1,6 +1,7 @@
 require "souls/version"
 require "souls/init"
 require "json"
+require "active_support/core_ext/string/inflections"
 
 module Souls
   class Error < StandardError; end

data/lib/souls/init.rb

@@ -247,11 +247,11 @@ module Souls
         file_path = "./app/models/#{class_name}.rb"
         File.open(file_path, "w") do |f|
           f.write <<~EOS
-            class #{class_name.capitalize} < ActiveRecord::Base
+            class #{class_name.camelize} < ActiveRecord::Base
             end
           EOS
         end
-        puts "model #{class_name}.rb created!: `#{file_path}`"
+        puts "Model #{class_name}.rb Auto Generated from schema.rb!: `#{file_path}`"
       end
 
       def type_check type
@@ -278,7 +278,7 @@ module Souls
 
       def table_check line: "", class_name: ""
         if line.include?("create_table")
-          return true if line.split(" ")[1].gsub("\"", "").gsub(",", "") == "#{class_name}s"
+          return true if line.split(" ")[1].gsub("\"", "").gsub(",", "") == "#{class_name.pluralize}"
         end
         false
       end
@@ -288,8 +288,8 @@ module Souls
         File.open(file_path, "w") do |new_line|
           new_line.write <<~EOS
             module Mutations
-              class Create#{class_name.capitalize} < BaseMutation
-                field :#{class_name}, Types::#{class_name.capitalize}Type, null: false
+              class Create#{class_name.camelize} < BaseMutation
+                field :#{class_name}, Types::#{class_name.camelize}Type, null: false
                 field :error, String, null: true
 
           EOS
@@ -307,7 +307,12 @@ module Souls
                 break if line.include?("end") || line.include?("t.index")
                 type, name = line.split(",")[0].gsub("\"", "").scan(/((?<=t\.).+(?=\s)) (.+)/)[0]
                 field = type_check type
-                new_line.write "    argument :#{name}, #{field}, required: false\n"
+                case name
+                when "created_at", "updated_at"
+                  next
+                else
+                  new_line.write "    argument :#{name}, #{field}, required: false\n"
+                end
               end
               @on = true if table_check(line: line, class_name: class_name)
             end
@@ -321,7 +326,7 @@ module Souls
           new_line.write <<~EOS
 
                 def resolve **args
-                  #{class_name} = #{class_name.capitalize}.new args
+                  #{class_name} = #{class_name.camelize}.new args
                   if #{class_name}.save
                     { #{class_name}: #{class_name} }
                   else
@@ -342,8 +347,8 @@ module Souls
         File.open(file_path, "w") do |new_line|
           new_line.write <<~EOS
             module Mutations
-              class Update#{class_name.capitalize} < BaseMutation
-                field :#{class_name}, Types::#{class_name.capitalize}Type, null: false
+              class Update#{class_name.camelize} < BaseMutation
+                field :#{class_name}, Types::#{class_name.camelize}Type, null: false
 
           EOS
         end
@@ -360,7 +365,12 @@ module Souls
                 break if line.include?("end") || line.include?("t.index")
                 type, name = line.split(",")[0].gsub("\"", "").scan(/((?<=t\.).+(?=\s)) (.+)/)[0]
                 field = type_check type
-                new_line.write "    argument :#{name}, #{field}, required: false\n"
+                case name
+                when "created_at", "updated_at"
+                  next
+                else
+                  new_line.write "    argument :#{name}, #{field}, required: false\n"
+                end
               end
               @on = true if table_check(line: line, class_name: class_name)
             end
@@ -374,9 +384,9 @@ module Souls
           new_line.write <<~EOS
 
                 def resolve **args
-                  #{class_name} = #{class_name.capitalize}.find args[:id]
+                  #{class_name} = #{class_name.camelize}.find args[:id]
                   #{class_name}.update args
-                  { #{class_name}: #{class_name.capitalize}.find(args[:id]) }
+                  { #{class_name}: #{class_name.camelize}.find(args[:id]) }
                 rescue StandardError => error
                   GraphQL::ExecutionError.new error
                 end
@@ -398,12 +408,12 @@ module Souls
         File.open(file_path, "w") do |f|
           f.write <<~EOS
             module Mutations
-              class Delete#{class_name.capitalize} < BaseMutation
-                field :#{class_name}, Types::#{class_name.capitalize}Type, null: false
+              class Delete#{class_name.camelize} < BaseMutation
+                field :#{class_name}, Types::#{class_name.camelize}Type, null: false
                 argument :id, Integer, required: true
 
                 def resolve id:
-                  #{class_name} = #{class_name.capitalize}.find id
+                  #{class_name} = #{class_name.camelize}.find id
                   #{class_name}.destroy
                   { #{class_name}: #{class_name} }
                 rescue StandardError => error
@@ -417,23 +427,24 @@ module Souls
       end
 
       def mutation class_name: "souls"
-        create_mutation_head class_name: class_name
-        create_mutation_params class_name: class_name
-        create_mutation_end class_name: class_name
-        update_mutation class_name: class_name
-        delete_mutation class_name: class_name
+        singularized_class_name = class_name.singularize
+        create_mutation_head class_name: singularized_class_name
+        create_mutation_params class_name: singularized_class_name
+        create_mutation_end class_name: singularized_class_name
+        update_mutation class_name: singularized_class_name
+        delete_mutation class_name: singularized_class_name
       end
 
-      def query class_name: "souls"
-        file_path = "./app/graphql/queries/#{class_name}s.rb"
+      def create_query class_name: "souls"
+        file_path = "./app/graphql/queries/#{class_name.pluralize}.rb"
         File.open(file_path, "w") do |f|
           f.write <<~EOS
             module Queries
-              class #{class_name.capitalize}s < Queries::BaseQuery
-                type [Types::#{class_name.capitalize}Type], null: false
+              class #{class_name.camelize.pluralize} < Queries::BaseQuery
+                type [Types::#{class_name.camelize}Type], null: false
 
                 def resolve
-                  ::#{class_name.capitalize}.all
+                  ::#{class_name.camelize}.all
                 rescue StandardError => error
                   GraphQL::ExecutionError.new error
                 end
@@ -441,33 +452,42 @@ module Souls
             end
           EOS
         end
-        puts "query #{class_name}s.rb created!: `#{file_path}`"
+        puts "Query #{class_name}.rb Auto Generated from schema.rb!: `#{file_path}`"
+      end
+
+      def create_queries 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.capitalize} < Queries::BaseQuery
-                type Types::#{class_name.capitalize}Type, null: false
+              class #{class_name.camelize} < Queries::BaseQuery
+                type Types::#{class_name.camelize}Type, null: false
                 argument :id, Integer, required: true
 
                 def resolve id:
-                  ::#{class_name.capitalize}.find(id)
+                  ::#{class_name.camelize}.find(id)
                 rescue StandardError => error
                   GraphQL::ExecutionError.new error
                 end
               end
             end
           EOS
-          puts "query #{class_name}.rb created!: `#{file_path}`"
+          puts "Query #{class_name.pluralize}.rb Auto Generated from schema.rb!: `#{file_path}`"
         end
       end
 
+      def query class_name: "souls"
+        singularized_class_name = class_name.singularize
+        create_query class_name: singularized_class_name
+        create_queries class_name: singularized_class_name
+      end
+
       def create_type_head class_name: "souls"
         file_path = "./app/graphql/types/#{class_name}_type.rb"
           File.open(file_path, "w") do |f|
             f.write <<~EOS
               module Types
-                class #{class_name.capitalize}Type < GraphQL::Schema::Object
+                class #{class_name.camelize}Type < GraphQL::Schema::Object
                   implements GraphQL::Types::Relay::Node
 
             EOS
@@ -508,13 +528,14 @@ module Souls
       end
 
       def type class_name: "souls"
-        create_type_head class_name: class_name
-        create_type_params class_name: class_name
-        create_type_end class_name: class_name
+        singularized_class_name = class_name.singularize
+        create_type_head class_name: singularized_class_name
+        create_type_params class_name: singularized_class_name
+        create_type_end class_name: singularized_class_name
       end
 
       def rspec_factory_head class_name: "souls"
-        file_path = "./spec/factories/#{class_name}s.rb"
+        file_path = "./spec/factories/#{class_name.pluralize}.rb"
         File.open(file_path, "w") do |f|
           f.write <<~EOS
             FactoryBot.define do
@@ -524,7 +545,7 @@ module Souls
       end
 
       def rspec_factory_params class_name: "souls"
-        file_path = "./spec/factories/#{class_name}s.rb"
+        file_path = "./spec/factories/#{class_name.pluralize}.rb"
         path = "./db/schema.rb"
         @on = false
         File.open(file_path, "a") do |new_line|
@@ -545,27 +566,28 @@ module Souls
       end
 
       def rspec_factory_end class_name: "souls"
-        file_path = "./spec/factories/#{class_name}s.rb"
+        file_path = "./spec/factories/#{class_name.pluralize}.rb"
         File.open(file_path, "a") do |f|
           f.write <<~EOS
               end
             end
           EOS
         end
-        puts "FactoryBot #{class_name}s.rb Auto Generated from schema.rb!: `#{file_path}`"
+        puts "FactoryBot #{class_name.pluralize}.rb Auto Generated from schema.rb!: `#{file_path}`"
       end
 
       def rspec_factory class_name: "souls"
-        rspec_factory_head class_name: class_name
-        rspec_factory_params class_name: class_name
-        rspec_factory_end class_name: class_name
+        singularized_class_name = class_name.singularize
+        rspec_factory_head class_name: singularized_class_name
+        rspec_factory_params class_name: singularized_class_name
+        rspec_factory_end class_name: singularized_class_name
       end
 
       def rspec_model class_name: "souls"
         file_path = "./spec/models/#{class_name}_spec.rb"
         File.open(file_path, "w") do |f|
           f.write <<~EOS
-            RSpec.describe #{class_name.capitalize}, type: :model do
+            RSpec.describe #{class_name.camelize}, type: :model do
               it "作成する" do
                 expect(FactoryBot.build(:#{class_name})).to be_valid
               end
@@ -577,7 +599,7 @@ module Souls
             end
           EOS
         end
-        puts "rspec_model #{class_name}_spec.rb created!: `#{file_path}`"
+        puts "Rspec #{class_name}_spec.rb Auto Generated from schema.rb!: `#{file_path}`"
       end
 
       def rspec_mutation class_name: "souls"

data/lib/souls/version.rb

@@ -1,3 +1,3 @@
 module Souls
-  VERSION = "0.8.7"
+  VERSION = "0.9.2"
 end

metadata

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