souls 0.25.13 → 0.25.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7142d4a473970f13230e3378201c217db36aee80976b8f82ad54b5f725fd6dab
-  data.tar.gz: af428562d11da66a658cd1f83607d704cd5a7acff91a14ff4ce6d44fbc319733
+  metadata.gz: 24ac34b77f043d519782fcc96186b2a367e698f6c54942ca57f7e433feb79de7
+  data.tar.gz: 9bd6a7050e1e21b3a3af3f65fe79a8f48a82351433c243ece6741209db07c176
 SHA512:
-  metadata.gz: 575ea8d5d6509a9ffde78fdce1ffb1c04bf604f2e56def0ab3bbc50344add169ccb01d0e93211148bfb7f91f6d2b75900215159d7dbd591f068dff01874bdd41
-  data.tar.gz: 8c0276edc2e6b6dbe26bcec59846c4c39a9899c82c51570f37a5fcef586e58b1da70a21e51d1d979c690a7005944a353093aec7dc7242e30064c7edaa60c131a
+  metadata.gz: 1e4c57899b2e1e4c253a7e8069ab0c040f0e5570db12d12540b698ff6f93734d73ecced5268c93122217e624cf9621360281985856e8965e95bdffcd414370cd
+  data.tar.gz: aba9a8c9f85fdfef566aba952dd093c17b5798fd76e93ab89b71421ca237b1859122c1c41b1168802a742279e4f2d794c8b7d3156efd317568be4ae7874a8af5

data/exe/souls

@@ -184,7 +184,7 @@ begin
     system("rm -rf ../#{other_app}/db/*")
     system("cp -r ./db/* ../#{other_app}/db/*")
   when "t", "test"
-    system("rubocop -a")
+    system("rubocop -A")
     system("bundle exec rspec")
   when "run"
     system("docker build . -t souls -f Dockerfile.dev")

data/lib/souls.rb

@@ -174,6 +174,7 @@ module Souls
       bucket_url = "gs://souls-bucket/boilerplates"
       file_name = "#{service_name}-v#{new_ver}.tgz"
       release_name = "#{service_name}-latest.tgz"
+      update_service_gemfile(service_name: service_name)
 
       case current_dir_name
       when "souls"
@@ -256,6 +257,31 @@ module Souls
       end
     end
 
+    def update_service_gemfile(service_name: "api")
+      file_dir = "./apps/#{service_name}"
+      file_path = "#{file_dir}/Gemfile"
+      gemfile_lock = "#{file_dir}/Gemfile.lock"
+      tmp_file = "#{file_dir}/tmp/Gemfile"
+      File.open(file_path, "r") do |f|
+        File.open(tmp_file, "w") do |new_line|
+          f.each_line do |line|
+            gem = line.gsub("gem ", "").gsub("\"", "").gsub("\n", "").gsub(" ", "").split(",")
+            if gem[0] == "souls"
+              old_ver = gem[1].split(".")
+              old_ver[2] = (old_ver[2].to_i + 1).to_s
+              new_line.write("  gem \"souls\", \"#{old_ver.join('.')}\"\n")
+            else
+              new_line.write(line)
+            end
+          end
+        end
+      end
+      FileUtils.rm(file_path)
+      FileUtils.rm(gemfile_lock) if File.exist?(gemfile_lock)
+      FileUtils.mv(tmp_file, file_path)
+      puts(Paint["\nSuccessfully Updated #{service_name} Gemfile!", :green])
+    end
+
     def detect_change
       git_status = `git status`
       result =

data/lib/souls/generate/mutation.rb

@@ -10,9 +10,9 @@ module Souls
       File.open(file_path, "w") do |new_line|
         new_line.write(<<~TEXT)
           module Mutations
-            module #{singularized_class_name.camelize}
+            module Base::#{singularized_class_name.camelize}
               class Create#{singularized_class_name.camelize} < BaseMutation
-                field :#{singularized_class_name}_edge, Types::#{singularized_class_name.camelize}.edge_type, null: false
+                field :#{singularized_class_name}_edge, Types::#{singularized_class_name.camelize}Type.edge_type, null: false
                 field :error, String, null: true
 
         TEXT
@@ -106,7 +106,7 @@ module Souls
           module Mutations
             module #{class_name.camelize}
               class Update#{class_name.camelize} < BaseMutation
