rubypitaya 2.27.0 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e382eff25c29ad543511d22efa945c52d1b770c7e9237ab46338db08d087842f
-  data.tar.gz: '08e25deffa96ab5acc7b3e239f8b9515355f7e9308228b4d7cfb8e25528403d6'
+  metadata.gz: '0308a5654cdfbb6aa96c6c680a27af78ca4a7ed6ca4830afdf352587e930967d'
+  data.tar.gz: bdaeef1f2af9594c8b0a39c8b954d2008c84383d8fa4a318637224e30c2507d1
 SHA512:
-  metadata.gz: c57f7eb3b0637bd463efc43185dd1c8a543b275f7db1ed2739e84b4d547f5c21d9519c1d910d9418ce7f19e273d24746b907e8ff32c334727ba0897b06eec66d
-  data.tar.gz: 29ea1d9037c932b84e0016316169c5e2821b166728075512cdaf132c110cf679d9544168881b65fb8bd9e701654d786eb05bba366ca2d272dfb0e26e66af348c
+  metadata.gz: 6e9f17d2cdb1e12dd2a1e37f693506e81054a7f91a313db0ae5873fd8423f3ff461782906db78f2a2494452a638eb26a464f6b186a81602c9023c501f61b265a
+  data.tar.gz: eda610ea2ca327de2f2fcf47f49ba8225d0e7500745ec3d3a7247f7371a6634cd1e4694734d2ba4da6c14243d05fe6df661d55bb9679a7dcf944d3221e7cd687

data/lib/rubypitaya/app-template/Gemfile

@@ -1,11 +1,12 @@
 source "https://rubygems.org"
 
-gem 'rubypitaya', '2.27.0'
+gem 'rubypitaya', '3.0.2'
 
 group :development do
-  gem 'pry', '0.14.0'
-  gem 'bundler', '2.1.4'
+  gem 'pry', '0.14.1'
   gem 'rspec', '3.10.0'
-  gem 'listen', '3.4.1'
-  gem 'cucumber', '5.3.0'
+  gem 'listen', '3.7.0'
+  gem 'bundler', '2.2.22'
+  gem 'cucumber', '7.0.0'
+  gem 'sinatra-contrib', '2.1.0'
 end

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

@@ -16,55 +16,57 @@ GEM
     builder (3.2.4)
     coderay (1.1.3)
     concurrent-ruby (1.1.9)
-    cucumber (5.3.0)
+    cucumber (7.0.0)
       builder (~> 3.2, >= 3.2.4)
-      cucumber-core (~> 8.0, >= 8.0.1)
-      cucumber-create-meta (~> 2.0, >= 2.0.2)
-      cucumber-cucumber-expressions (~> 10.3, >= 10.3.0)
-      cucumber-gherkin (~> 15.0, >= 15.0.2)
-      cucumber-html-formatter (~> 9.0, >= 9.0.0)
-      cucumber-messages (~> 13.1, >= 13.1.0)
-      cucumber-wire (~> 4.0, >= 4.0.1)
+      cucumber-core (~> 10.0, >= 10.0.1)
+      cucumber-create-meta (~> 6.0, >= 6.0.1)
+      cucumber-cucumber-expressions (~> 12.1, >= 12.1.1)
+      cucumber-gherkin (~> 20.0, >= 20.0.1)
+      cucumber-html-formatter (~> 16.0, >= 16.0.1)
+      cucumber-messages (~> 17.0, >= 17.0.1)
+      cucumber-wire (~> 6.0, >= 6.0.1)
       diff-lcs (~> 1.4, >= 1.4.4)
+      mime-types (~> 3.3, >= 3.3.1)
       multi_test (~> 0.1, >= 0.1.2)
-      sys-uname (~> 1.2, >= 1.2.1)
-    cucumber-core (8.0.1)
-      cucumber-gherkin (~> 15.0, >= 15.0.2)
-      cucumber-messages (~> 13.0, >= 13.0.1)
-      cucumber-tag-expressions (~> 2.0, >= 2.0.4)
-    cucumber-create-meta (2.0.4)
-      cucumber-messages (~> 13.1, >= 13.1.0)
-      sys-uname (~> 1.2, >= 1.2.1)
-    cucumber-cucumber-expressions (10.3.0)
-    cucumber-gherkin (15.0.2)
-      cucumber-messages (~> 13.0, >= 13.0.1)
-    cucumber-html-formatter (9.0.0)
-      cucumber-messages (~> 13.0, >= 13.0.1)
-    cucumber-messages (13.2.1)
-      protobuf-cucumber (~> 3.10, >= 3.10.8)
-    cucumber-tag-expressions (2.0.4)
-    cucumber-wire (4.0.1)
-      cucumber-core (~> 8.0, >= 8.0.1)
-      cucumber-cucumber-expressions (~> 10.3, >= 10.3.0)
-      cucumber-messages (~> 13.0, >= 13.0.1)
+      sys-uname (~> 1.2, >= 1.2.2)
+    cucumber-core (10.0.1)
+      cucumber-gherkin (~> 20.0, >= 20.0.1)
+      cucumber-messages (~> 17.0, >= 17.0.1)
+      cucumber-tag-expressions (~> 3.0, >= 3.0.1)
+    cucumber-create-meta (6.0.1)
+      cucumber-messages (~> 17.0, >= 17.0.1)
+      sys-uname (~> 1.2, >= 1.2.2)
+    cucumber-cucumber-expressions (12.1.3)
+    cucumber-gherkin (20.0.1)
+      cucumber-messages (~> 17.0, >= 17.0.1)
+    cucumber-html-formatter (16.0.1)
+      cucumber-messages (~> 17.0, >= 17.0.1)
+    cucumber-messages (17.1.1)
+    cucumber-tag-expressions (3.0.1)
+    cucumber-wire (6.1.1)
+      cucumber-core (~> 10.0, >= 10.0.1)
+      cucumber-cucumber-expressions (~> 12.1, >= 12.1.2)
+      cucumber-messages (~> 17.0, >= 17.0.1)
     diff-lcs (1.4.4)
-    etcdv3 (0.11.3)
+    etcdv3 (0.11.4)
       grpc (~> 1.17)
     eventmachine (1.2.7)
     ffi (1.15.4)
-    google-protobuf (3.17.3)
-    googleapis-common-protos-types (1.1.0)
+    google-protobuf (3.18.0-x86_64-linux)
+    googleapis-common-protos-types (1.2.0)
       google-protobuf (~> 3.14)
-    grpc (1.38.0)
+    grpc (1.40.0-x86_64-linux)
       google-protobuf (~> 3.15)
       googleapis-common-protos-types (~> 1.0)
     i18n (1.8.10)
       concurrent-ruby (~> 1.0)
