rubypitaya 2.26.2 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d51b3ca0829cdbe37dba4c94cc7b11c2236a95836d8c4ad7fc524d8d9f1bb70f
-  data.tar.gz: 2eb0bb00fecc086fbd8a728e19e317efc8f6bfedc04ac6b5f5d17850c330487a
+  metadata.gz: 931cb18a2775c209f73bb7a6b3894e07345fbb5eba18850602a7756ca3fd20ae
+  data.tar.gz: 91f1e1bd1f5c6d7a7ce77a236092840d6cb7a8671b2834a40d517e313c5975be
 SHA512:
-  metadata.gz: b03b3c5d4a5773c8134bcd8cd07ebf7e4cf3254f3c4dc69c97831045b072d899d3e460f609942699dde7f5d91184b094bd0ac4ed9db90586555ba18c38d08bdb
-  data.tar.gz: 89fa599b94b75c199327a55b93fc8398a39faef2b59d21b93151701ce3508b1e1fcc61f71ff2afd3dcfe54ba867bbe701d7fcb213219717ee38784cd7f896c48
+  metadata.gz: c9e8ecc54cd14a666f5b4f500a702f78f6788756c6bb61b3ae6ea84d2b473f1bf0bb7443e5390a9ea5a2aaeda6cc9968dfdb179e3e3ed38f8b3f7fc235326657
+  data.tar.gz: 1ccb6fc931ecd72552496174d578344795066bcb56b5209ae2f11644a4bea6f1775ac9cbccbc5e72ff0df85be98a4c824eda43f296e092cd3f439b81e2a33ec9

data/lib/rubypitaya/app-template/Gemfile

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

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

@@ -16,55 +16,58 @@ 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.3)
-    google-protobuf (3.17.3)
-    googleapis-common-protos-types (1.1.0)
+    ffi (1.15.4)
+    google-protobuf (3.18.0)
+    googleapis-common-protos-types (1.2.0)
       google-protobuf (~> 3.14)
-    grpc (1.38.0)
+    grpc (1.40.0)
       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)
@@ -81,12 +84,7 @@ GEM
       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,9 +109,9 @@ GEM
       rspec-support (~> 3.10.0)
     rspec-support (3.10.2)
     ruby2_keywords (0.0.5)
-    rubypitaya (2.26.2)
+    rubypitaya (3.0.0)
       activerecord (= 6.1.4.1)
-      etcdv3 (= 0.11.3)
+      etcdv3 (= 0.11.4)
       mongo (= 2.15.0)
       nats (= 0.11.0)
       ostruct (= 0.4.0)
@@ -122,16 +120,13 @@ GEM
       rake (= 13.0.6)
       redis (= 4.4.0)
       sinatra (= 2.1.0)
-      sinatra-activerecord (= 2.0.23)
       sinatra-contrib (= 2.1.0)
+      webrick (= 1.7.0)
     sinatra (2.1.0)
       mustermann (~> 1.0)
       rack (~> 2.2)
       rack-protection (= 2.1.0)
       tilt (~> 2.0)
-    sinatra-activerecord (2.0.23)
-      activerecord (>= 4.1)
-      sinatra (>= 1.0)
     sinatra-contrib (2.1.0)
       multi_json
       mustermann (~> 1.0)
@@ -145,18 +140,19 @@ GEM
     tilt (2.0.10)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
+    webrick (1.7.0)
     zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
 
 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.26.2)
+  rubypitaya (= 3.0.0)
 
 BUNDLED WITH
-   2.1.4
+   2.2.22

data/lib/rubypitaya/app-template/Makefile

@@ -41,7 +41,7 @@ test-cucumber:
 ## 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

@@ -3,14 +3,6 @@ class AppInitializer < RubyPitaya::InitializerBase
   # method:     run
   # parameter:  initializer_content
   # attributes:
-  #  - bll
-  #    - class: RubyPitaya::InstanceHolder
-  #    - link: https://gitlab.com/LucianoPC/ruby-pitaya/-/blob/master/lib/rubypitaya/core/instance_holder.rb
-  #    - methods:
-  #      - add_instance(key, instance)
-  #        - add any instance to any key
-  #      - [](key)
-  #        - get instance by key
   #  - redis
   #    - link: https://github.com/redis/redis-rb/
   #  - mongo
@@ -36,11 +28,9 @@ class AppInitializer < RubyPitaya::InitializerBase
   #        - log information
 
   def run(initializer_content)
-    bll = initializer_content.bll
-
     playerBll = PlayerBLL.new
 
-    bll.add_instance(:player, playerBll)
+    PlayerHandler.bll.add_instance(:player, playerBll)
   end
 
   def self.path

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/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 \ 
@@ -17,7 +17,7 @@ RUN bundle config --global jobs 4 && \
 
 # 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

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/spec/player_handler_spec.rb

@@ -42,7 +42,7 @@ RSpec.describe 'PlayerHandler', type: :request do
       request("rubypitaya.playerHandler.getInfo")
 
       expect(response[:code]).to eq(RubyPitaya::StatusCodes::CODE_NOT_AUTHENTICATED)
-      expect(response[:msg]).to eq('Not authenticated')
+      expect(response[:message]).to eq('Not authenticated')
     end
   end
 end

data/lib/rubypitaya/core/handler_base.rb

@@ -1,13 +1,15 @@
+require 'rubypitaya/core/instance_holder'
+
 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
 
-    attr_accessor :bll, :log, :redis, :setup, :config, :params, :session, :postman
+    attr_reader :bll, :log, :redis, :setup, :config, :params, :session, :postman
 
     def initialize
-      @bll = nil
       @log = nil
       @redis = nil
       @setup = nil
@@ -15,10 +17,11 @@ module RubyPitaya
       @params = nil
       @session = nil
       @postman = nil
+
+      @bll = self.class.bll
     end
 
-    def set_attributes(bll, log, redis, mongo, setup, config, params, session, postman)
-      @bll = bll
+    def set_attributes(log, redis, mongo, setup, config, params, session, postman)
       @log = log
       @redis = redis
       @mongo = mongo
@@ -29,6 +32,10 @@ module RubyPitaya
       @postman = postman
     end
 
+    def self.bll
+      self.handler_bll ||= InstanceHolder.new
+    end
+
     def self.non_authenticated_actions(*action_names)
       self.non_authenticated_routes = action_names.map(&:to_s)
     end

data/lib/rubypitaya/core/handler_router.rb

@@ -57,7 +57,7 @@ module RubyPitaya
     end
 
     def call(handler_name, action_name, session, postman, redis, mongo, setup,
-             config, bll, log, params)
+             config, log, params)
       unless @handler_name_map.include?(handler_name)
         return {
           code: StatusCodes::CODE_HANDLER_NOT_FOUND,
@@ -75,11 +75,11 @@ module RubyPitaya
       handler = @handler_name_map[handler_name]
 
       if !handler.class.authenticated_action_name?(action_name)
-        handler.set_attributes(bll, log, redis, mongo, setup, config, params, session, postman)
+        handler.set_attributes(log, redis, mongo, setup, config, params, session, postman)
         handler.send(action_name)
       else
         if session.authenticated?
-          handler.set_attributes(bll, log, redis, mongo, setup, config, params, session, postman)
+          handler.set_attributes(log, redis, mongo, setup, config, params, session, postman)
           handler.send(action_name)
         else
           return {

data/lib/rubypitaya/core/initializer_content.rb

@@ -2,10 +2,9 @@ module RubyPitaya
 
   class InitializerContent
 
-    attr_reader :bll, :log, :redis, :mongo, :setup, :config
+    attr_reader :log, :redis, :mongo, :setup, :config
 
-    def initialize(bll, log, redis, mongo, setup, config)
-      @bll = bll
+    def initialize(log, redis, mongo, setup, config)
       @log = log
       @mongo = mongo
       @redis = redis

data/lib/rubypitaya/core/main.rb

@@ -87,8 +87,7 @@ module RubyPitaya
 
       @bll = InstanceHolder.new
 
-      @initializer_content = InitializerContent.new(@bll,
-                                                    @log,
+      @initializer_content = InitializerContent.new(@log,
                                                     @redis_connector.redis,
                                                     @mongo_connector.mongo,
                                                     @setup,
@@ -166,10 +165,10 @@ module RubyPitaya
         session_id = request[:session][:id]
         session_uid = request[:session].fetch(:uid, '')
         session_data = request[:session][:data]
-        session_data = JSON.parse(session_data, symbolize_names: true) if session_data.class == String
+        session_data = JSON.parse(session_data, symbolize_names: true)
         frontend_id = request[:frontendID]
         metadata = request[:metadata]
-        metadata = JSON.parse(metadata, symbolize_names: true) if metadata.class == String
+        metadata = JSON.parse(metadata, symbolize_names: true)
 
         @session.update(session_id, session_uid, session_data, metadata,
                         frontend_id)
@@ -185,7 +184,7 @@ module RubyPitaya
         response = @handler_router.call(handler_name, action_name, @session,
                                         @postman, @redis_connector.redis,
                                         @mongo_connector.mongo, @setup, @config,
-                                        @bll, @log, params)
+                                        @log, params)
 
         delta_time_seconds = ((Time.now.to_f - start_time_seconds) * 1000).round(2)
 

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

@@ -12,7 +12,6 @@ module RubyPitaya
     def initialize(context)
       @@context = context
 
-      @@bll = InstanceHolder.new
       @@log = Logger.new('/dev/null')
       @@setup = SetupSpecHelper.new
       @@config = ConfigSpecHelper.new
@@ -27,8 +26,7 @@ module RubyPitaya
       @@handler_router ||= HandlerRouter.new()
 
 
-      @@initializer_content = InitializerContent.new(@@bll,
-                                                     @@log,
+      @@initializer_content = InitializerContent.new(@@log,
                                                      @@redis_connector.redis,
                                                      @@mongo_connector.mongo,
                                                      @@setup,
@@ -43,7 +41,7 @@ module RubyPitaya
       @@response = @@handler_router.call(handler_name, action_name, @@session,
                                          @@postman, @@redis_connector.redis,
                                          @@mongo_connector.mongo, @@setup,
-                                         @@config, @@bll, @@log, params)
+                                         @@config, @@log, params)
     end
 
     def response
@@ -74,10 +72,6 @@ module RubyPitaya
       @@setup.add(*keys, value)
     end
 
-    def bll
-      @@bll
-    end
-
     def log
       @@log
     end

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

@@ -11,4 +11,8 @@ RSpec.configure do |config|
   config.before(:each) do
     ActiveRecord::Base.descendants.each { |c| c.delete_all unless c == ActiveRecord::SchemaMigration }
   end
+
+  config.after(:each) do
+    ActiveRecord::Base.clear_active_connections!
+  end
 end

data/lib/rubypitaya/version.rb

@@ -1,3 +1,3 @@
 module RubyPitaya
-  VERSION = '2.26.2'
+  VERSION = '3.0.0'
 end

data/lib/rubypitaya.rb

@@ -66,7 +66,7 @@ module RubyPitaya
 
       plugin_migrations_files.each_with_index do |migration_file, i|
         migration_timestamp = base_migration_timestamp + i
-        new_file = migration_file.gsub(/^(.+\/migration\/)\d+(_.+)$/, "\\1#{migration_timestamp}\\2")
+        new_file = migration_file.gsub(/^(.+\/migrations\/)\d+(_.+)$/, "\\1#{migration_timestamp}\\2")
 
         File.rename(migration_file, new_file)
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubypitaya
 version: !ruby/object:Gem::Version
-  version: 2.26.2
+  version: 3.0.0
 platform: ruby
 authors:
 - Luciano Prestes Cavalcanti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-02 00:00:00.000000000 Z
+date: 2021-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -86,14 +86,28 @@ dependencies:
     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: ostruct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.4.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -109,19 +123,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.1.0
 - !ruby/object:Gem::Dependency
-  name: ostruct
+  name: webrick
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 1.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: protobuf
   requirement: !ruby/object:Gem::Requirement
@@ -184,14 +198,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.4
+        version: 2.2.22
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.4
+        version: 2.2.22
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -372,7 +386,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