rubypitaya 2.2.1 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f281a68ed8014d040980a1e38c395a06e01a2f6e0baa299ae31e721b96e38110
-  data.tar.gz: 5f4d111862aeb5ca039600fc7e89c371e7bc974fcbe36ce925d67185b4f6a341
+  metadata.gz: '093a7c67062ae87c5335220458fd7c8c1a1b97591a8f6ef87121c07aa544eb4d'
+  data.tar.gz: c0ab2dcd4a08ecda141a8d6ddfa646bb2e01dfb8648ddf78ac64a167a3f4593b
 SHA512:
-  metadata.gz: 9fbedb2b7e8671ebeb45abb4f59cb4555541293bb345d72a224b8f7e0b8dbb80f01ccc99d73be01859ea12c6be0a172ca998275f500fe33d81c1d351b481481e
-  data.tar.gz: 9abcf3ed56d184a29b673e03606a08b29c05344a07636797492aca84882bb66b690ba1e727f47eb21b703a1e2b1438c2d8f7f4867f456e29eea03167faeba86a
+  metadata.gz: af597a9e1481be99c5a93c42ffc3e12629d486acbd931b46e1c2c037f7f8806e1191e28e7669835622bb98d2940e5a00a889a51391bbc3502fff7ed7dacace9f
+  data.tar.gz: e3be1ef084dce3f1bd9cc77a4c4cab1b51f3d682329e7edbda3736487d3ebbf20d253336767eb97f62a11a191d3add2ba30d85a11669b5c28b9ef25cf2cbf91e

data/lib/rubypitaya/app-template/Gemfile

@@ -1,11 +1,3 @@
 source "https://rubygems.org"
 
-gem 'rubypitaya', '2.2.1'
-
-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.0'

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.1)
+    rubypitaya (2.4.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.2.1)
+  rubypitaya (= 2.4.0)
 
 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,14 +17,18 @@ 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_folder_paths = [Path::Core::APP_FOLDER_PATH, Path::APP_FOLDER_PATH]
 
-        @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,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.1'
+  VERSION = '2.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubypitaya
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.4.0
 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
@@ -108,6 +108,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 6.0.2
+- !ruby/object:Gem::Dependency
+  name: eventmachine
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.2.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.2.7
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -227,6 +241,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"