rubypitaya 2.19.1 → 2.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63a4b9efb72dc065c543c844c34f18109ecd16c6a037595dcaee92269600294a
-  data.tar.gz: 825ffcf632ca4152c92f859cc73075b7b25d47bdc0b82dcc047833cc8f2f5744
+  metadata.gz: 3622a8779af46681d3a25d677021ef477a968e2a538d3dc7712c54a3bb5cd01d
+  data.tar.gz: d3357dc303db00fc1d29c208557547d60def38e432558a8286313dce4a9776df
 SHA512:
-  metadata.gz: 88f7e8a0224d7e119a1f1660a82a57fa71a419a8d33ad190136f2b3796b03176ee6eb198d2528985fe30461dfde33f28e47f049f6df4ade56740c6bbf881cb9b
-  data.tar.gz: 5cc1afdaf5c20cb7ebcf809a833b6243cc3d064bfb47443ec8ba116678fb19bb385698bbb567f94e76d22d3b4185d2707593ef6df8cd4dffce1dd538bcf4a97a
+  metadata.gz: 7f253dd21e9999acbe8ca3e6f64795f5c434a392cc7ad58749d5d0ac964fd1261e1440ef28a676489ce545bc406f39d5e1547242cee04575b666acfbe9dac4cb
+  data.tar.gz: 8ea11f029554fbb21abecb2f12dd69f6a40f6bff2dcb326e1bb28812be9261318bb650f8ff783b010fd68f5ac430de311263338d725b44e9715da914cc4ed2d6

data/lib/rubypitaya.rb

@@ -49,7 +49,14 @@ module RubyPitaya
       `git -C #{Path::PLUGINS_FOLDER_PATH} clone #{plugin_git_link}`
       FileUtils.rm_rf(plugin_git_path)
 
-      plugin_migrations_path = File.join(plugin_folder_path, 'db/migration/')
+      Dir.entries(plugin_folder_path).each do |entry|
+        entry_path = File.join(plugin_folder_path, entry)
+        FileUtils.rm_rf(entry_path) unless entry == 'app' ||
+                                           entry == '.' ||
+                                           entry == '..'
+      end
+
+      plugin_migrations_path = File.join(plugin_folder_path, 'app/migrations/')
       plugin_migrations_files = Dir[File.join(plugin_migrations_path, '*')]
       base_migration_timestamp = Time.now.utc.to_i
 

data/lib/rubypitaya/app-template/Gemfile

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gem 'rubypitaya', '2.19.1'
+gem 'rubypitaya', '2.23.0'
 
 group :development do
   gem 'pry', '0.14.0'

data/lib/rubypitaya/app-template/Gemfile.lock

@@ -12,9 +12,10 @@ GEM
       minitest (>= 5.1)
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
+    bson (4.12.1)
     builder (3.2.4)
     coderay (1.1.3)
-    concurrent-ruby (1.1.8)
+    concurrent-ruby (1.1.9)
     cucumber (5.3.0)
       builder (~> 3.2, >= 3.2.4)
       cucumber-core (~> 8.0, >= 8.0.1)
@@ -50,14 +51,14 @@ GEM
     etcdv3 (0.10.2)
       grpc (~> 1.17)
     eventmachine (1.2.7)
-    ffi (1.15.0)
-    google-protobuf (3.15.5)
-    googleapis-common-protos-types (1.0.6)
-      google-protobuf (~> 3.14)
-    grpc (1.36.0)
+    ffi (1.15.3)
+    google-protobuf (3.17.3)
+    googleapis-common-protos-types (1.1.0)
       google-protobuf (~> 3.14)
+    grpc (1.38.0)
+      google-protobuf (~> 3.15)
       googleapis-common-protos-types (~> 1.0)
-    i18n (1.8.9)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
     listen (3.4.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
@@ -65,6 +66,8 @@ GEM
     method_source (1.0.0)
     middleware (0.1.0)
     minitest (5.14.4)
+    mongo (2.15.0)
+      bson (>= 4.8.2, < 5.0.0)
     multi_json (1.15.0)
     multi_test (0.1.2)
     mustermann (1.1.1)
@@ -90,7 +93,7 @@ GEM
     rack-protection (2.1.0)
       rack
     rake (13.0.3)
-    rb-fsevent (0.10.4)
+    rb-fsevent (0.11.0)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     redis (4.2.5)
@@ -107,11 +110,11 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.2)
-    ruby2_keywords (0.0.4)
-    rubypitaya (2.19.1)
+    ruby2_keywords (0.0.5)
+    rubypitaya (2.23.0)
       activerecord (= 6.1.3)
       etcdv3 (= 0.10.2)
-      eventmachine (= 1.2.7)
+      mongo (= 2.15.0)
       nats (= 0.11.0)
       ostruct (= 0.3.3)
       pg (= 1.2.3)
@@ -149,7 +152,7 @@ DEPENDENCIES
   listen (= 3.4.1)
   pry (= 0.14.0)
   rspec (= 3.10.0)
-  rubypitaya (= 2.19.1)
+  rubypitaya (= 2.23.0)
 
 BUNDLED WITH
    2.1.4

data/lib/rubypitaya/app-template/Makefile

@@ -41,7 +41,7 @@ test-cucumber:
 ## Update gems dependencies on Gemfile.lock
 update-dependencies:
 	@rm -f Gemfile.lock
-	@docker run --rm -v "$(PWD)":/usr/src/app -w /usr/src/app ruby:2.7.2-slim bundle install
+	@docker run --rm -v "$(PWD)":/usr/src/app -w /usr/src/app ruby:2.7.2 bundle install
 
 ## + Improve metagame
 
@@ -49,7 +49,7 @@ update-dependencies:
 create-migration:
 	@docker-compose run --service-ports --rm rubypitaya-commands bundle exec rubypitaya create-migration $(NAME)
 
