rubypitaya 2.26.0 → 2.27.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c289b7e66999cba7c278e77dd8658527cd101218009709e533fe853b5f43250
-  data.tar.gz: 4dd6b6fe78b6c22b30b1a7564a9972da484753c8d8716e4fd5dabd0e0f5ae001
+  metadata.gz: e382eff25c29ad543511d22efa945c52d1b770c7e9237ab46338db08d087842f
+  data.tar.gz: '08e25deffa96ab5acc7b3e239f8b9515355f7e9308228b4d7cfb8e25528403d6'
 SHA512:
-  metadata.gz: 3faa2a8b0cda879621cb823ae920271477596c556c9938881fcd829e185a7563d6da3492bb7a387c5a58766ce5d8f990dbc1c73bf997a19c3e0eaf5db6153ccc
-  data.tar.gz: ee519fc3028078226cc0e5e01e0b706bd96962481b10ca263e60c28f371b354bd0480b0fa3452e4fc9007ea4f786bbf0ba2ca75c330a6ad72b901cbf9defae9c
+  metadata.gz: c57f7eb3b0637bd463efc43185dd1c8a543b275f7db1ed2739e84b4d547f5c21d9519c1d910d9418ce7f19e273d24746b907e8ff32c334727ba0897b06eec66d
+  data.tar.gz: 29ea1d9037c932b84e0016316169c5e2821b166728075512cdaf132c110cf679d9544168881b65fb8bd9e701654d786eb05bba366ca2d272dfb0e26e66af348c

data/lib/rubypitaya/app-template/Gemfile

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gem 'rubypitaya', '2.26.0'
+gem 'rubypitaya', '2.27.0'
 
 group :development do
   gem 'pry', '0.14.0'

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

@@ -1,12 +1,12 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.1.3)
-      activesupport (= 6.1.3)
-    activerecord (6.1.3)
-      activemodel (= 6.1.3)
-      activesupport (= 6.1.3)
-    activesupport (6.1.3)
+    activemodel (6.1.4.1)
+      activesupport (= 6.1.4.1)
+    activerecord (6.1.4.1)
+      activemodel (= 6.1.4.1)
+      activesupport (= 6.1.4.1)
+    activesupport (6.1.4.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -48,10 +48,10 @@ GEM
       cucumber-cucumber-expressions (~> 10.3, >= 10.3.0)
       cucumber-messages (~> 13.0, >= 13.0.1)
     diff-lcs (1.4.4)
-    etcdv3 (0.10.2)
+    etcdv3 (0.11.3)
       grpc (~> 1.17)
     eventmachine (1.2.7)
-    ffi (1.15.3)
+    ffi (1.15.4)
     google-protobuf (3.17.3)
     googleapis-common-protos-types (1.1.0)
       google-protobuf (~> 3.14)
@@ -74,9 +74,9 @@ GEM
       ruby2_keywords (~> 0.0.1)
     nats (0.11.0)
       eventmachine (~> 1.2, >= 1.2)
-    ostruct (0.3.3)
+    ostruct (0.4.0)
     pg (1.2.3)
-    protobuf (3.10.0)
+    protobuf (3.10.4)
       activesupport (>= 3.2)
       middleware
       thor
@@ -92,11 +92,11 @@ GEM
     rack (2.2.3)
     rack-protection (2.1.0)
       rack
-    rake (13.0.3)
+    rake (13.0.6)
     rb-fsevent (0.11.0)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    redis (4.2.5)
+    redis (4.4.0)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
       rspec-expectations (~> 3.10.0)
@@ -111,16 +111,16 @@ GEM
       rspec-support (~> 3.10.0)
     rspec-support (3.10.2)
     ruby2_keywords (0.0.5)
-    rubypitaya (2.26.0)
-      activerecord (= 6.1.3)
-      etcdv3 (= 0.10.2)
+    rubypitaya (2.27.0)
+      activerecord (= 6.1.4.1)
+      etcdv3 (= 0.11.3)
       mongo (= 2.15.0)
       nats (= 0.11.0)
-      ostruct (= 0.3.3)
+      ostruct (= 0.4.0)
       pg (= 1.2.3)
-      protobuf (= 3.10.0)
-      rake (= 13.0.3)
-      redis (= 4.2.5)
+      protobuf (= 3.10.4)
+      rake (= 13.0.6)
+      redis (= 4.4.0)
       sinatra (= 2.1.0)
       sinatra-contrib (= 2.1.0)
     sinatra (2.1.0)
@@ -152,7 +152,7 @@ DEPENDENCIES
   listen (= 3.4.1)
   pry (= 0.14.0)
   rspec (= 3.10.0)
-  rubypitaya (= 2.26.0)
+  rubypitaya (= 2.27.0)
 
 BUNDLED WITH
    2.1.4

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/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/http_routes.rb

@@ -1,11 +1,9 @@
 require 'sinatra/base'
-require 'sinatra/activerecord'
 require 'rubypitaya/core/parameters'
 
 module RubyPitaya
 
   class HttpRoutes < Sinatra::Base
-    register Sinatra::ActiveRecordExtension
 
     def self.auto_reload
       require 'sinatra/reloader'

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,
@@ -159,17 +158,17 @@ module RubyPitaya
 
         message_route = request[:msg][:route]
         message_data = request[:msg][:data] || {}
-        message_data = JSON.parse(message_data) if message_data.class == String
+        message_data = JSON.parse(message_data)
 
         params = Parameters.new(message_data)
 
         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/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.0'
+  VERSION = '2.27.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.0
+  version: 2.27.0
 platform: ruby
 authors:
 - Luciano Prestes Cavalcanti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-01 00:00:00.000000000 Z
+date: 2021-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -164,20 +164,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 2.1.0
-- !ruby/object:Gem::Dependency
-  name: sinatra-activerecord
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.0.23
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.0.23
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement