rubypitaya 3.3.3 → 3.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 94da55ebb23095e84bb7673c03c090c5e6d750258ab8a04861776e0f3bccd488
-  data.tar.gz: b15065b35ab812d985d30bdd0b5ef073b739282632966c09a59e600bfc63b54c
+  metadata.gz: 9de06df9189f69c78f1c03512f6fada275ee1bdcd590ffe1810da2b62dce14f6
+  data.tar.gz: 5848c25207a857715972ff3cef0f705e30872a1b2bb702ccf89d41e3f49035dc
 SHA512:
-  metadata.gz: c7355c105856b63dbd68f15c6181adfba4a5450b6f94c98444e431c1692ab3fddee02d8609dc28b3e3e9afd83792d1fd6197f22e3a7f41b88643551d23b9baa1
-  data.tar.gz: cf3132334be52609395c0fde4bd1bacc27fe2335dcd75dc5cca27b73351d681145f9e9a5ddc422490809d848053524b59c30ff0149edfe2e0986cdc82700a9c1
+  metadata.gz: 35c5eb0d8a9d3bb497159ba40517126d8749f5d467fa4b632f75d07de5f4692ba848a72540ed375a976853713fe7d6c6900b7aee177ccafecb2e548d8782c327
+  data.tar.gz: 33ec57d8e7f46efe56804806d086d2708a1a9912469fc23a85a03b6927047460cb11f2f96dcdcfae195539b3f980d783f69ceda3f0ad852de07b6cdb752e0442

data/lib/rubypitaya/app-template/Gemfile

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gem 'rubypitaya', '3.3.3'
+gem 'rubypitaya', '3.3.7'
 
 group :development do
   gem 'pry', '0.14.1'

data/lib/rubypitaya/app-template/Gemfile.lock

@@ -103,7 +103,7 @@ GEM
       rspec-support (~> 3.10.0)
     rspec-support (3.10.3)
     ruby2_keywords (0.0.5)
-    rubypitaya (3.3.3)
+    rubypitaya (3.3.7)
       activerecord (= 6.1.4.1)
       etcdv3 (= 0.11.4)
       google-protobuf (= 3.18.1)
@@ -143,7 +143,7 @@ DEPENDENCIES
   listen (= 3.7.0)
   pry (= 0.14.1)
   rspec (= 3.10.0)
-  rubypitaya (= 3.3.3)
+  rubypitaya (= 3.3.7)
   sinatra-contrib (= 2.1.0)
 
 BUNDLED WITH

data/lib/rubypitaya/core/application_files_importer.rb

@@ -4,12 +4,15 @@ module RubyPitaya
 
   class ApplicationFilesImporter
 
-    def import
+    def import(is_cheats_enabled)
       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_files_path = "#{app_folder_path}/**/*.rb"
 
+        gem_files = Gem.find_files(app_files_path)
+        gem_files = gem_files.select { |a| !a[/.+_cheats.rb/] && !a[/.+_cheat.rb/] } unless is_cheats_enabled
+
         Gem.find_files(app_files_path).each do |path|
           require path unless path.include?('app/migrations')
         end

data/lib/rubypitaya/core/handler_router.rb

@@ -45,7 +45,10 @@ module RubyPitaya
 
     def import_handler_classes
       handler_classes = ObjectSpace.each_object(HandlerBase.singleton_class).select do |klass|
-        klass != HandlerBase
+        class_name = klass.to_s.downcase
+        is_cheat_class = class_name.end_with?('cheat') || class_name.end_with?('cheats')
+
+        klass != HandlerBase && (@is_cheats_enabled || !is_cheat_class)
       end
 
       @handlers = handler_classes.map { |handler_class| handler_class.new }

data/lib/rubypitaya/core/main.rb

@@ -32,6 +32,7 @@ module RubyPitaya
     def initialize
       @setup = Setup.new
       @environment_name = @setup.fetch('rubypitaya.server.environment', 'development')
+      @is_cheats_enabled = @setup.fetch('rubypitaya.server.cheats', false)
       @is_development_environment = @environment_name == 'development'
       @setup.auto_reload if @is_development_environment
 
@@ -42,7 +43,7 @@ module RubyPitaya
       end
 
       @application_files_importer = ApplicationFilesImporter.new
-      @application_files_importer.import
+      @application_files_importer.import(@is_cheats_enabled)
       @application_files_importer.auto_reload if @is_development_environment
 
       @server_name = @setup['rubypitaya.server.name']
@@ -94,7 +95,6 @@ module RubyPitaya
       @initializer_broadcast = InitializerBroadcast.new
       @initializer_broadcast.run(@initializer_content)
 
-      @is_cheats_enabled = @setup.fetch('rubypitaya.server.cheats', false)
       @handler_router = HandlerRouter.new(@is_cheats_enabled)
 
       run_http
@@ -180,10 +180,20 @@ module RubyPitaya
 
         @config.clear_cache
 
-        response = @handler_router.call(handler_name, action_name, @session,
-                                        @postman, @redis_connector.redis,
-                                        @mongo_connector.mongo, @setup, @config,
-                                        @log, params)
+        response = {}
+
+        begin
+          response = @handler_router.call(handler_name, action_name, @session,
+                                          @postman, @redis_connector.redis,
+                                          @mongo_connector.mongo, @setup, @config,
+                                          @log, params)
+        rescue RouteError => error
+          @log.error "ROUTE ERROR: #{error.class} | #{error.message}} \n #{error.backtrace.join("\n")}"
+          response = {
+            code: error.code,
+            message: error.message
+          }
+        end
 
         delta_time_seconds = ((Time.now.to_f - start_time_seconds) * 1000).round(2)
 
@@ -191,12 +201,6 @@ module RubyPitaya
 
         response
       end
-      rescue RouteError => error
-        @log.error "ROUTE ERROR: #{error.class} | #{error.message}} \n #{error.backtrace.join("\n")}"
-        response = {
-          code: error.code,
-          message: error.message
-        }
       rescue Exception => error
         @log.error "INTERNAL ERROR: #{error.class} | #{error.message}} \n #{error.backtrace.join("\n")}"
         run_nats_connection

data/lib/rubypitaya/core/spec-helpers/handler_spec_helper.rb

@@ -43,6 +43,11 @@ module RubyPitaya
                                          @@postman, @@redis_connector.redis,
                                          @@mongo_connector.mongo, @@setup,
                                          @@config, @@log, params)
+      rescue RouteError => error
+        @@response = {
+          code: error.code,
+          message: error.message
+        }
     end
 
     def response

data/lib/rubypitaya/version.rb

@@ -1,3 +1,3 @@
 module RubyPitaya
-  VERSION = '3.3.3'
+  VERSION = '3.3.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubypitaya
 version: !ruby/object:Gem::Version
-  version: 3.3.3
+  version: 3.3.7
 platform: ruby
 authors:
 - Luciano Prestes Cavalcanti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-27 00:00:00.000000000 Z
+date: 2021-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg