rubypitaya 1.8.2 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98578f08422524b11b61a8501ece0db64a473dc3d421292dc4f96736c2b97227
-  data.tar.gz: ad35ec4d5ed83954a9fa0bca5c95d6fee579863b5826a63115c0f98b988bc4ea
+  metadata.gz: e34b4f837db342c17e307255d3f45ead903794ab727e7de806674906019329c6
+  data.tar.gz: 335696b1f6de405da7f7f7bf5426c8a86485c7b46e3675729847f6203224ee95
 SHA512:
-  metadata.gz: 18dc452f364538e9c9fd8c8fdd0b57b74c140fd7501fb6492f3bc954051803bb35e31c5f5f29a232438634eae9868aec710efc45133aeb3d3bd00203ed6d8223
-  data.tar.gz: 7dee2039fc3efa7db3a25b439edace0cbd60cf12d84f13e0170c946f6a3bca5105fe92d16ac22c6b8092b4412faa389d8e1cce7812bfbdf75956b0b0c0ca8eb0
+  metadata.gz: 9a7c707616860f57845ccb552b593c1ef11b884918fc71eda11b1615e8e8aef335c4a91f44003cc4c74ee0d7446c1dc1db734f51878cd51203f1a285d06ede92
+  data.tar.gz: 34bf38eea9e9d1986a8a3aad6f0bf4231149a1ced7f21c48f9ae6b4106f2d496e375adf829087f15c1ac7d4f8691cb24a7395c302dcb2f68b62f68e425c7d286

data/lib/rubypitaya/app-template/Gemfile

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gem 'rubypitaya', '1.8.2'
+gem 'rubypitaya', '2.2.2'
 
 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 (1.8.2)
+    rubypitaya (2.2.2)
       activerecord (= 6.0.2)
       etcdv3 (= 0.10.2)
       eventmachine (= 1.2.7)
@@ -85,7 +85,7 @@ DEPENDENCIES
   pry (= 0.12.2)
   rake (= 10.0)
   rspec (= 3.8.0)
-  rubypitaya (= 1.8.2)
+  rubypitaya (= 2.2.2)
 
 BUNDLED WITH
    1.17.2

data/lib/rubypitaya/app-template/Rakefile

@@ -24,10 +24,12 @@ 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_path = RubyPitaya::Path::MIGRATIONS_FOLDER_PATH
+    migrations_paths = [RubyPitaya::Path::Core::MIGRATIONS_FOLDER_PATH]
+    migrations_paths += RubyPitaya::Path::Plugins::MIGRATIONS_FOLDER_PATHS
+    migrations_paths += [RubyPitaya::Path::MIGRATIONS_FOLDER_PATH]
 
     ActiveRecord::Base.establish_connection(connection_data)
-    ActiveRecord::Migrator.migrations_paths = [migrations_path]
+    ActiveRecord::Migrator.migrations_paths = migrations_paths
     ActiveRecord::Tasks::DatabaseTasks.migrate
     ActiveRecord::Base.connection.close
     puts 'Database migrated.'

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

@@ -4,7 +4,8 @@ class AppInitializer < RubyPitaya::InitializerBase
   # parameter:  initializer_content
   # attributes:
   #  - bll
-  #    - class: InstanceHolder
+  #    - 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
@@ -12,6 +13,12 @@ class AppInitializer < RubyPitaya::InitializerBase
   #        - 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
 
   def run(initializer_content)
     bll = initializer_content.bll

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

@@ -1,4 +1,3 @@
-require 'active_record'
-
-class User < ActiveRecord::Base
-end
+User.class_eval do
+  # has_one :player
+end

data/lib/rubypitaya/app-template/bin/console

@@ -14,14 +14,14 @@ ActiveSupport::LogSubscriber.colorize_logging = true
 
 Gem.find_files('rubypitaya/**/*.rb').each do |path|
   require path unless path.end_with?('spec.rb') ||
-                      path.include?('db/migrate') ||
+                      path.include?('db/migration') ||
                       path.include?('app-template')
 end
 
 app_files_path = File.join(RubyPitaya::Path::APP_FOLDER_PATH, '**/*.rb')
 Dir[app_files_path].each do |path|
   require path unless path.end_with?('spec.rb') ||
-                      path.include?('db/migrate')
+                      path.include?('db/migration')
 end
 
 require 'irb'

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

@@ -34,7 +34,7 @@ services:
       - 'etcd'
       - 'redis'
     ports:
