ru.Bee 2.7.13 → 2.7.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4094dc9186412f408a5fb68be073177c786e8348222f6b57c35744eea709dffb
-  data.tar.gz: 2d3c38258a5efc0aacc05b1f7d6a3dab1a46f41ec919464b7c90525f30205e35
+  metadata.gz: 16ac2bb8ad8fd47afad5c4e2dc8bd875b949636521fcb3b62cba49dd5fd0a37f
+  data.tar.gz: 03b783576f4c2d88c2dee210962b06597b9c4009fe0f741457a40ea1be93a193
 SHA512:
-  metadata.gz: 8e58881b7b4541f0c6e4f04060e99ca0ad16d473f783dfc9596408eeecb6900d2c8b1ac0bd8ccd31cf27a9d7e07e3fc7494f5b590149ef5f8a09fce4991aace9
-  data.tar.gz: df11787362b2894323fb7e3535c1cb2b192a5273ee39169c67e09dd826f5ed718e236ae48d0e5240cedb995270b3e2dcb37730ea62d15a8a72ae224285aa8728
+  metadata.gz: debf28f7b79c9477eb96c198b9de9afe915b82fed191d3ff93c8a0e639e4ef1cba58a2677bb34240058ca5e0f9e5ca829699ddcd4ed63d1381972490f88fa2e3
+  data.tar.gz: a3c9213b64b727b59bd1a29e77496623e9ad2a6cea5af6b6efe6e3a088cba760414ab1c8b8923a8bfb6b063d5ceb09b1dfca75a153cab6373130e096cc2a8882

data/lib/rubee/autoload.rb

@@ -1,6 +1,6 @@
 module Rubee
   class Autoload
-    BLACKLIST = ['rubee.rb', 'test_helper.rb']
+    BLACKLIST = ['rubee.rb', 'test_helper.rb', 'puma.rb']
     class << self
       def call(black_list = [], **options)
         load_whitelisted(options[:white_list_dirs]) && return if options[:white_list_dirs]

data/lib/rubee/cli/server.rb

@@ -9,36 +9,45 @@ module Rubee
  |_| \_\\____/ |____/|_____|__|
  Ver: %s       ⬡ ⬢ ⬢ rubee ⬢ ⬡
 LOGO
-
       class << self
         def call(command, argv)
           send(command, argv)
         end
 
         def start(argv)
-          # get params
-          options = argv.select { _1.start_with?('--') }
-          port = options.find { _1.start_with?('--port') }&.split('=')&.last
-          jit = options.find { _1.start_with?('--jit') }&.split('=')&.last
+          options    = argv.select { _1.start_with?('--') }
+          port       = options.find { _1.start_with?('--port') }&.split('=')&.last
+          jit        = options.find { _1.start_with?('--jit') }&.split('=')&.last
+          port     ||= ENV.fetch('PORT', '7000')  # fix: don't clobber parsed port
+          puma_config = ENV.fetch('PUMA_CONFIG', 'config/puma.rb')
+          rackup_file = ENV.fetch('RACKUP_FILE', '')
 
-          port ||= '7000'
           print_logo
           color_puts("Starting takeoff of ruBee on port: #{port}...", color: :yellow)
-          command = "#{jit_prefix(jit)}rackup #{ENV['RACKUP_FILE']} -p #{port}"
+
+          command = [
+            jit_prefix(jit),
+            "bundle exec puma",
+            File.exist?(puma_config) ? "-C #{puma_config}" : '',
+            rackup_file,
+            "-p #{port}",
+          ].join(" ")
+
           color_puts(command, color: :gray)
           exec(command)
         end
 
         def start_dev(argv)
           options = argv.select { _1.start_with?('--') }
-          port = options.find { _1.start_with?('--port') }&.split('=')&.last
-          jit = options.find { _1.start_with?('--jit') }&.split('=')&.last
+          port    = options.find { _1.start_with?('--port') }&.split('=')&.last
+          jit     = options.find { _1.start_with?('--jit') }&.split('=')&.last
+          port  ||= ENV.fetch('PORT', '7000')  # fix: consistent with start; use ENV fallback
+          rackup_file = ENV.fetch('RACKUP_FILE', '')
 
-          port ||= '7000'
           print_logo
-
           color_puts("Starting takeoff of ruBee server on port #{port} in dev mode...", color: :yellow)
-          command = "rerun -- #{jit_prefix_dev(jit)}rackup --port #{port} #{ENV['RACKUP_FILE']}"
+
+          command = "rerun -- #{jit_prefix(jit)}rackup --port #{port} #{rackup_file}"
           color_puts(command, color: :gray)
           exec(command)
         end
@@ -52,24 +61,13 @@ LOGO
         end
 
         def print_logo
-          puts "\e[36m#{LOGO % Rubee::VERSION}\e[0m" # Cyan color
-        end
-
-        def jit_prefix(key)
-          case key
-          when 'yjit'
-            "ruby --yjit -S "
-          else
-            ""
-          end
+          puts "\e[36m#{LOGO % Rubee::VERSION}\e[0m"
         end
 
-        def jit_prefix_dev(key)
+        def jit_prefix(key)  # fix: removed identical jit_prefix_dev; use this for both
           case key
-          when 'yjit'
-            "ruby --yjit -S "
-          else
-            ""
+          when 'yjit' then "ruby --yjit -S "
+          else ""
           end
         end
       end

data/lib/rubee/models/sequel_object.rb

@@ -174,17 +174,30 @@ module Rubee
         false
       end
 
+      def force_disconnect!
+        DB.disconnect
+        Object.send(:remove_const, :DB)
+      end
+
+      def force_reconnect!
+        force_disconnect!
+        const_set(:DB, Sequel.connect(Rubee::Configuration.get_database_url))
+      end
+
       def db_set?
         defined?(DB) && !DB.nil?
       end
 
       def dataset
-        DB[pluralize_class_name.to_sym]
+        @dataset ||= DB[pluralize_class_name.to_sym]
+        reconnect_count = 0
+
+        @dataset
       rescue Exception => e
         reconnect!
-        __reconnect_count ||= 0
-        __reconnect_count += 1
-        if __reconnect_count > 3
+        reconnect_count ||= 0
+        reconnect_count += 1
+        if reconnect_count > 3
           raise e
         end
         sleep(0.1)

data/lib/rubee.rb

@@ -20,7 +20,7 @@ module Rubee
     RUBEE_SUPPORT = { "Rubee::Support::Hash" => Hash, "Rubee::Support::String" => String }
   end
 
-  VERSION = '2.7.13'
+  VERSION = '2.7.14'
 
   require_relative 'rubee/router'
   require_relative 'rubee/logger'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ru.Bee
 version: !ruby/object:Gem::Version
-  version: 2.7.13
+  version: 2.7.15
 platform: ruby
 authors:
 - Oleg Saltykov