-## Add or update a plugim. GIT=[plugin-git-link]
+## Add or update a plugin. GIT=[plugin-http-git-link]
 add-plugin:
 	@docker-compose run --service-ports --rm rubypitaya-commands bundle exec rubypitaya add-plugin $(GIT)
 

data/lib/rubypitaya/app-template/Rakefile

@@ -8,8 +8,7 @@ namespace :db do
 
   desc 'Create the database'
   task :create do
-    environment_name = ENV.fetch("RUBYPITAYA_ENV") { 'development' }
-    database_config = RubyPitaya::DatabaseConfig.new(environment_name, RubyPitaya::Path::DATABASE_CONFIG_PATH)
+    database_config = RubyPitaya::DatabaseConfig.new
     connection_data = database_config.connection_data_without_database
 
     ActiveRecord::Base.establish_connection(connection_data)
@@ -21,8 +20,7 @@ namespace :db do
 
   desc 'Migrate the database'
   task :migrate do
-    environment_name = ENV.fetch("RUBYPITAYA_ENV") { 'development' }
-    database_config = RubyPitaya::DatabaseConfig.new(environment_name, RubyPitaya::Path::DATABASE_CONFIG_PATH)
+    database_config = RubyPitaya::DatabaseConfig.new
     connection_data = database_config.connection_data
     migrations_paths = [RubyPitaya::Path::Core::MIGRATIONS_FOLDER_PATH]
     migrations_paths += RubyPitaya::Path::Plugins::MIGRATIONS_FOLDER_PATHS
@@ -38,8 +36,7 @@ namespace :db do
 
   desc 'Rollback migrations'
   task :rollback do
-    environment_name = ENV.fetch("RUBYPITAYA_ENV") { 'development' }
-    database_config = RubyPitaya::DatabaseConfig.new(environment_name, RubyPitaya::Path::DATABASE_CONFIG_PATH)
+    database_config = RubyPitaya::DatabaseConfig.new
     connection_data = database_config.connection_data
     migrations_paths = [RubyPitaya::Path::Core::MIGRATIONS_FOLDER_PATH]
     migrations_paths += RubyPitaya::Path::Plugins::MIGRATIONS_FOLDER_PATHS
@@ -64,8 +61,7 @@ namespace :db do
 
   desc 'Drop the database'
   task :drop do
-    environment_name = ENV.fetch("RUBYPITAYA_ENV") { 'development' }
-    database_config = RubyPitaya::DatabaseConfig.new(environment_name, RubyPitaya::Path::DATABASE_CONFIG_PATH)
+    database_config = RubyPitaya::DatabaseConfig.new
     connection_data = database_config.connection_data_without_database
 
     ActiveRecord::Base.establish_connection(connection_data)
@@ -78,8 +74,7 @@ namespace :db do
 
   desc 'migration status'
   task :status do
-    environment_name = ENV.fetch("RUBYPITAYA_ENV") { 'development' }
-    database_config = RubyPitaya::DatabaseConfig.new(environment_name, RubyPitaya::Path::DATABASE_CONFIG_PATH)
+    database_config = RubyPitaya::DatabaseConfig.new
     connection_data = database_config.connection_data
     migrations_paths = [RubyPitaya::Path::Core::MIGRATIONS_FOLDER_PATH]
     migrations_paths += RubyPitaya::Path::Plugins::MIGRATIONS_FOLDER_PATHS

data/lib/rubypitaya/app-template/app/app_initializer.rb

@@ -13,6 +13,9 @@ class AppInitializer < RubyPitaya::InitializerBase
   #        - get instance by key
   #  - redis
   #    - link: https://github.com/redis/redis-rb/
+  #  - mongo
+  #    - class: Mongo::Client
+  #    - link: https://docs.mongodb.com/ruby-driver/current/tutorials/quick-start/
   #  - config
   #    - class: RubyPitaya::Config
   #    - link: https://gitlab.com/LucianoPC/ruby-pitaya/-/blob/master/lib/rubypitaya/core/config.rb

data/lib/rubypitaya/app-template/app/bll/player_bll.rb

@@ -2,7 +2,7 @@ class PlayerBLL
 
   def create_new_player(setup, config)
     name = config['initial_player'][:name]
-    gold = setup['initial_player.wallet.gold']
+    gold = config['initial_player'][:wallet][:gold]
 
     player = Player.new(name: name, gold: gold, user: User.new)
     player.save!

data/lib/rubypitaya/app-template/app/config/initial_player.json

@@ -1,3 +1,6 @@
 {
-    "name": "Guest"
+    "name": "Guest",
+    "wallet": {
+        "gold": 10
+    }
 }

data/lib/rubypitaya/app-template/app/handlers/player_handler.rb

@@ -11,6 +11,10 @@ class PlayerHandler < RubyPitaya::HandlerBase
   #  - @redis
   #    - link: https://github.com/redis/redis-rb/
   #
+  #  - @mongo
+  #    - class: Mongo::Client
+  #    - link: https://docs.mongodb.com/ruby-driver/current/tutorials/quick-start/
+  #
   #  - @config
   #    - info: Hash with config json files inside of 'app/config'
   #    - example:

data/lib/rubypitaya/app-template/app/setup/rubypitaya.yml

@@ -0,0 +1,33 @@
+server:
+  name: 'rubypitaya'
+  environment: development
+
+nats:
+  url: 'nats://nats:4222'
+
+etcd:
+  url: 'http://etcd:2379'
+  prefix: 'rubypitaya/'
+  leaseSeconds: '60'
+
+redis:
+  url: 'redis://redis:6379'
+
+database:
+  host: 'db'
+  port: 5432
+  user: 'postgres'
+  password: 'postgres'
+  name: 'ruby_pitaya'
+
+mongo:
+  url: mongo:27017
+  user: 'user'
+  pass: 'password'
+  database: admin
+
+http:
+  auth:
+    user: 'user'
+    pass: 'pass'
+    enabled: 'false'