-    listen (3.4.1)
+    listen (3.7.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     method_source (1.0.0)
-    middleware (0.1.0)
+    mime-types (3.3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2021.0901)
     minitest (5.14.4)
     mongo (2.15.0)
       bson (>= 4.8.2, < 5.0.0)
@@ -76,17 +78,7 @@ GEM
       eventmachine (~> 1.2, >= 1.2)
     ostruct (0.4.0)
     pg (1.2.3)
-    protobuf (3.10.4)
-      activesupport (>= 3.2)
-      middleware
-      thor
-      thread_safe
-    protobuf-cucumber (3.10.8)
-      activesupport (>= 3.2)
-      middleware
-      thor
-      thread_safe
-    pry (0.14.0)
+    pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
     rack (2.2.3)
@@ -111,18 +103,19 @@ GEM
       rspec-support (~> 3.10.0)
     rspec-support (3.10.2)
     ruby2_keywords (0.0.5)
-    rubypitaya (2.27.0)
+    rubypitaya (3.0.2)
       activerecord (= 6.1.4.1)
-      etcdv3 (= 0.11.3)
+      etcdv3 (= 0.11.4)
+      google-protobuf (= 3.18.0)
       mongo (= 2.15.0)
       nats (= 0.11.0)
       ostruct (= 0.4.0)
       pg (= 1.2.3)
-      protobuf (= 3.10.4)
       rake (= 13.0.6)
       redis (= 4.4.0)
       sinatra (= 2.1.0)
       sinatra-contrib (= 2.1.0)
+      webrick (= 1.7.0)
     sinatra (2.1.0)
       mustermann (~> 1.0)
       rack (~> 2.2)
@@ -136,23 +129,22 @@ GEM
       tilt (~> 2.0)
     sys-uname (1.2.2)
       ffi (~> 1.1)
-    thor (1.1.0)
-    thread_safe (0.3.6)
     tilt (2.0.10)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
+    webrick (1.7.0)
     zeitwerk (2.4.2)
 
 PLATFORMS
-  ruby
+  x86_64-linux
 
 DEPENDENCIES
-  bundler (= 2.1.4)
-  cucumber (= 5.3.0)
-  listen (= 3.4.1)
-  pry (= 0.14.0)
+  bundler (= 2.2.22)
+  cucumber (= 7.0.0)
+  listen (= 3.7.0)
+  pry (= 0.14.1)
   rspec (= 3.10.0)
-  rubypitaya (= 2.27.0)
+  rubypitaya (= 3.0.2)
 
 BUNDLED WITH
-   2.1.4
+   2.2.22

data/lib/rubypitaya/app-template/Makefile

@@ -36,12 +36,12 @@ test-rspec:
 
 ## Run cucumber tests. FILE=something.feature
 test-cucumber:
-	@docker-compose run --service-ports --rm rubypitaya bundle exec cucumber $(FILE)
+	@docker-compose run --service-ports --rm rubypitaya bundle exec cucumber --publish-quiet $(FILE)
 
 ## 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 bundle install
+	@docker run --rm -v "$(PWD)":/usr/src/app -w /usr/src/app ruby:3.0.2 bundle install
 
 ## + Improve metagame
 

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

@@ -5,9 +5,11 @@ class AppInitializer < RubyPitaya::InitializerBase
   # attributes:
   #  - 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
@@ -30,7 +32,7 @@ class AppInitializer < RubyPitaya::InitializerBase
   def run(initializer_content)
     playerBll = PlayerBLL.new
 
-    PlayerHandler.bll.add_instance(:player, playerBll)
+    PlayerHandler.objects.add(:bll, playerBll)
   end
 
   def self.path

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

@@ -2,11 +2,11 @@ class PlayerHandler < RubyPitaya::HandlerBase
 
   # class:      HandlerBase
   # attributes:
-  #  - @bll
+  #  - @objects
   #    - class: InstanceHolder
   #    - methods:
   #      - [](key)
-  #        - info: get bll by key
+  #        - info: get object by key
   #
   #  - @redis
   #    - link: https://github.com/redis/redis-rb/
@@ -51,7 +51,7 @@ class PlayerHandler < RubyPitaya::HandlerBase
     user_id = @params[:userId]
 
     player = Player.find_by_user_id(user_id)
-    player = @bll[:player].create_new_player(@setup, @config) if player.nil?
+    player = bll.create_new_player(@setup, @config) if player.nil?
 
     @session.uid = player.user_id
 
@@ -80,4 +80,10 @@ class PlayerHandler < RubyPitaya::HandlerBase
       data: player.to_hash,
     }
   end
+
+  private
+
+  def bll
+    @bll ||= @objects[:bll]
+  end
 end

data/lib/rubypitaya/app-template/app/migrations/1606736477_create_player_migration.rb

@@ -1,6 +1,6 @@
 require 'active_record'
 
-class CreatePlayerMigration < ActiveRecord::Migration[5.1]
+class CreatePlayerMigration < ActiveRecord::Migration[6.1]
 
   enable_extension 'pgcrypto'
 

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

@@ -1,6 +1,7 @@
 server:
   name: 'rubypitaya'
   environment: development
+  cheats: true
 
 nats:
   url: 'nats://nats:4222'

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

@@ -1,4 +1,4 @@
-FROM ruby:2.7.2-slim
+FROM ruby:3.0.2-slim
 
 ENV LANG=C.UTF-8
 ENV LC_ALL=C.UTF-8

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

@@ -1,4 +1,4 @@
-FROM ruby:2.7.2-slim as builder
+FROM ruby:3.0.2-slim as builder
 
 RUN apt update && \ 
     apt install -y --no-install-recommends \ 
@@ -15,9 +15,21 @@ RUN bundle config --global jobs 4 && \
     bundle config --global without "development test" && \
     bundle install
 
+RUN rm -rf /usr/local/bundle/cache && \
+    rm -rf /usr/local/bundle/build_info && \
+    rm -rf /usr/local/bundle/doc && \
+    rm -rf /usr/local/bundle/doc && \
+    find /usr/local/bundle/gems/grpc-*/src/ruby/lib/grpc/2.4/ -name "*.so" -delete && \
+    find /usr/local/bundle/gems/grpc-*/src/ruby/lib/grpc/2.5/ -name "*.so" -delete && \
+    find /usr/local/bundle/gems/grpc-*/src/ruby/lib/grpc/2.6/ -name "*.so" -delete && \
+    find /usr/local/bundle/gems/grpc-*/src/ruby/lib/grpc/2.7/ -name "*.so" -delete && \
+    find /usr/local/bundle/gems/ -name "*.c" -delete && \
+    find /usr/local/bundle/gems/ -name "*.o" -delete && \
+    find /usr/local/bundle/gems/ -name "spec" -exec rm -rv {} +
+
 # RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl
 
-FROM ruby:2.7.2-slim
+FROM ruby:3.0.2-slim
 
 ENV LANG=C.UTF-8
 ENV LC_ALL=C.UTF-8
@@ -29,9 +41,6 @@ RUN apt update && \
     && rm -rf /var/lib/apt/lists/*
 
 COPY --from=builder /usr/local/bundle /usr/local/bundle
-RUN rm -rf /usr/local/bundle/cache
-RUN rm -rf /usr/local/bundle/build_info
-RUN rm -rf /usr/local/bundle/doc
 
 # COPY --from=builder /kubectl /usr/local/bin/kubectl
 # RUN chmod +x /usr/local/bin/kubectl

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

@@ -1,12 +1,12 @@
 version: '3'
 services:
   nats:
-    image: 'nats:2.1.4'
+    image: 'nats:2.6.2-alpine'
     ports:
       - '4222:4222'
 
   etcd:
-    image: 'appcelerator/etcd:3.0.15'
+    image: 'appcelerator/etcd:3.3.3'
     ports:
       - '2379:2379'
       - '2380:2380'
@@ -17,7 +17,7 @@ services:
       - '9001:6379'
 
   db:
-    image: 'postgres:9.6.17'
+    image: 'postgres:14.0-alpine'
     volumes:
       - 'postgres:/var/lib/postgresql/data'
     environment:
@@ -27,7 +27,7 @@ services:
       - '9100:5432'
 
   mongo:
-    image: mongo:5.0.0
+    image: mongo:5.0.3
     restart: always
     ports:
       - 27017:27017

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

@@ -12,6 +12,8 @@ Given(/^[Ss]erver should response the following json[:]*$/) do |expected_json|
   expected_json = JSON.generate(JSON.parse(expected_json.strip))
   response_json = JSON.generate(@handler_helper.response)
 
+  puts JSON.pretty_generate(@handler_helper.response) if expected_json != response_json
+
   expect(response_json).to eq(expected_json)
 end
 

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

@@ -27,6 +27,8 @@ spec:
         env:
           - name: RUBYPITAYA_SERVER_ENVIRONMENT
             value: {{ .Values.rubypitaya.server.environment | quote }}
+          - name: RUBYPITAYA_SERVER_CHEATS
+            value: {{ .Values.rubypitaya.server.cheats | quote }}
           - name: RUBYPITAYA_NATS_URL
             value: "nats://nats.{{ .Values.namespace }}.svc.cluster.local:4222"
           - name: RUBYPITAYA_ETCD_URL

data/lib/rubypitaya/app-template/helm/templates/statefulsets/etcd.yaml

@@ -20,7 +20,7 @@ spec:
     spec:
       containers:
       - name: etcd
-        image: appcelerator/etcd:3.0.15
+        image: appcelerator/etcd:3.3.3
         ports:
         - containerPort: 2379
           name: etcd-2379

data/lib/rubypitaya/app-template/helm/templates/statefulsets/nats.yaml

@@ -20,7 +20,7 @@ spec:
     spec:
       containers:
       - name: nats
-        image: nats:2.1.4
+        image: nats:2.6.2-alpine
         ports:
         - containerPort: 4222
           name: nats

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

@@ -9,6 +9,7 @@ connector:
 rubypitaya:
   server:
     environment: production
+    cheats: true
   image:
     repository: [metagame-repository-link]
     tag: latest

data/lib/rubypitaya/app-template/kubernetes/statefulset-etcd.yaml

@@ -17,7 +17,7 @@ spec:
     spec:
       containers:
       - name: etcd
-        image: appcelerator/etcd:3.0.15
+        image: appcelerator/etcd:3.3.3
         ports:
         - containerPort: 2379
           name: etcd-2379

data/lib/rubypitaya/app-template/kubernetes/statefulset-nats.yaml

@@ -17,7 +17,7 @@ spec:
     spec:
       containers:
       - name: nats
-        image: nats:2.1.4
+        image: nats:2.6.2-alpine
         ports:
         - containerPort: 4222
           name: nats

data/lib/rubypitaya/app-template/kubernetes/statefulset-postgres.yaml

@@ -17,7 +17,7 @@ spec:
     spec:
       containers:
       - name: postgres
-        image: postgres:9.6.17
+        image: postgres:14.0-alpine
         env:
           - name: POSTGRES_USER
             value: "postgres"

data/lib/rubypitaya/core/database_connector.rb

@@ -5,8 +5,9 @@ module RubyPitaya
 
   class DatabaseConnector
 
-    def initialize(database_config)
+    def initialize(database_config, logger = nil)
       @database_config = database_config
+      @logger ||= ActiveSupport::Logger.new(STDOUT)
     end
 
     def connect

data/lib/rubypitaya/core/handler_base.rb

@@ -5,9 +5,9 @@ module RubyPitaya
   class HandlerBase
 
     class_attribute :non_authenticated_routes, default: []
-    class_attribute :handler_bll, default: nil, instance_reader: false, instance_writer: false, instance_accessor: false, instance_predicate: false
+    class_attribute :handler_objects, default: nil, instance_reader: false, instance_writer: false, instance_accessor: false, instance_predicate: false
 
-    attr_reader :bll, :log, :redis, :setup, :config, :params, :session, :postman
+    attr_reader :objects, :log, :redis, :setup, :config, :params, :session, :postman
 
     def initialize
       @log = nil
@@ -18,7 +18,7 @@ module RubyPitaya
       @session = nil
       @postman = nil
 
-      @bll = self.class.bll
+      @objects = self.class.objects
     end
 
     def set_attributes(log, redis, mongo, setup, config, params, session, postman)
@@ -32,8 +32,9 @@ module RubyPitaya
       @postman = postman
     end
 
-    def self.bll
-      self.handler_bll ||= InstanceHolder.new
+    def self.objects
+      self.handler_objects ||= InstanceHolder.new
+      return self.handler_objects
     end
 
     def self.non_authenticated_actions(*action_names)

data/lib/rubypitaya/core/handler_router.rb

@@ -8,7 +8,9 @@ module RubyPitaya
 
     INVALID_ACTION_NAMES = ['initialize', 'set_attributes']
 
-    def initialize()
+    def initialize(is_cheats_enabled)
+      @is_cheats_enabled = is_cheats_enabled
+
       routes_path = Path::ROUTES_FILE_PATH
       handler_folder_paths = Path::Plugins::HANDLERS_FOLDER_PATHS + [Path::HANDLERS_FOLDER_PATH]
 
@@ -35,7 +37,10 @@ module RubyPitaya
     end
 
     def import_handler_files(handler_folder_path)
-      Gem.find_files("#{handler_folder_path}/*.rb").each { |path| require path }
+      handler_files = Gem.find_files("#{handler_folder_path}/*.rb")
+      handler_files = handler_files.select { |a| !a[/.+_cheats.rb/] && !a[/.+_cheat.rb/] } unless @is_cheats_enabled
+
+      handler_files.each { |path| require path }
     end
 
     def import_handler_classes

data/lib/rubypitaya/core/http_base.rb

@@ -0,0 +1,20 @@
+require 'rubypitaya/core/instance_holder'
+
+module RubyPitaya
+
+  class HttpBase
+
+    class_attribute :handler_objects, default: nil, instance_reader: false, instance_writer: false, instance_accessor: false, instance_predicate: false
+
+    attr_reader :objects
+
+    def initialize
+      @objects = self.class.objects
+    end
+
+    def self.objects
+      self.handler_objects ||= InstanceHolder.new
+      return self.handler_objects
+    end
+  end
+end

data/lib/rubypitaya/core/http_routes.rb

@@ -23,12 +23,12 @@ module RubyPitaya
     before do
       content_type :json
 
-      @bll = settings.bll
       @log = settings.log
       @mongo = settings.mongo
       @setup = settings.setup
       @redis = settings.redis
       @config = settings.config
+      @objects = settings.objects
       @session = nil
       @postman = nil
 

data/lib/rubypitaya/core/instance_holder.rb

@@ -6,7 +6,7 @@ module RubyPitaya
       @instances = {}
     end
 
-    def add_instance(key, instance)
+    def add(key, instance)
       @instances[key] = instance
     end
 

data/lib/rubypitaya/core/main.rb

@@ -28,8 +28,6 @@ module RubyPitaya
 
   class Main
 
-    attr_reader :redis_connector, :config, :bll
-
     def initialize
       @setup = Setup.new
       @environment_name = @setup.fetch('rubypitaya.server.environment', 'development')
@@ -69,7 +67,7 @@ module RubyPitaya
       @redis_connector.connect
 
       @database_config = DatabaseConfig.new
-      @database_connector = DatabaseConnector.new(@database_config)
+      @database_connector = DatabaseConnector.new(@database_config, @log)
       @database_connector.connect
 
       @mongo_address = @setup['rubypitaya.mongo.url']
@@ -85,7 +83,7 @@ module RubyPitaya
       @config = Config.new
       @config.auto_reload if @is_development_environment
 
-      @bll = InstanceHolder.new
+      @objects = InstanceHolder.new
 
       @initializer_content = InitializerContent.new(@log,
                                                     @redis_connector.redis,
@@ -95,7 +93,8 @@ module RubyPitaya
       @initializer_broadcast = InitializerBroadcast.new
       @initializer_broadcast.run(@initializer_content)
 
-      @handler_router = HandlerRouter.new()
+      @is_cheats_enabled = @setup.fetch('rubypitaya.server.cheats', false)
+      @handler_router = HandlerRouter.new(@is_cheats_enabled)
 
       run_http
       run_server
@@ -104,12 +103,12 @@ module RubyPitaya
     private
 
     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 :objects, @objects
       HttpRoutes.set :views, [Path::HTTP_VIEWS_PATH] + Path::Plugins::HTTP_VIEWS_PATHS
 
       HttpRoutes.auto_reload if @is_development_environment
@@ -158,7 +157,7 @@ module RubyPitaya
 
         message_route = request[:msg][:route]
         message_data = request[:msg][:data] || {}
-        message_data = JSON.parse(message_data)
+        message_data = JSON.parse(message_data) if message_data.class == String
 
         params = Parameters.new(message_data)
 
@@ -173,7 +172,6 @@ module RubyPitaya
         @session.update(session_id, session_uid, session_data, metadata,
                         frontend_id)
 
-        # 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}"

data/lib/rubypitaya/core/nats_connector.rb

@@ -1,5 +1,7 @@
-require 'protobuf'
 require 'nats/client'
+require 'google/protobuf'
+
+require 'rubypitaya/core/protos/nats_connector_pb'
 
 module RubyPitaya
 
@@ -23,14 +25,16 @@ module RubyPitaya
       NATS.start(:servers => [@nats_address]) do |nc|
 
         NATS.subscribe(subscribe_topic) do |message, reply, a, b|
-          request = NatsRequest.decode(message).to_hash
+          request = NatsRequest.decode(message).to_h
 
           Fiber.new do
             response = yield request
 
             nats_response = NatsResponse.new(data: response.to_json)
 
-            NATS.publish(reply, nats_response)
+            response = NatsResponse.encode(nats_response)
+
+            NATS.publish(reply, response)
           end.resume
         end
 
@@ -61,8 +65,11 @@ module RubyPitaya
         metadata: session.metadata.to_json,
       )
 
-      nats_response = NATS.request(frontend_topic, nats_request)
-      response = NatsResponse.decode(nats_response).to_hash
+      request = NatsRequest.encode(nats_request)
+
+      nats_response = NATS.request(frontend_topic, request)
+
+      response = NatsResponse.decode(nats_response).to_h
 
       response
     end
@@ -93,56 +100,4 @@ module RubyPitaya
       "pitaya/connector/user/#{uid}/push"
     end
   end
-
-  class NatsSession < ::Protobuf::Message; end
-  class NatsMessage < ::Protobuf::Message; end
-  class NatsRequest < ::Protobuf::Message; end
-  class NatsResponse < ::Protobuf::Message; end
-  class NatsError < ::Protobuf::Message; end
-  class NatsBindMsg < ::Protobuf::Message; end
-  class NatsPush < ::Protobuf::Message; end
-
-  class NatsSession
-    optional :int32, :id, 1
-    optional :bytes, :uid, 2
-    optional :bytes, :data, 3
-  end
-
-  class NatsMessage
-    optional :int32, :id, 1
-    optional :bytes, :route, 2
-    optional :bytes, :data, 3
-    optional :bytes, :reply, 4
-    optional :int32, :type,  5
-  end
-
-  class NatsRequest
-    optional :int32, :type, 1
-    optional NatsSession, :session, 2
-    optional NatsMessage, :msg, 3
-    optional :bytes, :frontendID, 4
-    optional :bytes, :metadata, 5
-  end
-
-  class NatsError
-    optional :bytes, :code, 1
-    optional :bytes, :message, 2
-    optional :bytes, :metadata, 3
-  end
-
-  class NatsResponse
-    optional :bytes, :data, 1
-    optional NatsError, :error, 2
-  end
-
-  class NatsBindMsg
-    optional :bytes, :uid, 1
-    optional :bytes, :fid, 2
-  end
-
-  class NatsPush
-    optional :bytes, :route, 1
-    optional :bytes, :uid, 2
-    optional :bytes, :data, 3
-  end
 end

data/lib/rubypitaya/core/postman.rb

@@ -19,7 +19,9 @@ module RubyPitaya
         data: session.data.to_json,
       )
 
-      response = @nats_connector.push_to_frontend(session, route, nats_session)
+      payload = NatsSession.encode(nats_session)
+
+      response = @nats_connector.push_to_frontend(session, route, payload)
 
       response
     end

data/lib/rubypitaya/core/protos/nats_connector.proto

@@ -0,0 +1,47 @@
+syntax = "proto3";
+
+package RubyPitaya;
+
+message NatsSession {
+	optional int32 id = 1;
+	optional bytes uid = 2;
+	optional bytes data = 3;
+}
+
+message NatsMessage {
+	optional int32 id = 1;
+	optional bytes route = 2;
+	optional bytes data = 3;
+	optional bytes reply = 4;
+	optional int32 type = 5;
+}
+
+message NatsRequest {
+	optional int32 type = 1;
+	optional NatsSession session = 2;
+	optional NatsMessage msg = 3;
+	optional bytes frontendID = 4;
+	optional bytes metadata = 5;
+}
+
+message NatsError {
+	optional bytes code = 1;
+	optional bytes message = 2;
+	optional bytes metadata = 3;
+}
+
+message NatsResponse {
+	optional bytes data = 1;
+	optional NatsError error = 2;
+}
+
+message NatsBindMsg {
+	optional bytes uid = 1;
+	optional bytes fid = 2;
+}
+
+message NatsPush {
+	optional bytes route = 1;
+	optional bytes uid = 2;
+	optional bytes data = 3;
+}

data/lib/rubypitaya/core/protos/nats_connector_pb.rb

@@ -0,0 +1,56 @@
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: nats_connector.proto
+
+require 'google/protobuf'
+
+Google::Protobuf::DescriptorPool.generated_pool.build do
+  add_file("nats_connector.proto", :syntax => :proto3) do
+    add_message "RubyPitaya.NatsSession" do
+      proto3_optional :id, :int32, 1
+      proto3_optional :uid, :bytes, 2
+      proto3_optional :data, :bytes, 3
+    end
+    add_message "RubyPitaya.NatsMessage" do
+      proto3_optional :id, :int32, 1
+      proto3_optional :route, :bytes, 2
+      proto3_optional :data, :bytes, 3
+      proto3_optional :reply, :bytes, 4
+      proto3_optional :type, :int32, 5
+    end
+    add_message "RubyPitaya.NatsRequest" do
+      proto3_optional :type, :int32, 1
+      proto3_optional :session, :message, 2, "RubyPitaya.NatsSession"
+      proto3_optional :msg, :message, 3, "RubyPitaya.NatsMessage"
+      proto3_optional :frontendID, :bytes, 4
+      proto3_optional :metadata, :bytes, 5
+    end
+    add_message "RubyPitaya.NatsError" do
+      proto3_optional :code, :bytes, 1
+      proto3_optional :message, :bytes, 2
+      proto3_optional :metadata, :bytes, 3
+    end
+    add_message "RubyPitaya.NatsResponse" do
+      proto3_optional :data, :bytes, 1
+      proto3_optional :error, :message, 2, "RubyPitaya.NatsError"
+    end
+    add_message "RubyPitaya.NatsBindMsg" do
+      proto3_optional :uid, :bytes, 1
+      proto3_optional :fid, :bytes, 2
+    end
+    add_message "RubyPitaya.NatsPush" do
+      proto3_optional :route, :bytes, 1
+      proto3_optional :uid, :bytes, 2
+      proto3_optional :data, :bytes, 3
+    end
+  end
+end
+
+module RubyPitaya
+  NatsSession = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("RubyPitaya.NatsSession").msgclass
+  NatsMessage = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("RubyPitaya.NatsMessage").msgclass
+  NatsRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("RubyPitaya.NatsRequest").msgclass
+  NatsError = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("RubyPitaya.NatsError").msgclass
+  NatsResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("RubyPitaya.NatsResponse").msgclass
+  NatsBindMsg = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("RubyPitaya.NatsBindMsg").msgclass
+  NatsPush = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("RubyPitaya.NatsPush").msgclass
+end

data/lib/rubypitaya/core/session.rb

@@ -25,5 +25,13 @@ module RubyPitaya
     def authenticated?
       !@uid.strip.empty?
     end
+
+    def user_id
+      @uid
+    end
+
+    def user_id=(value)
+      @uid = value
+    end
   end
 end

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

@@ -23,7 +23,8 @@ module RubyPitaya
       initialize_redis
       initialize_mongo
 
-      @@handler_router ||= HandlerRouter.new()
+      is_cheats_enabled = @@setup.fetch('rubypitaya.server.cheats', false)
+      @@handler_router ||= HandlerRouter.new(is_cheats_enabled)
 
 
       @@initializer_content = InitializerContent.new(@@log,

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

@@ -24,6 +24,10 @@ module RubyPitaya
       @setup_mock = merge_recursively(@setup_mock, add_hash)
     end
 
+    def fetch(*args)
+      @setup_mock.fetch(*args)
+    end
+
     private
 
     def undig(*keys, value)

data/lib/rubypitaya/core/templates/template_migration.rb.erb

@@ -2,11 +2,14 @@ require 'active_record'
 
 class <%= class_name %> < ActiveRecord::Migration[6.1]
 
-  enable_extension 'pgcrypto'
+  enable_extension 'pgcrypto' unless extension_enabled?('pgcrypto')
+
+  # Migration suported types reference: https://guides.rubyonrails.org/v3.2/migrations.html#supported-types
 
   def change
     create_table :[table-name-here-in-plural], id: :uuid do |t|
       # t.belongs_to :user, type: :uuid, foreing_key: true
+      # t.belongs_to :user, type: :uuid, foreing_key: true, index: { unique: true }
       t.timestamps null: false
     end
   end

data/lib/rubypitaya/version.rb

@@ -1,3 +1,3 @@
 module RubyPitaya
-  VERSION = '2.27.0'
+  VERSION = '3.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubypitaya
 version: !ruby/object:Gem::Version
-  version: 2.27.0
+  version: 3.0.2
 platform: ruby
 authors:
 - Luciano Prestes Cavalcanti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-02 00:00:00.000000000 Z
+date: 2021-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -58,84 +58,84 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.15.0
+        version: 2.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.15.0
+        version: 2.16.0
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.4.0
+        version: 4.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.4.0
+        version: 4.5.1
 - !ruby/object:Gem::Dependency
   name: etcdv3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.3
+        version: 0.11.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.3
+        version: 0.11.4
 - !ruby/object:Gem::Dependency
-  name: sinatra
+  name: ostruct
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
-  name: ostruct
+  name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
-  name: protobuf
+  name: webrick
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.10.4
+        version: 1.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.10.4
+        version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -151,19 +151,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 6.1.4.1
 - !ruby/object:Gem::Dependency
-  name: sinatra-contrib
+  name: google-protobuf
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 3.18.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 3.18.1
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -179,47 +179,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.14.1
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.4
+        version: 3.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.4
+        version: 3.10.0
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: listen
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.10.0
+        version: 3.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.10.0
+        version: 3.7.0
 - !ruby/object:Gem::Dependency
-  name: listen
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: 2.2.22
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: 2.2.22
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
@@ -234,6 +234,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 7.0.0
+- !ruby/object:Gem::Dependency
+  name: sinatra-contrib
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.1.0
 description: RubyPitaya is an application to create servers using the pitaya protocol.
 email:
 - lucianopcbr@gmail.com
@@ -328,6 +342,7 @@ files:
 - "./lib/rubypitaya/core/handler_base.rb"
 - "./lib/rubypitaya/core/handler_router.rb"
 - "./lib/rubypitaya/core/helpers/setup_helper.rb"
+- "./lib/rubypitaya/core/http_base.rb"
 - "./lib/rubypitaya/core/http_routes.rb"
 - "./lib/rubypitaya/core/initializer_base.rb"
 - "./lib/rubypitaya/core/initializer_broadcast.rb"
@@ -339,6 +354,8 @@ files:
 - "./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/routes_base.rb"
 - "./lib/rubypitaya/core/session.rb"
@@ -372,7 +389,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: Create servers with pitaya