rubypitaya 2.4.3 → 2.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c37e06c8f040555eff17f296bfe155fe91308c3a60a73355fdd9e25d9c62b35
-  data.tar.gz: ac258070d0ae3de61f289a21d99b7cdf2947e54580a929230c512d3b3e807d0f
+  metadata.gz: 51114edc315a800b8ff579ae81cba7744513593b44833f0b3bfc0ee364e11508
+  data.tar.gz: 6de822e29dba8f1ecf0513cc7d36459be92d33602ee011bc5e78cf189e916cc9
 SHA512:
-  metadata.gz: 4a140e5251bded607ec142250651d0a083a77b980af60707e8706fba4d1dab34f0b648f5d9a98f00358889fb9421490d608d2df43bc685b2142d4d0fc7df8a49
-  data.tar.gz: 737f8486eb4d345b123eb19dee79ab59eecc652e893bccbfff34fa65de9fce89d81e84736bcf455deb6b19f0cb7c4d0674ae594678906a14c93e00ad8e9f7714
+  metadata.gz: 05ce7aefbbb01c7e4bf0b537625b4dfa65d0128b5e5819b24df4325cd171f4d71e0392fc9363fe16850fcef72ad355505cd60f0f8e18c73d7a8f8ecfa71aaff3
+  data.tar.gz: 8e587032ea14a49ca68d5188cd1f9a2d49e773e79fe4fd91f1add50fd9e463f1960b707cccfd4069c1f4c149966267e39f9d72d12afd1d550104091b45b059d8

data/lib/rubypitaya/app-template/Gemfile

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

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

@@ -62,7 +62,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
     rspec-support (3.8.3)
-    rubypitaya (2.4.3)
+    rubypitaya (2.6.1)
       activerecord (= 6.0.2)
       etcdv3 (= 0.10.2)
       eventmachine (= 1.2.7)
@@ -85,7 +85,7 @@ DEPENDENCIES
   listen (= 3.2.1)
   pry (= 0.12.2)
   rspec (= 3.8.0)
-  rubypitaya (= 2.4.3)
+  rubypitaya (= 2.6.1)
 
 BUNDLED WITH
    1.17.2

data/lib/rubypitaya/app-template/Makefile

@@ -16,7 +16,7 @@ test:
 
 ## Run ruby irb console
 console:
-	@docker-compose run --service-ports --rm rubypitaya bundle exec ruby ./bin/console
+	@docker-compose run --service-ports --rm rubypitaya-console bundle exec ruby ./bin/console
 
 ## Run bash on container
 bash:

data/lib/rubypitaya/app-template/Rakefile

@@ -40,6 +40,9 @@ namespace :db do
     environment_name = ENV.fetch("RUBYPITAYA_ENV") { 'development' }
     database_config = RubyPitaya::DatabaseConfig.new(environment_name, RubyPitaya::Path::DATABASE_CONFIG_PATH)
     connection_data = database_config.connection_data
+    migrations_paths = [RubyPitaya::Path::Core::MIGRATIONS_FOLDER_PATH]
+    migrations_paths += RubyPitaya::Path::Plugins::MIGRATIONS_FOLDER_PATHS
+    migrations_paths += [RubyPitaya::Path::MIGRATIONS_FOLDER_PATH]
 
     step = ENV["STEP"] ? ENV["STEP"].to_i : 1
 
@@ -51,6 +54,7 @@ namespace :db do
     end
 
     ActiveRecord::Base.establish_connection(connection_data)
+    ActiveRecord::Migrator.migrations_paths = migrations_paths
     ActiveRecord::Base.connection.migration_context.rollback(step)
     ActiveRecord::Base.connection.close
 

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

@@ -19,6 +19,12 @@ class AppInitializer < RubyPitaya::InitializerBase
   #    - 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
 
   def run(initializer_content)
     bll = initializer_content.bll

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

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

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

@@ -12,8 +12,8 @@ class StatusCodes
   #
   ## Error codes
   # RubyPitaya::StatusCodes::CODE_UNKNOWN              = 'RP-000'
-  # RubyPitaya::StatusCodes::CODE_HANDLER_NOT_FOUNDED  = 'RP-001'
-  # RubyPitaya::StatusCodes::CODE_ACTION_NOT_FOUNDED   = 'RP-002'
+  # 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'
   #

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