data/lib/rubypitaya/app-template/bin/console

@@ -7,8 +7,7 @@ require 'rubypitaya'
 require 'rubypitaya/core/database_config'
 
 # Database connection
-environment_name = ENV.fetch("RUBYPITAYA_ENV") { 'development' }
-database_config = RubyPitaya::DatabaseConfig.new(environment_name, RubyPitaya::Path::DATABASE_CONFIG_PATH)
+database_config = RubyPitaya::DatabaseConfig.new
 ActiveRecord::Base.establish_connection(database_config.connection_data)
 ActiveRecord::Base.logger = ActiveSupport::Logger.new(STDOUT)
 ActiveSupport::LogSubscriber.colorize_logging = true
@@ -16,7 +15,7 @@ ActiveSupport::LogSubscriber.colorize_logging = true
 # Loading core files
 Gem.find_files('rubypitaya/**/*.rb').each do |path|
   require path unless path.end_with?('spec.rb') ||
-                      path.include?('db/migration') ||
+                      path.include?('app/migrations') ||
                       path.include?('core/templates') ||
                       path.include?('core/spec-helpers') ||
                       path.include?('app-template')
@@ -29,7 +28,7 @@ app_folder_paths.each do |app_folder_path|
 
   Dir[app_files_path].each do |path|
     require path unless path.end_with?('spec.rb') ||
-                        path.include?('db/migration') ||
+                        path.include?('app/migrations') ||
                         path.include?('spec_helper.rb')
   end
 end

data/lib/rubypitaya/app-template/docker-compose.yml

@@ -26,6 +26,28 @@ services:
     ports:
       - '9100:5432'
 
+  mongo:
+    image: mongo:5.0.0
+    restart: always
+    ports:
+      - 27017:27017
+    environment:
+      MONGO_INITDB_ROOT_USERNAME: user
+      MONGO_INITDB_ROOT_PASSWORD: password
+
+  mongo-express:
+    depends_on:
+      - 'mongo'
+    image: mongo-express:0.54.0
+    restart: always
+    ports:
+      - 8081:8081
+    environment:
+      ME_CONFIG_MONGODB_ADMINUSERNAME: user
+      ME_CONFIG_MONGODB_ADMINPASSWORD: password
+      ME_CONFIG_MONGODB_SERVER: 'mongo'
+      ME_CONFIG_MONGODB_PORT: '27017'
+
   connector:
     image: 'registry.gitlab.com/lucianopc/pitaya-connector:0.1.0'
     depends_on:
@@ -49,6 +71,8 @@ services:
       - 'nats'
       - 'etcd'
       - 'redis'
+      - 'mongo'
+      - 'mongo-express'
       - 'connector'
     build:
       context: '.'
@@ -60,22 +84,7 @@ services:
     ports:
       - '80:4567'
     environment:
-      SERVER_NAME: 'rubypitaya'
-      RUBYPITAYA_ENV: 'development'
       HISTFILE: '/app/rubypitaya/.bash-history'
-      NATS_URL: 'nats://nats:4222'
-      ETCD_URL: 'http://etcd:2379'
-      ETCD_PREFIX: 'rubypitaya/'
-      ETCD_LEASE_SECONDS: '60'
-      REDIS_URL: 'redis://redis:6379'
-      DATABASE_HOST: 'db'
-      DATABASE_PORT: 5432
-      DATABASE_USER: 'postgres'
-      DATABASE_PASSWORD: 'postgres'
-      DATABASE_NAME: 'ruby_pitaya'
-      HTTP_AUTH_ENABLED: 'false'
-      HTTP_AUTH_USER: 'user'
-      HTTP_AUTH_PASS: 'pass'
 
   rubypitaya-console:
     <<: *rubypitaya

data/lib/rubypitaya/app-template/docker/dev/Dockerfile

@@ -5,6 +5,7 @@ ENV LC_ALL=C.UTF-8
 
 RUN apt update && \
     apt install -y --no-install-recommends \
+    git \
     netcat \
     libpq-dev \
     build-essential \

data/lib/rubypitaya/app-template/docker/entrypoint.sh

@@ -4,7 +4,10 @@ cmd="$@"
 
 echo "=> Waiting for postgres"
 
-./docker/wait_for.sh $DATABASE_HOST:$DATABASE_PORT
+RUBYPITAYA_DATABASE_HOST=${RUBYPITAYA_DATABASE_HOST:-'db'}
+RUBYPITAYA_DATABASE_PORT=${RUBYPITAYA_DATABASE_PORT:-5432}
+
+./docker/wait_for.sh $RUBYPITAYA_DATABASE_HOST:$RUBYPITAYA_DATABASE_PORT
 
 echo "=> Postgres is ready"
 

data/lib/rubypitaya/app-template/features/player.feature

@@ -3,7 +3,7 @@ Feature: Player
   As a game player I want to have a player on database
 
   Scenario: Create new player
-    Given setup key 'initial_player.wallet.gold' is '10'
+    Given config key 'initial_player.wallet.gold' is '10'
     And   config key 'initial_player.name' is 'Guest'
     When  client call route 'rubypitaya.playerHandler.authenticate'
     Then  server should response 'code' as 'RP-200'

data/lib/rubypitaya/app-template/helm/templates/deployments/rubypitaya.yaml

@@ -25,34 +25,30 @@ spec:
         - containerPort: 4567
           name: rubypitaya
         env:
