rubypitaya 3.3.2 → 3.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b218ecc854aaf6e7cb2cf7bbf1ad80d910967c73b3ccf0ba06f81b039b5838b5
-  data.tar.gz: 30acb028ff6a65f8b7697be1ca1d533efb5383b3e68d180cdc92bdcf37d762f1
+  metadata.gz: 534b8bf854794eab64b53a7f550a18a8bc60b0f13b41ba8f75dba4e58506d319
+  data.tar.gz: b76c9e552bdc04d4bdcfabafa94eeeeda84fca483dec6df5c00cbd74c43e0816
 SHA512:
-  metadata.gz: 610d327bbf85407e5880b4593bd804c55ffff8022783582340e48f962da345f91d569b24f8b7e477027c8edbd61f8d8e9bb7827acb14e8070c63687e64799049
-  data.tar.gz: 1c5c9d3256b9d81d539f6b47c0181d15656e4a75185c3634d951984bc532762c5b6f3a390a94e8ae7c4486da20c0cde79885e69391875590f27c843963fdae33
+  metadata.gz: 0420eda040f59d7d06913e3352faea670f19536d3435c9e3c2094986ec4bd8b81f2272cd1845e05791695ac610713e652a3985b2e62147b1b66d57e19bed220f
+  data.tar.gz: f0f2da6df0dbd54511b0eab8eacbcd98bd07a03a2e285bbd1cd1fb1d8692f71866252f8000a04af5937dfeee25aeacb6e4c834eac14a99115e6a9c64799ccd12

data/lib/rubypitaya/app-template/Gemfile

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gem 'rubypitaya', '3.3.2'
+gem 'rubypitaya', '3.3.6'
 
 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.2)
+    rubypitaya (3.3.6)
       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.2)
+  rubypitaya (= 3.3.6)
   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

@@ -10,6 +10,7 @@ require 'rubypitaya/core/session'
 require 'rubypitaya/core/postman'
 require 'rubypitaya/core/parameters'
 require 'rubypitaya/core/http_routes'
+require 'rubypitaya/core/route_error'
 require 'rubypitaya/core/routes_base'
 require 'rubypitaya/core/status_codes'
 require 'rubypitaya/core/handler_router'
@@ -31,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
 
@@ -41,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']
@@ -93,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
@@ -179,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)
 
@@ -190,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/route_error.rb

@@ -1,6 +1,8 @@
 module RubyPitaya
   class RouteError < StandardError
 
+    attr_reader :code, :message
+
     def initialize(code, message)
       @code = code
       @message = message

data/lib/rubypitaya/version.rb

@@ -1,3 +1,3 @@
 module RubyPitaya
-  VERSION = '3.3.2'
+  VERSION = '3.3.6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubypitaya
 version: !ruby/object:Gem::Version
-  version: 3.3.2
+  version: 3.3.6
 platform: ruby
 authors:
 - Luciano Prestes Cavalcanti