rubypitaya 2.0.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 22d3c8209b6441874334ea9dca6d209ff79ff63e5a5cbb4273125ac94bad12e7
-  data.tar.gz: 2d50b5319e1c113a92b5e67f76835a9be9706f4c60fc91185bdfa984cc576e25
+  metadata.gz: 56eed6ff93a6e6e8bc76351c3c4d06584fcc247888ef05783040cc96dc2966e6
+  data.tar.gz: 408c3f0226b7c42604fe416362e4bac3d333f72e313f59a2da646c527eec568c
 SHA512:
-  metadata.gz: 95b1cc17e073849eea4aa13fb9f00f99f016768be5aaaeb00e93571829d036fbc4abc3407b165001858cfae0e23473f3f91ffdb52f8d14f3339599e82209f998
-  data.tar.gz: 1918c5bbda757ef6566acf6f32c269d6aaa08dae329316651d9ac417f7774fe1d0c1ac2f685d498f1b15e891d4b2f72f4fe15e4a6d8ef6b1975c0d1a323903b3
+  metadata.gz: f6c3ad1a9c338076f5dcee3000016b41f157f843b921015aa30eb6fcad6da0e6a49265ee39f9dc382dd8840e9e74ba71934a6aea70e8f00490aaef7e15c8a0fe
+  data.tar.gz: 71060870925f98450a9e17326ece14500bd0ff095399b50e33df9dec360fb105321e9fa33bb2b64f17d989d8588584ed983d0d660349cf1ad473cd5221df0b42

data/lib/rubypitaya/app-template/Gemfile

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gem 'rubypitaya', '2.0.0'
+gem 'rubypitaya', '2.3.0'
 
 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.0.0)
+    rubypitaya (2.3.0)
       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 (= 2.0.0)
+  rubypitaya (= 2.2.2)
 
 BUNDLED WITH
    1.17.2

data/lib/rubypitaya/app-template/Rakefile

@@ -24,8 +24,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::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_paths

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/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,7 +5,7 @@ module RubyPitaya
   class ApplicationFilesImporter
 
     def import
-      @app_folder_paths = [Path::APP_FOLDER_PATH] + Path::Plugins::APP_FOLDER_PATHS
+      @app_folder_paths = [Path::Core::APP_FOLDER_PATH, Path::APP_FOLDER_PATH] + Path::Plugins::APP_FOLDER_PATHS
 
       @app_folder_paths.each do |app_folder_path|
         app_files_path = "#{app_folder_path}/**/*.rb"
@@ -17,14 +17,16 @@ module RubyPitaya
     def auto_reload
       require 'listen'
 
-      @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 = 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
+
+      @app_files_listener.start
     end
 
     private

data/lib/rubypitaya/core/config.rb

@@ -1,87 +1,22 @@
+require 'rubypitaya/core/config_core'
+
 module RubyPitaya
 
   class Config
 
-    def initialize()
-      @config = {}
-      @configs_folder_paths = [Path::APP_CONFIG_FOLDER_PATH] + Path::Plugins::APP_CONFIG_FOLDER_PATHS
-
-      @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
-
-    def get
-      @config
+    def initialize
+      @config_core = ConfigCore.new
+      @config_core_override = nil
     end
 
     def [](key)
-      @config[key]
+      result = @config_core_override[key] unless @config_core_override.nil?
+      result = @config_core[key] if result.nil?
     end
 
     def auto_reload
-      require 'listen'
-
-      @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
-      end
-    end
-
-    private
-
-    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]
-                              .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
+      @config_core.auto_reload
+      @config_core_override.auto_reload unless @config_core_override.nil?
     end
   end
 end

data/lib/rubypitaya/core/config_core.rb

@@ -0,0 +1,84 @@
+module RubyPitaya
+
+  class ConfigCore
+
+    def initialize()
+      @config = {}
+      @configs_folder_paths = [Path::APP_CONFIG_FOLDER_PATH] + Path::Plugins::APP_CONFIG_FOLDER_PATHS
+
+      @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
+
+    def [](key)
+      split_key = key.split('/')
+      @config.dig(*split_key)
+    end
+
+    def auto_reload
+      require 'listen'
+
+      @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
+      end
+    end
+
+    private
+
+    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]
+                              .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/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,12 +62,14 @@ module RubyPitaya
 
       @session = Session.new
       @postman = Postman.new(@nats_connector)
-      @config = Config.new()
+      @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)
 

data/lib/rubypitaya/core/path.rb

@@ -12,6 +12,10 @@ module RubyPitaya
 
     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/'))

data/lib/rubypitaya/version.rb

@@ -1,3 +1,3 @@
 module RubyPitaya
-  VERSION = '2.0.0'
+  VERSION = '2.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubypitaya
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Luciano Prestes Cavalcanti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-16 00:00:00.000000000 Z
+date: 2020-11-02 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/migration/001_create_user_migration.rb"
-- "./lib/rubypitaya/app-template/db/migration/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,13 @@ 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/config_core.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"