-          - name: SERVER_NAME
-            value: "rubypitaya"
-          - name: RUBYPITAYA_ENV
-            value: "production"
-          - name: NATS_URL
+          - name: RUBYPITAYA_SERVER_ENVIRONMENT
+            value: {{ .Values.rubypitaya.server.environment | quote }}
+          - name: RUBYPITAYA_NATS_URL
             value: "nats://nats.{{ .Values.namespace }}.svc.cluster.local:4222"
-          - name: ETCD_URL
+          - name: RUBYPITAYA_ETCD_URL
             value: "http://etcd.{{ .Values.namespace }}.svc.cluster.local:2379"
-          - name: ETCD_PREFIX
-            value: "rubypitaya/"
-          - name: ETCD_LEASE_SECONDS
-            value: "60"
-          - name: REDIS_URL
+          - name: RUBYPITAYA_REDIS_URL
             value: "redis://redis.{{ .Values.namespace }}.svc.cluster.local:6379"
-          - name: DATABASE_NAME
+          - name: RUBYPITAYA_DATABASE_NAME
             value: {{ .Values.database.name | quote }}
-          - name: DATABASE_HOST
+          - name: RUBYPITAYA_DATABASE_HOST
             value: {{ .Values.database.host | quote }}
-          - name: DATABASE_USER
+          - name: RUBYPITAYA_DATABASE_USER
             value: {{ .Values.database.user | quote }}
-          - name: DATABASE_PASSWORD
+          - name: RUBYPITAYA_DATABASE_PORT
+            value: {{ .Values.database.port | quote }}
+          - name: RUBYPITAYA_DATABASE_PASSWORD
             value: {{ .Values.database.password | quote }}
-          - name: HTTP_AUTH_ENABLED
-            value: {{ .Values.http.enabled | quote }}
-          - name: HTTP_AUTH_USER
-            value: {{ .Values.http.user | quote }}
-          - name: HTTP_AUTH_PASS
-            value: {{ .Values.http.password | quote }}
+          - name: RUBYPITAYA_HTTP_AUTH_ENABLED
+            value: {{ .Values.http.auth.enabled | quote }}
+          - name: RUBYPITAYA_HTTP_AUTH_USER
+            value: {{ .Values.http.auth.user | quote }}
+          - name: RUBYPITAYA_HTTP_AUTH_PASS
+            value: {{ .Values.http.auth.password | quote }}
           - name: MATCHMAKING_CURRENTROOMBLL
             value: kubernetes
           - name: MATCHMAKING_ROOMBLL_KUBERNETES_NAMESPACE

data/lib/rubypitaya/app-template/helm/values.yaml

@@ -7,6 +7,8 @@ connector:
     tag: 0.2.0
 
 rubypitaya:
+  server:
+    environment: production
   image:
     repository: [metagame-repository-link]
     tag: latest
@@ -15,12 +17,14 @@ database:
   name: [database-name]
   host: [database-host]
   user: [database-user]
+  port: [database-port]
   password: [database-password]
 
 http:
-  enabled: false
-  user: user
-  password: pass
+  auth:
+    user: 'user'
+    pass: 'pass'
+    enabled: 'false'
 
 gameserver:
   image:

data/lib/rubypitaya/app-template/kubernetes/deployment-rubypitaya.yaml

@@ -22,27 +22,23 @@ spec:
         - containerPort: 4567
           name: rubypitaya
         env:
-          - name: SERVER_NAME
-            value: "rubypitaya"
-          - name: RUBYPITAYA_ENV
+          - name: RUBYPITAYA_SERVER_ENVIRONMENT
             value: "production"
-          - name: NATS_URL
+          - name: RUBYPITAYA_NATS_URL
             value: "nats://nats.default.svc.cluster.local:4222"
-          - name: ETCD_URL
+          - name: RUBYPITAYA_ETCD_URL
             value: "http://etcd.default.svc.cluster.local:2379"
-          - name: ETCD_PREFIX
-            value: "rubypitaya/"
-          - name: ETCD_LEASE_SECONDS
-            value: "60"
-          - name: REDIS_URL
+          - name: RUBYPITAYA_REDIS_URL
             value: "redis://redis.default.svc.cluster.local:6379"
-          - name: DATABASE_HOST
+          - name: RUBYPITAYA_DATABASE_HOST
             value: "postgres.default.svc.cluster.local"
-          - name: DATABASE_USER
+          - name: RUBYPITAYA_DATABASE_USER
             value: "postgres"
-          - name: DATABASE_PASSWORD
+          - name: RUBYPITAYA_DATABASE_PORT
+            value: "5432"
+          - name: RUBYPITAYA_DATABASE_PASSWORD
             value: "postgres"
-          - name: DATABASE_NAME
+          - name: RUBYPITAYA_DATABASE_NAME
             value: "ruby_pitaya"
       imagePullSecrets:
       - name: gitlab-registry

data/lib/rubypitaya/app-template/spec/player_handler_spec.rb

@@ -3,10 +3,11 @@ require 'spec_helper'
 RSpec.describe 'PlayerHandler', type: :request do
   context 'authenticate' do
     it 'create_new_user' do
-      setup = {'initial_player' => {'wallet' => {'gold' => 10}}}
-      config = {'initial_player' => {'name' => 'Guest'}}
+      config = {'initial_player' => {
+        'name' => 'Guest',
+        'wallet' => {'gold' => 10},
+      }}
 
-      set_setup(setup)
       set_config(config)
 
       params = {}

data/lib/rubypitaya/core/application_files_importer.rb

@@ -10,7 +10,9 @@ module RubyPitaya
       app_folder_paths.each do |app_folder_path|
         app_files_path = "#{app_folder_path}/**/*.rb"
 
-        Gem.find_files(app_files_path).each { |path| require path }
+        Gem.find_files(app_files_path).each do |path|
+          require path unless path.include?('app/migrations')
+        end
       end
     end
 

data/lib/rubypitaya/core/config.rb