-                field :#{class_name}_edge, Types::#{class_name.camelize}.edge_type, null: false
+                field :#{class_name}_edge, Types::#{class_name.camelize}Type.edge_type, null: false
 
                 argument :id, String, required: true
         TEXT

data/lib/souls/generate/rspec_policy.rb

@@ -15,7 +15,7 @@ module Souls
             let(:#{class_name.underscore}) { FactoryBot.create(:#{class_name.underscore}) }
 
             context "being a visitor" do
-              let(:user) { FactoryBot.create(:user, user_role: :normal) }
+              let(:user) { FactoryBot.create(:user, roles: :normal) }
 
               it { is_expected.to permit_action(:index) }
               it { is_expected.to permit_action(:show) }
@@ -23,13 +23,13 @@ module Souls
             end
 
             context "being a user" do
-              let(:user) { FactoryBot.create(:user, user_role: :user) }
+              let(:user) { FactoryBot.create(:user, roles: :user) }
 
               it { is_expected.to permit_actions([:create, :update]) }
             end
 
             context "being an admin" do
-              let(:user) { FactoryBot.create(:user, user_role: :admin) }
+              let(:user) { FactoryBot.create(:user, roles: :admin) }
 
               it { is_expected.to permit_actions([:create, :update, :delete]) }
             end

data/lib/souls/generate/rspec_query.rb

@@ -26,23 +26,23 @@ module Souls
               if line.include?("end") || line.include?("t.index")
                 if @relation_params.empty?
                   new_line.write(<<-TEXT)
-  let!(:#{class_name}) { FactoryBot.create(:#{class_name}) }
+    let!(:#{class_name}) { FactoryBot.create(:#{class_name}) }
 
-  let(:query) do
-    data_id = Base64.encode64("#{class_name.camelize}:\#{#{class_name.singularize.underscore}.id}")
-    %(query {
-      #{class_name.singularize.camelize(:lower)}(id: \\"\#{data_id}\\") {
-        id
+    let(:query) do
+      data_id = Base64.encode64("#{class_name.camelize}:\#{#{class_name.singularize.underscore}.id}")
+      %(query {
+        #{class_name.singularize.camelize(:lower)}(id: \\"\#{data_id}\\") {
+          id
                   TEXT
                 else
                   new_line.write(<<-TEXT)
-  let(:#{class_name}) { FactoryBot.create(:#{class_name}, #{@relation_params.join(', ')}) }
+    let(:#{class_name}) { FactoryBot.create(:#{class_name}, #{@relation_params.join(', ')}) }
 
-  let(:query) do
-    data_id = Base64.encode64("#{class_name.camelize}:\#{#{class_name.singularize.underscore}.id}")
-    %(query {
-      #{class_name.singularize.camelize(:lower)}(id: \\"\#{data_id}\\") {
-        id
+    let(:query) do
+      data_id = Base64.encode64("#{class_name.camelize}:\#{#{class_name.singularize.underscore}.id}")
+      %(query {
+        #{class_name.singularize.camelize(:lower)}(id: \\"\#{data_id}\\") {
+          id
                   TEXT
                 end
                 break
@@ -70,25 +70,25 @@ module Souls
           f.each_line.with_index do |line, _i|
             if @on
               if line.include?("end") || line.include?("t.index")
-                new_line.write(<<~TEXT)
-                                          }
-                                        }
-                                      )
-                                    end
-                  #{'                  '}
-                                    subject(:result) do
-                                      SoulsApiSchema.execute(query).as_json
-                                    end
-                  #{'                  '}
-                                    it "return #{class_name.camelize} Data" do
-                                      begin
-                                        a1 = result.dig("data", "#{class_name.singularize.camelize(:lower)}")
-                                        raise unless a1.present?
-                                      rescue
-                                        raise StandardError, result
-                                      end
-                                      expect(a1).to include(
-                                        "id" => be_a(String),
+                new_line.write(<<-TEXT)
+          }
+        }
+      )
+    end
+
+    subject(:result) do
+      SoulsApiSchema.execute(query).as_json
+    end
+
+    it "return #{class_name.camelize} Data" do
+      begin
+        a1 = result.dig("data", "#{class_name.singularize.camelize(:lower)}")
+        raise unless a1.present?
+      rescue
+        raise StandardError, result
+      end
+      expect(a1).to include(
+        "id" => be_a(String),
                 TEXT
                 break
               end
@@ -133,14 +133,14 @@ module Souls
                 case type
                 when "text", "date", "datetime"
                   if array_true
-                    new_line.write("        \"#{name.camelize(:lower)}\" => be_all(String),\n")
+                    new_line.write("       \"#{name.camelize(:lower)}\" => be_all(String),\n")
                   else
-                    new_line.write("        \"#{name.camelize(:lower)}\" => be_a(String),\n")
+                    new_line.write("       \"#{name.camelize(:lower)}\" => be_a(String),\n")
                   end
                 when "boolean"
-                  new_line.write("        \"#{name.singularize.camelize(:lower)}\" => be_in([true, false]),\n")
+                  new_line.write("       \"#{name.singularize.camelize(:lower)}\" => be_in([true, false]),\n")
                 when "string", "bigint", "integer", "float"
-                  new_line.write("        \"#{name.singularize.camelize(:lower)}\" => be_a(#{field}),\n")
+                  new_line.write("       \"#{name.singularize.camelize(:lower)}\" => be_a(#{field}),\n")
                 end
               end
             end

data/lib/souls/generate/rspec_resolver.rb

@@ -26,31 +26,31 @@ module Souls
               if line.include?("end") || line.include?("t.index")
                 if @relation_params.empty?
                   new_line.write(<<-TEXT)
-  let!(:#{class_name}) { FactoryBot.create(:#{class_name}) }
+    let!(:#{class_name}) { FactoryBot.create(:#{class_name}) }
 
-  let(:query) do
-    %(query {
-      #{class_name.singularize.camelize(:lower)}Search(filter: {
-        isDeleted: false
-    }) {
-        edges {
-          cursor
-          node {
-            id
+    let(:query) do
+      %(query {
+        #{class_name.singularize.camelize(:lower)}Search(filter: {
+          isDeleted: false
+      }) {
+          edges {
+            cursor
+            node {
+              id
                   TEXT
                 else
                   new_line.write(<<-TEXT)
-  let!(:#{class_name}) { FactoryBot.create(:#{class_name}, #{@relation_params.join(', ')}) }
+    let!(:#{class_name}) { FactoryBot.create(:#{class_name}, #{@relation_params.join(', ')}) }
 
-  let(:query) do
-    %(query {
-      #{class_name.singularize.camelize(:lower)}Search(filter: {
-        isDeleted: false
-    }) {
-        edges {
-          cursor
-          node {
-            id
+    let(:query) do
+      %(query {
+        #{class_name.singularize.camelize(:lower)}Search(filter: {
+          isDeleted: false
+      }) {
+          edges {
+            cursor
+            node {
+              id
                   TEXT
                 end
                 break
@@ -79,35 +79,35 @@ module Souls
             if @on
               if line.include?("end") || line.include?("t.index")
                 new_line.write(<<-TEXT)
+              }
+            }
+            nodes {
+              id
+            }
+            pageInfo {
+              endCursor
+              hasNextPage
+              startCursor
+              hasPreviousPage
             }
-          }
-          nodes {
-            id
-          }
-          pageInfo {
-            endCursor
-            hasNextPage
-            startCursor
-            hasPreviousPage
           }
         }
-      }
-    )
-  end
-
-  subject(:result) do
-    SoulsApiSchema.execute(query).as_json
-  end
+      )
+    end
 
-  it "return #{class_name.camelize} Data" do
-    begin
-      a1 = result.dig("data", "#{class_name.singularize.camelize(:lower)}Search", "edges")[0]["node"]
-      raise unless a1.present?
-    rescue
-      raise StandardError, result
+    subject(:result) do
+      SoulsApiSchema.execute(query).as_json
     end
-    expect(a1).to include(
-      "id" => be_a(String),
+
+    it "return #{class_name.camelize} Data" do
+      begin
+        a1 = result.dig("data", "#{class_name.singularize.camelize(:lower)}Search", "edges")[0]["node"]
+        raise unless a1.present?
+      rescue
+        raise StandardError, result
+      end
+      expect(a1).to include(
+        "id" => be_a(String),
                 TEXT
                 break
               end

data/lib/souls/version.rb

@@ -1,4 +1,4 @@
 module Souls
-  VERSION = "0.25.13".freeze
+  VERSION = "0.25.17".freeze
   public_constant :VERSION
 end

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-0.4.16
+0.4.20

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-0.4.16
+0.4.20

metadata

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