@@ -47,7 +47,7 @@ class PlayerHandler < RubyPitaya::HandlerBase
     user_id = @params[:userId]
 
     player = Player.find_by_user_id(user_id)
-    player = @bll[:player].create_new_player(@config) if player.nil?
+    player = @bll[:player].create_new_player(@setup, @config) if player.nil?
 
     @session.uid = player.user_id
 
@@ -55,14 +55,14 @@ class PlayerHandler < RubyPitaya::HandlerBase
 
     unless bind_session_response.dig(:error, :code).nil?
       return response = {
-        code: StatusCodes::CODE_AUTHENTICATION_ERROR,
+        code: RubyPitaya::StatusCodes::CODE_AUTHENTICATION_ERROR,
         msg: 'Error to authenticate',
       }
     end
 
     response = {
        code: StatusCodes::CODE_OK,
-       player: player.to_hash,
+       data: player.to_hash,
     }
   end
 
@@ -73,7 +73,7 @@ class PlayerHandler < RubyPitaya::HandlerBase
 
     response = {
        code: StatusCodes::CODE_OK,
-       player: player.to_hash,
+       data: player.to_hash,
     }
   end
 end

data/lib/rubypitaya/app-template/app/http/hello_world_http.rb

@@ -0,0 +1,27 @@
+require 'rubypitaya/core/http_routes'
+
+RubyPitaya::HttpRoutes.class_eval do
+
+    get '/hello-world/html' do
+      content_type 'text/html'
+
+      @message = "Hello World"
+
+      erb :hello_world
+    end
+
+    get '/hello-world/json' do
+      response = {
+        message: 'Hello World!'
+      }.to_json
+    end
+
+  private
+
+  def response_error(message)
+    response = {
+      code: StatusCodes::CODE_ERROR,
+      message: message,
+    }.to_json
+  end
+end

data/lib/rubypitaya/app-template/app/http/views/hello_world.erb

@@ -0,0 +1 @@
+<h3><%= @message %></h3>

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

@@ -4,11 +4,12 @@ class Player < ActiveRecord::Base
 
   belongs_to :user
 
-  validates_presence_of :name, :user
+  validates_presence_of :name, :gold, :user
 
   def to_hash
     {
       name: name,
+      gold: gold,
       userId: user_id,
     }
   end

data/lib/rubypitaya/app-template/app/setup/initial_player.yml

@@ -0,0 +1,2 @@
+wallet: 
+  gold: 10

data/lib/rubypitaya/app-template/config/database.yml

@@ -8,7 +8,7 @@ default: &default
 
 development:
   <<: *default
-  database: <%= "#{ENV['DATABASE_NAME']}_development" %>
+  database: <%= "#{ENV['DATABASE_NAME']}" %>
 
 test:
   <<: *default
@@ -16,7 +16,5 @@ test:
 
 production:
   <<: *default
-  database: <%= "#{ENV['DATABASE_NAME']}_production" %>
-  # username: rails_project
-  # password: <%= ENV['RAILS_PROJECT_DATABASE_PASSWORD'] %>
+  database: <%= "#{ENV['DATABASE_NAME']}" %>
 

data/lib/rubypitaya/app-template/db/migration/0000000002_create_player_migration.rb

@@ -8,6 +8,7 @@ class CreatePlayerMigration < ActiveRecord::Migration[5.1]
     create_table :players, id: :uuid do |t|
       t.belongs_to :user, type: :uuid
       t.string :name, null: false
+      t.integer :gold, null: false
       t.timestamps null: false
     end
   end

data/lib/rubypitaya/app-template/docker-compose.yml

@@ -43,7 +43,7 @@ services:
       PITAYA_CLUSTER_SD_ETCD_PREFIX: 'rubypitaya/'
       SERVER_ROUTES: 'rubypitaya'
 
-  rubypitaya:
+  rubypitaya: &rubypitaya
     depends_on:
       - 'db'
       - 'nats'
@@ -56,6 +56,8 @@ services:
     working_dir: '/app/rubypitaya'
     volumes:
       - '.:/app/rubypitaya'
+    ports:
+      - '80:4567'
     environment:
       SERVER_NAME: 'rubypitaya'
       RUBYPITAYA_ENV: 'development'
@@ -70,5 +72,9 @@ services:
       DATABASE_PASSWORD: 'postgres'
       DATABASE_NAME: 'ruby_pitaya'
 
+  rubypitaya-console:
+    <<: *rubypitaya
+    ports: []
+
 volumes:
   postgres:

data/lib/rubypitaya/core/handler_base.rb

@@ -4,11 +4,12 @@ module RubyPitaya
 
     class_attribute :non_authenticated_routes, default: []
 
-    attr_accessor :bll, :redis, :config, :params, :session, :postman
+    attr_accessor :bll, :redis, :setup, :config, :params, :session, :postman
 
     def initialize
       @bll = nil
       @redis = nil
+      @setup = nil
       @config = nil
       @params = nil
       @session = nil

data/lib/rubypitaya/core/handler_router.rb

@@ -52,18 +52,18 @@ module RubyPitaya
       @handler_name_map = @handler_name_map.to_h
     end
 
-    def call(handler_name, action_name, session, postman, redis, config, bll,
-            params)
+    def call(handler_name, action_name, session, postman, redis, setup, config,
+             bll, params)
       unless @handler_name_map.include?(handler_name)
         return {
-          code: StatusCodes::CODE_HANDLER_NOT_FOUNDED,
+          code: StatusCodes::CODE_HANDLER_NOT_FOUND,
           msg: "Handler #{handler_name} not founded"
         }
       end
 
       unless @handler_name_map[handler_name].methods.include?(action_name.to_sym)
         return {
-          code: StatusCodes::CODE_ACTION_NOT_FOUNDED,
+          code: StatusCodes::CODE_ACTION_NOT_FOUND,
           msg: "Handler #{handler_name} action #{action_name} not founded"
         }
       end
@@ -72,6 +72,7 @@ module RubyPitaya
 
       handler.bll = bll
       handler.redis = redis
+      handler.setup = setup
       handler.config = config
       handler.params = params
       handler.session = session

data/lib/rubypitaya/core/http_routes.rb

@@ -0,0 +1,26 @@
+require 'sinatra/base'
+require 'sinatra/reloader' if ENV['RUBYPITAYA_ENV'] == 'development'
+require 'rubypitaya/core/parameters'
+
+module RubyPitaya
+
+  class HttpRoutes < Sinatra::Base
+
+    if ENV['RUBYPITAYA_ENV'] == 'development'
+      register Sinatra::Reloader
+    end
+
+    before do
+      content_type :json
+
+      @bll = settings.bll
+      @setup = settings.setup
+      @config = settings.config
+
+      request_body = request.body.read
+      @params.merge!(JSON.parse(request_body)) if !request_body.blank?
+
+      @params = Parameters.new(@params)
+    end
+  end
+end

data/lib/rubypitaya/core/initializer_content.rb

@@ -4,9 +4,10 @@ module RubyPitaya
 
     attr_reader :bll, :redis, :config
 
-    def initialize(bll, redis, config)
+    def initialize(bll, redis, setup, config)
       @bll = bll
       @redis = redis
+      @setup = setup
       @config = config
     end
   end

data/lib/rubypitaya/core/main.rb

@@ -3,6 +3,7 @@ require 'securerandom'
 require 'active_model'
 
 require 'rubypitaya/core/path'
+require 'rubypitaya/core/setup'
 require 'rubypitaya/core/config'
 require 'rubypitaya/core/session'
 require 'rubypitaya/core/postman'
@@ -64,22 +65,39 @@ module RubyPitaya
       @postman = Postman.new(@nats_connector)
       @config = Config.new
       @config.auto_reload if @is_development_environment
+      @setup = Setup.new
+      @setup.auto_reload if @is_development_environment
 
       @bll = InstanceHolder.new
 
       @initializer_content = InitializerContent.new(@bll,
                                                     @redis_connector.redis,
+                                                    @setup,
                                                     @config)
       @initializer_broadcast = InitializerBroadcast.new
       @initializer_broadcast.run(@initializer_content)
 
       @handler_router = HandlerRouter.new()
 
+      run_http
       run_server
     end
 
     private
 
