ru.Bee 2.3.0 → 2.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4265fe78eeb8daacd156944598c50939c7a2f98aeee6b8b7cf5752f853f7a75
-  data.tar.gz: 0f5b0f9e44474beed31ecd28f9d42950131db539dd467d68436c21ae4e8772b3
+  metadata.gz: 3098241bea70d0e5fadfb944de3d50f411d7799142a84858ed848082ea97b5b4
+  data.tar.gz: 24c80462cc23bc334324bbee12192dab6efb6517460ddb2b427b28cc5ed69df4
 SHA512:
-  metadata.gz: 7f929f4a7bd876f0c6a0250b298dc9e546e22944602262b89abe6cd73f9981fa3888f9bde95226861346abf01ead84e3f77b442164c037fcaca33704eedcda84
-  data.tar.gz: b2de33afa3602ef196972f06f36c5d6a3426ec2edf7b2c9f218ed537bebf6e6a46c232ffceb146927f40945d9b02ed8fd4f19b5d211f418779d511d9424afb31
+  metadata.gz: 3dfab254bc794bdd28ee8c4d36ddfcb8b10e5e0efd050e89fca05cda000d0861a5381aa6730767e0fbcc5f35ff6a64bf5d86f8c502a2de27ce670d98152fa5fd
+  data.tar.gz: 35d0922f40a339fd3ca2733d0682d60cea9b9b62b17ab080a0eb768e085217eeba3694a5a68a309974a45c4ed86b404cea9d468253c4bc7fc7f5949c1e12216a

data/lib/db/create_comments.rb

@@ -12,6 +12,7 @@ class CreateComments
 
     end
 
-    User.create(email: 'ok@ok.com', password: 'password')
+    user = User.create(email: 'ok@ok.com', password: 'password')
+    Comment.create(text: 'hello', user_id: user.id)
   end
 end

data/lib/db/create_dummies.rb

@@ -0,0 +1,13 @@
+class CreateDummies
+  def call
+    return if Rubee::SequelObject::DB.tables.include?(:dummies)
+
+    Rubee::SequelObject::DB.create_table(:dummies) do
+      primary_key(:id)
+      String(:color, null: false)
+      # timestamps
+      datetime(:created)
+      datetime(:updated)
+    end
+  end
+end

data/lib/rubee/autoload.rb

@@ -7,9 +7,9 @@ module Rubee
         # autoload all rbs
         root_directory = File.join(Rubee::ROOT_PATH, '/lib')
         priority_order_require(root_directory, black_list)
+        load_inits(root_directory, black_list)
         # ensure sequel object is connected
         Rubee::SequelObject.reconnect!
-
         Dir.glob(File.join(Rubee::APP_ROOT, '**', '*.rb')).sort.each do |file|
           base_name = File.basename(file)
 
@@ -27,7 +27,7 @@ module Rubee
         end
       end
 
-      def priority_order_require(root_directory, black_list)
+      def load_inits(root_directory, black_list)
         # rubee inits
         Dir[File.join(root_directory, 'inits/**', '*.rb')].each do |file|
           require_relative file unless black_list.include?("#{file}.rb")
@@ -36,6 +36,9 @@ module Rubee
         Dir[File.join(Rubee::APP_ROOT, 'inits/**', '*.rb')].each do |file|
           require_relative file unless black_list.include?("#{file}.rb")
         end
+      end
+
+      def priority_order_require(root_directory, black_list)
         # rubee pub sub
         Dir[File.join(root_directory, 'rubee/pubsub/**', '*.rb')].each do |file|
           require_relative file unless black_list.include?("#{file}.rb")
@@ -53,13 +56,6 @@ module Rubee
           require_relative File.join(Rubee::APP_ROOT, Rubee::LIB,
                                      'config/base_configuration')
         end
-        # This is necessary prerequisitedb init step
-        if Rubee::PROJECT_NAME == 'rubee'
-          Rubee::Configuration.setup(env = :test) do |config|
-            config.database_url = { url: 'sqlite://lib/tests/test.db', env: }
-          end
-        end
-
         require_relative File.join(Rubee::APP_ROOT, Rubee::LIB, 'config/routes') unless black_list.include?('routes.rb')
         # rubee extensions
         Dir[File.join(root_directory, 'rubee/extensions/**', '*.rb')].each do |file|

