rubypitaya 2.2.0 → 2.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: daa040aaa44dd5fda0dd5e44f8f74f29c6f774c9233735147243fc261d98f59e
-  data.tar.gz: 00f7d1a43a2d098356b090339fcf8db82f2a01520c674fb4df7e69c904deccc5
+  metadata.gz: 1a6fde2eae7ed9a98258d0032349d13a7c1c472630bba199e91b5d75a2999054
+  data.tar.gz: ce0f2c89d96cfb2368eb38b303251d696afe9022feda6baaf56f880d962464e7
 SHA512:
-  metadata.gz: b2ca865cc8ccdd2450d1d117baccea88f3acda3ca50615d7d75086e3489aee3e6cbe0a79cf279ef1be90062d59de4bf26f915cba91afc8992a4261379cc4b629
-  data.tar.gz: 17c1fe0d67e03065e12f0c6c2bc0f668314614a8eafd82e52fede90131e23da0b9fd0f8aa502a66c6fdc7a08c8e58db81c9cfef8a2d2ff9cee13468265c29010
+  metadata.gz: f70ae9bb4b1cfc53234a4e6f6c0d4680f10a923f6c563908b06d471eebda2e3b4a3e4bdcd85c13dec41e2f850d471b8a7fbf9c0cdd7d72f5c761a33f239de79a
+  data.tar.gz: a255dcfdcb71951a92fe57afb4b01f12adb576fb7fde1248a395ef62275c1f2560990f0618e6efb86b6938dd5b9472f116f3915f2bcf5efb519a158879f382a3

data/lib/rubypitaya/app-template/Gemfile

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

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/core/application_files_importer.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,88 +1,25 @@
+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
+    attr_writer :config_core_override
 
-    def get
-      @config
+    def initialize
+      @config_core = ConfigCore.new
+      @config_core_override = nil
     end
 
     def [](key)
-      split_key = key.split('/')
-      @config.dig(*split_key)
+      result = @config_core_override[key] unless @config_core_override.nil?
+      result = @config_core[key] if result.nil?
+      result
     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/version.rb

@@ -1,3 +1,3 @@
 module RubyPitaya
-  VERSION = '2.2.0'
+  VERSION = '2.3.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubypitaya
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.2
 platform: ruby
 authors:
 - Luciano Prestes Cavalcanti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-31 00:00:00.000000000 Z
+date: 2020-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -227,6 +227,7 @@ files:
 - "./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"