+    def run_http
+      HttpRoutes.set :bll, @bll
+      HttpRoutes.set :setup, @setup
+      HttpRoutes.set :config, @config
+      HttpRoutes.set :views, [Path::HTTP_VIEWS_PATH] + Path::Plugins::APP_CONFIG_FOLDER_PATHS;
+
+      Thread.new do
+        HttpRoutes.bind = '0.0.0.0'
+        HttpRoutes.port = '4567'
+        HttpRoutes.run!
+      end
+    end
+
     def run_server
       @is_shutting_down = false
 
@@ -139,7 +157,7 @@ module RubyPitaya
 
         response = @handler_router.call(handler_name, action_name, @session,
                                         @postman, @redis_connector.redis,
-                                        @config, @bll, params)
+                                        @setup, @config, @bll, params)
 
         delta_time_seconds = Time.now.to_i - start_time_seconds
 

data/lib/rubypitaya/core/path.rb

@@ -8,10 +8,13 @@ module RubyPitaya
     APP_FOLDER_PATH = File.join(Dir.pwd, 'app/')
     HANDLERS_FOLDER_PATH = File.join(Dir.pwd, 'app/handlers/')
     APP_CONFIG_FOLDER_PATH = File.join(Dir.pwd, 'app/config/')
+    APP_SETUP_FOLDER_PATH = File.join(Dir.pwd, 'app/setup/')
     MIGRATIONS_FOLDER_PATH = File.join(Dir.pwd, 'db/migration/')
 
     ROUTES_FILE_PATH = File.join(Dir.pwd, 'config/routes.rb')
 
+    HTTP_VIEWS_PATH = File.join(Dir.pwd, 'app/http/views')
+
     class Core
       APP_FOLDER_PATH = File.join(__dir__, 'app/')
       MIGRATIONS_FOLDER_PATH = File.join(__dir__, 'db/migration/')
@@ -21,7 +24,9 @@ module RubyPitaya
       APP_FOLDER_PATHS = Dir.glob(File.join(Dir.pwd, 'plugins/*/app/'))
       HANDLERS_FOLDER_PATHS = Dir.glob(File.join(Dir.pwd, 'plugins/*/app/handlers'))
       APP_CONFIG_FOLDER_PATHS = Dir.glob(File.join(Dir.pwd, 'plugins/*/app/config/'))
+      APP_SETUP_FOLDER_PATHS = Dir.glob(File.join(Dir.pwd, 'plugins/*/app/setup/'))
       MIGRATIONS_FOLDER_PATHS = Dir.glob(File.join(Dir.pwd, 'plugins/*/db/migration'))
+      HTTP_VIEWS_PATHS = Dir.glob(File.join(Dir.pwd, 'plugins/*/app/http/views'))
     end
   end
 end

data/lib/rubypitaya/core/setup.rb