@@ -9,6 +9,7 @@ module RubyPitaya
       @config_core_override = nil
       @has_config_core_override = false
 
+      @empty_hash = {}
       @result_cache = {}
     end
 
@@ -18,6 +19,7 @@ module RubyPitaya
 
       if @has_config_core_override
         result = @config_core_override[key]
+        result = @config_core[key] if result.nil?
       else
         result = @config_core[key]
       end
@@ -27,6 +29,13 @@ module RubyPitaya
       result
     end
 
+    def fetch(*args)
+      result = self[args[0]]
+      return result unless result.nil?
+
+      @empty_hash.fetch(*args)
+    end
+
     def auto_reload
       @config_core.auto_reload
       @config_core_override.auto_reload unless @config_core_override.nil?

data/lib/rubypitaya/core/database_config.rb

@@ -1,21 +1,30 @@
 require 'erb'
 require 'yaml'
 
-require 'rubypitaya/core/path'
+require 'rubypitaya/core/setup'
 
 module RubyPitaya
 
   class DatabaseConfig
 
-    def initialize(environment_name, database_config_path)
-      @environment_name = environment_name
+    def initialize()
+      @setup = Setup.new
+
+      @config = {
+        'adapter' => 'postgresql',
+        'encoding' => 'unicode',
+        'pool' => @setup.fetch('rubypitaya.database.pool', 5),
+        'host' => @setup['rubypitaya.database.host'],
+        'user' => @setup['rubypitaya.database.user'],
+        'password' => @setup['rubypitaya.database.password'],
+        'database' => @setup['rubypitaya.database.name'],
+      }
 
-      yaml_contents = File.open(database_config_path).read
-      @config = YAML.load( ERB.new(yaml_contents).result )
+      @config['database'] = "#{@config['database']}_test" if @environment_name == 'test'
     end
 
     def config
-      @config[@environment_name]
+      @config
     end
 
     def connection_data
@@ -44,9 +53,5 @@ module RubyPitaya
     def database_name
       config['database']
     end
-
-    def migrations_path
-      @migrations_path
-    end
   end
 end

data/lib/rubypitaya/core/handler_base.rb

@@ -17,10 +17,11 @@ module RubyPitaya
       @postman = nil
     end
 
-    def set_attributes(bll, log, redis, setup, config, params, session, postman)
+    def set_attributes(bll, log, redis, mongo, setup, config, params, session, postman)
       @bll = bll
       @log = log
       @redis = redis
+      @mongo = mongo
       @setup = setup
       @config = config
       @params = params

data/lib/rubypitaya/core/handler_router.rb

@@ -54,8 +54,8 @@ module RubyPitaya
       @handler_name_map = @handler_name_map.to_h
     end
 
-    def call(handler_name, action_name, session, postman, redis, setup, config,
-             bll, log, params)
+    def call(handler_name, action_name, session, postman, redis, mongo, setup,
+             config, bll, log, params)
       unless @handler_name_map.include?(handler_name)
         return {
           code: StatusCodes::CODE_HANDLER_NOT_FOUND,
@@ -72,11 +72,11 @@ module RubyPitaya
       handler = @handler_name_map[handler_name]
 
       if !handler.class.authenticated_action_name?(action_name)
-        handler.set_attributes(bll, log, redis, setup, config, params, session, postman)
+        handler.set_attributes(bll, log, redis, mongo, setup, config, params, session, postman)
         handler.send(action_name)
       else
         if session.authenticated?
-          handler.set_attributes(bll, log, redis, setup, config, params, session, postman)
+          handler.set_attributes(bll, log, redis, mongo, setup, config, params, session, postman)
           handler.send(action_name)
         else
           return {

data/lib/rubypitaya/core/helpers/setup_helper.rb

@@ -3,8 +3,7 @@ require 'active_record'
 require 'rubypitaya/core/database_config'
 
 # Database connection
-environment_name = ENV.fetch("RUBYPITAYA_ENV") { 'development' }
-database_config = RubyPitaya::DatabaseConfig.new(environment_name, RubyPitaya::Path::DATABASE_CONFIG_PATH)
+database_config = RubyPitaya::DatabaseConfig.new
 ActiveRecord::Base.establish_connection(database_config.connection_data)
 # ActiveRecord::Base.logger = ActiveSupport::Logger.new(STDOUT)
 # ActiveSupport::LogSubscriber.colorize_logging = true
@@ -19,7 +18,7 @@ ActiveRecord::Migration.maintain_test_schema!
 # Loading core files
 Gem.find_files('rubypitaya/**/*.rb').each do |path|
   require path unless path.end_with?('spec.rb') ||
-                      path.include?('db/migration') ||
+                      path.include?('app/migrations') ||
                       path.include?('core/templates') ||
                       path.include?('core/spec-helpers') ||
                       path.include?('app-template')
@@ -32,6 +31,6 @@ app_folder_paths.each do |app_folder_path|
 
   Dir[app_files_path].each do |path|
     require path unless path.end_with?('spec.rb') ||
-                        path.include?('db/migration')
+                        path.include?('app/migrations')
   end
 end

data/lib/rubypitaya/core/http_routes.rb

@@ -1,13 +1,13 @@
 require 'sinatra/base'
-require 'sinatra/reloader' if ENV['RUBYPITAYA_ENV'] == 'development'
 require 'rubypitaya/core/parameters'
 
 module RubyPitaya
 
   class HttpRoutes < Sinatra::Base
 
-    if ENV['RUBYPITAYA_ENV'] == 'development'
-      register Sinatra::Reloader
+    def self.auto_reload
+      require 'sinatra/reloader'
+      register ::Sinatra::Reloader
     end
 
     helpers do
@@ -19,12 +19,13 @@ module RubyPitaya
     before do
       content_type :json
 
-      return error_unauthorized unless authorized?(request)
-
       @bll = settings.bll
+      @mongo = settings.mongo
       @setup = settings.setup
       @config = settings.config
 
+      return error_unauthorized unless authorized?(request)
+
       @config.clear_cache
 
       if request.content_type == 'application/json'
@@ -49,12 +50,12 @@ module RubyPitaya
     end
 
     def http_auth_enabled?
-      return ENV.fetch("HTTP_AUTH_ENABLED") { 'false' } == 'true'
+      return @setup.fetch('rubypitaya.http.auth.enabled') { 'false' } == 'true'
     end
 
     def get_http_auth
-      user = ENV.fetch("HTTP_AUTH_USER") { '' }
-      pass = ENV.fetch("HTTP_AUTH_PASS") { '' }
+      user = @setup.fetch('rubypitaya.http.auth.user') { '' }
+      pass = @setup.fetch('rubypitaya.http.auth.pass') { '' }
 
       auth_token = ::Base64.strict_encode64("#{user}:#{pass}")
 

data/lib/rubypitaya/core/initializer_content.rb

@@ -2,11 +2,12 @@ module RubyPitaya
 
   class InitializerContent
 
-    attr_reader :bll, :log, :redis, :setup, :config
+    attr_reader :bll, :log, :redis, :mongo, :setup, :config
 
-    def initialize(bll, log, redis, setup, config)
+    def initialize(bll, log, redis, mongo, setup, config)
       @bll = bll
       @log = log
+      @mongo = mongo
       @redis = redis
       @setup = setup
       @config = config

data/lib/rubypitaya/core/main.rb

@@ -16,8 +16,9 @@ require 'rubypitaya/core/handler_router'
 require 'rubypitaya/core/etcd_connector'
 require 'rubypitaya/core/nats_connector'
 require 'rubypitaya/core/database_config'
-require 'rubypitaya/core/redis_connector'
 require 'rubypitaya/core/instance_holder'
+require 'rubypitaya/core/mongo_connector'
+require 'rubypitaya/core/redis_connector'
 require 'rubypitaya/core/database_connector'
 require 'rubypitaya/core/initializer_content'
 require 'rubypitaya/core/initializer_broadcast'
@@ -30,8 +31,10 @@ module RubyPitaya
     attr_reader :redis_connector, :config, :bll
 
     def initialize
-      @environment_name = ENV.fetch("RUBYPITAYA_ENV") { 'development' }
+      @setup = Setup.new
+      @environment_name = @setup.fetch('rubypitaya.server.environment', 'development')
       @is_development_environment = @environment_name == 'development'
+      @setup.auto_reload if @is_development_environment
 
       @log = Logger.new('/proc/self/fd/1')
       @log.level = Logger::INFO
@@ -43,13 +46,13 @@ module RubyPitaya
       @application_files_importer.import
       @application_files_importer.auto_reload if @is_development_environment
 
-      @server_name = ENV['SERVER_NAME']
+      @server_name = @setup['rubypitaya.server.name']
       @service_uuid = SecureRandom.uuid
       @desktop_name = Socket.gethostname
 
-      @etcd_prefix = ENV['ETCD_PREFIX']
-      @etcd_address = ENV['ETCD_URL']
-      @etcd_lease_seconds = ENV['ETCD_LEASE_SECONDS'].to_i
+      @etcd_prefix = @setup['rubypitaya.etcd.prefix']
+      @etcd_address = @setup['rubypitaya.etcd.url']
+      @etcd_lease_seconds = @setup['rubypitaya.etcd.leaseSeconds'].to_i
       @allow_reconnect = false
       @etcd_connector = EtcdConnector.new(@service_uuid, @desktop_name,
                                           @server_name, @etcd_prefix,
@@ -57,30 +60,37 @@ module RubyPitaya
                                           @etcd_lease_seconds)
       @etcd_connector.connect
 
-      @nats_address = ENV['NATS_URL']
+      @nats_address = @setup['rubypitaya.nats.url']
       @nats_connector = NatsConnector.new(@nats_address, @service_uuid,
                                           @server_name)
 
-      @redis_address = ENV['REDIS_URL']
+      @redis_address = @setup['rubypitaya.redis.url']
       @redis_connector = RedisConnector.new(@redis_address)
       @redis_connector.connect
 
-      @database_config = DatabaseConfig.new(@environment_name, Path::DATABASE_CONFIG_PATH)
+      @database_config = DatabaseConfig.new
       @database_connector = DatabaseConnector.new(@database_config)
       @database_connector.connect
 
+      @mongo_address = @setup['rubypitaya.mongo.url']
+      @mongo_user = @setup['rubypitaya.mongo.user']
+      @mongo_password = @setup['rubypitaya.mongo.pass']
+      @mongo_database_name = @setup['rubypitaya.mongo.database']
+      @mongo_connector = MongoConnector.new(@mongo_address, @mongo_user,
+                                            @mongo_password, @mongo_database_name)
+      @mongo_connector.connect
+
       @session = Session.new
       @postman = Postman.new(@nats_connector)
       @config = Config.new
       @config.auto_reload if @is_development_environment
-      @setup = Setup.new
-      @setup.auto_reload if @is_development_environment
 
       @bll = InstanceHolder.new
 
       @initializer_content = InitializerContent.new(@bll,
                                                     @log,
                                                     @redis_connector.redis,
+                                                    @mongo_connector.mongo,
                                                     @setup,
                                                     @config)
       @initializer_broadcast = InitializerBroadcast.new
@@ -97,10 +107,14 @@ module RubyPitaya
     def run_http
       HttpRoutes.set :bll, @bll
       HttpRoutes.set :log, @log
+      HttpRoutes.set :redis, @redis_connector.redis
+      HttpRoutes.set :mongo, @mongo_connector.mongo
       HttpRoutes.set :setup, @setup
       HttpRoutes.set :config, @config
       HttpRoutes.set :views, [Path::HTTP_VIEWS_PATH] + Path::Plugins::HTTP_VIEWS_PATHS
 
+      HttpRoutes.auto_reload if @is_development_environment
+
       Thread.new do
         HttpRoutes.bind = '0.0.0.0'
         HttpRoutes.port = '4567'
@@ -170,7 +184,8 @@ module RubyPitaya
 
         response = @handler_router.call(handler_name, action_name, @session,
                                         @postman, @redis_connector.redis,
-                                        @setup, @config, @bll, @log, params)
+                                        @mongo_connector.mongo, @setup, @config,
+                                        @bll, @log, params)
 
         delta_time_seconds = ((Time.now.to_f - start_time_seconds) * 1000).round(2)
 

data/lib/rubypitaya/core/mongo_connector.rb

@@ -0,0 +1,25 @@
+require 'mongo'
+
+module RubyPitaya
+
+  class MongoConnector
+
+    def initialize(mongo_address, mongo_user, mongo_password, mongo_database_name)
+      @mongo_address = mongo_address
+      @mongo_user = mongo_user
+      @mongo_password = mongo_password
+      @mongo_database_name = mongo_database_name
+    end
+
+    def connect
+      @mongo_client = Mongo::Client.new([@mongo_address],
+                                        user: @mongo_user,
+                                        password: @mongo_password,
+                                        database: @mongo_database_name)
+    end
+
+    def mongo
+      @mongo_client
+    end
+  end
+end

data/lib/rubypitaya/core/path.rb

@@ -4,13 +4,11 @@ module RubyPitaya
     APP_TEMPLATE_FOLDER_PATH = File.join(__dir__, '../app-template/')
     MIGRATION_TEMPLATE_PATH = File.join(__dir__, 'templates/template_migration.rb.erb')
 
-    DATABASE_CONFIG_PATH = File.join(Dir.pwd, 'config/database.yml')
-
     APP_FOLDER_PATH = File.join(Dir.pwd, 'app/')
     HANDLERS_FOLDER_PATH = File.join(Dir.pwd, 'app/handlers/')
     APP_CONFIG_FOLDER_PATH = File.join(Dir.pwd, 'app/config/')
     APP_SETUP_FOLDER_PATH = File.join(Dir.pwd, 'app/setup/')
-    MIGRATIONS_FOLDER_PATH = File.join(Dir.pwd, 'db/migration/')
+    MIGRATIONS_FOLDER_PATH = File.join(Dir.pwd, 'app/migrations/')
     PLUGINS_FOLDER_PATH = File.join(Dir.pwd, 'plugins/')
 
     ROUTES_FILE_PATH = File.join(Dir.pwd, 'config/routes.rb')
@@ -20,7 +18,7 @@ module RubyPitaya
 
     class Core
       APP_FOLDER_PATH = File.join(__dir__, 'app/')
-      MIGRATIONS_FOLDER_PATH = File.join(__dir__, 'db/migration/')
+      MIGRATIONS_FOLDER_PATH = File.join(__dir__, 'app/migrations/')
     end
 
     class Plugins
@@ -28,7 +26,7 @@ module RubyPitaya
       HANDLERS_FOLDER_PATHS = Dir.glob(File.join(Dir.pwd, 'plugins/*/app/handlers'))
       APP_CONFIG_FOLDER_PATHS = Dir.glob(File.join(Dir.pwd, 'plugins/*/app/config/'))
       APP_SETUP_FOLDER_PATHS = Dir.glob(File.join(Dir.pwd, 'plugins/*/app/setup/'))
-      MIGRATIONS_FOLDER_PATHS = Dir.glob(File.join(Dir.pwd, 'plugins/*/db/migration'))
+      MIGRATIONS_FOLDER_PATHS = Dir.glob(File.join(Dir.pwd, 'plugins/*/app/migrations/'))
       HTTP_VIEWS_PATHS = Dir.glob(File.join(Dir.pwd, 'plugins/*/app/http/views'))
     end
   end

data/lib/rubypitaya/core/setup.rb

@@ -1,9 +1,12 @@
+require 'rubypitaya/core/path'
+
 module RubyPitaya
 
   class Setup
 
     def initialize()
       @config = {}
+      @empty_hash = {}
       configs_folder_paths = Path::Plugins::APP_SETUP_FOLDER_PATHS + [Path::APP_SETUP_FOLDER_PATH]
 
       configs_folder_paths.each do |configs_folder_path|
@@ -24,6 +27,13 @@ module RubyPitaya
       @config.dig(*split_key)
     end
 
+    def fetch(*args)
+      result = self[args[0]]
+      return result unless result.nil?
+
+      @empty_hash.fetch(*args)
+    end
+
     def auto_reload
       require 'listen'
 

data/lib/rubypitaya/core/spec-helpers/handler_spec_helper.rb

@@ -1,3 +1,4 @@
+require 'rubypitaya/core/setup'
 require 'rubypitaya/core/handler_router'
 require 'rubypitaya/core/redis_connector'
 require 'rubypitaya/core/spec-helpers/setup_spec_helper'
@@ -21,6 +22,7 @@ module RubyPitaya
       @@response = {}
 
       initialize_redis
+      initialize_mongo
 
       @@handler_router ||= HandlerRouter.new()
 
@@ -28,6 +30,7 @@ module RubyPitaya
       @@initializer_content = InitializerContent.new(@@bll,
                                                      @@log,
                                                      @@redis_connector.redis,
+                                                     @@mongo_connector.mongo,
                                                      @@setup,
                                                      @@config)
       @@initializer_broadcast = InitializerBroadcast.new
@@ -39,7 +42,8 @@ module RubyPitaya
 
       @@response = @@handler_router.call(handler_name, action_name, @@session,
                                          @@postman, @@redis_connector.redis,
-                                         @@setup, @@config, @@bll, @@log, params)
+                                         @@mongo_connector.mongo, @@setup,
+                                         @@config, @@bll, @@log, params)
     end
 
     def response
