rubypitaya 2.2.2 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e34b4f837db342c17e307255d3f45ead903794ab727e7de806674906019329c6
-  data.tar.gz: 335696b1f6de405da7f7f7bf5426c8a86485c7b46e3675729847f6203224ee95
+  metadata.gz: 56eed6ff93a6e6e8bc76351c3c4d06584fcc247888ef05783040cc96dc2966e6
+  data.tar.gz: 408c3f0226b7c42604fe416362e4bac3d333f72e313f59a2da646c527eec568c
 SHA512:
-  metadata.gz: 9a7c707616860f57845ccb552b593c1ef11b884918fc71eda11b1615e8e8aef335c4a91f44003cc4c74ee0d7446c1dc1db734f51878cd51203f1a285d06ede92
-  data.tar.gz: 34bf38eea9e9d1986a8a3aad6f0bf4231149a1ced7f21c48f9ae6b4106f2d496e375adf829087f15c1ac7d4f8691cb24a7395c302dcb2f68b62f68e425c7d286
+  metadata.gz: f6c3ad1a9c338076f5dcee3000016b41f157f843b921015aa30eb6fcad6da0e6a49265ee39f9dc382dd8840e9e74ba71934a6aea70e8f00490aaef7e15c8a0fe
+  data.tar.gz: 71060870925f98450a9e17326ece14500bd0ff095399b50e33df9dec360fb105321e9fa33bb2b64f17d989d8588584ed983d0d660349cf1ad473cd5221df0b42

data/lib/rubypitaya/app-template/Gemfile

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gem 'rubypitaya', '2.2.2'
+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.2.2)
+    rubypitaya (2.3.0)
       activerecord (= 6.0.2)
       etcdv3 (= 0.10.2)
       eventmachine (= 1.2.7)

data/lib/rubypitaya/core/config.rb

@@ -1,88 +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)
-      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?
     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/main.rb

@@ -62,7 +62,7 @@ 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

data/lib/rubypitaya/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubypitaya
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.3.0
 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"