ru.Bee 2.7.12 → 2.7.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eaa1ece6857f2f0db00babf6e947d326ea54daf67ac46eb0dde520ad321c9595
-  data.tar.gz: 94ccd860bb65eef74830da90367fca8fd1ce91c391244cf3da60e56d2ea2a7dd
+  metadata.gz: e6378c189ee732e5d57d9243c15cbb821b438adb16cb35c78f22940526bac65c
+  data.tar.gz: 7c39cfc95486d9eab4e4685ba4467bbc683f994ca9e28f6f6b1f27d539707692
 SHA512:
-  metadata.gz: 7f6dc332b7f976d75649970c334b5cd5fd0b7cfd8b6b43bf52e3142009a079882ddb9369eabd9ed2fe34835488b37a2f56010824fe5bd50b435e5d470b0b36ac
-  data.tar.gz: 40330befd2de983785daf907d02f1eb15858bd45fdea4033239ee15f77f80b37b0267d88d51e260fa5572485baf1887666314e8e95594c2510cdfc0ed1cd2a0b
+  metadata.gz: 42a775843e2181ace3bea37ee918adf8a3606309b2831572b27936eac49d7c8b2fb259ad2822097f8386305e9a29765813e5d16a7315ff499d5b3b4dd30d8dd0
+  data.tar.gz: 12ca16e3d05017ed31e7b6c301da397105eb5e0f9394e0a308051eae49ea5d07472e9dcb8b480655e3baf0b4bb13ff3874b2bbd45c87a952d432a2679ce32015

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

@@ -54,7 +54,7 @@ module Rubee
 
     def update(args = {})
       assign_attributes(args)
-      args.merge!(updated:)
+      args = args.merge(updated:)
       found_hash = self.class.dataset.where(id:)
       return self.class.find(id) if Rubee::DBTools.with_retry { found_hash&.update(**args) }
 
@@ -179,12 +179,15 @@ module Rubee
       end
 
       def dataset
-        @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)
@@ -259,7 +262,7 @@ module Rubee
 
       def create(attrs)
         if dataset.columns.include?(:created) && dataset.columns.include?(:updated)
-          attrs.merge!(created: Time.now, updated: Time.now)
+          attrs = attrs.merge(created: Time.now, updated: Time.now)
         end
         instance = new(**attrs)
         Rubee::DBTools.with_retry { instance.save }

data/lib/rubee.rb

@@ -20,7 +20,7 @@ module Rubee
     RUBEE_SUPPORT = { "Rubee::Support::Hash" => Hash, "Rubee::Support::String" => String }
   end
 
-  VERSION = '2.7.12'
+  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.12
+  version: 2.7.14
 platform: ruby
 authors:
 - Oleg Saltykov