rubypitaya 2.12.0 → 2.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 545395137fd805934f481bfd80cbe531579a968923a755b3ad715c2d585222d2
-  data.tar.gz: 126432e40f15067cd120f36213819076ec2480c9d84365621b11aa8c918f2e4c
+  metadata.gz: 86eb826473766e568cdeec334cb978b65d8b36188a129c8f5aa8b31d837afbf1
+  data.tar.gz: cf96a7e6c0ed0f0abc69e797d00ba59b6d9fdef5524761928bbda431593b582d
 SHA512:
-  metadata.gz: 0e2560d693758d519856c75f15acc9c8b66314b7fb27b4ebd2b866ae510770eff0f1ec287e80800d316efb904a2da02969f80d046311a6c0f284d75b2153d908
-  data.tar.gz: 2392c071b2a0e0673faf4b155e510dc0c07645e5c9dd494eecc45189be92b4eabaafe9b4d82395055560c86aace25a0c5bf67afac30a3f8009b4d523561e7a25
+  metadata.gz: 0416f1d8c5c8e31231bb7cb8800aa3bb4e68aa5415db605f5db79b8b83590c453ade21ea46644a38a02b7827f760dd45b9b186b0efb9b12471f9d1f86961c0ff
+  data.tar.gz: efb6d17b6f86544a3381d579b1625159f6ab0a4c11427ff69a466720ac755d576b21a760bfbda7e233d34701470231e18792b35f27879ede51a7da2f4d399816

data/bin/rubypitaya

@@ -94,7 +94,7 @@ def show_help_create_migration
 end
 
 def show_help_add_plugin
-  puts 'Usage: $ rubypitaya create-migration [migration_name]'
+  puts 'Usage: $ rubypitaya add-plugin [plugin_git_link]'
   puts ''
 end
 

data/lib/rubypitaya/app-template/Gemfile

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gem 'rubypitaya', '2.12.0'
+gem 'rubypitaya', '2.15.0'
 
 group :development do
   gem 'pry', '0.12.2'

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

@@ -84,7 +84,7 @@ GEM
       rspec-support (~> 3.8.0)
     rspec-support (3.8.3)
     ruby2_keywords (0.0.2)
-    rubypitaya (2.12.0)
+    rubypitaya (2.15.0)
       activerecord (= 6.0.2)
       etcdv3 (= 0.10.2)
       eventmachine (= 1.2.7)
@@ -123,7 +123,7 @@ DEPENDENCIES
   listen (= 3.2.1)
   pry (= 0.12.2)
   rspec (= 3.8.0)
-  rubypitaya (= 2.12.0)
+  rubypitaya (= 2.15.0)
 
 BUNDLED WITH
    1.17.2

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

@@ -1,49 +1,46 @@
-module MyApp
+class AppInitializer < RubyPitaya::InitializerBase
 
-  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/
+  #  - config
+  #    - class: RubyPitaya::Config
+  #    - link: https://gitlab.com/LucianoPC/ruby-pitaya/-/blob/master/lib/rubypitaya/core/config.rb
+  #    - methods:
+  #      - [](key)
+  #        - get config file by config path
+  #  - setup
+  #    - class: RubyPitaya::Setup
+  #    - link: https://gitlab.com/LucianoPC/ruby-pitaya/-/blob/master/lib/rubypitaya/core/setup.rb
+  #    - methods:
+  #      - [](key)
+  #        - get config file by config path
+  #  - log
+  #    - class: Logger
+  #    - link: https://ruby-doc.org/stdlib-2.6.4/libdoc/logger/rdoc/Logger.html
+  #    - methods:
+  #      - info
+  #        - log information
 
-    # 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/
-    #  - config
-    #    - class: RubyPitaya::Config
-    #    - link: https://gitlab.com/LucianoPC/ruby-pitaya/-/blob/master/lib/rubypitaya/core/config.rb
-    #    - methods:
-    #      - [](key)
-    #        - get config file by config path
-    #  - setup
-    #    - class: RubyPitaya::Setup
-    #    - link: https://gitlab.com/LucianoPC/ruby-pitaya/-/blob/master/lib/rubypitaya/core/setup.rb
-    #    - methods:
-    #      - [](key)
-    #        - get config file by config path
-    #  - log
-    #    - class: Logger
-    #    - link: https://ruby-doc.org/stdlib-2.6.4/libdoc/logger/rdoc/Logger.html
-    #    - methods:
-    #      - info
-    #        - log information
+  def run(initializer_content)
+    bll = initializer_content.bll
 
-    def run(initializer_content)
-      bll = initializer_content.bll
+    playerBll = PlayerBLL.new
 
-      playerBll = PlayerBLL.new
-
-      bll.add_instance(:player, playerBll)
-    end
+    bll.add_instance(:player, playerBll)
+  end
 
-    def self.path
-      __FILE__
-    end
+  def self.path
+    __FILE__
   end
 end

data/lib/rubypitaya/app-template/app/bll/player_bll.rb

@@ -1,14 +1,11 @@
-module MyApp
-  
-  class PlayerBLL
+class PlayerBLL
 
-    def create_new_player(setup, config)
-      name = config['initial_player']['name']
-      gold = setup['initial_player.wallet.gold']
+  def create_new_player(setup, config)
+    name = config['initial_player']['name']
+    gold = setup['initial_player.wallet.gold']
 
-      player = Player.new(name: name, gold: gold, user: User.new)
-      player.save
-      player
-    end
+    player = Player.new(name: name, gold: gold, user: User.new)
+    player.save
+    player
   end
 end

data/lib/rubypitaya/app-template/app/constants/status_codes.rb

@@ -1,25 +1,22 @@
-module MyApp
-  
-  class StatusCodes
+class StatusCodes
 
-    CODE_OK = RubyPitaya::StatusCodes::CODE_OK
+  CODE_OK = RubyPitaya::StatusCodes::CODE_OK
 
-    ################
-    ## Existent Codes
-    ################
-    ## Success codes
-    #
-    # RubyPitaya::StatusCodes::CODE_OK                   = 'RP-200'
-    #
-    #
-    ## Error codes
-    # RubyPitaya::StatusCodes::CODE_UNKNOWN              = 'RP-000'
-    # RubyPitaya::StatusCodes::CODE_HANDLER_NOT_FOUND    = 'RP-001'
-    # RubyPitaya::StatusCodes::CODE_ACTION_NOT_FOUND     = 'RP-002'
-    # RubyPitaya::StatusCodes::CODE_NOT_AUTHENTICATED    = 'RP-003'
-    # RubyPitaya::StatusCodes::CODE_AUTHENTICATION_ERROR = 'RP-004'
-    #
-    # RubyPitaya::StatusCodes::Connector::CODE_UNKNOWN   = 'PIT-000'
-    ################
-  end
+  ################
+  ## Existent Codes
+  ################
+  ## Success codes
+  #
+  # RubyPitaya::StatusCodes::CODE_OK                   = 'RP-200'
+  #
+  #
+  ## Error codes
+  # RubyPitaya::StatusCodes::CODE_UNKNOWN              = 'RP-000'
+  # RubyPitaya::StatusCodes::CODE_HANDLER_NOT_FOUND    = 'RP-001'
+  # RubyPitaya::StatusCodes::CODE_ACTION_NOT_FOUND     = 'RP-002'
+  # RubyPitaya::StatusCodes::CODE_NOT_AUTHENTICATED    = 'RP-003'
+  # RubyPitaya::StatusCodes::CODE_AUTHENTICATION_ERROR = 'RP-004'
+  #
+  # RubyPitaya::StatusCodes::Connector::CODE_UNKNOWN   = 'PIT-000'
+  ################
 end

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

@@ -1,16 +1,13 @@
-module MyApp
+class HelloWorldHandler < RubyPitaya::HandlerBase
 
-  class HelloWorldHandler < RubyPitaya::HandlerBase
+  non_authenticated_actions :sayHello
 
