rubypitaya 2.18.0 → 2.21.0

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/config.rb

@@ -9,6 +9,7 @@ module RubyPitaya
       @config_core_override = nil
       @has_config_core_override = false
 
+      @empty_hash = {}
       @result_cache = {}
     end
 
@@ -18,15 +19,23 @@ 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
 
-      @result_cache[key] = result.deep_symbolize_keys
+      @result_cache[key] = result
 
       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,6 +17,17 @@ module RubyPitaya
       @postman = nil
     end
 
+    def set_attributes(bll, log, redis, setup, config, params, session, postman)
+      @bll = bll
+      @log = log
+      @redis = redis
+      @setup = setup
+      @config = config
+      @params = params
+      @session = session
+      @postman = postman
+    end
+
     def self.non_authenticated_actions(*action_names)
       self.non_authenticated_routes = action_names.map(&:to_s)
     end

data/lib/rubypitaya/core/handler_router.rb

@@ -62,8 +62,7 @@ module RubyPitaya
           msg: "Handler #{handler_name} not founded"
         }
       end
-
-      unless @handler_name_map[handler_name].methods.include?(action_name.to_sym)
+      unless @handler_name_map[handler_name].public_methods(false).include?(action_name.to_sym)
         return {
           code: StatusCodes::CODE_ACTION_NOT_FOUND,
           msg: "Handler #{handler_name} action #{action_name} not founded"
@@ -72,19 +71,12 @@ module RubyPitaya
 
       handler = @handler_name_map[handler_name]
 
-      handler.bll = bll
-      handler.log = log
-      handler.redis = redis
-      handler.setup = setup
-      handler.config = config
-      handler.params = params
-      handler.session = session
-      handler.postman = postman
-
       if !handler.class.authenticated_action_name?(action_name)
+        handler.set_attributes(bll, log, redis, 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.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

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
@@ -23,6 +23,10 @@ module RubyPitaya
       @setup = settings.setup
       @config = settings.config
 
+      return error_unauthorized unless authorized?(request)
+
+      @config.clear_cache
+
       if request.content_type == 'application/json'
         request_body = request.body.read
         @params.merge!(JSON.parse(request_body)) if !request_body.blank?
@@ -30,5 +34,31 @@ module RubyPitaya
 
       @params = Parameters.new(@params)
     end
+
+    private
+
+    def error_unauthorized
+      return halt(401, 'Unauthorized')
+    end
+
+    def authorized?(request)
+      return true unless http_auth_enabled?
+
+      auth_token = request.env['HTTP_AUTHORIZATION']
+      return auth_token == get_http_auth
+    end
+
+    def http_auth_enabled?
+      return @setup.fetch('rubypitaya.http.auth.enabled') { 'false' } == 'true'
+    end
+
+    def get_http_auth
+      user = @setup.fetch('rubypitaya.http.auth.user') { '' }
+      pass = @setup.fetch('rubypitaya.http.auth.pass') { '' }
+
+      auth_token = ::Base64.strict_encode64("#{user}:#{pass}")
+
+      return "Basic #{auth_token}"
+    end
   end
 end

data/lib/rubypitaya/core/main.rb

@@ -30,8 +30,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 +45,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,15 +59,15 @@ 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
 
@@ -73,8 +75,6 @@ module RubyPitaya
       @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
 
@@ -101,6 +101,8 @@ module RubyPitaya
       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'
@@ -152,15 +154,16 @@ module RubyPitaya
         session_id = request[:session][:id]
         session_uid = request[:session].fetch(:uid, '')
         session_data = request[:session][:data]
-        session_data = JSON.parse(session_data) if session_data.class == String
+        session_data = JSON.parse(session_data, symbolize_names: true) if session_data.class == String
         frontend_id = request[:frontendID]
         metadata = request[:metadata]
-        metadata = JSON.parse(metadata) if metadata.class == String
+        metadata = JSON.parse(metadata, symbolize_names: true) if metadata.class == String
 
         @session.update(session_id, session_uid, session_data, metadata,
                         frontend_id)
 
-        handler_name, action_name = message_route.split('.')[1..-1]
+        # TODO: Validate if handler and action names are not nil
+        handler_name, action_name = message_route.scan(/\A\w+\.(\w+)\.(\w+)\z/)[0]
 
         @log.info "request  -> route: #{message_route}"
         @log.info "         -> data:  #{message_data}"

data/lib/rubypitaya/core/path.rb

@@ -4,8 +4,6 @@ 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/')

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/config_spec_helper.rb

@@ -15,7 +15,7 @@ module RubyPitaya
     end
 
     def config_mock=(value)
-      @config_mock = value
+      @config_mock = value.deep_symbolize_keys.stringify_keys
     end
 
     def config_core_override=(value)
@@ -24,7 +24,7 @@ module RubyPitaya
     def add(key, value)
       keys = key.split('.')
       add_hash = undig(*keys, value)
-      @config_mock = merge_recursively(@config_mock, add_hash)
+      @config_mock = merge_recursively(@config_mock, add_hash).deep_symbolize_keys.stringify_keys
     end
 
     private

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'
@@ -96,7 +97,8 @@ 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

data/lib/rubypitaya/version.rb

@@ -1,3 +1,3 @@
 module RubyPitaya
-  VERSION = '2.18.0'
+  VERSION = '2.21.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubypitaya
 version: !ruby/object:Gem::Version
-  version: 2.18.0
+  version: 2.21.0
 platform: ruby
 authors:
 - Luciano Prestes Cavalcanti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-07 00:00:00.000000000 Z
+date: 2021-07-18 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
@@ -150,20 +164,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 6.1.3
-- !ruby/object:Gem::Dependency
-  name: eventmachine
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.2.7
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.2.7
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -260,20 +260,39 @@ files:
 - "./lib/rubypitaya/app-template/app/http/views/hello_world.erb"
 - "./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"
 - "./lib/rubypitaya/app-template/docker/prod/Dockerfile"
+- "./lib/rubypitaya/app-template/docker/wait_for.sh"
 - "./lib/rubypitaya/app-template/features/hello_world.feature"
 - "./lib/rubypitaya/app-template/features/player.feature"
 - "./lib/rubypitaya/app-template/features/step_definitions/application_steps.rb"
 - "./lib/rubypitaya/app-template/features/step_definitions/rubypitaya_steps.rb"
 - "./lib/rubypitaya/app-template/features/support/env.rb"
+- "./lib/rubypitaya/app-template/helm/Chart.yaml"
+- "./lib/rubypitaya/app-template/helm/templates/config-maps/nginx-config.yaml"
+- "./lib/rubypitaya/app-template/helm/templates/deployments/connector.yaml"
+- "./lib/rubypitaya/app-template/helm/templates/deployments/gameserver-nginx.yaml"
+- "./lib/rubypitaya/app-template/helm/templates/deployments/rubypitaya.yaml"
+- "./lib/rubypitaya/app-template/helm/templates/role-bindings/rubypitaya.yaml"
+- "./lib/rubypitaya/app-template/helm/templates/roles/rubypitaya.yaml"
+- "./lib/rubypitaya/app-template/helm/templates/service-accounts/rubypitaya.yaml"
+- "./lib/rubypitaya/app-template/helm/templates/services/connector.yaml"
+- "./lib/rubypitaya/app-template/helm/templates/services/etcd.yaml"
+- "./lib/rubypitaya/app-template/helm/templates/services/gameserver-nginx.yaml"
+- "./lib/rubypitaya/app-template/helm/templates/services/gameserver.yaml"
+- "./lib/rubypitaya/app-template/helm/templates/services/nats.yaml"
+- "./lib/rubypitaya/app-template/helm/templates/services/redis.yaml"
+- "./lib/rubypitaya/app-template/helm/templates/services/rubypitaya.yaml"
+- "./lib/rubypitaya/app-template/helm/templates/statefulsets/etcd.yaml"
+- "./lib/rubypitaya/app-template/helm/templates/statefulsets/nats.yaml"
+- "./lib/rubypitaya/app-template/helm/templates/statefulsets/redis.yaml"
+- "./lib/rubypitaya/app-template/helm/values.yaml"
 - "./lib/rubypitaya/app-template/kubernetes/README.md"
 - "./lib/rubypitaya/app-template/kubernetes/deployment-connector.yaml"
 - "./lib/rubypitaya/app-template/kubernetes/deployment-rubypitaya.yaml"