souls 0.9.6 → 0.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76d16e22f896d21fad8dee314b75ddc65e42507d8fdabd494ed8f250ec785457
-  data.tar.gz: 022b54f4f66325a19fb8877662411d6d4d00cf667bc2c04d83222dd77bffa1da
+  metadata.gz: dfc16affde84b15f23a6c4d1c97ed25862e5f5b1bfab48570fb8b2882930038e
+  data.tar.gz: '094139bfe2171b44beb293ac9467d7cb56965b28b3a90d32620dfb74e1adf88a'
 SHA512:
-  metadata.gz: 9c3a5949f7b388f5bdd8863070e2704d25f4e94bc62f7434838b24b11c2cddacbe68d009ab6d089d518e5343e3f6c40d969333c926fc445df034435418ba450a
-  data.tar.gz: 0d0131a7ac137d5fb15f502b2b863e7d666e7aa71796981f93b0b5c60dd1738cf6e5a40bded2e33c9fd766b2458a3d1e501f9b94716206d37c21bf163dd9210d
+  metadata.gz: f13ab04eacb55fc25652526912cb8253296072ccd0bedb3f5a71ca67ddf3f66d389d52104d3386989ad293499ae8df768aba0f9ca2c4e2123d86dc94455797a7
+  data.tar.gz: e9a15bac295d47b3125948dc9c3cc39a0bc608bbec109575216e342df4759d08e395ef3d72ed286b0bb7a54585fa66efbb9adf7d7fb9b3a5bf3d57c21556fb29

data/Gemfile.lock

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

data/exe/souls

@@ -76,8 +76,8 @@ begin
     else
     end
   when "t", "test"
-    puts `rubocop`
-    puts `bundle exec rspec`
+    `rubocop`
+    `bundle exec rspec`
   when "deploy"
     project_id = Souls.configuration.project_id
     `gcloud builds submit --config=cloudbuild.yml --project #{project_id}`

data/lib/souls/init.rb

@@ -244,7 +244,7 @@ module Souls
       end
 
       def model class_name: "souls"
-        file_path = "./app/models/#{class_name}.rb"
+        file_path = "./app/models/#{class_name.singularize}.rb"
         File.open(file_path, "w") do |f|
           f.write <<~EOS
             class #{class_name.camelize} < ActiveRecord::Base
@@ -261,6 +261,7 @@ module Souls
           float: "Float",
           text: "String",
           datetime: "GraphQL::Types::ISO8601DateTime",
+          date: "GraphQL::Types::ISO8601DateTime",
           boolean: "Boolean",
           integer: "Integer"
         }[type.to_sym]
@@ -269,9 +270,11 @@ module Souls
       def get_test_type type
         {
           bigint: 1,
+          float: 4.2,
           string: '"MyString"',
           text: '"MyString"',
           datetime: "Time.now",
+          date: "Time.now",
           boolean: false,
           integer: 1
         }[type.to_sym]
@@ -307,8 +310,9 @@ module Souls
             f.each_line.with_index do |line, i|
               if @on
                 break if line.include?("end") || line.include?("t.index")
+                field = "[String]" if line.include?("array: true")
                 type, name = line.split(",")[0].gsub("\"", "").scan(/((?<=t\.).+(?=\s)) (.+)/)[0]
-                field = type_check type
+                field ||= type_check type
                 case name
                 when "created_at", "updated_at"
                   next
@@ -328,7 +332,7 @@ module Souls
           new_line.write <<~EOS
 
                   def resolve **args
-                    #{class_name} = #{class_name.camelize}.new args
+                    #{class_name} = ::#{class_name.camelize}.new args
                     if #{class_name}.save
                       { #{class_name}: #{class_name} }
                     else
@@ -367,8 +371,9 @@ module Souls
             f.each_line.with_index do |line, i|
               if @on
                 break if line.include?("end") || line.include?("t.index")
+                field = "[String]" if line.include?("array: true")
                 type, name = line.split(",")[0].gsub("\"", "").scan(/((?<=t\.).+(?=\s)) (.+)/)[0]
-                field = type_check type
+                field ||= type_check type
                 case name
                 when "created_at", "updated_at"
                   next
@@ -388,9 +393,9 @@ module Souls
           new_line.write <<~EOS
 
                   def resolve **args
-                    #{class_name} = #{class_name.camelize}.find args[:id]
+                    #{class_name} = ::#{class_name.camelize}.find args[:id]
                     #{class_name}.update args
-                    { #{class_name}: #{class_name.camelize}.find(args[:id]) }
+                    { #{class_name}: ::#{class_name.camelize}.find(args[:id]) }
                   rescue StandardError => error
                     GraphQL::ExecutionError.new error
                   end
@@ -419,7 +424,7 @@ module Souls
                   argument :id, Integer, required: true
 
                   def resolve id:
-                    #{class_name} = #{class_name.camelize}.find id
+                    #{class_name} = ::#{class_name.camelize}.find id
                     #{class_name}.destroy
                     { #{class_name}: #{class_name} }
                   rescue StandardError => error
@@ -433,20 +438,20 @@ module Souls
         file_path
       end
 
-      def create_confirm
-        puts "Directory already exists, Overwrite?? (Y/N)"
+      def create_confirm dir_path: ""
+        puts "Directory already exists, Overwrite?? (Y/N)\n#{dir_path}"
         input = STDIN.gets.chomp
         return true if input == "Y"
-        raise StandardError.new "Directory Already Exist!"
+        raise StandardError.new "Directory Already Exist!\n#{dir_path}"
       end
 
       def mutation class_name: "souls"
         singularized_class_name = class_name.singularize
         if Dir.exist? "./app/graphql/mutations/#{singularized_class_name}"
-          # create_confirm
-          FileUtils.rm_r("./app/graphql/mutations/#{singularized_class_name}")
+          create_confirm dir_path: "./app/graphql/mutations/#{singularized_class_name}"
+        else
+          Dir.mkdir "./app/graphql/mutations/#{singularized_class_name}"
         end
-        Dir.mkdir "./app/graphql/mutations/#{singularized_class_name}"
         create_mutation_head class_name: singularized_class_name
         create_mutation_params class_name: singularized_class_name
         [
@@ -523,8 +528,9 @@ module Souls
             f.each_line.with_index do |line, i|
               if @on
                 new_line.write "\n" && break if line.include?("end") || line.include?("t.index")
+                field = "[String]" if line.include?("array: true")
                 type, name = line.split(",")[0].gsub("\"", "").scan(/((?<=t\.).+(?=\s)) (.+)/)[0]
-                field = type_check type
+                field ||= type_check type
                 new_line.write "    field :#{name}, #{field}, null: true\n"
               end
               if table_check(line: line, class_name: class_name)
@@ -573,8 +579,9 @@ module Souls
             f.each_line.with_index do |line, i|
               if @on
                 new_line.write "\n" && break if line.include?("end") || line.include?("t.index")
+                field = '["tag1", "tag2", "tag3"]' if line.include?("array: true")
                 type, name = line.split(",")[0].gsub("\"", "").scan(/((?<=t\.).+(?=\s)) (.+)/)[0]
-                field = get_test_type type
+                field ||= get_test_type type
                 new_line.write "    #{name} { #{field} }\n"
               end
               if table_check(line: line, class_name: class_name)
@@ -609,12 +616,7 @@ module Souls
           f.write <<~EOS
             RSpec.describe #{class_name.camelize}, type: :model do
               it "作成する" do
-                expect(FactoryBot.build(:#{class_name})).to be_valid
-              end
-
-              it "同じtitleがあると作成できない" do
-                FactoryBot.build(:#{class_name}, title: "hey")
-                expect(FactoryBot.build(:#{class_name}, title: "hey")).to be_valid
+                expect(FactoryBot.build(:#{class_name.singularize})).to be_valid
               end
             end
           EOS
@@ -663,7 +665,6 @@ module Souls
       end
 
       def migrate class_name: "souls"
-        # `rake db:migrate`
         singularized_class_name = class_name.singularize
         model_paths = model class_name: singularized_class_name
         type_paths = type class_name: singularized_class_name
@@ -679,21 +680,22 @@ module Souls
           query: query_path,
           mutation: mutation_path,
           add_query_type: [
-            "field :#{singularized_class_name}, resolver: Queries::#{singularized_class_name.camelize}",
-            "field :#{singularized_class_name.pluralize}, Types::#{singularized_class_name.camelize}Type.connection_type, null: true"
+            "    field :#{singularized_class_name}, resolver: Queries::#{singularized_class_name.camelize}",
+            "    field :#{singularized_class_name.pluralize}, Types::#{singularized_class_name.camelize}Type.connection_type, null: true"
           ],
           add_mutation_type: [
-            "field :create_#{singularized_class_name}, mutation: Mutations::#{singularized_class_name.camelize}::Create#{singularized_class_name.camelize}",
-            "field :update_#{singularized_class_name}, mutation: Mutations::#{singularized_class_name.camelize}::Update#{singularized_class_name.camelize}",
-            "field :delete_#{singularized_class_name}, mutation: Mutations::#{singularized_class_name.camelize}::Delete#{singularized_class_name.camelize}"
+            "    field :create_#{singularized_class_name}, mutation: Mutations::#{singularized_class_name.camelize}::Create#{singularized_class_name.camelize}",
+            "    field :update_#{singularized_class_name}, mutation: Mutations::#{singularized_class_name.camelize}::Update#{singularized_class_name.camelize}",
+            "    field :delete_#{singularized_class_name}, mutation: Mutations::#{singularized_class_name.camelize}::Delete#{singularized_class_name.camelize}"
           ]
         ]
       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
+          migrate class_name: class_name.singularize
         end
         puts "\n============== Model ======================\n\n"
         paths.each do |class_name|
@@ -743,6 +745,12 @@ module Souls
             path[:add_query_type].each { |line| puts line }
           end
         end
+        puts "\n\n    ## Connection Type\n\n"
+        get_tables.each do |class_name|
+          puts "    def #{class_name.pluralize}"
+          puts "      #{class_name.camelize}.all.order(id: :desc)"
+          puts "    end\n"
+        end
         puts "\n#############################################################\n"
         puts "#                                                           #\n"
         puts "# Add These Lines at ./app/graphql/types/mutation_type.rb   #\n"

data/lib/souls/version.rb

@@ -1,3 +1,3 @@
 module Souls
-  VERSION = "0.9.6"
+  VERSION = "0.10.2"
 end

metadata

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