rubypitaya 1.8.1 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6af52a60b6ae4d3e721706cba8b7a888182d648f0e4eef7c91be38fc41e9c08
-  data.tar.gz: 7e224b942b81b4e5d3a759c08e468c643eca5b5a895cd08d233dc77741c9cbd7
+  metadata.gz: f281a68ed8014d040980a1e38c395a06e01a2f6e0baa299ae31e721b96e38110
+  data.tar.gz: 5f4d111862aeb5ca039600fc7e89c371e7bc974fcbe36ce925d67185b4f6a341
 SHA512:
-  metadata.gz: e897b6cac313dc5ba1bfbd81367b3d952cdca06245b1bf045c908ad23276aef4b6c570366e63014d0098ea1548d57d4e4ee7052209742f92c2511aa9b743fc84
-  data.tar.gz: 0ec9970b1fdaa694bf8523cb19462426fcf68594aa491415ee00ac6dca8ef5853159ba3d3a4f89409d579a345ae269f64d3de100198c6e2937dc2d99ff4c7a97
+  metadata.gz: 9fbedb2b7e8671ebeb45abb4f59cb4555541293bb345d72a224b8f7e0b8dbb80f01ccc99d73be01859ea12c6be0a172ca998275f500fe33d81c1d351b481481e
+  data.tar.gz: 9abcf3ed56d184a29b673e03606a08b29c05344a07636797492aca84882bb66b690ba1e727f47eb21b703a1e2b1438c2d8f7f4867f456e29eea03167faeba86a

data/lib/rubypitaya/app-template/Gemfile

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gem 'rubypitaya', '1.8.1'
+gem 'rubypitaya', '2.2.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 (1.8.1)
+    rubypitaya (2.2.1)
       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.0)
+  rubypitaya (= 2.2.1)
 
 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,20 +5,26 @@ 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|
-        import_added_files(added)
-        reload_modified_files(modified)
-      end
+      @app_folder_paths.each do |app_folder_path|
+        @app_files_listener = Listen.to(app_folder_path, only: /\.rb$/) do |modified, added, removed|
+          import_added_files(added)
+          reload_modified_files(modified)
+        end
 
-      @app_files_listener.start
+        @app_files_listener.start
+      end
     end
 
     private

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
@@ -75,7 +79,7 @@ module RubyPitaya
         if is_last_index
           config[key] = value
         else
-          config[key] = {}
+          config[key] = {} unless config.key?(key)
           config = config[key]
         end
       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.1"
+  VERSION = '2.2.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubypitaya
 version: !ruby/object:Gem::Version
-  version: 1.8.1
+  version: 2.2.1
 platform: ruby
 authors:
 - Luciano Prestes Cavalcanti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-08 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"