rubypitaya 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d50d6d5ffeeab38f9d623c33970eb87e4e89ad64e385f4fe57a8d414342e969a
-  data.tar.gz: 7fb8db293deae83dd0de428a825588b9ca6418eab26a220ab983ac6b1737ab69
+  metadata.gz: '0308a5654cdfbb6aa96c6c680a27af78ca4a7ed6ca4830afdf352587e930967d'
+  data.tar.gz: bdaeef1f2af9594c8b0a39c8b954d2008c84383d8fa4a318637224e30c2507d1
 SHA512:
-  metadata.gz: 88510c87137b193a0f4f1f2a12ad7fd7c2c9acb1be8d2aaeee7545b8f1832b380b4e57a4e9d072deef7e526cc87dfd86461584933fc4e9e0d5f466c520408831
-  data.tar.gz: 341555828f6ed7c3996210cf64bc21cc36e756940b1f506cf81f62aaecbc0aadb18fe07fb9cc6c525d3455c4d45ff22e82efa257e6eee63d41b59b502a85c2c9
+  metadata.gz: 6e9f17d2cdb1e12dd2a1e37f693506e81054a7f91a313db0ae5873fd8423f3ff461782906db78f2a2494452a638eb26a464f6b186a81602c9023c501f61b265a
+  data.tar.gz: eda610ea2ca327de2f2fcf47f49ba8225d0e7500745ec3d3a7247f7371a6634cd1e4694734d2ba4da6c14243d05fe6df661d55bb9679a7dcf944d3221e7cd687

data/lib/rubypitaya/app-template/Gemfile

@@ -1,11 +1,12 @@
 source "https://rubygems.org"
 
-gem 'rubypitaya', '3.0.1'
+gem 'rubypitaya', '3.0.2'
 
 group :development do
   gem 'pry', '0.14.1'
-  gem 'bundler', '2.2.22'
   gem 'rspec', '3.10.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

@@ -103,7 +103,7 @@ GEM
       rspec-support (~> 3.10.0)
     rspec-support (3.10.2)
     ruby2_keywords (0.0.5)
-    rubypitaya (3.0.1)
+    rubypitaya (3.0.2)
       activerecord (= 6.1.4.1)
       etcdv3 (= 0.11.4)
       google-protobuf (= 3.18.0)
@@ -144,7 +144,7 @@ DEPENDENCIES
   listen (= 3.7.0)
   pry (= 0.14.1)
   rspec (= 3.10.0)
-  rubypitaya (= 3.0.1)
+  rubypitaya (= 3.0.2)
 
 BUNDLED WITH
    2.2.22

data/lib/rubypitaya/app-template/Makefile

@@ -36,7 +36,7 @@ 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:

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/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/prod/Dockerfile

@@ -15,6 +15,18 @@ 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:3.0.2-slim
@@ -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/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
@@ -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/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 = '3.0.1'
+  VERSION = '3.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubypitaya
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - Luciano Prestes Cavalcanti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-24 00:00:00.000000000 Z
+date: 2021-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -58,28 +58,28 @@ 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
@@ -156,98 +156,98 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.18.0
+        version: 3.18.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.18.0
+        version: 3.18.1
 - !ruby/object:Gem::Dependency
-  name: sinatra-contrib
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.0
-  type: :runtime
+        version: 0.14.1
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 0.14.1
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.1
+        version: 3.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.1
+        version: 3.10.0
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: listen
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.22
+        version: 3.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.22
+        version: 3.7.0
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.10.0
+        version: 2.2.22
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.10.0
+        version: 2.2.22
 - !ruby/object:Gem::Dependency
-  name: listen
+  name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: 7.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: 7.0.0
 - !ruby/object:Gem::Dependency
-  name: cucumber
+  name: sinatra-contrib
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.0
+        version: 2.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.0
+        version: 2.1.0
 description: RubyPitaya is an application to create servers using the pitaya protocol.
 email:
 - lucianopcbr@gmail.com
@@ -342,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"