rubypitaya 2.2.2 → 2.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e34b4f837db342c17e307255d3f45ead903794ab727e7de806674906019329c6
-  data.tar.gz: 335696b1f6de405da7f7f7bf5426c8a86485c7b46e3675729847f6203224ee95
+  metadata.gz: 15a4c18905f4a79f7187e77415448088f7f1b85f67af17e0435d0bb1d7446fb6
+  data.tar.gz: 0af1363c965f78d0468444f068ccd5d9ae85888c5487bf7eaf0711e4f97ec8ef
 SHA512:
-  metadata.gz: 9a7c707616860f57845ccb552b593c1ef11b884918fc71eda11b1615e8e8aef335c4a91f44003cc4c74ee0d7446c1dc1db734f51878cd51203f1a285d06ede92
-  data.tar.gz: 34bf38eea9e9d1986a8a3aad6f0bf4231149a1ced7f21c48f9ae6b4106f2d496e375adf829087f15c1ac7d4f8691cb24a7395c302dcb2f68b62f68e425c7d286
+  metadata.gz: e08b6488c57f20bf8ef2999e5788c71a6499ac8a6693470ccbf2dda3b8a949a7326756001d74e18c195d3c473b7dea0133c4213ca859298436a18e8465466c57
+  data.tar.gz: a0a60168b6dd1de0fef61a67ac7bfa04b9f3a665d56620a7fe4b8718592846929cb9e31a2cb74246c271d9714a0a281d9b9bdbe93512882b47247fe9ef4478b2

data/lib/rubypitaya/app-template/Gemfile

@@ -1,11 +1,3 @@
 source "https://rubygems.org"
 
-gem 'rubypitaya', '2.2.2'
-
-group :development do
-  gem 'pry', '0.12.2'
-  gem 'bundler', '1.17.2'
-  gem 'rake', '10.0'
-  gem 'rspec', '3.8.0'
-  gem 'listen', '3.2.1'
-end
+gem 'rubypitaya', '2.4.1'

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.4.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 (= 2.2.2)
+  rubypitaya (= 2.4.1)
 
 BUNDLED WITH
    1.17.2

data/lib/rubypitaya/core/application_files_importer.rb

@@ -5,9 +5,9 @@ module RubyPitaya
   class ApplicationFilesImporter
 
     def import
-      @app_folder_paths = [Path::Core::APP_FOLDER_PATH, Path::APP_FOLDER_PATH] + Path::Plugins::APP_FOLDER_PATHS
+      app_folder_paths = Path::Plugins::APP_FOLDER_PATHS + [Path::Core::APP_FOLDER_PATH, Path::APP_FOLDER_PATH]
 
-      @app_folder_paths.each do |app_folder_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 }
@@ -17,7 +17,9 @@ module RubyPitaya
     def auto_reload
       require 'listen'
 
-      @app_files_listener = Listen.to(*@app_folder_paths,
+      app_folder_paths = [Path::Core::APP_FOLDER_PATH, Path::APP_FOLDER_PATH]
+
+      app_files_listener = Listen.to(*app_folder_paths,
                                       only: /\.rb$/,
                                       force_polling: true,
                                       latency: 0.25,
@@ -26,7 +28,7 @@ module RubyPitaya
         reload_modified_files(modified)
       end
 
-      @app_files_listener.start
+      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,88 @@
+module RubyPitaya
+
+  class ConfigCore
+
+    def initialize()
+      @config = {}
+      configs_folder_paths = Path::Plugins::APP_CONFIG_FOLDER_PATHS + [Path::APP_CONFIG_FOLDER_PATH]
+
+      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_path = Path::APP_CONFIG_FOLDER_PATH
+
+      config_files_listener = Listen.to(configs_folder_path,
+                                        only: /\.json$/,
+                                        force_polling: true,
+                                        latency: 0.25,
+                                        wait_for_delay: 0.1) do |modified, added, removed|
+        import_added_files(configs_folder_path, added)
+        reload_modified_files(configs_folder_path, modified)
+      end
+
+      config_files_listener.start
+    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/handler_router.rb

@@ -6,7 +6,7 @@ module RubyPitaya
 
     def initialize()
       routes_path = Path::ROUTES_FILE_PATH
-      handler_folder_paths = [Path::HANDLERS_FOLDER_PATH] + Path::Plugins::HANDLERS_FOLDER_PATHS
+      handler_folder_paths = Path::Plugins::HANDLERS_FOLDER_PATHS + [Path::HANDLERS_FOLDER_PATH]
 
       import_routes_file(routes_path)
 

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.4.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubypitaya
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.4.1
 platform: ruby
 authors:
 - Luciano Prestes Cavalcanti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-31 00:00:00.000000000 Z
+date: 2020-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -25,19 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.21.0
 - !ruby/object:Gem::Dependency
-  name: eventmachine
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.7
+        version: '10.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.7
+        version: '10.0'
 - !ruby/object:Gem::Dependency
   name: nats
   requirement: !ruby/object:Gem::Requirement
@@ -109,47 +109,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 6.0.2
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: eventmachine
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.2
-  type: :development
+        version: 1.2.7
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: 1.2.7
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.17.2
+        version: 0.12.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.17.2
+        version: 0.12.2
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 1.17.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 1.17.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -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"