-      - '3252:3250'
+      - '3250:3250'
     environment:
       PITAYA_CLUSTER_RPC_SERVER_NATS_CONNECT: 'nats://nats:4222'
       PITAYA_CLUSTER_RPC_CLIENT_NATS_CONNECT: 'nats://nats:4222'

data/lib/rubypitaya/core/app/models/user.rb

@@ -0,0 +1,4 @@
+require 'active_record'
+
+class User < ActiveRecord::Base
+end

data/lib/rubypitaya/core/application_files_importer.rb

@@ -5,15 +5,23 @@ module RubyPitaya
   class ApplicationFilesImporter
 
     def import
-      app_files_path = "#{Path::APP_FOLDER_PATH}/**/*.rb"
+      @app_folder_paths = [Path::Core::APP_FOLDER_PATH, Path::APP_FOLDER_PATH] + Path::Plugins::APP_FOLDER_PATHS
 
-      Gem.find_files(app_files_path).each { |path| require path }
+      @app_folder_paths.each do |app_folder_path|
+        app_files_path = "#{app_folder_path}/**/*.rb"
+
+        Gem.find_files(app_files_path).each { |path| require path }
+      end
     end
 
     def auto_reload
       require 'listen'
 
-      @app_files_listener = Listen.to(Path::APP_FOLDER_PATH, only: /\.rb$/) do |modified, added, removed|
+      @app_files_listener = Listen.to(*@app_folder_paths,
+                                      only: /\.rb$/,
+                                      force_polling: true,
+                                      latency: 0.25,
+                                      wait_for_delay: 0.1) do |modified, added, removed|
         import_added_files(added)
         reload_modified_files(modified)
       end

data/lib/rubypitaya/core/config.rb

@@ -2,16 +2,17 @@ module RubyPitaya
 
   class Config
 
-    def initialize(configs_folder_path)
-      @configs_folder_path = configs_folder_path
-
-      path_to_all_files = File.join(@configs_folder_path, '**/*.json')
-      config_files = Dir.glob(path_to_all_files)
-
+    def initialize()
       @config = {}
+      @configs_folder_paths = [Path::APP_CONFIG_FOLDER_PATH] + Path::Plugins::APP_CONFIG_FOLDER_PATHS
 
-      config_files.each do |config_file|
-        load_config_file(config_file)
+      @configs_folder_paths.each do |configs_folder_path|
+        path_to_all_files = File.join(configs_folder_path, '**/*.json')
+        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
 
@@ -20,27 +21,30 @@ module RubyPitaya
     end
 
     def [](key)
-      @config[key]
+      split_key = key.split('/')
+      @config.dig(*split_key)
     end
 
     def auto_reload
       require 'listen'
 
-      @config_files_listener = Listen.to(@configs_folder_path, only: /\.json$/) do |modified, added, removed|
-        import_added_files(added)
-        reload_modified_files(modified)
-      end
+      @configs_folder_paths.each do |configs_folder_path|
+        config_files_listener = Listen.to(configs_folder_path, only: /\.json$/) do |modified, added, removed|
+          import_added_files(configs_folder_path, added)
+          reload_modified_files(configs_folder_path, modified)
+        end
 
-      @config_files_listener.start
+        config_files_listener.start
+      end
     end
 
     private
 
-    def load_config_file(file_path)
+    def load_config_file(configs_folder_path, file_path)
       config_text = File.open(file_path, &:read)
       config_hash = JSON.parse(config_text)
 
