rubypitaya 3.4.2 → 3.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 782f0fbd940b77a8ec951dec8df3f63cf673feddc6a68219829c5a7a1d9883d4
-  data.tar.gz: 9d107b921e8dabe4d410eae3025d6bd187c61718bf3ee3bc69a7cf449edd0516
+  metadata.gz: 0d18288d711a487bc0b84dcd073c63ed0192ca0412fb99fcbc1e0305c587df97
+  data.tar.gz: 1c5b6be9550df23b8d625806ae0b2a0f3a6b454e01a9ba32f27d890b5f169272
 SHA512:
-  metadata.gz: '055149df21395547a80b581a6d31ef9aa2e7f3edce05a797e0d4e48152bfb22c3133ad0d30430bb2ee062f33f06e608611a5b3e51f8d3535ebc64e546a202535'
-  data.tar.gz: '0292348893de9daa8a9e2590de75755459da6a26517ff77e20842bbb37d48729e5908d6edd46aa9ac4ab0b13c35ac16dd16de624f034528adec3482e88c9a999'
+  metadata.gz: 0326e18138b4eeae46b59d4d43df908446072b95838e724dcf9fd46125c937519bdf3781e177ba97c7e7db5d3aeabbc5a25675f0602d2aeaa4a640637bc1fc2e
+  data.tar.gz: cfe3acbd44442ea99606bb6ba4e51b7103febecdad79551228a1bf2a2aaf5fda80b219d168fed4e8055eed6efc006aea0c0d582df6d0a15d6f7ab5e83769ee6c

data/lib/rubypitaya/app-template/Gemfile

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gem 'rubypitaya', '3.4.2'
+gem 'rubypitaya', '3.7.0'
 
 group :development do
   gem 'pry', '0.14.1'

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

@@ -99,7 +99,7 @@ GEM
       rspec-support (~> 3.11.0)
     rspec-support (3.11.0)
     ruby2_keywords (0.0.5)
-    rubypitaya (3.4.2)
+    rubypitaya (3.7.0)
       activerecord (= 7.0.2)
       etcdv3 (= 0.11.5)
       google-protobuf (= 3.19.4)
@@ -138,7 +138,7 @@ DEPENDENCIES
   listen (= 3.7.1)
   pry (= 0.14.1)
   rspec (= 3.11.0)
-  rubypitaya (= 3.4.2)
+  rubypitaya (= 3.7.0)
   sinatra-contrib (= 2.1.0)
 
 BUNDLED WITH

data/lib/rubypitaya/app-template/Makefile

@@ -99,6 +99,12 @@ prod-push-image:
 prod-deploy-image:
 	kubectl --context='$(KUBECONTEXT)' -n $(KUBE_NAMESPACE) set image deployment $(KUBE_DEPLOYMENT_SERVER) $(KUBE_DEPLOYMENT_SERVER)=$(IMAGE_REGISTRY):$(IMAGE_TAG)
 
+## + Other Commands
+
+## Clear docker containers and volumes
+clear:
+	@docker rm -f $$(docker ps -aq) ; docker volume rm -f $$(docker volume ls)
+
 .DEFAULT_GOAL := show-help
 
 .PHONY: show-help

data/lib/rubypitaya/app-template/Rakefile

@@ -1,6 +1,7 @@
 require 'active_record'
 
 require 'rubypitaya/core/path'
+require 'rubypitaya/core/setup'
 require 'rubypitaya/core/database_config'
 
 
@@ -8,7 +9,7 @@ namespace :db do
 
   desc 'Create the database'
   task :create do
-    database_config = RubyPitaya::DatabaseConfig.new
+    database_config = RubyPitaya::DatabaseConfig.new(RubyPitaya::Setup.new)
     connection_data = database_config.connection_data_without_database
 
     ActiveRecord::Base.establish_connection(connection_data)
@@ -20,7 +21,7 @@ namespace :db do
 
   desc 'Migrate the database'
   task :migrate do
-    database_config = RubyPitaya::DatabaseConfig.new
+    database_config = RubyPitaya::DatabaseConfig.new(RubyPitaya::Setup.new)
     connection_data = database_config.connection_data
     migrations_paths = [RubyPitaya::Path::Core::MIGRATIONS_FOLDER_PATH]
     migrations_paths += RubyPitaya::Path::Plugins::MIGRATIONS_FOLDER_PATHS