data/lib/rubee/cli/console.rb

@@ -10,12 +10,6 @@ module Rubee
           argv.clear
           ENV['RACK_ENV'] ||= 'development'
 
-          if Rubee::PROJECT_NAME == 'rubee'
-            Rubee::Configuration.setup(env = :test) do |config|
-              config.database_url = { url: 'sqlite://lib/tests/test.db', env: }
-            end
-          end
-
           begin
             # Start IRB
             IRB.start

data/lib/rubee/cli/db.rb

@@ -5,13 +5,6 @@ module Rubee
         def call(command, argv)
           command = argv[1].split(':').first
           ENV['RACK_ENV'] ||= 'development'
-          if Rubee::PROJECT_NAME == 'rubee'
-            Rubee::Configuration.setup(env = :test) do |config|
-              config.database_url = { url: 'sqlite://lib/tests/test.db', env: }
-            end
-            Rubee::SequelObject.reconnect! unless command == 'init'
-          end
-
           send(command, argv)
         end
 
@@ -25,12 +18,9 @@ module Rubee
           else
             [file_name]
           end
-          Rubee::Configuration.envs.each do |env|
-            ENV['RACK_ENV'] = env.to_s
-            file_names.each do |file|
-              color_puts("Run #{file} file for #{env} env", color: :cyan)
-              Object.const_get(file.split('_').map(&:capitalize).join).new.call
-            end
+          file_names.each do |file|
+            color_puts("Run #{file} file for #{ENV['RACK_ENV']} env", color: :cyan)
+            Object.const_get(file.split('_').map(&:capitalize).join).new.call
           end
           color_puts("Migration for #{file_name} completed", color: :green)
           unless Rubee::PROJECT_NAME == 'rubee'
@@ -81,6 +71,7 @@ module Rubee
               if File.exist?(db_path = db_url.sub(%r{^sqlite://}, ''))
                 color_puts("Database #{ENV['RACK_ENV']} exists", color: :cyan)
               else
+                db_path = "#{Rubee::LIB}/#{db_path}" if Rubee::PROJECT_NAME == 'rubee'
                 Sequel.sqlite(db_path)
                 color_puts("Database #{ENV['RACK_ENV']} created", color: :green)
               end

data/lib/rubee/configuration.rb

@@ -34,7 +34,7 @@ module Rubee
 
       def database_url=(args)
         args[:app] ||= :app
-        @configuraiton[args[:app].to_sym][args[:env].to_sym][:database_url] = args[:url]
+        @configuraiton[args[:app].to_sym][args[:env].to_sym][:database_url] = args[:url].gsub("//", "//#{Rubee::LIB}")
       end
 
       def redis_url=(args)

data/lib/rubee/models/sequel_object.rb

@@ -160,13 +160,19 @@ module Rubee
       end
 
       def reconnect!
-        return if defined?(DB) && !DB.nil?
+        return if db_set?
 
         const_set(:DB, Sequel.connect(Rubee::Configuration.get_database_url))
 
         Rubee::DBTools.set_prerequisites!
 
         true
+      rescue Exception => e
+        false
+      end
+
+      def db_set?
+        defined?(DB) && !DB.nil?
       end
 
       def dataset

data/lib/rubee.rb

@@ -17,7 +17,7 @@ module Rubee
   CSS_DIR = File.join(APP_ROOT, LIB, 'css') unless defined?(CSS_DIR)
   ROOT_PATH = File.expand_path(File.join(__dir__, '..')) unless defined?(ROOT_PATH)
 
-  VERSION = '2.3.0'
+  VERSION = '2.3.2'
 
   require_relative 'rubee/router'
   require_relative 'rubee/logger'

data/lib/tests/cli/db_test.rb

@@ -0,0 +1,29 @@
+require_relative '../test_helper'
+
+describe 'Rubee::CLI::Db' do
+  describe 'when run db run:all with no ENV set' do
+    it 'goes with no errors' do
+      out = capture_stdout do
+        Rubee::CLI::Command.new(['db', 'run:create_dummies']).call
+      end
+
+      _(out).must_equal(
+        "\e[0;36mRun create_dummies file for test env\e[0m
+\e[0;32mMigration for create_dummies completed\e[0m
+"
+      )
+
+      Rubee::SequelObject::DB.drop_table(:dummies)
+    end
+
+    it 'cretes dummies table' do
+      Rubee::SequelObject::DB.drop_table(:dummies) if Rubee::SequelObject::DB.tables.include?(:dummies)
+
+      _(Rubee::SequelObject::DB.tables.include?(:dummies)).must_equal false
+      Rubee::CLI::Command.new(['db', 'run:create_dummies']).call
+      _(Rubee::SequelObject::DB.tables.include?(:dummies)).must_equal true
+
+      Rubee::SequelObject::DB.drop_table(:dummies)
+    end
+  end
+end

data/lib/tests/test_helper.rb

@@ -15,10 +15,6 @@ require 'stringio'
 require_relative '../../lib/rubee'
 
 Rubee::Autoload.call
-Rubee::Configuration.setup(env = :test) do |config|
-  config.database_url = { url: 'sqlite://lib/tests/test.db', env: }
-end
-Rubee::SequelObject.reconnect!
 
 def assert_difference(expression, difference = 1)
   before = expression.call

data/readme.md

@@ -978,8 +978,9 @@ irb(main):047> foo.errors
 Model example
 ```ruby
 class User < Rubee::SequelObject
-  attr_accessor :id, :email, :password, :created, :updated
-
+  attr_accessor :id, :email, :password, :created
+  
+  validate_after_setters # This will run validation after each setter.
   validate_before_persist! # This will validate and raise error in case invalid before saving to DB
   validate do
     attribute(:email).required
@@ -1016,6 +1017,15 @@ irb(main):081> user
  @password=123,
  @updated=2025-11-30 17:18:52.254206 -0500>
 ```
+If you want to apply validation_before_persist! and validation_after_setters globally,
+add init/sequle_object_preloader.rb(you can chose any name)
+file withing set up those methods 
+for Rubee::SequelObject parent class by adding:
+```
+Rubee::SequelObject.validate_befor_persist!
+Rubee::SequelObject.validate_after_setters
+```
+So you shouldn't add it to each model again and again.
 [Back to content](#content)
 
 ## JWT based authentification

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ru.Bee
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.2
 platform: ruby
 authors:
 - Oleg Saltykov
@@ -39,7 +39,6 @@ extra_rdoc_files: []
 files:
 - LICENSE
 - bin/rubee
-- bin/test.db
 - lib/Dockerfile
 - lib/app/controllers/users_controller.rb
 - lib/app/controllers/welcome_controller.rb
@@ -61,9 +60,12 @@ files:
 - lib/db/create_carrots.rb
 - lib/db/create_clients.rb
 - lib/db/create_comments.rb
+- lib/db/create_dummies.rb
 - lib/db/create_posts.rb
 - lib/db/create_users.rb
+- lib/db/development.db
 - lib/db/structure.rb
+- lib/db/test.db
 - lib/esbuild.config.js
 - lib/images/rubee.svg
 - lib/inits/charged_hash.rb
@@ -275,6 +277,7 @@ files:
 - lib/rubee/websocket/websocket_connections.rb
 - lib/tests/async/thread_async_test.rb
 - lib/tests/cli/attach_test.rb
+- lib/tests/cli/db_test.rb
 - lib/tests/controllers/auth_tokenable_test.rb
 - lib/tests/controllers/base_controller_test.rb
 - lib/tests/controllers/hookable_test.rb
@@ -296,7 +299,6 @@ files:
 - lib/tests/models/user_model_test.rb
 - lib/tests/rubee_attach_test.rb
 - lib/tests/rubee_generator_test.rb
-- lib/tests/test.db
 - lib/tests/test_helper.rb
 - readme.md
 homepage: https://github.com/nucleom42/rubee