@@ -96,12 +100,30 @@ module RubyPitaya
       @@redis_connector ||= nil
 
       if @@redis_connector.nil?
-        redis_address = ENV['REDIS_URL']
+        @@core_setup ||= Setup.new
+        redis_address = @@core_setup['rubypitaya.redis.url']
         @@redis_connector = RedisConnector.new(redis_address)
         @@redis_connector.connect
       end
 
       @@redis_connector.redis.flushall
     end
+
+    def initialize_mongo
+      @@mongo_connector ||= nil
+
+      if @@mongo_connector.nil?
+        @@core_setup ||= Setup.new
+        mongo_address = @@core_setup['rubypitaya.mongo.url']
+        mongo_user = @@core_setup['rubypitaya.mongo.user']
+        mongo_password = @@core_setup['rubypitaya.mongo.pass']
+        mongo_database_name = @@core_setup['rubypitaya.mongo.database']
+        @@mongo_connector = MongoConnector.new(mongo_address, mongo_user,
+                                              mongo_password, mongo_database_name)
+        @@mongo_connector.connect
+      end
+
+      @@mongo_connector.mongo.collections.map(&:drop)
+    end
   end
 end

data/lib/rubypitaya/version.rb

@@ -1,3 +1,3 @@
 module RubyPitaya
