souls 0.24.1 → 0.24.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a177fdad1d5e6df31a9a51e12ab059d583ae4aa6fc97a529809aeaeb0fb5d85
-  data.tar.gz: ab2e23cc111ce0a07e61f98c9755ce6faef4533c9a581632d4ef72b15a652f9a
+  metadata.gz: 8305b1df5cacb1a4ec1e331666f60fe43fdb4c29b20d29caa2815ed8ae7e18f1
+  data.tar.gz: '08130c02290519c844dac657f9a5b4f3663a13e0931ad96a326e276d9a3e696d'
 SHA512:
-  metadata.gz: 28c46f5c4491a210d98ef5385840f334d47c4e57925a34478344ba843b037cf0390873710f5d49dea63e96fd920cae18bd3033af90ad3cecfacdbbb2b37abacf
-  data.tar.gz: c6fd132c48e96fa2897b649181ab6b3ee442d5b92c1557ce27f3c6a69307319a5758be8cc9346c3a4aacba0a7d146d43ff8ed6f992e585bb30b38891b887ca65
+  metadata.gz: ff64c773e7b4e7b8050e6626c49ed0a11734e9c6688ddc364899c186b51f60a9e2e2eadb4d85f5be34b86cec3b7a38bdad600425eb02b27075ace03820f809cf
+  data.tar.gz: c527bc6749ad24f8827c4e68459cd5d7c945c156b66fceb224703804d168be3987f58df5988f8ed30d6ee93e704c12b04b034d5e1764356efada87c985395e91

data/.irbrc

@@ -1,2 +1,3 @@
 require "./lib/souls"
 require "./config/souls"
+require "souls"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    souls (0.24.0)
+    souls (0.24.1)
       paint (= 2.2.1)
       whirly (= 0.3.0)
 

data/apps/api/.irbrc

@@ -1 +1,4 @@
 require "./app"
+require "souls"
+require "./config/souls"
+Dir["./spec/factories/*.rb"].each { |f| require f }

data/apps/api/Gemfile

@@ -38,12 +38,12 @@ group :development, :test do
   gem "rubocop", "1.18.3"
   gem "selenium-webdriver", "3.142.7"
   gem "solargraph", "0.42.4"
-  gem "souls", "0.24.0"
+  gem "souls", "0.24.1"
   gem "webmock", "3.13.0"
 end
 
 group :development do
-  gem "listen", "3.5.1"
+  gem "listen", "3.6.0"
   gem "rubocop-graphql", "0.9.0"
   gem "spring", "2.1.1"
   gem "spring-watcher-listen", "2.0.1"

data/apps/api/Gemfile.lock

