souls 0.25.15 → 0.25.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9260166372806697964d695eb8e5715701951aca0fbc488077e1e17e7f15d4c1
-  data.tar.gz: d773cf796195391e392520041225a3614aed1b863ccd759ad03e26b303782589
+  metadata.gz: b95e788773391bebd59bf7faf921e9d647bb39f564430b45e239e79c2b0ccfed
+  data.tar.gz: 22d8445babf829feb19c61209033f5e9b32196f827468f0ad2f9c40aa75305d9
 SHA512:
-  metadata.gz: 976b7cc1173658166fd691a694f915e43beaa85e997f1d6ac71d5dcd7a9636067b2fbe41aa7e2ffc160ef35a4e710f98604d7af9b746bfed9ad00d409f65bcaa
-  data.tar.gz: 9d0d22d2ae8cc90cbf33ef6f66ac3699043b8db37749969a2c226a343a75cd14cc7bd8570a4056f76ba2119eaae86cfc5ef08436bb506c9d1b1a66c43b160555
+  metadata.gz: 19d6e7e610f56fe92c41c12f2b2175fd92877d2d398a2f246e3a26c18f8cb4d53abb462e4644bf21527c92e9b89e26f16e88e66e68cb682a65c11eecc49b2bc8
+  data.tar.gz: eca89781a54e42932c3835f56b9c70c3ea1cc3f282b9c4c32c0effeb8ce354e313ce1cafb64ceb90e9191f78c9e92ffe18a5ce6bc9b9503cee257d87bf06bc0b

data/README.md

@@ -22,19 +22,16 @@
 Welcome to SOULs Serverless Application Framework!
 
 SOULs is a Serverless Application Framework with Ruby GraphQL. 
-SOULs has six strains, API, Worker, Console, Admin, Media, Doc, and can be used in combination according to the purpose. SOULs Backend GraphQL Ruby & Frontend Relay are Scalable and Easy to deploy to Google Cloud. No more routing for Backends!
-You can focus on your business logic. No more infra problems.
+SOULs has 3 strains, API, Worker, and Frontend. It can be used in combination according to the purpose. SOULs Backend GraphQL Ruby & Frontend Relay are Scalable and Easy to deploy to Google Cloud. No more routing for Backends!
+You can focus on your business logic.
 
 ![画像](https://storage.googleapis.com/souls-bucket/imgs/souls-structure.jpg)
 
-SOULs creates 6 types of framework.
+SOULs creates 3 types of framework.
 
 1. API - GraphQL (Ruby) - Simple API - Cloud Run
 2. Worker - Google Pub/Sub Worker API (Ruby) - Cloud Run
-3. Console Web Client - User Console and CMS (TypeScript)
-4. Admin Web Client - Admin Console and CMS (TypeScript)
-5. Media Web Client - Media web client with SSG (TypeScript)
-6. Doc Web Client - Doc web client with SSG (TypeScript)
+3. Frontend - React Application (TypeScript) - Firebase
 
 ## Dependency
 
@@ -81,10 +78,7 @@ And Create Your APP
 Select Strain:
 1. SOULs GraphQL API
 2. SOULs Worker
-3. SOULs Console Web
-4. SOULs Admin Web
-5. SOULs Media Web
-6. SOULs Doc Web
+3. SOULs Frontend Web
 
 
 ## Gemfile 自動更新アップデート

data/exe/souls

@@ -18,14 +18,7 @@ begin
     end
 
     prompt = TTY::Prompt.new
-    choices = [
-      "1. SOULs GraphQL API",
-      "2. SOULs Pub/Sub Worker",
-      "3. SOULs Console Web",
-      "4. SOULs Admin Web",
-      "5. SOULs Media Web",
-      "6. SOULs Doc Web"
-    ]
+    choices = ["1. SOULs GraphQL API", "2. SOULs Pub/Sub Worker", "3. SOULs Frontend Web"]
     choice_num = prompt.select(Paint["Select Strain: ", :cyan], choices)[0].to_i
     case choice_num
     when 1, 2
@@ -184,7 +177,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/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
@@ -104,9 +104,9 @@ module Souls
       File.open(file_path, "w") do |new_line|
         new_line.write(<<~TEXT)
           module Mutations
-            module #{class_name.camelize}
+            module Base::#{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
@@ -211,7 +211,7 @@ module Souls
       File.open(file_path, "w") do |f|
         f.write(<<~TEXT)
           module Mutations
-            module #{class_name.camelize}
+            module Base::#{class_name.camelize}
               class Delete#{class_name.camelize} < BaseMutation
                 field :#{class_name}, Types::#{class_name.camelize}Type, null: false
                 argument :id, String, required: true
@@ -240,7 +240,7 @@ module Souls
       File.open(file_path, "w") do |f|
         f.write(<<~TEXT)
           module Mutations
-            module #{class_name.camelize}
+            module Base::#{class_name.camelize}
               class DestroyDelete#{class_name.camelize} < BaseMutation
                 field :#{class_name}, Types::#{class_name.camelize}Type, null: false
                 argument :id, String, required: true

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.15".freeze
+  VERSION = "0.25.19".freeze
   public_constant :VERSION
 end

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-0.4.18
+0.4.22

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-0.4.18
+0.4.22

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 0.25.15
+  version: 0.25.19
 platform: ruby
 authors:
 - POPPIN-FUMI
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-07-28 00:00:00.000000000 Z
+date: 2021-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paint
@@ -55,9 +55,10 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.3.0
 description: |-
-  SOULs is a Serverless Application Framework.
-    SOULs has four strains, API, Worker, Console, Media, and can be used in combination according to the purpose.
-    SOULs Backend GraphQL Ruby & Frontend Relay are Scalable and Easy to deploy to Google Cloud and Amazon Web Services
+  SOULs is a Serverless Application Framework with Ruby GraphQL.
+    SOULs has 3 strains, API, Worker, and Frontend. It can be used in combination according to the purpose.
+    SOULs Ruby GraphQL API / Worker and Easy to deploy to Google Cloud. No more routing for Backends!
+    You can focus on your business logic.
 email:
 - f.kawasaki@elsoul.nl
 - s.kishi@elsoul.nl
@@ -123,8 +124,8 @@ requirements: []
 rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
-summary: SOULs is a Serverless Application Framework. SOULs has four strains, API,
-  Worker, Console, Media, and can be used in combination according to the purpose.
-  SOULs Backend GraphQL Ruby & Frontend Relay are Scalable and Easy to deploy to Google
-  Cloud and Amazon Web Services
+summary: SOULs is a Serverless Application Framework with Ruby GraphQL. SOULs has
+  3 strains, API, Worker, and Frontend. It can be used in combination according to
+  the purpose. SOULs Ruby GraphQL API / Worker and Easy to deploy to Google Cloud.
+  No more routing for Backends! You can focus on your business logic.
 test_files: []