rubypitaya 3.4.2 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 782f0fbd940b77a8ec951dec8df3f63cf673feddc6a68219829c5a7a1d9883d4
-  data.tar.gz: 9d107b921e8dabe4d410eae3025d6bd187c61718bf3ee3bc69a7cf449edd0516
+  metadata.gz: bea764ce3cb4595677dc5ff2b0af555d0fa0db47500e0ae28a4431275ff0b3d0
+  data.tar.gz: b4d3ac9a4b66605396f1fd27fb83618e8897f5284e6fc9b97426b0ece545ef10
 SHA512:
-  metadata.gz: '055149df21395547a80b581a6d31ef9aa2e7f3edce05a797e0d4e48152bfb22c3133ad0d30430bb2ee062f33f06e608611a5b3e51f8d3535ebc64e546a202535'
-  data.tar.gz: '0292348893de9daa8a9e2590de75755459da6a26517ff77e20842bbb37d48729e5908d6edd46aa9ac4ab0b13c35ac16dd16de624f034528adec3482e88c9a999'
+  metadata.gz: 38152d121b929079ba9315832bfac315771bb640c7cabbd7c66fdd286662706c54f9a0412d575bc2024e3aa929aae950c679c6189969ecfe454e41d333e38fb7
+  data.tar.gz: c3b9b060a58f659a32fbff7baa950eade738672d426e1aaadb295df58bed56cbd5ddde2b09f1ce3a8caca47c4b1ce85e086b10598798c858fb45fdc0483604cb

data/lib/rubypitaya/app-template/Gemfile

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gem 'rubypitaya', '3.4.2'
+gem 'rubypitaya', '3.5.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.5.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.5.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/app/app_initializer.rb

@@ -1,10 +1,12 @@
+require 'rubypitaya/core/redis_service'
+
 class AppInitializer < RubyPitaya::InitializerBase
 
   # method:     run
   # parameter:  initializer_content
   # attributes:
-  #  - redis
-  #    - link: https://github.com/redis/redis-rb/
+  #  - services
+  #    - link: https://gitlab.com/LucianoPC/ruby-pitaya/-/blob/master/lib/rubypitaya/core/service_holder.rb
   #
   #  - mongo
   #    - class: Mongo::Client
@@ -29,9 +31,17 @@ class AppInitializer < RubyPitaya::InitializerBase
   #      - info
   #        - log information
 
+  # services:
+  #  - redis
+  #    - link: https://github.com/redis/redis-rb/
+
   def run(initializer_content)
-    playerBll = PlayerBLL.new
+    setup = initializer_content.setup
+    services = initializer_content.services
 
+    services.add(:redis, RubyPitaya::RedisService.new(setup))
+
+    playerBll = PlayerBLL.new
     PlayerHandler.objects.add(:bll, playerBll)
   end
 

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: 'RP-200',
+      data: {
+        message: 'Ok!'
+      }
+    }
+  end
+end

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

@@ -8,9 +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/

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,9 +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, mongo, setup, config, params, session, postman)
       @log = log
-      @redis = redis
+      @services = services
       @mongo = mongo
       @setup = setup
       @config = config

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, mongo, 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, mongo, 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, mongo, setup, config, params, session, postman)
           handler.send(action_name)
         else
           return {

data/lib/rubypitaya/core/http_routes.rb

@@ -26,7 +26,7 @@ module RubyPitaya
       @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,12 @@ module RubyPitaya
 
   class InitializerContent
 
-    attr_reader :log, :redis, :mongo, :setup, :config
+    attr_reader :log, :services, :mongo, :setup, :config
 
-    def initialize(log, redis, mongo, setup, config)
+    def initialize(log, services, mongo, setup, config)
       @log = log
+      @services = services
       @mongo = mongo
-      @redis = redis
       @setup = setup
       @config = config
     end

data/lib/rubypitaya/core/main.rb

@@ -13,13 +13,13 @@ 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/service_holder'
 require 'rubypitaya/core/database_config'
 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,10 +64,6 @@ 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.connect
@@ -86,10 +82,12 @@ module RubyPitaya
       @config = Config.new
       @config.auto_reload if @is_development_environment
 
+      @services = ServiceHolder.new
+
       @objects = InstanceHolder.new
 
       @initializer_content = InitializerContent.new(@log,
-                                                    @redis_connector.redis,
+                                                    @services,
                                                     @mongo_connector.mongo,
                                                     @setup,
                                                     @config)
@@ -98,15 +96,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 :services, @services
       HttpRoutes.set :mongo, @mongo_connector.mongo
       HttpRoutes.set :setup, @setup
       HttpRoutes.set :config, @config
@@ -147,6 +155,8 @@ module RubyPitaya
 
       @log.info "Server shutting down..."
 
+      disconnect_services
+
       @etcd_connector.disconnect
       @nats_connector.disconnect
       @database_connector.disconnect
@@ -186,17 +196,17 @@ module RubyPitaya
 
         begin
           response = @handler_router.call(handler_name, action_name, @session,
-                                          @postman, @redis_connector.redis,
+                                          @postman, @services,
                                           @mongo_connector.mongo, @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.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.class} | #{error.message} \n #{error.backtrace.join("\n")}"
           response = {
             code: StatusCodes::CODE_INTERNAL_ERROR,
             message: StatusCodes::MESSAGE_INTERNAL_ERROR,

data/lib/rubypitaya/core/{redis_connector.rb → redis_service.rb}

@@ -1,14 +1,15 @@
 require 'redis'
+require 'rubypitaya/core/service_base'
 
 module RubyPitaya
 
-  class RedisConnector
+  class RedisService < ServiceBase
 
     attr_reader :redis
 
-    def initialize(redis_address)
+    def initialize(setup)
       @redis = nil
-      @redis_address = redis_address
+      @redis_address = setup['rubypitaya.redis.url']
     end
 
     def connect
@@ -21,5 +22,17 @@ module RubyPitaya
 
       @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/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/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'
@@ -17,10 +17,10 @@ module RubyPitaya
       @@config = ConfigSpecHelper.new
       @@session = Session.new
       @@postman = PostmanSpecHelper.new
+      @@services = ServiceHolder.new
 
       @@response = {}
 
-      initialize_redis
       initialize_mongo
 
       is_cheats_enabled = @@setup.fetch('rubypitaya.server.cheats', false)
@@ -28,7 +28,7 @@ module RubyPitaya
 
 
       @@initializer_content = InitializerContent.new(@@log,
-                                                     @@redis_connector.redis,
+                                                     @@services,
                                                      @@mongo_connector.mongo,
                                                      @@setup,
                                                      @@config)
@@ -40,7 +40,7 @@ module RubyPitaya
       handler_name, action_name = route.split('.')[1..-1]
 
       @@response = @@handler_router.call(handler_name, action_name, @@session,
-                                         @@postman, @@redis_connector.redis,
+                                         @@postman, @@services,
                                          @@mongo_connector.mongo, @@setup,
                                          @@config, @@log, params)
       rescue RouteError => error
@@ -98,25 +98,12 @@ 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
-    end
-
     def initialize_mongo
       @@mongo_connector ||= nil
 

data/lib/rubypitaya/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubypitaya
 version: !ruby/object:Gem::Version
-  version: 3.4.2
+  version: 3.5.0
 platform: ruby
 authors:
 - Luciano Prestes Cavalcanti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-11 00:00:00.000000000 Z
+date: 2022-03-01 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"
@@ -357,9 +358,11 @@ files:
 - "./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/redis_service.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"