-  VERSION = '2.19.1'
+  VERSION = '2.23.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubypitaya
 version: !ruby/object:Gem::Version
-  version: 2.19.1
+  version: 2.23.0
 platform: ruby
 authors:
 - Luciano Prestes Cavalcanti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-21 00:00:00.000000000 Z
+date: 2021-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -52,6 +52,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.11.0
+- !ruby/object:Gem::Dependency
+  name: mongo
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.15.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.15.0
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
@@ -244,13 +258,12 @@ files:
 - "./lib/rubypitaya/app-template/app/handlers/player_handler.rb"
 - "./lib/rubypitaya/app-template/app/http/hello_world_http.rb"
 - "./lib/rubypitaya/app-template/app/http/views/hello_world.erb"
+- "./lib/rubypitaya/app-template/app/migrations/1606736477_create_player_migration.rb"
 - "./lib/rubypitaya/app-template/app/models/player.rb"
 - "./lib/rubypitaya/app-template/app/models/user.rb"
-- "./lib/rubypitaya/app-template/app/setup/initial_player.yml"
+- "./lib/rubypitaya/app-template/app/setup/rubypitaya.yml"
 - "./lib/rubypitaya/app-template/bin/console"
-- "./lib/rubypitaya/app-template/config/database.yml"
 - "./lib/rubypitaya/app-template/config/routes.rb"
-- "./lib/rubypitaya/app-template/db/migration/1606736477_create_player_migration.rb"
 - "./lib/rubypitaya/app-template/docker-compose.yml"
 - "./lib/rubypitaya/app-template/docker/dev/Dockerfile"
 - "./lib/rubypitaya/app-template/docker/entrypoint.sh"
@@ -303,13 +316,13 @@ files:
 - "./lib/rubypitaya/app-template/spec/hello_world_handler_spec.rb"
 - "./lib/rubypitaya/app-template/spec/player_handler_spec.rb"
 - "./lib/rubypitaya/app-template/spec/spec_helper.rb"
+- "./lib/rubypitaya/core/app/migrations/0000000001_create_user_migration.rb"
 - "./lib/rubypitaya/core/app/models/user.rb"
 - "./lib/rubypitaya/core/application_files_importer.rb"
 - "./lib/rubypitaya/core/config.rb"
 - "./lib/rubypitaya/core/config_core.rb"
 - "./lib/rubypitaya/core/database_config.rb"
 - "./lib/rubypitaya/core/database_connector.rb"
-- "./lib/rubypitaya/core/db/migration/0000000001_create_user_migration.rb"
 - "./lib/rubypitaya/core/etcd_connector.rb"
 - "./lib/rubypitaya/core/handler_base.rb"
 - "./lib/rubypitaya/core/handler_router.rb"
@@ -320,6 +333,7 @@ files:
 - "./lib/rubypitaya/core/initializer_content.rb"
 - "./lib/rubypitaya/core/instance_holder.rb"
 - "./lib/rubypitaya/core/main.rb"
+- "./lib/rubypitaya/core/mongo_connector.rb"
 - "./lib/rubypitaya/core/nats_connector.rb"
 - "./lib/rubypitaya/core/parameters.rb"
 - "./lib/rubypitaya/core/path.rb"

data/lib/rubypitaya/app-template/app/setup/initial_player.yml

@@ -1,2 +0,0 @@
-wallet: 
-  gold: 10

data/lib/rubypitaya/app-template/config/database.yml

@@ -1,20 +0,0 @@
-default: &default
-  adapter: postgresql
-  encoding: unicode
-  pool: <%= ENV['RUBYPITAYA_MAX_THREADS'] { 5 } %>
-  host: <%= ENV['DATABASE_HOST'] %>
-  user: <%= ENV['DATABASE_USER'] %>
-  password: <%= ENV['DATABASE_PASSWORD'] %>
-
-development:
-  <<: *default
-  database: <%= "#{ENV['DATABASE_NAME']}" %>
-
-test:
-  <<: *default
-  database: <%= "#{ENV['DATABASE_NAME']}_test" %>
-
-production:
-  <<: *default
-  database: <%= "#{ENV['DATABASE_NAME']}" %>
-