souls 0.23.8 → 0.24.2

data/apps/worker/spec/factories/article_categories.rb

@@ -0,0 +1,9 @@
+FactoryBot.define do
+  factory :article_category do
+    name { Faker::Books::CultureSeries.culture_ship_class }
+    tags { %w[tag1 tag2 tag3] }
+    is_deleted { false }
+    created_at { Time.now }
+    updated_at { Time.now }
+  end
+end

data/apps/worker/spec/factories/articles.rb

@@ -0,0 +1,17 @@
+FactoryBot.define do
+  factory :article do
+    association :user, factory: :user
+    title { Faker::Book.unique.title }
+    body { Faker::Quote.matz }
+    thumnail_url { Faker::Internet.url }
+    public_date { Time.now }
+    association :article_category, factory: :article_category
+    is_public { false }
+    just_created { false }
+    slag { Faker::Internet.password(min_length: 16) }
+    tags { %w[tag1 tag2 tag3] }
+    is_deleted { false }
+    created_at { Time.now }
+    updated_at { Time.now }
+  end
+end

data/apps/worker/spec/factories/users.rb

@@ -0,0 +1,23 @@
+require "gimei"
+FactoryBot.define do
+  factory :user do
+    uid { Faker::Internet.password }
+    username { Gimei.kanji }
+    screen_name { Faker::Internet.unique.username }
+    last_name { Gimei.last.hiragana }
+    first_name { Gimei.first.hiragana }
+    last_name_kanji { Gimei.last.kanji }
+    first_name_kanji { Gimei.first.kanji }
+    last_name_kana { Gimei.last.katakana }
+    first_name_kana { Gimei.last.katakana }
+    email { Faker::Internet.unique.email }
+    tel { Faker::PhoneNumber.subscriber_number(length: 10) }
+    icon_url { "https://picsum.photos/200" }
+    birthday { Faker::Date.birthday(min_age: 18, max_age: 65) }
+    gender { Gimei.male }
+    lang { "ja" }
+    category { "user" }
+    roles_mask { :normal }
+    is_deleted { false }
+  end
+end

data/apps/worker/spec/models/article_category_spec.rb

@@ -0,0 +1,7 @@
+RSpec.describe("ArticleCategory Model テスト", type: :model) do
+  describe "ArticleCategory データを書き込む" do
+    it "valid ArticleCategory Model" do
+      expect(FactoryBot.build(:article_category)).to(be_valid)
+    end
+  end
+end

data/apps/worker/spec/models/article_spec.rb

@@ -0,0 +1,7 @@
+RSpec.describe("Article Model テスト", type: :model) do
+  describe "Article データを書き込む" do
+    it "valid Article Model" do
+      expect(FactoryBot.build(:article)).to(be_valid)
+    end
+  end
+end

data/apps/worker/spec/models/user_spec.rb

@@ -0,0 +1,7 @@
+RSpec.describe("User Model テスト", type: :model) do
+  describe "User データを書き込む" do
+    it "valid User Model" do
+      expect(FactoryBot.build(:user)).to(be_valid)
+    end
+  end
+end

data/apps/worker/spec/spec_helper.rb

@@ -0,0 +1,110 @@
+ENV["RACK_ENV"] = "test"
+require "./app"
+require "rspec"
+# require "test/unit"
+require "rack/test"
+require "database_cleaner"
+require "capybara/rspec"
+require "webmock/rspec"
+require "pundit/matchers"
+
+if ENV["RACK_ENV"] == "production"
+  abort("The Souls environment is running in production mode!")
+end
+
+WebMock.disable_net_connect!(allow_localhost: true)
+
+begin
+  ActiveRecord::Migration.maintain_test_schema!
+rescue ActiveRecord::PendingMigrationError => e
+  puts e.to_s.strip
+  exit 1
+end
+
+def app
+  SoulsApi
+end
+
+Pundit::Matchers.configure do |config|
+  # config.user_alias = :user_role
+end
+
+RSpec.configure do |config|
+  config.order = :random
+
+  config.include Capybara::DSL
+  config.expect_with :rspec do |expectations|
+    # config.filter_run_excluding skip: true
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+  end
+
+  # rspec-mocks config goes here. You can use an alternate test double
+  # library (such as bogus or mocha) by changing the `mock_with` option here.
+  config.mock_with :rspec do |mocks|
+    mocks.verify_partial_doubles = true
+  end
+
+  config.shared_context_metadata_behavior = :apply_to_host_groups
+  config.include FactoryBot::Syntax::Methods
+  config.include Rack::Test::Methods
+
+  config.before(:suite) do
+    FactoryBot.find_definitions
+    DatabaseCleaner.clean_with(:truncation)
+  end
+
+  config.before(:each) do |_example|
+    DatabaseCleaner.strategy = :transaction
+    DatabaseCleaner.start
+  end
+
+  config.append_after(:each) { |_example| DatabaseCleaner.clean }
+  config.filter_run_excluding long: true
+  config.filter_run_excluding uses_external_service: true
+end
+
+class ActiveRecord::Base
+  mattr_accessor :shared_connection
+  @@shared_connection = nil
+
+  def self.connection
+    @@shared_connection || retrieve_connection
+  end
+end
+
+ActiveRecord::Base.shared_connection = ActiveRecord::Base.connection
+def get_global_key class_name, id
+  Base64.strict_encode64("#{class_name}:#{id}")
+end
+
+class ActiveSupport::TestCase
+  setup :begin_gc_deferment
+  teardown :reconsider_gc_deferment
+  teardown :scrub_instance_variables
+
+  @@reserved_ivars = %w[@_implementation @_result @_proxy @_assigns_hash_proxy @_backtrace]
+  DEFERRED_GC_THRESHOLD = (ENV["DEFER_GC"] || 1.0).to_f
+
+  @@last_gc_run = Time.now
+
+  def begin_gc_deferment
+    GC.disable if DEFERRED_GC_THRESHOLD > 0
+  end
+
+  def reconsider_gc_deferment
+    if DEFERRED_GC_THRESHOLD > 0 && Time.now - @@last_gc_run >= DEFERRED_GC_THRESHOLD
+
+      GC.enable
+      GC.start
+      GC.disable
+
+      @@last_gc_run = Time.now
+    end
+  end
+
+  def scrub_instance_variables
+    (instance_variables - @@reserved_ivars).each do |ivar|
+      instance_variable_set(ivar, nil)
+    end
+  end
+end

data/config/souls.rb

@@ -1,5 +1,9 @@
 Souls.configure do |config|
-  config.app = "souls-app"
-  config.project_id = "souls-app"
-  config.strain = "api"
+  config.app = "souls-api"
+  config.project_id = "souls-api"
+  config.strain = "worker"
+  config.api_repo = "elsoul/souls_api"
+  config.worker_repo = "elsoul/souls_worker"
+  config.worker_endpoint = "https://worker.com"
+  config.fixed_gems = []
 end

data/exe/souls

@@ -42,8 +42,6 @@ begin
     case strain
     when "media", "admin", "console", "doc"
       system("yarn dev")
-    when "worker"
-      system("bundle exec puma -p 3000 -e development")
     else
       system("foreman start -f Procfile.dev")
     end
@@ -69,7 +67,22 @@ begin
     Whirly.start(spinner: "clock", interval: 420, stop: "🎉") do
       Whirly.status = status
       send_method = ARGV[1]
-      Souls::Gcloud.public_send(send_method)
+
+      case send_method
+      when "create_pubsub_topic"
+        topic_name = ARGV[2]
+        args = { topic_name: topic_name }
+        Souls::Gcloud.public_send(send_method, args)
+      when "create_pubsub_subscription"
+        project_id = Souls.configuration.project_id
+        topic_name = ARGV[2]
+        service_account = "#{Souls.configuration.app}@#{project_id}iam.gserviceaccount.com"
+        endpoint = Souls.configuration.endpoint
+        args = { project_id: project_id, topic_name: topic_name, service_account: service_account, endpoint: endpoint }
+        Souls::Gcloud.public_send(send_method, args)
+      else
+        Souls::Gcloud.public_send(send_method)
+      end
       Whirly.status = "Done!"
     end
   when "-v", "--version"

data/lib/souls.rb

@@ -28,171 +28,160 @@ 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 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_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_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_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.show_wait_spinner(fps = 10)
-    chars = %w[| / - \\]
-    delay = 1.0 / fps
-    iter = 0
-    spinner =
-      Thread.new do
-        while iter
-          print(chars[(iter += 1) % chars.length])
-          sleep(delay)
-          print("\b")
-        end
-      end
-    yield.tap do
-      iter = false
-      spinner.join
+    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
-  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 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]
-                }
-              ]
+      @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
-            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
         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
-    attr_accessor :app, :strain, :project_id, :worker_name, :api_name
+    attr_accessor :app, :strain, :project_id, :worker_repo, :api_repo, :worker_endpoint, :fixed_gems
 
     def initialize
       @app = nil
       @project_id = nil
       @strain = nil
-      @worker_name = nil
-      @api_name = nil
+      @worker_repo = nil
+      @api_repo = nil
+      @worker_endpoint = nil
+      @fixed_gems = nil
     end
   end
 end