@@ -176,7 +176,7 @@ GEM
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
-    listen (3.5.1)
+    listen (3.6.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     loofah (2.10.0)
@@ -335,7 +335,7 @@ GEM
       thor (~> 1.0)
       tilt (~> 2.0)
       yard (~> 0.9, >= 0.9.24)
-    souls (0.24.0)
+    souls (0.24.1)
       paint (= 2.2.1)
       whirly (= 0.3.0)
     spring (2.1.1)
@@ -381,7 +381,7 @@ DEPENDENCIES
   graphql-batch (= 0.4.3)
   graphql_playground (= 0.0.1)
   jwt (= 2.2.3)
-  listen (= 3.5.1)
+  listen (= 3.6.0)
   pg (= 1.2.3)
   puma (= 5.3.2)
   pundit (= 2.1.0)
@@ -402,7 +402,7 @@ DEPENDENCIES
   sinatra-contrib (= 2.1.0)
   slack-ruby3 (= 0.1.2)
   solargraph (= 0.42.4)
-  souls (= 0.24.0)
+  souls (= 0.24.1)
   spring (= 2.1.1)
   spring-watcher-listen (= 2.0.1)
   webmock (= 3.13.0)

data/apps/api/app/policies/user_policy.rb

@@ -19,6 +19,10 @@ class UserPolicy < ApplicationPolicy
     admin_permissions?
   end
 
+  def update_user_role?
+    @user.master?
+  end
+
   private
 
   def user_permissions?
@@ -28,8 +32,4 @@ class UserPolicy < ApplicationPolicy
   def admin_permissions?
     @user.master? or @user.admin?
   end
-
-  def update_user_role?
-    @user.master?
-  end
 end

data/apps/api/spec/policies/article_category_policy_spec.rb

@@ -1,24 +1,23 @@
 describe ArticleCategoryPolicy do
-  subject { described_class.new(user, article_category) }
+  subject { described_class.new(user, article) }
 
-  let(:article_category) { FactoryBot.create(:article_category) }
+  let(:article) { FactoryBot.create(:article) }
 
-  context "being a visitor" do
+  context "being a normal" do
     let(:user) { FactoryBot.create(:user) }
 
-    it { is_expected.to(permit_action(:index)) }
-    it { is_expected.to(permit_action(:show)) }
+    it { is_expected.to(permit_actions(%i[index show])) }
     it { is_expected.to(forbid_actions(%i[create update delete])) }
   end
 
-  context "being a staff" do
-    let(:user) { FactoryBot.create(:user, roles_mask: 3) }
+  context "being a user" do
+    let(:user) { FactoryBot.create(:user, roles: :user) }
 
     it { is_expected.to(permit_actions(%i[create update])) }
   end
 
-  context "being an administrator" do
-    let(:user) { FactoryBot.create(:user, roles_mask: 4) }
+  context "being an admin" do
+    let(:user) { FactoryBot.create(:user, roles: :admin) }
 
     it { is_expected.to(permit_actions(%i[create update delete])) }
   end

data/apps/api/spec/policies/article_policy_spec.rb

@@ -3,22 +3,21 @@ describe ArticlePolicy do
 
   let(:article) { FactoryBot.create(:article) }
 
-  context "being a visitor" do
+  context "being a normal" do
     let(:user) { FactoryBot.create(:user) }
 
-    it { is_expected.to(permit_action(:index)) }
-    it { is_expected.to(permit_action(:show)) }
+    it { is_expected.to(permit_actions(%i[index show])) }
     it { is_expected.to(forbid_actions(%i[create update delete])) }
   end
 
-  context "being a staff" do
-    let(:user) { FactoryBot.create(:user, roles_mask: 3) }
+  context "being a user" do
+    let(:user) { FactoryBot.create(:user, roles: :user) }
 
     it { is_expected.to(permit_actions(%i[create update])) }
   end
 
-  context "being an administrator" do
-    let(:user) { FactoryBot.create(:user, roles_mask: 4) }
+  context "being an admin" do
+    let(:user) { FactoryBot.create(:user, roles: :admin) }
 
     it { is_expected.to(permit_actions(%i[create update delete])) }
   end

data/apps/api/spec/policies/user_policy_spec.rb

@@ -1,5 +1,24 @@
 describe UserPolicy do
-  subject { described_class.new(user, user) }
+  subject { described_class.new(user, article) }
 
-  let!(:user) { FactoryBot.create(:user) }
+  let(:article) { FactoryBot.create(:article) }
+
+  context "being a normal" do
+    let(:user) { FactoryBot.create(:user) }
+
+    it { is_expected.to(permit_actions(%i[index show])) }
+    it { is_expected.to(forbid_actions(%i[create update delete])) }
+  end
+
+  context "being a user" do
+    let(:user) { FactoryBot.create(:user, roles: :user) }
+
+    it { is_expected.to(permit_actions(%i[create update])) }
+  end
+
+  context "being an admin" do
+    let(:user) { FactoryBot.create(:user, roles: :admin) }
+
+    it { is_expected.to(permit_actions(%i[create update delete])) }
+  end
 end

data/apps/worker/.irbrc

@@ -1 +1,4 @@
 require "./app"
+require "souls"
+require "./config/souls"
+Dir["./spec/factories/*.rb"].each { |f| require f }

data/lib/souls.rb

@@ -28,143 +28,147 @@ module Souls
   class Error < StandardError; end
   class << self
     attr_accessor :configuration
-  end
 
-  def self.run_psql
-    system(
-      "docker run --rm -d \
-        -p 5433:5432 \
-        -v postgres-tmp:/var/lib/postgresql/data \
-        -e POSTGRES_USER=postgres \
-        -e POSTGRES_PASSWORD=postgres \
-        -e POSTGRES_DB=souls_test \
-        postgres:13-alpine"
-    )
-    system("docker ps")
-  end
+    def run_psql
+      system(
+        "docker run --rm -d \
+          -p 5433:5432 \
+          -v postgres-tmp:/var/lib/postgresql/data \
+          -e POSTGRES_USER=postgres \
+          -e POSTGRES_PASSWORD=postgres \
+          -e POSTGRES_DB=souls_test \
+          postgres:13-alpine"
+      )
+      system("docker ps")
+    end
 
-  def self.run_mysql
-    system(
-      "docker run --rm -d \
-        -p 3306:3306 \
-        -v mysql-tmp:/var/lib/mysql \
-        -e MYSQL_USER=mysql \
-        -e MYSQL_ROOT_PASSWORD=mysql \
-        -e MYSQL_DB=souls_test \
-        mysql:latest"
-    )
-    system("docker ps")
-  end
+    def run_mysql
+      system(
+        "docker run --rm -d \
+          -p 3306:3306 \
+          -v mysql-tmp:/var/lib/mysql \
+          -e MYSQL_USER=mysql \
+          -e MYSQL_ROOT_PASSWORD=mysql \
+          -e MYSQL_DB=souls_test \
+          mysql:latest"
+      )
+      system("docker ps")
+    end
 
-  def self.run_awake(url)
-    app = Souls.configuration.app
-    system(
-      "gcloud scheduler jobs create http #{app}-awake
-      --schedule '0,10,20,30,40,50 * * * *' --uri #{url} --http-method GET"
-    )
-  end
+    def run_awake(url)
+      app = Souls.configuration.app
+      system(
+        "gcloud scheduler jobs create http #{app}-awake
+        --schedule '0,10,20,30,40,50 * * * *' --uri #{url} --http-method GET"
+      )
+    end
 
-  def self.gemfile_latest_version
-    file_path = "./Gemfile"
-    updated_gems = []
-    updated_gem_versions = []
-    updated_lines = []
-    from_dev = false
-    File.open(file_path, "r") do |f|
-      f.each_line do |line|
-        from_dev = true if line.include?("group")
-        next unless line.include?("gem ")
+    def gemfile_latest_version
+      file_path = "./Gemfile"
+      updated_gems = []
+      updated_gem_versions = []
+      updated_lines = []
+      from_dev = false
+      File.open(file_path, "r") do |f|
+        f.each_line do |line|
+          from_dev = true if line.include?("group")
+          next unless line.include?("gem ")
 
-        gem = line.gsub("gem ", "").gsub("\"", "").gsub("\n", "").gsub(" ", "").split(",")
-        url = URI("https://rubygems.org/api/v1/versions/#{gem[0]}/latest.json")
-        res = Net::HTTP.get_response(url)
-        data = JSON.parse(res.body)
-        next if Souls.configuration.fixed_gems.include?(gem[0].to_s)
-        next if data["version"].to_s == gem[1].to_s
+          gem = line.gsub("gem ", "").gsub("\"", "").gsub("\n", "").gsub(" ", "").split(",")
+          url = URI("https://rubygems.org/api/v1/versions/#{gem[0]}/latest.json")
+          res = Net::HTTP.get_response(url)
+          data = JSON.parse(res.body)
+          next if Souls.configuration.fixed_gems.include?(gem[0].to_s)
+          next if data["version"].to_s == gem[1].to_s
 
-        updated_lines << if from_dev
-                           "  gem \"#{gem[0]}\", \"#{data['version']}\""
-                         else
-                           "gem \"#{gem[0]}\", \"#{data['version']}\""
-                         end
-        updated_gems << (gem[0]).to_s
-        updated_gem_versions << data["version"]
-        system("gem update #{gem[0]}")
+          updated_lines << if from_dev
+                             "  gem \"#{gem[0]}\", \"#{data['version']}\""
+                           else
+                             "gem \"#{gem[0]}\", \"#{data['version']}\""
+                           end
+          updated_gems << (gem[0]).to_s
+          updated_gem_versions << data["version"]
+          system("gem update #{gem[0]}")
+        end
       end
+      {
+        gems: updated_gems,
+        lines: updated_lines,
+        updated_gem_versions: updated_gem_versions
+      }
     end
-    {
-      gems: updated_gems,
-      lines: updated_lines,
-      updated_gem_versions: updated_gem_versions
-    }
-  end
 
-  def self.update_gemfile
-    file_path = "./Gemfile"
-    tmp_file = "./tmp/Gemfile"
-    new_gems = gemfile_latest_version
-    logs = []
-    message = Paint["\nAlready Up to date!", :green]
-    return "Already Up to date!" && puts(message) if new_gems[:gems].blank?
+    def update_gemfile
+      file_path = "./Gemfile"
+      tmp_file = "./tmp/Gemfile"
+      new_gems = gemfile_latest_version
+      logs = []
+      message = Paint["\nAlready Up to date!", :green]
+      return "Already Up to date!" && puts(message) if new_gems[:gems].blank?
 
-    @i = 0
-    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 new_gems[:gems].include?(gem[0])
-            old_ver = gem[1].split(".")
-            new_ver = new_gems[:updated_gem_versions][@i].split(".")
-            if old_ver[0] < new_ver[0]
-              logs << Paint % [
-                "#{gem[0]} v#{gem[1]} → %{red_text}",
-                :white,
-                {
-                  red_text: ["v#{new_gems[:updated_gem_versions][@i]}", :red]
-                }
-              ]
-            elsif old_ver[1] < new_ver[1]
-              logs << Paint % [
-                "#{gem[0]} v#{gem[1]} → v#{new_ver[0]}.%{yellow_text}",
-                :white,
-                {
-                  yellow_text: ["#{new_ver[1]}.#{new_ver[2]}", :yellow]
-                }
-              ]
-            elsif old_ver[2] < new_ver[2]
-              logs << Paint % [
-                "#{gem[0]} v#{gem[1]} → v#{new_ver[0]}.#{new_ver[1]}.%{green_text}",
-                :white,
-                {
-                  green_text: [(new_ver[2]).to_s, :green]
-                }
-              ]
-            end
-            if gem[0] == "souls"
-              logs << Paint % ["\nSOULs Doc: %{cyan_text}", :white, { cyan_text: ["https://souls.elsoul.nl\n", :cyan] }]
+      @i = 0
+      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 new_gems[:gems].include?(gem[0])
+              old_ver = gem[1].split(".")
+              new_ver = new_gems[:updated_gem_versions][@i].split(".")
+              if old_ver[0] < new_ver[0]
+                logs << Paint % [
+                  "#{gem[0]} v#{gem[1]} → %{red_text}",
+                  :white,
+                  {
+                    red_text: ["v#{new_gems[:updated_gem_versions][@i]}", :red]
+                  }
+                ]
+              elsif old_ver[1] < new_ver[1]
+                logs << Paint % [
+                  "#{gem[0]} v#{gem[1]} → v#{new_ver[0]}.%{yellow_text}",
+                  :white,
+                  {
+                    yellow_text: ["#{new_ver[1]}.#{new_ver[2]}", :yellow]
+                  }
+                ]
+              elsif old_ver[2] < new_ver[2]
+                logs << Paint % [
+                  "#{gem[0]} v#{gem[1]} → v#{new_ver[0]}.#{new_ver[1]}.%{green_text}",
+                  :white,
+                  {
+                    green_text: [(new_ver[2]).to_s, :green]
+                  }
+                ]
+              end
+              if gem[0] == "souls"
+                logs << Paint % [
+                  "\nSOULs Doc: %{cyan_text}",
+                  :white,
+                  { cyan_text: ["https://souls.elsoul.nl\n", :cyan] }
+                ]
+              end
+              new_line.write("#{new_gems[:lines][@i]}\n")
+              @i += 1
+            else
+              new_line.write(line)
             end
-            new_line.write("#{new_gems[:lines][@i]}\n")
-            @i += 1
-          else
-            new_line.write(line)
           end
         end
       end
+      FileUtils.rm("./Gemfile")
+      FileUtils.rm("./Gemfile.lock")
+      FileUtils.mv("./tmp/Gemfile", "./Gemfile")
+      system("bundle update")
+      success = Paint["\n\nSuccessfully Updated These Gems!\n", :green]
+      puts(success)
+      logs.each do |line|
+        puts(line)
+      end
     end
-    FileUtils.rm("./Gemfile")
-    FileUtils.rm("./Gemfile.lock")
-    FileUtils.mv("./tmp/Gemfile", "./Gemfile")
-    system("bundle update")
-    success = Paint["\n\nSuccessfully Updated These Gems!\n", :green]
-    puts(success)
-    logs.each do |line|
-      puts(line)
-    end
-  end
 
-  def self.configure
-    self.configuration ||= Configuration.new
-    yield(configuration)
+    def configure
+      self.configuration ||= Configuration.new
+      yield(configuration)
+    end
   end
 
   class Configuration

data/lib/souls/gcloud/iam.rb

@@ -1,31 +1,45 @@
 module Souls
   module Gcloud
     class << self
-      def create_service_account(service_account: "souls-app")
-        `gcloud iam service-accounts create #{service_account} \
-        --description="Souls Service Account" \
-        --display-name="#{service_account}"`
+      def create_service_account(args)
+        service_account = args[:service_account] || "souls-app"
+        system(
+          "gcloud iam service-accounts create #{service_account} \
+        --description='Souls Service Account' \
+        --display-name=#{service_account}"
+        )
       end
 
-      def create_service_account_key(service_account: "souls-app")
-        project_id = Souls.configuration.project_id
-        `gcloud iam service-accounts keys create ./config/keyfile.json \
-          --iam-account #{service_account}@#{project_id}.iam.gserviceaccount.com`
+      def create_service_account_key(args)
+        service_account = args[:service_account] || "souls-app"
+        project_id = args[:project_id] || "souls-app"
+        system(
+          "gcloud iam service-accounts keys create ./config/keyfile.json \
+          --iam-account #{service_account}@#{project_id}.iam.gserviceaccount.com"
+        )
       end
 
-      def add_service_account_role(service_account: "souls-app", role: "roles/firebase.admin")
-        project_id = Souls.configuration.project_id
+      def add_service_account_role(args)
+        service_account = args[:service_account] || "souls-app"
+        project_id = args[:project_id] || "souls-app"
+        role = args[:role] || "roles/firebase.admin"
         `gcloud projects add-iam-policy-binding #{project_id} \
         --member="serviceAccount:#{service_account}@#{project_id}.iam.gserviceaccount.com" \
         --role="#{role}"`
       end
 
-      def add_permissions(service_account: "souls-app")
-        add_service_account_role(service_account: service_account, role: "roles/cloudsql.serviceAgent")
-        add_service_account_role(service_account: service_account, role: "roles/containerregistry.ServiceAgent")
-        add_service_account_role(service_account: service_account, role: "roles/pubsub.serviceAgent")
-        add_service_account_role(service_account: service_account, role: "roles/firestore.serviceAgent")
-        add_service_account_role(service_account: service_account, role: "roles/iam.serviceAccountUser")
+      def add_permissions(args)
+        service_account = args[:service_account] || "souls-app"
+        roles = [
+          "roles/cloudsql.serviceAgent",
+          "roles/containerregistry.ServiceAgent",
+          "roles/pubsub.serviceAgent",
+          "roles/firestore.serviceAgent",
+          "roles/iam.serviceAccountUser"
+        ]
+        roles.each do |role|
+          add_service_account_role(service_account: service_account, role: role)
+        end
       end
     end
   end

data/lib/souls/init.rb

@@ -9,21 +9,6 @@ module Souls
       data[0]["tag_name"]
     end
 
-    def self.initial_config_init(app_name: "souls", strain: "api")
-      FileUtils.touch("./#{app_name}/config/souls.rb")
-      file_path = "./#{app_name}/config/souls.rb"
-      File.open(file_path, "w") do |f|
-        f.write(<<~TEXT)
-          Souls.configure do |config|
-            config.app = "#{app_name}"
-            config.strain = "#{strain}"
-          end
-        TEXT
-      end
-    rescue StandardError => e
-      puts(e)
-    end
-
     def self.download_souls(app_name: "souls", repository_name: "souls_api ")
       version = get_version(repository_name: repository_name)
       system("curl -OL https://github.com/elsoul/#{repository_name}/archive/#{version}.tar.gz")

data/lib/souls/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 0.24.1
+  version: 0.24.2
 platform: ruby
 authors:
 - POPPIN-FUMI
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-07-20 00:00:00.000000000 Z
+date: 2021-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paint
@@ -66,7 +66,6 @@ files:
 - README.md
 - Rakefile
 - Steepfile
-- api_v0.0.1.tar.gz
 - apps/api/.env.sample
 - apps/api/.gitignore
 - apps/api/.irbrc
@@ -270,7 +269,6 @@ files:
 - lib/souls/version.rb
 - rbs/init.rbs
 - souls.gemspec
-- souls_api2.tar.gz
 homepage: https://souls.elsoul.nl
 licenses:
 - Apache-2.0