-      path_array = file_path.sub(/^#{@configs_folder_path}/, '')[0..-6]
+      path_array = file_path.sub(/^#{configs_folder_path}/, '')[0..-6]
                               .split('/')
 
       set_config_value(path_array, config_hash)
@@ -50,17 +54,17 @@ module RubyPitaya
         puts error.backtrace
     end
 
-    def import_added_files(files_path)
+    def import_added_files(configs_folder_path, files_path)
       files_path.each do |path|
-        load_config_file(path)
+        load_config_file(configs_folder_path, path)
 
         puts "ADDED config: #{path}"
       end
     end
 
-    def reload_modified_files(files_path)
+    def reload_modified_files(configs_folder_path, files_path)
       files_path.each do |path|
-        load_config_file(path)
+        load_config_file(configs_folder_path, path)
 
         puts "MODIFIED @config: #{path}"
       end

data/lib/rubypitaya/core/handler_router.rb

@@ -4,9 +4,15 @@ module RubyPitaya
 
   class HandlerRouter
 
-    def initialize(handler_folder_path, routes_path)
+    def initialize()
+      routes_path = Path::ROUTES_FILE_PATH
+      handler_folder_paths = [Path::HANDLERS_FOLDER_PATH] + Path::Plugins::HANDLERS_FOLDER_PATHS
+
       import_routes_file(routes_path)
-      import_handler_files(handler_folder_path)
+
+      handler_folder_paths.each do |handler_folder_path|
+        import_handler_files(handler_folder_path)
+      end
 
       import_routes_class
       import_handler_classes

data/lib/rubypitaya/core/initializer_content.rb

@@ -2,11 +2,12 @@ module RubyPitaya
 
   class InitializerContent
 
-    attr_reader :bll, :redis
+    attr_reader :bll, :redis, :config
 
-    def initialize(bll, redis)
+    def initialize(bll, redis, config)
       @bll = bll
       @redis = redis
+      @config = config
     end
   end
 end

data/lib/rubypitaya/core/main.rb

@@ -62,17 +62,18 @@ module RubyPitaya
 
       @session = Session.new
       @postman = Postman.new(@nats_connector)
-      @config = Config.new(Path::APP_CONFIG_FOLDER_PATH)
+      @config = Config.new()
       @config.auto_reload if @is_development_environment
 
       @bll = InstanceHolder.new
 
-      @initializer_content = InitializerContent.new(@bll, @redis_connector.redis)
+      @initializer_content = InitializerContent.new(@bll,
+                                                    @redis_connector.redis,
+                                                    @config)
       @initializer_broadcast = InitializerBroadcast.new
       @initializer_broadcast.run(@initializer_content)
 
-      @handler_router = HandlerRouter.new(Path::HANDLERS_FOLDER_PATH,
-                                          Path::ROUTES_FILE_PATH)
+      @handler_router = HandlerRouter.new()
 
       run_server
     end

data/lib/rubypitaya/core/path.rb

@@ -8,8 +8,20 @@ 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/')
-    MIGRATIONS_FOLDER_PATH = File.join(Dir.pwd, 'db/migrate/')
+    MIGRATIONS_FOLDER_PATH = File.join(Dir.pwd, 'db/migration/')
 
     ROUTES_FILE_PATH = File.join(Dir.pwd, 'config/routes.rb')
+
+    class Core
+      APP_FOLDER_PATH = File.join(__dir__, 'app/')
+      MIGRATIONS_FOLDER_PATH = File.join(__dir__, 'db/migration/')
+    end
+
+    class Plugins
+      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/'))
+      MIGRATIONS_FOLDER_PATHS = Dir.glob(File.join(Dir.pwd, 'plugins/*/db/migration'))
+    end
   end
 end

data/lib/rubypitaya/version.rb

@@ -1,3 +1,3 @@
 module RubyPitaya
-  VERSION = "1.8.2"
+  VERSION = '2.2.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubypitaya
 version: !ruby/object:Gem::Version
-  version: 1.8.2
+  version: 2.2.2
 platform: ruby
 authors:
 - Luciano Prestes Cavalcanti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-10 00:00:00.000000000 Z
+date: 2020-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -204,8 +204,7 @@ files:
 - "./lib/rubypitaya/app-template/bin/console"
 - "./lib/rubypitaya/app-template/config/database.yml"
 - "./lib/rubypitaya/app-template/config/routes.rb"
-- "./lib/rubypitaya/app-template/db/migrate/001_create_user_migration.rb"
-- "./lib/rubypitaya/app-template/db/migrate/002_create_player_migration.rb"
+- "./lib/rubypitaya/app-template/db/migration/0000000002_create_player_migration.rb"
 - "./lib/rubypitaya/app-template/docker-compose.yml"
 - "./lib/rubypitaya/app-template/docker/dev/Dockerfile"
 - "./lib/rubypitaya/app-template/docker/entrypoint.sh"
@@ -225,10 +224,12 @@ files:
 - "./lib/rubypitaya/app-template/kubernetes/statefulset-nats.yaml"
 - "./lib/rubypitaya/app-template/kubernetes/statefulset-postgres.yaml"
 - "./lib/rubypitaya/app-template/kubernetes/statefulset-redis.yaml"
+- "./lib/rubypitaya/core/app/models/user.rb"
 - "./lib/rubypitaya/core/application_files_importer.rb"
 - "./lib/rubypitaya/core/config.rb"
 - "./lib/rubypitaya/core/database_config.rb"
 - "./lib/rubypitaya/core/database_connector.rb"
+- "./lib/rubypitaya/core/db/migration/0000000001_create_user_migration.rb"
 - "./lib/rubypitaya/core/etcd_connector.rb"
 - "./lib/rubypitaya/core/handler_base.rb"
 - "./lib/rubypitaya/core/handler_router.rb"