-    non_authenticated_actions :sayHello
-
-    def sayHello
-      response = {
-        code: 'RP-200',
-        data: {
-          message: 'Hello!'
-        }
+  def sayHello
+    response = {
+      code: 'RP-200',
+      data: {
+        message: 'Hello!'
       }
-    end
+    }
   end
-end
+end

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

@@ -1,82 +1,79 @@
-module MyApp
-  
-  class PlayerHandler < RubyPitaya::HandlerBase
+class PlayerHandler < RubyPitaya::HandlerBase
 
-    # class:      HandlerBase
-    # attributes:
-    #  - @bll
-    #    - class: InstanceHolder
-    #    - methods:
-    #      - [](key)
-    #        - info: get bll by key
-    #
-    #  - @redis
-    #    - link: https://github.com/redis/redis-rb/
-    #
-    #  - @config
-    #    - info: Hash with config json files inside of 'app/config'
-    #    - example:
-    #               Given you have the following file "app/config/initial_player.json"
-    #               And this json content is {'name': 'Guest'}
-    #               And you can get the initial player name
-    #               Then you can run the following code: @config['initial_player']['name']
-    #
-    #  - @params
-    #    - info: Special hash with the request parameters
-    #    - link: https://api.rubyonrails.org/classes/ActionController/Parameters.html
-    #
-    #  - @session
-    #    - attributes:
-    #      - id          :: session id
-    #      - uid         :: user id
-    #      - data        :: session data
-    #      - metadata    :: session data
-    #      - frontend_id :: connector server id
-    #
-    #  - @postman
-    #    - info: Send messages to server and clients
-    #    - methods:
-    #      - bind_session(session)
-    #        - info:
-    #                Send a session to connector, you can use to set the userId
-    #                of the session, for example you can set an userId on
-    #                @session, like `@session.uid = '123'`, and then you can
-    #                bind this session with `@postman.bind_session(@session)`
+  # class:      HandlerBase
+  # attributes:
+  #  - @bll
+  #    - class: InstanceHolder
+  #    - methods:
+  #      - [](key)
+  #        - info: get bll by key
+  #
+  #  - @redis
+  #    - link: https://github.com/redis/redis-rb/
+  #
+  #  - @config
+  #    - info: Hash with config json files inside of 'app/config'
+  #    - example:
+  #               Given you have the following file "app/config/initial_player.json"
+  #               And this json content is {'name': 'Guest'}
+  #               And you can get the initial player name
+  #               Then you can run the following code: @config['initial_player']['name']
+  #
+  #  - @params
+  #    - info: Special hash with the request parameters
+  #    - link: https://api.rubyonrails.org/classes/ActionController/Parameters.html
+  #
+  #  - @session
+  #    - attributes:
+  #      - id          :: session id
+  #      - uid         :: user id
+  #      - data        :: session data
+  #      - metadata    :: session data
+  #      - frontend_id :: connector server id
+  #
+  #  - @postman
+  #    - info: Send messages to server and clients
+  #    - methods:
+  #      - bind_session(session)
+  #        - info:
+  #                Send a session to connector, you can use to set the userId
+  #                of the session, for example you can set an userId on
+  #                @session, like `@session.uid = '123'`, and then you can
+  #                bind this session with `@postman.bind_session(@session)`
 
-    non_authenticated_actions :authenticate
+  non_authenticated_actions :authenticate
 
-    def authenticate
-      user_id = @params[:userId]
+  def authenticate
+    user_id = @params[:userId]
 
-      player = Player.find_by_user_id(user_id)
-      player = @bll[:player].create_new_player(@setup, @config) if player.nil?
+    player = Player.find_by_user_id(user_id)
+    player = @bll[:player].create_new_player(@setup, @config) if player.nil?
 
-      @session.uid = player.user_id
+    @session.uid = player.user_id
 
-      bind_session_response = @postman.bind_session(@session)
+    bind_session_response = @postman.bind_session(@session)
 
-      unless bind_session_response.dig(:error, :code).nil?
-        return response = {
-          code: RubyPitaya::StatusCodes::CODE_AUTHENTICATION_ERROR,
-          msg: 'Error to authenticate',
-        }
-      end
-
-      response = {
-        code: StatusCodes::CODE_OK,
-        data: player.to_hash,
+    unless bind_session_response.dig(:error, :code).nil?
+      return response = {
+        code: RubyPitaya::StatusCodes::CODE_AUTHENTICATION_ERROR,
+        msg: 'Error to authenticate',
       }
     end
 
-    def getInfo
-      user_id = @session.uid
+    response = {
+      code: StatusCodes::CODE_OK,
+      data: player.to_hash,
+    }
+  end
 
-      player = Player.find_by_user_id(user_id)
+  def getInfo
+    user_id = @session.uid
 
-      response = {
-        code: StatusCodes::CODE_OK,
-        data: player.to_hash,
-      }
-    end
+    player = Player.find_by_user_id(user_id)
+
+    response = {
+      code: StatusCodes::CODE_OK,
+      data: player.to_hash,
+    }
   end
 end

data/lib/rubypitaya/app-template/app/models/player.rb

@@ -1,19 +1,16 @@
 require 'active_record'
 
-module MyApp
+class Player < ActiveRecord::Base
 
-  class Player < ActiveRecord::Base
+  belongs_to :user
 
-    belongs_to :user
+  validates_presence_of :name, :gold, :user
 
-    validates_presence_of :name, :gold, :user
-
-    def to_hash
-      {
-        name: name,
-        gold: gold,
-        userId: user_id,
-      }
-    end
+  def to_hash
+    {
+      name: name,
+      gold: gold,
+      userId: user_id,
+    }
   end
 end

data/lib/rubypitaya/app-template/config/routes.rb

@@ -6,6 +6,6 @@ class Routes < RubyPitaya::RoutesBase
   #    - Defines a new name to handler
 
   def setup
-    # match('helloHandler', to: 'MyApp::HelloWorldHandler')
+    # match('helloHandler', to: 'HelloWorldHandler')
   end
 end

data/lib/rubypitaya/app-template/features/player.feature

@@ -19,11 +19,11 @@ Feature: Player
     Then  server should response the following json:
       """
       {
-        'code': 'RP-200',
-        'data': {
-          'name': 'Someone',
-          'gold': 15,
-          'userId': '00000000-0000-0000-0000-000000000001'
+        "code": "RP-200",
+        "data": {
+          "name": "Someone",
+          "gold": 15,
+          "userId": "00000000-0000-0000-0000-000000000001"
         }
       }
       """

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

@@ -1,5 +1,5 @@
 Given(/^[Tt]he [Pp]layer ["'](.+)["'] is authenticated$/) do |player_name|
-  player = MyApp::Player.find_by_name(player_name)
+  player = Player.find_by_name(player_name)
   @handler_helper.authenticate(player.user_id)
 end
 
@@ -7,6 +7,6 @@ Given(/^[Tt]he following [Pp]layer[s]*[:]*$/) do |table|
   player_hashes = table.hashes
   player_hashes.each do |player_hash|
     player_hash[:user] = User.new(id: player_hash[:user_id])
-    MyApp::Player.create(player_hash)
+    Player.create(player_hash)
   end
 end

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

@@ -9,8 +9,8 @@ Given(/^[Ss]erver should response ["'](.+)["'] as ["'](.+)["']$/) do |response_k
 end
 
 Given(/^[Ss]erver should response the following json[:]*$/) do |expected_json|
-  expected_json = expected_json.delete("\n").delete(' ')
-  response_json = @handler_helper.response.to_json.gsub("\"", "'")
+  expected_json = JSON.generate(JSON.parse(expected_json.strip))
+  response_json = JSON.generate(@handler_helper.response)
 
   expect(response_json).to eq(expected_json)
 end
@@ -38,6 +38,16 @@ Given(/^(?:[Nn]ow\s)?[Tt]oday is ["'](.+)["']$/) do |date_text|
   Time.stub(:now).and_return(time_now)
 end
 
+Given(/^[Tt]he [Uu]ser ["'](.+)["'] is authenticated$/) do |user_id|
+  @handler_helper.authenticate(user_id)
+end
+
+Given(/^[Tt]he following [Uu]ser[s]*[:]*$/) do |table|
+  table.hashes.each do |table_hash|
+    User.create(id: table_hash[:user_id])
+  end
+end
+
 Before do
   ActiveRecord::Base.descendants.each { |c| c.delete_all unless c == ActiveRecord::SchemaMigration }
   @handler_helper = RubyPitaya::HandlerSpecHelperClass.new('cucumber')

data/lib/rubypitaya/app-template/spec/hello_world_handler_spec.rb

@@ -1,19 +1,16 @@
 require 'spec_helper'
 
-module MyApp
+RSpec.describe 'HelloWorldHandler', type: :request do
+  context 'sayHello' do
+    it 'success' do
+      request("rubypitaya.helloWorldHandler.sayHello")
 
-  RSpec.describe 'HelloWorldHandler', type: :request do
-    context 'sayHello' do
-      it 'success' do
-        request("rubypitaya.helloWorldHandler.sayHello")
+      expected_response = {
+        code: 'RP-200',
+        data: { message: 'Hello!' } 
+      }
 
-        expected_response = {
-          code: 'RP-200',
-          data: { message: 'Hello!' } 
-        }
-
-        expect(response).to eq(expected_response)
-      end
+      expect(response).to eq(expected_response)
     end
   end
 end

data/lib/rubypitaya/app-template/spec/player_handler_spec.rb

@@ -1,50 +1,47 @@
 require 'spec_helper'
 
-module MyApp
+RSpec.describe 'PlayerHandler', type: :request do
+  context 'authenticate' do
+    it 'create_new_user' do
+      setup = {'initial_player' => {'wallet' => {'gold' => 10}}}
+      config = {'initial_player' => {'name' => 'Guest'}}
 
-  RSpec.describe 'PlayerHandler', type: :request do
-    context 'authenticate' do
-      it 'create_new_user' do
-        setup = {'initial_player' => {'wallet' => {'gold' => 10}}}
-        config = {'initial_player' => {'name' => 'Guest'}}
+      set_setup(setup)
+      set_config(config)
 
-        set_setup(setup)
-        set_config(config)
+      params = {}
+      request("rubypitaya.playerHandler.authenticate", params)
 
-        params = {}
-        request("rubypitaya.playerHandler.authenticate", params)
+      player = Player.last
 
-        player = ::MyApp::Player.last
+      expect(response[:code]).to eq('RP-200')
+      expect(response[:data][:name]).to eq('Guest')
+      expect(response[:data][:gold]).to eq(10)
 
-        expect(response[:code]).to eq('RP-200')
-        expect(response[:data][:name]).to eq('Guest')
-        expect(response[:data][:gold]).to eq(10)
-
-        expect(::User.count).to eq(1)
-        expect(::MyApp::Player.count).to eq(1)
-        expect(player.name).to eq('Guest')
-        expect(player.gold).to eq(10)
-      end
+      expect(User.count).to eq(1)
+      expect(Player.count).to eq(1)
+      expect(player.name).to eq('Guest')
+      expect(player.gold).to eq(10)
     end
+  end
 
-    context 'getInfo' do
-      it 'success' do
-        player = ::MyApp::Player.create(name: 'Someone', gold: 12, user: User.new)
+  context 'getInfo' do
+    it 'success' do
+      player = Player.create(name: 'Someone', gold: 12, user: User.new)
 
-        authenticate(player.user_id)
+      authenticate(player.user_id)
 
-        request("rubypitaya.playerHandler.getInfo")
+      request("rubypitaya.playerHandler.getInfo")
 
-        expect(response[:code]).to eq('RP-200')
-        expect(response[:data]).to eq(player.to_hash)
-      end
+      expect(response[:code]).to eq('RP-200')
+      expect(response[:data]).to eq(player.to_hash)
+    end
 
-      it 'error_not_authenticated' do
-        request("rubypitaya.playerHandler.getInfo")
+    it 'error_not_authenticated' do
+      request("rubypitaya.playerHandler.getInfo")
 
-        expect(response[:code]).to eq(RubyPitaya::StatusCodes::CODE_NOT_AUTHENTICATED)
-        expect(response[:msg]).to eq('Not authenticated')
-      end
+      expect(response[:code]).to eq(RubyPitaya::StatusCodes::CODE_NOT_AUTHENTICATED)
+      expect(response[:msg]).to eq('Not authenticated')
     end
   end
 end

data/lib/rubypitaya/core/config.rb

@@ -9,11 +9,19 @@ module RubyPitaya
     def initialize
       @config_core = ConfigCore.new
       @config_core_override = nil
+
+      @result_cache = {}
     end
 
     def [](key)
+      result = @result_cache[key]
+      return result unless result.nil?
+
       result = @config_core_override[key] unless @config_core_override.nil?
       result = @config_core[key] if result.nil?
+
+      @result_cache[key] = result
+
       result
     end
 
@@ -21,5 +29,9 @@ module RubyPitaya
       @config_core.auto_reload
       @config_core_override.auto_reload unless @config_core_override.nil?
     end
+
+    def clear_cache
+      @result_cache.clear
+    end
   end
 end

data/lib/rubypitaya/core/main.rb

@@ -165,6 +165,8 @@ module RubyPitaya
         @log.info "request  -> route: #{message_route}"
         @log.info "         -> data:  #{message_data}"
 
+        @config.clear_cache
+
         response = @handler_router.call(handler_name, action_name, @session,
                                         @postman, @redis_connector.redis,
                                         @setup, @config, @bll, @log, params)
@@ -177,7 +179,7 @@ module RubyPitaya
       end
       rescue Exception => error
         @log.info "ERROR: #{error}"
-        @log.info error.backtrace
+        @log.info error.backtrace.join("\n")
         run_nats_connection
     end
   end

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

@@ -19,7 +19,6 @@ module RubyPitaya
     end
 
     def config_core_override=(value)
-      @config_mock = value
     end
 
     def add(key, value)

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

@@ -70,6 +70,26 @@ module RubyPitaya
       @@setup.add(*keys, value)
     end
 
+    def get_bll
+      @@bll
+    end
+
+    def get_log
+      @@log
+    end
+
+    def get_session
+      @@session
+    end
+
+    def get_postman
+      @@postman
+    end
+
+    def get_redis
+      @@redis_connector.redis
+    end
+
     private
 
     def initialize_redis

data/lib/rubypitaya/version.rb

@@ -1,3 +1,3 @@
 module RubyPitaya
-  VERSION = '2.12.0'
+  VERSION = '2.15.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubypitaya
 version: !ruby/object:Gem::Version
-  version: 2.12.0
+  version: 2.15.0
 platform: ruby
 authors:
 - Luciano Prestes Cavalcanti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-08 00:00:00.000000000 Z
+date: 2021-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg