rubypitaya 3.11.0 → 3.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bad9c41d62bb4942b96dfff5b40dc4ae4ca1d8eba3ee2707721bdf59739c0182
-  data.tar.gz: da92de658a771d3a37008412964e3f5d976fab512c804de1147bfc6afdc5208d
+  metadata.gz: 6dc13fa821fa9f933f0cb1f5e9b249d7a7f1901ab78f158a0ad1d6bd9d3ad21c
+  data.tar.gz: 92cd7c6bfec0a54a1d1d502bf2cbafa2e4a23b022e01bb569bda01f746f0ac8c
 SHA512:
-  metadata.gz: a635d4835b2d1115615a586c96062437ec81c216c617c92284a863fc7859fce75c0e3b537b34c11f2a2e05460f464698122cc6c7916038ec39cc9c8166725797
-  data.tar.gz: 952703d5f8b7febd62567805ae45ae3bc26e9a06dc8fbcaa1494a205478d277b062b92c7a4f773ca4baecff0a2fced207d41e4f1cbc28e80af5778ea09dd34be
+  metadata.gz: e5c1aa2141075b6bbe4785b02f026765c287098a08b6d108a27a73f91db41511edc5cd1cd3e5e82a0a3aa10b8efe45eea4eed1e8a5cb9e7a010e726da9645960
+  data.tar.gz: 9018428be3b99436e7d22cdd51642ba52c7c5b9ef0c3c5a91c5f442a6c3f8d85e3827d333235ce81dfe4382486ea91afad786332e47cea2b56e193a0b6c06ee4

data/lib/rubypitaya/app-template/Gemfile

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gem 'rubypitaya', '3.11.0'
+gem 'rubypitaya', '3.12.0'
 
 group :development do
   gem 'pry', '0.14.1'

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

@@ -134,7 +134,7 @@ DEPENDENCIES
   listen (= 3.7.1)
   pry (= 0.14.1)
   rspec (= 3.11.0)
-  rubypitaya (= 3.11.0)
+  rubypitaya (= 3.12.0)
   sinatra-contrib (= 2.1.0)
 
 BUNDLED WITH

data/lib/rubypitaya/app-template/Makefile

@@ -52,7 +52,7 @@ setup-test: clear
 ## 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:3.0.3 bundle install
+	@docker run --rm -v "$(PWD)":/usr/src/app -w /usr/src/app ruby:3.1.3 bundle install
 
 ## + Improve metagame
 

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

@@ -2,7 +2,7 @@ require 'active_record'
 
 class CreatePlayerMigration < ActiveRecord::Migration[7.0]
 
-  enable_extension 'pgcrypto'
+  enable_extension 'pgcrypto' unless extension_enabled?('pgcrypto')
 
   def change
     create_table :players, id: :uuid do |t|

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

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

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

@@ -1,7 +1,7 @@
-FROM ruby:3.0.3-slim as builder
+FROM ruby:3.1.3-slim as builder
 
-RUN apt update && \ 
-    apt install -y --no-install-recommends \ 
+RUN apt update && \
+    apt install -y --no-install-recommends \
     curl \
     libpq-dev \
     build-essential \
@@ -28,13 +28,13 @@ RUN rm -rf /usr/local/bundle/cache && \
 
 # 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.3-slim
+FROM ruby:3.1.3-slim
 
 ENV LANG=C.UTF-8
 ENV LC_ALL=C.UTF-8
 
-RUN apt update && \ 
-    apt install -y --no-install-recommends \ 
+RUN apt update && \
+    apt install -y --no-install-recommends \
     netcat \
     libpq5 \
     && rm -rf /var/lib/apt/lists/*

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

@@ -3,25 +3,25 @@ Feature: Hello World
   As a developer I want to see the hello world messages
 
   Scenario: Hello World message
-    Given client call route 'rubypitaya.helloWorldHandler.sayHello'
-    Then  server should response 'code' as 'RP-200'
-    And   server should response 'data.message' as 'Hello!'
+    Given the client calls the route 'rubypitaya.helloWorldHandler.sayHello'
+    Then  the server response 'code' should be 'RP-200'
+    And   the server response 'data.message' should be 'Hello!'
 
   Scenario: Custom message
-    When  client call route 'rubypitaya.helloWorldHandler.showMessage' with params:
+    Given the client calls the route 'rubypitaya.helloWorldHandler.showMessage' with params
       | message      |
       | Hello World! |
-    Then  server should response 'code' as 'RP-200'
-    And   server should response 'data.message' as 'Hello World!'
+    Then  the server response 'code' should be 'RP-200'
+    And   the server response 'data.message' should be 'Hello World!'
 
   Scenario: Custom message with json
-    When client call route 'rubypitaya.helloWorldHandler.showMessage' with json params:
+    Given the client calls the route 'rubypitaya.helloWorldHandler.showMessage' with json
       """
       {
         "message": "Hello World!"
       }
       """
-    Then server should response the following json:
+    Then  the server response should be the following json
       """
       {
         "code": "RP-200",

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

@@ -3,20 +3,20 @@ Feature: Player
   As a game player I want to have a player on database
 
   Scenario: Create new player
-    Given config key 'initial_player.wallet.gold' is '10'
-    And   config key 'initial_player.name' is 'Guest'
-    When  client call route 'rubypitaya.playerHandler.authenticate'
-    Then  server should response 'code' as 'RP-200'
-    And   server should response 'data.name' as 'Guest'
-    And   server should response 'data.gold' as '10'
+    Given the config key 'initial_player.wallet.gold' is '10'
+    And   the config key 'initial_player.name' is 'Guest'
+    When  the client calls the route 'rubypitaya.playerHandler.authenticate'
+    Then  the server response 'code' should be 'RP-200'
+    And   the server response 'data.name' should be 'Guest'
+    And   the server response 'data.gold' should be '10'
 
   Scenario: Get player info
-    Given the following player:
+    Given the following Player
       | name    | gold | user_id                              |
       | Someone | 15   | 00000000-0000-0000-0000-000000000001 |
-    And   the player 'Someone' is authenticated
-    When  client call route 'rubypitaya.playerHandler.getInfo'
-    Then  server should response the following json:
+    And   the Player 'Someone' is authenticated
+    When  the client calls the route 'rubypitaya.playerHandler.getInfo'
+    Then  the server response should be the following json
       """
       {
         "code": "RP-200",
@@ -27,3 +27,20 @@ Feature: Player
         }
       }
       """
+    And   the server response 'data' should be the following json
+      """
+      {
+        "name": "Someone",
+        "gold": 15,
+        "userId": "00000000-0000-0000-0000-000000000001"
+      }
+      """
+    And   the server response should contains the following json
+      """
+      {
+        "data": {
+          "gold": 15,
+          "userId": "00000000-0000-0000-0000-000000000001"
+        }
+      }
+      """

data/lib/rubypitaya/app-template/features/step_definitions/{application_steps.rb → player_steps.rb}

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

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

@@ -1,63 +1,73 @@
-Given(/^[Cc]lient call route ["'](.+)["']$/) do |route|
-  @app_helper.request(route)
+Given(/^the following User[s]?$/) do |table|
+  table.hashes.each do |table_hash|
+    User.create(id: table_hash[:user_id])
+  end
 end
 
-Given(/^[Cc]lient call route ["'](.+)["'] with param[s]*[:]*$/) do |route, table|
-  params = table.hashes.first.symbolize_keys
-  @app_helper.request(route, params)
+Given(/^the User ["'](.+)["'] is authenticated$/) do |user_id|
+  @app_helper.authenticate(user_id)
 end
 
-Given(/^[Cc]lient call route ["'](.+)["'] with json param[s]*[:]*$/) do |route, json|
-  params = JSON.parse(json, symbolize_names: true)
-  @app_helper.request(route, params)
+Given(/^the setup key ["'](.+)["'] is ["'](.+)["']$/) do |key, value|
+  @app_helper.add_setup(key, value)
 end
 
-Given(/^[Ss]erver should response ["'](.+)["'] as ["'](.+)["']$/) do |response_key, expected_value|
-  response_value = @app_helper.response.dig(*response_key.split('.').map(&:to_sym))
-
-  expect(response_value.to_s).to eq(expected_value)
+Given(/^the config key ["'](.+)["'] is ["'](.+)["']$/) do |key, value|
+  @app_helper.add_config(key, value)
 end
 
-Given(/^[Ss]erver should response the following json[:]*$/) do |expected_json|
-  expected_json = JSON.generate(JSON.parse(expected_json.strip))
-  response_json = JSON.generate(@app_helper.response)
+Given(/^the config is the following json*$/) do |config_json|
+  config = JSON.parse(config_json)
+  @app_helper.set_config(config)
+end
 
-  puts JSON.pretty_generate(@app_helper.response) if expected_json != response_json
+Given(/^(?:now\s)?today is ["'](.+)["']$/) do |date_text|
+  time_now = date_text.to_time
 
-  expect(response_json).to eq(expected_json)
+  Time.stub(:now).and_return(time_now)
 end
 
-Given(/^[Ss]etup key ["'](.+)["'] is ["'](.+)["']$/) do |key, value|
-  @app_helper.add_setup(key, value)
+When(/^the client calls the route ["'](.+)["']$/) do |route|
+  @app_helper.request(route)
 end
 
-Given(/^[Cc]onfig key ["'](.+)["'] is ["'](.+)["']$/) do |key, value|
-  @app_helper.add_config(key, value)
+When(/^the client calls the route ["'](.+)["'] with params$/) do |route, table|
+  params = table.hashes.first.symbolize_keys
+  @app_helper.request(route, params)
 end
 
-Given(/^[Cc]onfig is the following json[:]*$/) do |config_json|
-  config = JSON.parse(config_json)
-  @app_helper.set_config(config)
+When(/^the client calls the route ["'](.+)["'] with json$/) do |route, json|
+  params = JSON.parse(json, symbolize_names: true)
+  @app_helper.request(route, params)
 end
 
-Given(/^[Pp]rint server response$/) do 
-  puts "response: #{@app_helper.response}"
+Then(/^the server response ["'](.+)["'] should be ["'](.+)["']$/) do |response_key, expected_value|
+  response_value = @app_helper.response.dig(*response_key.split('.').map(&:to_sym))
+
+  expect(response_value.to_s).to eq(expected_value)
 end
 
-Given(/^(?:[Nn]ow\s)?[Tt]oday is ["'](.+)["']$/) do |date_text|
-  time_now = date_text.to_time
+Then(/^the server response(?: ["'](.+)["'])? should be the following json$/) do |response_key, expected_json_text|
+  response_json = @app_helper.response
+  response_json = @app_helper.response.dig(*response_key.split('.').map(&:to_sym)) unless response_key.blank?
 
-  Time.stub(:now).and_return(time_now)
+  expected_json = JSON.parse(expected_json_text.strip, symbolize_names: true)
+
+  expect(response_json).to eq(expected_json)
 end
 
-Given(/^[Tt]he [Uu]ser ["'](.+)["'] is authenticated$/) do |user_id|
-  @app_helper.authenticate(user_id)
+Then(/^the server response(?: ["'](.+)["'])? should contains the following json[:]?$/) do |response_key, expected_json_text|
+  response_json = @app_helper.response
+  response_json = @app_helper.response.dig(*response_key.split('.').map(&:to_sym)) unless response_key.blank?
+
+  expected_json = JSON.parse(expected_json_text.strip, symbolize_names: true)
+  expected_json = response_json.deep_merge(expected_json)
+
+  expect(response_json).to eq(expected_json)
 end
 
-Given(/^[Tt]he following [Uu]ser[s]*[:]*$/) do |table|
-  table.hashes.each do |table_hash|
-    User.create(id: table_hash[:user_id])
-  end
+Given(/^print server response$/) do
+  puts JSON.pretty_generate(@app_helper.response)
 end
 
 Before do

data/lib/rubypitaya/core/app/migrations/0000000001_create_user_migration.rb

@@ -2,7 +2,7 @@ require 'active_record'
 
 class CreateUserMigration < ActiveRecord::Migration[6.1]
 
-  enable_extension 'pgcrypto'
+  enable_extension 'pgcrypto' unless extension_enabled?('pgcrypto')
 
   def change
     create_table :users, id: :uuid do |t|

data/lib/rubypitaya/core/app/services/redis_service.rb

@@ -13,9 +13,7 @@ module RubyPitaya
     def connect
       @redis = Redis.new(
         url: @redis_address,
-        :reconnect_attempts => 10,
-        :reconnect_delay => 1.5,
-        :reconnect_delay_max => 2.0,
+        :reconnect_attempts => [1.5]*10,
       )
 
       @redis.ping

data/lib/rubypitaya/core/http_routes.rb

@@ -27,7 +27,6 @@ module RubyPitaya
       @setup = settings.setup
       @services = settings.services
       @config = settings.config
-      @objects = settings.objects
       @session = nil
       @postman = nil
 

data/lib/rubypitaya/core/main.rb

@@ -72,8 +72,6 @@ module RubyPitaya
 
       @services = ServiceHolder.new
 
-      @objects = InstanceHolder.new
-
       @initializer_content = InitializerContent.new(@log,
                                                     @services,
                                                     @setup,
@@ -104,7 +102,6 @@ module RubyPitaya
       HttpRoutes.set :services, @services
       HttpRoutes.set :setup, @setup
       HttpRoutes.set :config, @config
-      HttpRoutes.set :objects, @objects
       HttpRoutes.set :views, [Path::HTTP_VIEWS_FOLDER_PATH] + Path::Plugins::HTTP_VIEWS_FOLDER_PATHS
 
       HttpRoutes.auto_reload if @is_development_environment

data/lib/rubypitaya/version.rb

@@ -1,3 +1,3 @@
 module RubyPitaya
-  VERSION = '3.11.0'
+  VERSION = '3.12.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubypitaya
 version: !ruby/object:Gem::Version
-  version: 3.11.0
+  version: 3.12.0
 platform: ruby
 authors:
 - Luciano Prestes Cavalcanti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-05 00:00:00.000000000 Z
+date: 2023-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 1.4.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 1.4.5
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.6.0
+        version: 5.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.6.0
+        version: 5.0.5
 - !ruby/object:Gem::Dependency
   name: etcdv3
   requirement: !ruby/object:Gem::Requirement
@@ -72,28 +72,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.3
+        version: 0.5.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.3
+        version: 0.5.5
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 3.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 3.0.5
 - !ruby/object:Gem::Dependency
   name: webrick
   requirement: !ruby/object:Gem::Requirement
@@ -114,126 +114,126 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.2.1
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.2
+        version: 7.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.2
+        version: 7.0.4
 - !ruby/object:Gem::Dependency
   name: google-protobuf
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.19.4
+        version: 3.21.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.19.4
+        version: 3.21.12
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.1
+        version: 0.14.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.1
+        version: 0.14.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.11.0
+        version: 3.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.11.0
+        version: 3.12.0
 - !ruby/object:Gem::Dependency
   name: listen
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.7.1
+        version: 3.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.7.1
+        version: 3.8.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.32
+        version: 2.3.26
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.32
+        version: 2.3.26
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.0
+        version: 8.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.0
+        version: 8.0.0
 - !ruby/object:Gem::Dependency
   name: sinatra-contrib
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 3.0.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 3.0.5
 description: RubyPitaya is an application to create servers using the pitaya protocol.
 email:
 - lucianopcbr@gmail.com
@@ -272,7 +272,7 @@ files:
 - "./lib/rubypitaya/app-template/docker/wait_for.sh"
 - "./lib/rubypitaya/app-template/features/hello_world.feature"
 - "./lib/rubypitaya/app-template/features/player.feature"
-- "./lib/rubypitaya/app-template/features/step_definitions/application_steps.rb"
+- "./lib/rubypitaya/app-template/features/step_definitions/player_steps.rb"
 - "./lib/rubypitaya/app-template/features/step_definitions/rubypitaya_steps.rb"
 - "./lib/rubypitaya/app-template/features/support/env.rb"
 - "./lib/rubypitaya/app-template/helm/Chart.yaml"
@@ -384,7 +384,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: Create servers with pitaya