souls 0.9.7 → 0.10.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 889a302559758a12cf2318206787f3848ca961cee8505218ff0414c797fd3f48
-  data.tar.gz: 9cc808cb6af449c3330b6fa67e559875621c3f45ab7268f1c65e3c3d1a8be0ad
+  metadata.gz: fe9369434a6abecbc1cb289ea7aac653a0e3b91db733b3a36db61315d1d74ad2
+  data.tar.gz: 7e87da0f68519dc5b1c1d275a252386162aba25357a53c80e045603ec99363fd
 SHA512:
-  metadata.gz: b2d55d3e5bee86ae7b31fda1261c0c64be8dc1280bb253de49f5080adf396c378802b11ae07b0da4c08c13e22762850fb63d16c79ecabfa1f1d3c80c30c98805
-  data.tar.gz: f1f6c88288d458ee6c2125d0b2675dbeee6763300464018f97a55573f83bc53c6633a2e8b0237d19bf70e4ecd7d2290a042121d33261256fc2132bee0519b1e6
+  metadata.gz: ce2e507855c02c4035afd03626d49a294f65d70ee67f6f789e89e77dc2af839ab407a5ec4e10971b7047305551503e4bf7aca56a1fe4aed8b03709542ab48cd7
+  data.tar.gz: edbb59b6dec323d14247ff441a7e4bf4ad4aba340f5a2ab30c1ddf29f24ed38833edc5d1625747e8baeadc420e084a629953c610c83396a515438b9d13c44f65

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    souls (0.9.6)
+    souls (0.10.2)
 
 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]
@@ -273,6 +274,7 @@ module Souls
           string: '"MyString"',
           text: '"MyString"',
           datetime: "Time.now",
+          date: "Time.now",
           boolean: false,
           integer: 1
         }[type.to_sym]
@@ -330,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
@@ -391,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
@@ -422,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
@@ -436,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
         [
@@ -526,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)
@@ -576,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)
@@ -612,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
@@ -666,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
@@ -682,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|
@@ -746,6 +745,12 @@ module Souls
             path[:add_query_type].each { |line| puts line }
           end
         end
+        puts "\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\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.7"
+  VERSION = "0.10.3"
 end

metadata

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