@@ -36,7 +37,7 @@ namespace :db do
 
   desc 'Rollback migrations'
   task :rollback do
-    database_config = RubyPitaya::DatabaseConfig.new
+    database_config = RubyPitaya::DatabaseConfig.new(RubyPitaya::Setup.new)
     connection_data = database_config.connection_data
     migrations_paths = [RubyPitaya::Path::Core::MIGRATIONS_FOLDER_PATH]
     migrations_paths += RubyPitaya::Path::Plugins::MIGRATIONS_FOLDER_PATHS
@@ -61,7 +62,7 @@ namespace :db do
 
   desc 'Drop the database'
   task :drop do
-    database_config = RubyPitaya::DatabaseConfig.new
+    database_config = RubyPitaya::DatabaseConfig.new(RubyPitaya::Setup.new)
     connection_data = database_config.connection_data_without_database
 
     ActiveRecord::Base.establish_connection(connection_data)
@@ -74,7 +75,7 @@ namespace :db do
 
   desc 'migration status'
   task :status do
-    database_config = RubyPitaya::DatabaseConfig.new
+    database_config = RubyPitaya::DatabaseConfig.new(RubyPitaya::Setup.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

@@ -1,14 +1,13 @@
+require 'rubypitaya/core/app/services/mongo_service'
+require 'rubypitaya/core/app/services/redis_service'
+
 class AppInitializer < RubyPitaya::InitializerBase
 
   # method:     run
   # parameter:  initializer_content
   # attributes:
-  #  - redis
-  #    - link: https://github.com/redis/redis-rb/
-  #
-  #  - mongo
-  #    - class: Mongo::Client
-  #    - link: https://docs.mongodb.com/ruby-driver/current/tutorials/quick-start/
+  #  - services
+  #    - link: https://gitlab.com/LucianoPC/ruby-pitaya/-/blob/master/lib/rubypitaya/core/service_holder.rb
   #
   #  - config
   #    - class: RubyPitaya::Config
@@ -28,10 +27,23 @@ class AppInitializer < RubyPitaya::InitializerBase
   #    - methods:
   #      - info
   #        - log information
+  #
+  # services:
+  #  - redis
+  #    - link: https://github.com/redis/redis-rb/
+  #
+  #  - mongo
+  #    - class: Mongo::Client
+  #    - link: https://docs.mongodb.com/ruby-driver/current/tutorials/quick-start/
 
   def run(initializer_content)
-    playerBll = PlayerBLL.new
+    setup = initializer_content.setup
+    services = initializer_content.services
 
+    services.add(:mongo, RubyPitaya::MongoService.new(setup))
+    services.add(:redis, RubyPitaya::RedisService.new(setup))
+
+    playerBll = PlayerBLL.new
     PlayerHandler.objects.add(:bll, playerBll)
   end
 

data/lib/rubypitaya/app-template/app/constants/status_codes.rb

@@ -1,6 +1,7 @@
 class StatusCodes
 
   CODE_OK = RubyPitaya::StatusCodes::CODE_OK
+  CODE_AUTHENTICATION_ERROR = RubyPitaya::StatusCodes::CODE_AUTHENTICATION_ERROR
 
   ################
   ## Existent Codes

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

@@ -0,0 +1,18 @@
+class ErrorHandler < RubyPitaya::HandlerBase
+
+  non_authenticated_actions :getError
+
+  def getError
+    error_code = RubyPitaya::StatusCodes::CODE_ERROR
+    error_message = "Some Error"
+
+    raise RubyPitaya::RouteError.new(error_code, error_message)
+
+    response = {
+      code: StatusCodes::CODE_OK,
+      data: {
+        message: 'Ok!'
+      }
+    }
+  end
+end

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

@@ -1,13 +1,24 @@
 class HelloWorldHandler < RubyPitaya::HandlerBase
 
-  non_authenticated_actions :sayHello
+  non_authenticated_actions :sayHello, :showMessage
 
   def sayHello
     response = {
-      code: 'RP-200',
+      code: StatusCodes::CODE_OK,
       data: {
         message: 'Hello!'
       }
     }
   end
+
+  def showMessage
+    message = @params[:message]
+
+    response = {
+      code: StatusCodes::CODE_OK,
+      data: {
+        message: message
+      }
+    }
+  end
 end

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

@@ -1,6 +1,6 @@
 class PlayerHandler < RubyPitaya::HandlerBase
 
-  # class:      HandlerBase
+  # class:      RubyPitaya::HandlerBase
   # attributes:
   #  - @objects
   #    - class: InstanceHolder
@@ -8,13 +8,6 @@ class PlayerHandler < RubyPitaya::HandlerBase
   #      - [](key)
   #        - info: get object 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
   #    - info: Hash with config json files inside of 'app/config'
   #    - example:
@@ -44,6 +37,14 @@ class PlayerHandler < RubyPitaya::HandlerBase
   #                of the session, for example you can set an userId on
   #                @session, like `@session.uid = '123'`, and then you can
   #                bind this session with `@postman.bind_session(@session)`
+  #
+  #  - @services:
+  #    - redis
+  #      - link: https://github.com/redis/redis-rb/
+  #
+  #    - mongo
+  #      - class: Mongo::Client
+  #      - link: https://docs.mongodb.com/ruby-driver/current/tutorials/quick-start/
 
   non_authenticated_actions :authenticate
 
@@ -58,10 +59,7 @@ class PlayerHandler < RubyPitaya::HandlerBase
     bind_session_response = @postman.bind_session(@session)
 
     unless bind_session_response.dig(:error, :code).nil?
-      return response = {
-        code: RubyPitaya::StatusCodes::CODE_AUTHENTICATION_ERROR,
-        msg: 'Error to authenticate',
-      }
+      raise RubyPitaya::RouteError.new(StatusCodes::CODE_AUTHENTICATION_ERROR, 'Error to authenticate')
     end
 
     response = {

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

@@ -26,7 +26,6 @@ mongo:
   user: 'user'
   pass: 'password'
   database: admin
-  enabled: true
 
 http:
   auth:

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

@@ -6,3 +6,27 @@ Feature: Hello World
     Given client call route 'rubypitaya.helloWorldHandler.sayHello'
     Then  server should response 'code' as 'RP-200'
     And   server should response 'data.message' as 'Hello!'
+
+  Scenario: Custom message
+    When  client call route 'rubypitaya.helloWorldHandler.showMessage' with params:
+      | message      |
+      | Hello World! |
+    Then  server should response 'code' as 'RP-200'
+    And   server should response 'data.message' as 'Hello World!'
+
+  Scenario: Custom message with json
+    When client call route 'rubypitaya.helloWorldHandler.showMessage' with json params:
+      """
+      {
+        "message": "Hello World!"
+      }
+      """
+    Then server should response the following json:
+      """
+      {
+        "code": "RP-200",
+        "data": {
+          "message": "Hello World!"
+        }
+      }
+      """

data/lib/rubypitaya/app-template/features/step_definitions/rubypitaya_steps.rb

@@ -2,6 +2,16 @@ Given(/^[Cc]lient call route ["'](.+)["']$/) do |route|
   @handler_helper.request(route)
 end
 
+Given(/^[Cc]lient call route ["'](.+)["'] with param[s]*[:]*$/) do |route, table|
+  params = table.hashes.first.symbolize_keys
+  @handler_helper.request(route, params)
+end
+
+Given(/^[Cc]lient call route ["'](.+)["'] with json param[s]*[:]*$/) do |route, json|
+  params = JSON.parse(json, symbolize_names: true)
+  @handler_helper.request(route, params)
+end
+
 Given(/^[Ss]erver should response ["'](.+)["'] as ["'](.+)["']$/) do |response_key, expected_value|
   response_value = @handler_helper.response.dig(*response_key.split('.').map(&:to_sym))
 
@@ -52,6 +62,7 @@ end
 
 Before do
   ActiveRecord::Base.descendants.each { |c| c.delete_all unless c == ActiveRecord::SchemaMigration }
+  RubyPitaya::HandlerSpecHelper.update_before_each
   @handler_helper = RubyPitaya::HandlerSpecHelperClass.new('cucumber')
 end
 

data/lib/rubypitaya/app-template/features/support/env.rb

@@ -1,7 +1,13 @@
 require 'rspec'
 require 'cucumber/rspec/doubles'
 
+require 'rubypitaya/core/helpers/setup_helper'
+require 'rubypitaya/core/spec-helpers/handler_spec_helper_class'
+
 ENV['RUBYPITAYA_ENV'] = 'test'
 
-require 'rubypitaya/core/helpers/setup_helper'
-require 'rubypitaya/core/spec-helpers/handler_spec_helper_class'
+RubyPitaya::HandlerSpecHelper.initialize_before_suite
+
+at_exit do
+  RubyPitaya::HandlerSpecHelper.finalize_after_suite
+end

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

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

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

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+RSpec.describe 'RubyPitaya::RedisService', type: :request do
+  it 'mock service' do
+    allow(services[:redis]).to receive(:get).with('key').and_return('something')
+
+    value = services[:redis].get('key')
+
+    expect(value).to eq('something')
+  end
+
+  it 'not mock service' do
+    services[:redis].set('foo', 'bar')
+
+    value = services[:redis].get('foo')
+
+    expect(value).to eq('bar')
+  end
+end

data/lib/rubypitaya/core/app/services/mongo_service.rb

@@ -0,0 +1,35 @@
+require 'mongo'
+require 'rubypitaya/core/service_base'
+
+module RubyPitaya
+
+  class MongoService < ServiceBase
+
+    def initialize(setup)
+      @mongo = nil
+      @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']
+    end
+
+    def connect
+      @mongo = Mongo::Client.new([@mongo_address],
+                                 user: @mongo_user,
+                                 password: @mongo_password,
+                                 database: @mongo_database_name)
+    end
+
+    def disconnect
+      # TODO: implement it
+    end
+
+    def client
+      @mongo
+    end
+
+    def clear_all_data
+      # TODO: implement it
+    end
+  end
+end

data/lib/rubypitaya/core/app/services/redis_service.rb

@@ -0,0 +1,36 @@
+require 'redis'
+require 'rubypitaya/core/service_base'
+
+module RubyPitaya
+
+  class RedisService < ServiceBase
+
+    def initialize(setup)
+      @redis = nil
+      @redis_address = setup['rubypitaya.redis.url']
+    end
+
+    def connect
+      @redis = Redis.new(
+        url: @redis_address,
+        :reconnect_attempts => 10,
+        :reconnect_delay => 1.5,
+        :reconnect_delay_max => 2.0,
+      )
+
+      @redis.ping
+    end
+
+    def disconnect
+      @redis.close
+    end
+
+    def client
+      @redis
+    end
+
+    def clear_all_data
+      @redis.flushall
+    end
+  end
+end

data/lib/rubypitaya/core/database_config.rb

@@ -7,20 +7,20 @@ module RubyPitaya
 
   class DatabaseConfig
 
-    def initialize()
-      @setup = Setup.new
-
+    def initialize(setup)
       @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'],
+        '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'],
       }
 
-      @config['database'] = "#{@config['database']}_test" if @environment_name == 'test'
+      environment_name = setup.fetch('rubypitaya.server.environment', 'development')
+
+      @config['database'] = "#{@config['database']}_test" if environment_name == 'test'
     end
 
     def config

data/lib/rubypitaya/core/database_connector.rb

@@ -5,14 +5,16 @@ module RubyPitaya
 
   class DatabaseConnector
 
-    def initialize(database_config, logger = nil)
-      @database_config = database_config
-      @logger ||= ActiveSupport::Logger.new(STDOUT)
+    def initialize(setup, logger = nil)
+      @database_config = DatabaseConfig.new(setup)
+      @logger = ActiveSupport::Logger.new(STDOUT)
+      # TODO: Use this
+      # @logger = logger || ActiveSupport::Logger.new(STDOUT)
     end
 
     def connect
       ActiveRecord::Base.establish_connection(@database_config.connection_data)
-      ActiveRecord::Base.logger = ActiveSupport::Logger.new(STDOUT)
+      ActiveRecord::Base.logger = @logger
       ActiveSupport::LogSubscriber.colorize_logging = true
     end
 

data/lib/rubypitaya/core/handler_base.rb

@@ -7,11 +7,11 @@ module RubyPitaya
     class_attribute :non_authenticated_routes, default: []
     class_attribute :handler_objects, default: nil, instance_reader: false, instance_writer: false, instance_accessor: false, instance_predicate: false
 
-    attr_reader :objects, :log, :redis, :setup, :config, :params, :session, :postman
+    attr_reader :objects, :log, :services, :setup, :config, :params, :session, :postman
 
     def initialize
       @log = nil
-      @redis = nil
+      @services = nil
       @setup = nil
       @config = nil
       @params = nil
@@ -21,10 +21,9 @@ module RubyPitaya
       @objects = self.class.objects
     end
 
-    def set_attributes(log, redis, mongo, setup, config, params, session, postman)
+    def set_attributes(log, services, setup, config, params, session, postman)
       @log = log
-      @redis = redis
-      @mongo = mongo
+      @services = services
       @setup = setup
       @config = config
       @params = params

data/lib/rubypitaya/core/handler_router.rb

@@ -64,7 +64,7 @@ module RubyPitaya
       @handler_name_map = @handler_name_map.to_h
     end
 
-    def call(handler_name, action_name, session, postman, redis, mongo, setup,
+    def call(handler_name, action_name, session, postman, services, setup,
              config, log, params)
       unless @handler_name_map.include?(handler_name)
         return {
@@ -83,11 +83,11 @@ module RubyPitaya
       handler = @handler_name_map[handler_name]
 
       if !handler.class.authenticated_action_name?(action_name)
-        handler.set_attributes(log, redis, mongo, setup, config, params, session, postman)
+        handler.set_attributes(log, services, setup, config, params, session, postman)
         handler.send(action_name)
       else
         if session.authenticated?
-          handler.set_attributes(log, redis, mongo, setup, config, params, session, postman)
+          handler.set_attributes(log, services, setup, config, params, session, postman)
           handler.send(action_name)
         else
           return {

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

@@ -1,12 +1,11 @@
 require 'active_record'
 
+require 'rubypitaya/core/setup'
 require 'rubypitaya/core/database_config'
 
 # Database connection
-database_config = RubyPitaya::DatabaseConfig.new
+database_config = RubyPitaya::DatabaseConfig.new(RubyPitaya::Setup.new)
 ActiveRecord::Base.establish_connection(database_config.connection_data)
-# ActiveRecord::Base.logger = ActiveSupport::Logger.new(STDOUT)
-# ActiveSupport::LogSubscriber.colorize_logging = true
 
 connection_data = database_config.connection_data
 migrations_paths = [RubyPitaya::Path::Core::MIGRATIONS_FOLDER_PATH]

data/lib/rubypitaya/core/http_routes.rb

@@ -24,9 +24,8 @@ module RubyPitaya
       content_type :json
 
       @log = settings.log
-      @mongo = settings.mongo
       @setup = settings.setup
-      @redis = settings.redis
+      @services = settings.services
       @config = settings.config
       @objects = settings.objects
       @session = nil

data/lib/rubypitaya/core/initializer_content.rb

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

data/lib/rubypitaya/core/main.rb

@@ -13,13 +13,11 @@ require 'rubypitaya/core/http_routes'
 require 'rubypitaya/core/route_error'
 require 'rubypitaya/core/routes_base'
 require 'rubypitaya/core/status_codes'
-require 'rubypitaya/core/handler_router'
 require 'rubypitaya/core/etcd_connector'
+require 'rubypitaya/core/handler_router'
 require 'rubypitaya/core/nats_connector'
-require 'rubypitaya/core/database_config'
+require 'rubypitaya/core/service_holder'
 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'
@@ -64,33 +62,20 @@ module RubyPitaya
       @nats_connector = NatsConnector.new(@nats_address, @service_uuid,
                                           @server_name)
 
-      @redis_address = @setup['rubypitaya.redis.url']
-      @redis_connector = RedisConnector.new(@redis_address)
-      @redis_connector.connect
-
-      @database_config = DatabaseConfig.new
-      @database_connector = DatabaseConnector.new(@database_config, @log)
+      @database_connector = DatabaseConnector.new(@setup, @log)
       @database_connector.connect
 
-      @mongo_enabled = @setup['rubypitaya.mongo.enabled']
-      @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 if @mongo_enabled
-
       @session = Session.new
       @postman = Postman.new(@nats_connector)
       @config = Config.new
       @config.auto_reload if @is_development_environment
 
+      @services = ServiceHolder.new
+
       @objects = InstanceHolder.new
 
       @initializer_content = InitializerContent.new(@log,
-                                                    @redis_connector.redis,
-                                                    @mongo_connector.mongo,
+                                                    @services,
                                                     @setup,
                                                     @config)
       @initializer_broadcast = InitializerBroadcast.new
@@ -98,16 +83,25 @@ module RubyPitaya
 
       @handler_router = HandlerRouter.new(@is_cheats_enabled)
 
+      connect_services
+
       run_http
       run_server
     end
 
     private
 
+    def connect_services
+      @services.all_services.map(&:connect)
+    end
+
+    def disconnect_services
+      @services.all_services.map(&:disconnect)
+    end
+
     def run_http
       HttpRoutes.set :log, @log
-      HttpRoutes.set :redis, @redis_connector.redis
-      HttpRoutes.set :mongo, @mongo_connector.mongo
+      HttpRoutes.set :services, @services
       HttpRoutes.set :setup, @setup
       HttpRoutes.set :config, @config
       HttpRoutes.set :objects, @objects
@@ -147,6 +141,8 @@ module RubyPitaya
 
       @log.info "Server shutting down..."
 
+      disconnect_services
+
       @etcd_connector.disconnect
       @nats_connector.disconnect
       @database_connector.disconnect
@@ -186,17 +182,16 @@ module RubyPitaya
 
         begin
           response = @handler_router.call(handler_name, action_name, @session,
-                                          @postman, @redis_connector.redis,
-                                          @mongo_connector.mongo, @setup, @config,
+                                          @postman, @services, @setup, @config,
                                           @log, params)
         rescue RouteError => error
-          @log.error "ROUTE ERROR: #{error.class} | #{error.message}} \n #{error.backtrace.join("\n")}"
+          @log.error "ROUTE ERROR: #{error.code} | #{error.class} | #{error.message} \n #{error.backtrace.join("\n")}"
           response = {
             code: error.code,
             message: error.message
           }
         rescue Exception => error
-          @log.error "INTERNAL ERROR: #{error.class} | #{error.message}} \n #{error.backtrace.join("\n")}"
+          @log.error "INTERNAL ERROR: #{error.code} | #{error.class} | #{error.message} \n #{error.backtrace.join("\n")}"
           response = {
             code: StatusCodes::CODE_INTERNAL_ERROR,
             message: StatusCodes::MESSAGE_INTERNAL_ERROR,

data/lib/rubypitaya/core/service_base.rb

@@ -0,0 +1,21 @@
+module RubyPitaya
+
+  class ServiceBase
+
+    def connect
+      raise "Service connect method not implemented"
+    end
+
+    def disconnect
+      raise "Service disconnect method not implemented"
+    end
+
+    # def get_service_instance
+    #   raise "Service get_service_instance method not implemented"
+    # end
+
+    def clear_all_data
+      raise "Service disconnect method not implemented"
+    end
+  end
+end

data/lib/rubypitaya/core/service_holder.rb

@@ -0,0 +1,32 @@
+module RubyPitaya
+
+  class ServiceHolder
+
+    def initialize
+      @services = {}
+    end
+
+    def add(key, service)
+      check_service_instance(service)
+      @services[key] = service
+    end
+
+    def [](key)
+      @services[key].client
+    end
+
+    def all_services
+      @services.values
+    end
+
+    private
+
+    def check_service_instance(service)
+      raise not_a_service_message(service) unless service.is_a? ServiceBase
+    end
+
+    def not_a_service_message(service)
+      "Service #{service.class} is not inheriting from RubyPitaya::ServiceBase"
+    end
+  end
+end

data/lib/rubypitaya/core/session.rb

@@ -33,5 +33,13 @@ module RubyPitaya
     def user_id=(value)
       @uid = value
     end
+
+    def clear
+      @id = ''
+      @uid = ''
+      @data = {}
+      @metadata = {}
+      @frontend_id = ''
+    end
   end
 end

data/lib/rubypitaya/core/setup.rb

@@ -34,6 +34,10 @@ module RubyPitaya
       @empty_hash.fetch(*args)
     end
 
+    def get_config
+      @config.deep_dup
+    end
+
     def auto_reload
       require 'listen'
 

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

@@ -27,6 +27,10 @@ module RubyPitaya
       @config_mock = merge_recursively(@config_mock, add_hash).deep_symbolize_keys.stringify_keys
     end
 
+    def clear
+      @config_mock = {}
+    end
+
     private
 
     def undig(*keys, value)
@@ -34,7 +38,13 @@ module RubyPitaya
     end
 
     def merge_recursively(a, b)
-      a.merge(b) {|key, a_item, b_item| merge_recursively(a_item, b_item) }
+      a.merge(b) do |key, a_item, b_item|
+        if a_item.is_a?(Hash) && b_item.is_a?(Hash)
+          merge_recursively(a_item, b_item)
+        else
+          a[key] = b_item
+        end
+      end
     end
   end
 end

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

@@ -1,6 +1,6 @@
 require 'rubypitaya/core/setup'
 require 'rubypitaya/core/handler_router'
-require 'rubypitaya/core/redis_connector'
+require 'rubypitaya/core/service_holder'
 require 'rubypitaya/core/spec-helpers/setup_spec_helper'
 require 'rubypitaya/core/spec-helpers/config_spec_helper'
 require 'rubypitaya/core/spec-helpers/postman_spec_helper'
@@ -9,39 +9,52 @@ module RubyPitaya
 
   module HandlerSpecHelper
 
-    def initialize(context)
-      @@context = context
+    def self.initialize_before_suite
+      default_setup = Setup.new.get_config
 
       @@log = Logger.new('/dev/null')
-      @@setup = SetupSpecHelper.new
+      @@setup = SetupSpecHelper.new(default_setup)
       @@config = ConfigSpecHelper.new
       @@session = Session.new
       @@postman = PostmanSpecHelper.new
+      @@services = ServiceHolder.new
 
-      @@response = {}
-
-      initialize_redis
-      initialize_mongo
+      @@default_setup = Setup.new
 
-      is_cheats_enabled = @@setup.fetch('rubypitaya.server.cheats', false)
+      is_cheats_enabled = @@setup.fetch('rubypitaya.server.cheats', true)
       @@handler_router ||= HandlerRouter.new(is_cheats_enabled)
 
 
       @@initializer_content = InitializerContent.new(@@log,
-                                                     @@redis_connector.redis,
-                                                     @@mongo_connector.mongo,
+                                                     @@services,
                                                      @@setup,
                                                      @@config)
       @@initializer_broadcast = InitializerBroadcast.new
       @@initializer_broadcast.run(@@initializer_content)
+
+      connect_services
+    end
+
+    def self.finalize_after_suite
+      disconnect_services
+    end
+
+    def self.update_before_each
+      @@response = {}
+      @@setup.clear
+      @@config.clear
+      @@session.clear
+      clear_all_services_data
+    end
+
+    def initialize(context)
     end
 
     def request(route, params = {})
       handler_name, action_name = route.split('.')[1..-1]
 
       @@response = @@handler_router.call(handler_name, action_name, @@session,
-                                         @@postman, @@redis_connector.redis,
-                                         @@mongo_connector.mongo, @@setup,
+                                         @@postman, @@services, @@setup,
                                          @@config, @@log, params)
       rescue RouteError => error
         @@response = {
@@ -98,40 +111,22 @@ module RubyPitaya
       @@postman
     end
 
-    def redis
-      @@redis_connector.redis
+    def services
+      @@services
     end
 
     private
 
-    def initialize_redis
-      @@redis_connector ||= nil
-
-      if @@redis_connector.nil?
-        @@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
+    def self.connect_services
+      @@services.all_services.map(&:connect)
     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
+    def self.disconnect_services
+      @@services.all_services.map(&:disconnect)
+    end
 
-      @@mongo_connector.mongo.collections.map(&:drop)
+    def self.clear_all_services_data
+      @@services.all_services.map(&:clear_all_data)
     end
   end
 end

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

@@ -8,7 +8,16 @@ require 'rubypitaya/core/spec-helpers/handler_spec_helper'
 RSpec.configure do |config|
   config.include RubyPitaya::HandlerSpecHelper
 
+  config.before(:suite) do
+    RubyPitaya::HandlerSpecHelper.initialize_before_suite
+  end
+
+  config.after(:suite) do
+    RubyPitaya::HandlerSpecHelper.finalize_after_suite
+  end
+
   config.before(:each) do
+    RubyPitaya::HandlerSpecHelper.update_before_each
     ActiveRecord::Base.descendants.each { |c| c.delete_all unless c == ActiveRecord::SchemaMigration }
   end
 

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

@@ -2,13 +2,18 @@ module RubyPitaya
 
   class SetupSpecHelper
 
-    def initialize
+    def initialize(default_setup = {})
+      @empty_hash = {}
       @setup_mock = {}
+      @default_setup = default_setup
     end
 
     def [](key)
       split_key = key.split('.')
-      @setup_mock.dig(*split_key)
+      result = @setup_mock.dig(*split_key)
+      return result unless result.nil?
+
+      @default_setup.dig(*split_key)
     end
 
     def auto_reload
@@ -25,7 +30,14 @@ module RubyPitaya
     end
 
     def fetch(*args)
-      @setup_mock.fetch(*args)
+      result = self[args[0]]
+      return result unless result.nil?
+
+      @empty_hash.fetch(*args)
+    end
+
+    def clear
+      @setup_mock = {}
     end
 
     private
@@ -35,7 +47,13 @@ module RubyPitaya
     end
 
     def merge_recursively(a, b)
-      a.merge(b) {|key, a_item, b_item| merge_recursively(a_item, b_item) }
+      a.merge(b) do |key, a_item, b_item|
+        if a_item.is_a?(Hash) && b_item.is_a?(Hash)
+          merge_recursively(a_item, b_item)
+        else
+          a[key] = b_item
+        end
+      end
     end
   end
 end

data/lib/rubypitaya/version.rb

@@ -1,3 +1,3 @@
 module RubyPitaya
-  VERSION = '3.4.2'
+  VERSION = '3.7.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubypitaya
 version: !ruby/object:Gem::Version
-  version: 3.4.2
+  version: 3.7.0
 platform: ruby
 authors:
 - Luciano Prestes Cavalcanti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-11 00:00:00.000000000 Z
+date: 2022-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -268,6 +268,7 @@ files:
 - "./lib/rubypitaya/app-template/app/bll/player_bll.rb"
 - "./lib/rubypitaya/app-template/app/config/initial_player.json"
 - "./lib/rubypitaya/app-template/app/constants/status_codes.rb"
+- "./lib/rubypitaya/app-template/app/handlers/error_handler.rb"
 - "./lib/rubypitaya/app-template/app/handlers/hello_world_handler.rb"
 - "./lib/rubypitaya/app-template/app/handlers/player_handler.rb"
 - "./lib/rubypitaya/app-template/app/http/hello_world_http.rb"
@@ -331,9 +332,12 @@ files:
 - "./lib/rubypitaya/app-template/plugins.yaml"
 - "./lib/rubypitaya/app-template/spec/hello_world_handler_spec.rb"
 - "./lib/rubypitaya/app-template/spec/player_handler_spec.rb"
+- "./lib/rubypitaya/app-template/spec/redis_service_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/app/services/mongo_service.rb"
+- "./lib/rubypitaya/core/app/services/redis_service.rb"
 - "./lib/rubypitaya/core/application_files_importer.rb"
 - "./lib/rubypitaya/core/config.rb"
 - "./lib/rubypitaya/core/config_core.rb"
@@ -350,16 +354,16 @@ 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"
 - "./lib/rubypitaya/core/postman.rb"
 - "./lib/rubypitaya/core/protos/nats_connector.proto"
 - "./lib/rubypitaya/core/protos/nats_connector_pb.rb"
-- "./lib/rubypitaya/core/redis_connector.rb"
 - "./lib/rubypitaya/core/route_error.rb"
 - "./lib/rubypitaya/core/routes_base.rb"
+- "./lib/rubypitaya/core/service_base.rb"
+- "./lib/rubypitaya/core/service_holder.rb"
 - "./lib/rubypitaya/core/session.rb"
 - "./lib/rubypitaya/core/setup.rb"
 - "./lib/rubypitaya/core/spec-helpers/config_spec_helper.rb"

data/lib/rubypitaya/core/mongo_connector.rb

@@ -1,25 +0,0 @@
-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/redis_connector.rb

@@ -1,25 +0,0 @@
-require 'redis'
-
-module RubyPitaya
-
-  class RedisConnector
-
-    attr_reader :redis
-
-    def initialize(redis_address)
-      @redis = nil
-      @redis_address = redis_address
-    end
-
-    def connect
-      @redis = Redis.new(
-        url: @redis_address,
-        :reconnect_attempts => 10,
-        :reconnect_delay => 1.5,
-        :reconnect_delay_max => 2.0,
-      )
-
-      @redis.ping
-    end
-  end
-end