@@ -0,0 +1,96 @@
+module RubyPitaya
+
+  class Setup
+
+    def initialize()
+      @config = {}
+      configs_folder_paths = Path::Plugins::APP_SETUP_FOLDER_PATHS + [Path::APP_SETUP_FOLDER_PATH]
+
+      configs_folder_paths.each do |configs_folder_path|
+        path_to_all_files = File.join(configs_folder_path, '**/*.yml')
+        config_files = Dir.glob(path_to_all_files)
+
+        config_files.each do |config_file|
+          load_config_file(configs_folder_path, config_file)
+        end
+      end
+    end
+
+    def [](key)
+      result = get_config_from_env_var(key)
+      return result unless result.nil?
+
+      split_key = key.split('.')
+      @config.dig(*split_key)
+    end
+
+    def get_config_from_env_var(key)
+      env_key = key.gsub('.', '_').upcase
+      ENV.fetch(env_key) { nil }
+    end
+
+    def auto_reload
+      require 'listen'
+
+      configs_folder_path = Path::APP_CONFIG_FOLDER_PATH
+
+      config_files_listener = Listen.to(configs_folder_path,
+                                        only: /\.yml$/,
+                                        force_polling: true,
+                                        latency: 0.25,
+                                        wait_for_delay: 0.1) do |modified, added, removed|
+        import_added_files(configs_folder_path, added)
+        reload_modified_files(configs_folder_path, modified)
+      end
+
+      config_files_listener.start
+    end
+
+    private
+
+    def load_config_file(configs_folder_path, file_path)
+      config_text = File.open(file_path, &:read)
+      config_hash = YAML.load(ERB.new(config_text).result)
+
+      path_array = file_path.sub(/^#{configs_folder_path}/, '')[0..-5]
+                              .split('/')
+
+      set_config_value(path_array, config_hash)
+
+      rescue Exception => error
+        puts "ERROR: #{error}"
+        puts error.backtrace
+    end
+
+    def import_added_files(configs_folder_path, files_path)
+      files_path.each do |path|
+        load_config_file(configs_folder_path, path)
+
+        puts "ADDED config: #{path}"
+      end
+    end
+
+    def reload_modified_files(configs_folder_path, files_path)
+      files_path.each do |path|
+        load_config_file(configs_folder_path, path)
+
+        puts "MODIFIED @config: #{path}"
+      end
+    end
+
+    def set_config_value(keys, value)
+      config = @config
+
+      keys.each_with_index do |key, index|
+        is_last_index = index == keys.size - 1
+
+        if is_last_index
+          config[key] = value
+        else
+          config[key] = {} unless config.key?(key)
+          config = config[key]
+        end
+      end
+    end
+  end
+end

data/lib/rubypitaya/core/status_codes.rb

@@ -6,8 +6,8 @@ module RubyPitaya
 
     # Error codes
     CODE_UNKNOWN = 'RP-000'
-    CODE_HANDLER_NOT_FOUNDED = 'RP-001'
-    CODE_ACTION_NOT_FOUNDED = 'RP-002'
+    CODE_HANDLER_NOT_FOUND = 'RP-001'
+    CODE_ACTION_NOT_FOUND = 'RP-002'
     CODE_NOT_AUTHENTICATED = 'RP-003'
     CODE_AUTHENTICATION_ERROR = 'RP-004'
 

data/lib/rubypitaya/version.rb

@@ -1,3 +1,3 @@
 module RubyPitaya
-  VERSION = '2.4.3'
+  VERSION = '2.6.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubypitaya
 version: !ruby/object:Gem::Version
-  version: 2.4.3
+  version: 2.6.1
 platform: ruby
 authors:
 - Luciano Prestes Cavalcanti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-11 00:00:00.000000000 Z
+date: 2020-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -80,6 +80,34 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.10.2
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+- !ruby/object:Gem::Dependency
+  name: sinatra-contrib
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: protobuf
   requirement: !ruby/object:Gem::Requirement
@@ -199,8 +227,11 @@ files:
 - "./lib/rubypitaya/app-template/app/constants/status_codes.rb"
 - "./lib/rubypitaya/app-template/app/handlers/hello_world_handler.rb"
 - "./lib/rubypitaya/app-template/app/handlers/player_handler.rb"
+- "./lib/rubypitaya/app-template/app/http/hello_world_http.rb"
+- "./lib/rubypitaya/app-template/app/http/views/hello_world.erb"
 - "./lib/rubypitaya/app-template/app/models/player.rb"
 - "./lib/rubypitaya/app-template/app/models/user.rb"
+- "./lib/rubypitaya/app-template/app/setup/initial_player.yml"
 - "./lib/rubypitaya/app-template/bin/console"
 - "./lib/rubypitaya/app-template/config/database.yml"
 - "./lib/rubypitaya/app-template/config/routes.rb"
@@ -234,6 +265,7 @@ files:
 - "./lib/rubypitaya/core/etcd_connector.rb"
 - "./lib/rubypitaya/core/handler_base.rb"
 - "./lib/rubypitaya/core/handler_router.rb"
+- "./lib/rubypitaya/core/http_routes.rb"
 - "./lib/rubypitaya/core/initializer_base.rb"
 - "./lib/rubypitaya/core/initializer_broadcast.rb"
 - "./lib/rubypitaya/core/initializer_content.rb"
@@ -246,6 +278,7 @@ files:
 - "./lib/rubypitaya/core/redis_connector.rb"
 - "./lib/rubypitaya/core/routes_base.rb"
 - "./lib/rubypitaya/core/session.rb"
+- "./lib/rubypitaya/core/setup.rb"
 - "./lib/rubypitaya/core/status_codes.rb"
 - "./lib/rubypitaya/version.rb"
 - bin/rubypitaya