ru.Bee 1.5.4 → 1.6.0

data/lib/tests/logger_test.rb

@@ -0,0 +1,76 @@
+require_relative 'test_helper'
+
+class CustomLogger
+  class << self
+    def warn(message:, **options, &block); end
+
+    def info(message:, **options, &block)
+      puts "CUSTOM INFO #{message}"
+    end
+
+    def error(message:, **options, &block); end
+
+    def critical(message:, **options, &block); end
+
+    def debug(object:, **options, &block); end
+  end
+end
+
+describe 'Rubee::Logger' do
+  describe 'logger' do
+    it 'exists' do
+      _(Rubee::Logger).wont_be_nil
+    end
+  end
+
+  describe '.warn' do
+    it 'output message' do
+      output = capture_stdout { Rubee::Logger.warn(message: 'test') }
+
+      assert_includes(output, "WARN test")
+    end
+  end
+
+  describe '.info' do
+    it 'output message' do
+      output = capture_stdout { Rubee::Logger.info(message: 'test') }
+
+      assert_includes(output, "INFO test")
+    end
+  end
+
+  describe '.error' do
+    it 'output message' do
+      output = capture_stdout { Rubee::Logger.error(message: 'test') }
+
+      assert_includes(output, "ERROR test")
+    end
+  end
+
+  describe '.critical' do
+    it 'output message' do
+      output = capture_stdout { Rubee::Logger.critical(message: 'test') }
+
+      assert_includes(output, "CRITICAL test")
+    end
+  end
+
+  describe '.debug' do
+    it 'output message' do
+      output = capture_stdout { Rubee::Logger.debug(object: User.new(email: 'ok@ok.com', password: 123)) }
+
+      assert_includes(output, "DEBUG #<User:")
+    end
+  end
+
+  describe 'when custom logger defined in the configuration' do
+    it 'uses custom logger' do
+      Rubee::Configuration.setup(env = :test) { _1.logger = { logger: CustomLogger, env: } }
+
+      output = capture_stdout { Rubee::Logger.info(message: 'test') }
+      assert_includes(output, "CUSTOM INFO test")
+
+      Rubee::Configuration.setup(env = :test) { _1.logger = { env: } }
+    end
+  end
+end

data/lib/tests/{account_model_test.rb → models/account_model_test.rb}

@@ -1,4 +1,4 @@
-require_relative 'test_helper'
+require_relative '../test_helper'
 
 describe 'Account model' do
   describe 'holds :user' do

data/lib/tests/{comment_model_test.rb → models/comment_model_test.rb}

@@ -1,4 +1,4 @@
-require_relative 'test_helper'
+require_relative '../test_helper'
 
 describe 'Comment model' do
   describe 'owns_many :users, over: :posts' do
@@ -32,4 +32,16 @@ describe 'Comment model' do
       end
     end
   end
+
+  describe 'method' do
+    it 'updates existing model' do
+      comment = Comment.new(text: 'test 1')
+      comment.save
+
+      comment.text = 'test 2'
+      comment.save
+
+      _(Comment.find(comment.id).text).must_equal('test 2')
+    end
+  end
 end

data/lib/tests/models/db_objectable_test.rb

@@ -0,0 +1,21 @@
+require_relative '../test_helper'
+
+class MergBerg
+  include Rubee::DatabaseObjectable
+  attr_accessor :id, :foo, :bar
+end
+
+describe 'Database Objectable' do
+  describe 'class methods' do
+    it 'pluralizes class names' do
+      _(MergBerg.pluralize_class_name).must_equal('mergbergs')
+    end
+
+    it 'retrieves accessor names' do
+      accessors = MergBerg.accessor_names
+      _(accessors).must_include(:id)
+      _(accessors).must_include(:foo)
+      _(accessors).must_include(:bar)
+    end
+  end
+end

data/lib/tests/models/seralizable_test.rb

@@ -0,0 +1,36 @@
+require_relative '../test_helper'
+
+class TestSerialized
+  include Rubee::Serializable
+
+  attr_accessor :id, :towel_color, :name
+end
+
+describe 'Serializable Model' do
+  describe 'attributes' do
+    it 'exists and settable' do
+      cerealed = TestSerialized.new(id: 10, towel_color: 'blue', name: 'Ford Prefect')
+
+      _(cerealed.id).must_equal(10)
+      _(cerealed.towel_color).must_equal('blue')
+      _(cerealed.name).must_equal('Ford Prefect')
+    end
+
+    it 'does not exist not settable' do
+      _ { TestSerialized.new(blue: 'hello') }.must_raise(NoMethodError)
+    end
+  end
+
+  describe 'coverts to' do
+    before do
+      @cerealed = TestSerialized.new(id: 10, towel_color: 'blue', name: 'Ford Prefect')
+    end
+    it 'hash' do
+      _(@cerealed.to_h).must_be_instance_of(Hash)
+    end
+
+    it 'json' do
+      _(@cerealed.to_json).must_be_instance_of(String)
+    end
+  end
+end

data/lib/tests/{user_model_test.rb → models/user_model_test.rb}

@@ -1,4 +1,4 @@
-require_relative 'test_helper'
+require_relative '../test_helper'
 
 describe 'User model' do
   describe '.create' do
@@ -248,4 +248,35 @@ describe 'User model' do
       end
     end
   end
+
+  describe 'owns_one' do
+    after do
+      User.destroy_all(cascade: true)
+    end
+    describe 'when there is one associated account' do
+      it 'cannot add more than one address' do
+        skip "This is an idea that can be implemented later"
+        user = User.new(email: 'bleh@example.com', password: '123')
+        user.save
+
+        address = Address.new(user_id: user.id, street: '1234 ble ave', apt: '', city: 'NY', state: 'NY', zip: '555555')
+        address.save
+
+        address_two = Address.new(user_id: user.id, street: '1234 ble ave', apt: '', city: 'NY', state: 'NY',
+zip: '555555')
+
+        _ { address_two.save }.must_raise(Rubee::OwnsOneError)
+      end
+
+      it 'returns the single address' do
+        user = User.new(email: 'bleh@example.com', password: '123')
+        user.save
+
+        address = Address.new(user_id: user.id, street: '1234 ble ave', apt: '', city: 'NY', state: 'NY', zip: '555555')
+        address.save
+
+        _(user.address.id).must_equal(address.id)
+      end
+    end
+  end
 end

data/lib/tests/test_helper.rb

@@ -1,8 +1,17 @@
 require 'bundler/setup'
 Bundler.require(:test)
 
+require 'simplecov'
+SimpleCov.start do
+  add_filter %r{^/lib/db/}
+  add_filter %r{^/lib/inits/}
+  add_filter %r{^/lib/tests/}
+end
+
 require 'minitest/autorun'
 require 'rack/test'
+require 'stringio'
+
 require_relative '../../lib/rubee'
 
 Rubee::Autoload.call
@@ -17,7 +26,15 @@ def assert_difference(expression, difference = 1)
   after = expression.call
   actual_diff = after - before
 
-  assert_equal difference, actual_diff,
-    "Expected change of #{difference}, but got #{actual_diff}"
+  assert_equal(difference, actual_diff,
+    "Expected change of #{difference}, but got #{actual_diff}")
 end
 
+def capture_stdout
+  old_stdout = $stdout
+  $stdout = StringIO.new
+  yield
+  $stdout.string
+ensure
+  $stdout = old_stdout
+end

data/readme.md

@@ -18,6 +18,25 @@ Want to get a quick API server up and runing? You can do it for real quick!
 
 All greaet features are yet to come!
 
+## Content:
+
+- [Installation](#Installation)
+- [Run tests](#Run tests)
+- [Draw contract](#Draw contract)
+- [Model](#Model)
+- [Routing](#Routing)
+- [Database](#Database)
+- [Views](#Views)
+- [Hooks](#Hooks)
+- [JWT based authentification](#JWT based authentification)
+- [Rubee commands](#Rubee commands)
+- [Generate commands](#Generate commands)
+- [Migration commands](#Migration commands)
+- [Rubee console](#Rubee console)
+- [Testing](#Testing)
+- [Background jobs](#Background jobs)
+- [Logger](#Logger)
+
 ## Features
 
 - **Lightweight**: A minimal footprint that focuses on serving Ruby applications efficiently.
@@ -33,6 +52,8 @@ All greaet features are yet to come!
 - **Hooks** Addlogic before, after and around any action.
 - **Test** Run all or selected tests witin minitest.
 - **Asyncable** Add async adapter and pick any popular background job queue enginee
+- **Console** Start the interactive console and reload it on the fly
+- **Background jobs** Add async adapter and pick any popular background job queue engine
 
 ## Installation
 
@@ -65,12 +86,12 @@ rubee start
 
 5. Open your browser and go to http://localhost:7000
 
-## Run the tests
+## Run tests
 ```bash
 rubee test
 ```
 
-## Create API contract and generate files from the routes
+## Draw contract
 1. Add the routes to the routes.rb
     ```ruby
     Rubee::Router.draw do |router|
@@ -88,21 +109,21 @@ rubee test
     end
     ```
 2. generate the files
-    ```bash
+```bash
     rubee generate get /apples
-    ```
-- This will generate the following files
-  ```bash
+```
+This will generate the following files
+```bash
   ./app/controllers/apples_controller.rb # Controller with respective action
   ./app/views/apples_index.erb # ERB view that is rendered by the controller right away
   ./app/models/apple.rb # Model that acts as ORM
   ./db/create_apples.rb # Database migration file needed for creating repsective table
-  ```
+```
 
 3. Run the initial db migration
     ```bash
     rubee db run:all
-    ``` 
+    ```
 
 5. Fill the generated files with the logic you need and run the server again!
 
@@ -395,9 +416,9 @@ Example 3:
 Rubee::Router.draw do |router|
   ...
   # draw the contract
-  router.get "/apples", to: "apples#index", 
-    model: { 
-      name: 'apple', 
+  router.get "/apples", to: "apples#index",
+    model: {
+      name: 'apple',
       attributes: [
         { name: 'id', type: :primary },
         { name: 'colour', type: :string },
@@ -755,6 +776,51 @@ end
 
 TestAsyncRunnner.new.perform_async(options: {"email"=> "new@new.com", "password"=> "123"})
 ```
+### Logger
+
+You can use your own logger by setting it in the /config/base_configuration.rb.
+
+```ruby
+# config/base_configuration.rb
+Rubee::Configuration.setup(env=:development) do |config|
+  config.database_url = { url: "sqlite://db/development.db", env: }
+  config.logger = { logger: MyLogger, env: }
+end
+```
+
+Or you can use the default logger.
+Let's consider example with welcome controller and around hook:
+```ruby
+# app/controllers/welcome_controller.rb
+class WelcomeController < Rubee::BaseController
+  around :show, ->(&target_method) do
+    start = Time.now
+    Rubee::Logger.warn(message: 'This is a warning message', method: :show, class_name: 'WelcomeController')
+    Rubee::Logger.error(message: 'This is a warning message', class_name: 'WelcomeController')
+    Rubee::Logger.critical(message: 'We are on fire!')
+    target_method.call
+    Rubee::Logger.info(
+      message: "Execution Time: #{Time.now - start} seconds",
+      method: :show,
+      class_name: 'WelcomeController'
+    )
+    Rubee::Logger.debug(object: User.last, method: :show, class_name: 'WelcomeController')
+  end
+
+  def show
+    response_with
+  end
+end
+```
+When you trigger the controller action, the logs will look like this:
+
+```bash
+[2025-04-26 12:32:33] WARN [method: show][class_name: WelcomeController] This is a warning message
+[2025-04-26 12:32:33] ERROR [class_name: WelcomeController] This is a warning message
+[2025-04-26 12:32:33] CRITICAL We are on fire!
+[2025-04-26 12:32:33] INFO [method: show][class_name: WelcomeController] Execution Time: 0.000655 seconds
+[2025-04-26 12:32:33] DEBUG [method: show][class_name: WelcomeController] #<User:0x000000012c5c63e0 @id=4545, @email="ok@op.com", @password="123">
+```
 
 ### Contributing
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ru.Bee
 version: !ruby/object:Gem::Version
-  version: 1.5.4
+  version: 1.6.0
 platform: ruby
 authors:
 - Oleg Saltykov
@@ -44,10 +44,8 @@ files:
 - lib/app/controllers/welcome_controller.rb
 - lib/app/models/user.rb
 - lib/app/views/app.tsx
-- lib/app/views/apples_.erb
 - lib/app/views/index.html
 - lib/app/views/layout.erb
-- lib/app/views/s_.erb
 - lib/app/views/utils/redirectToBackend.tsx
 - lib/app/views/welcome_header.erb
 - lib/app/views/welcome_show.erb
@@ -56,6 +54,7 @@ files:
 - lib/config/routes.rb
 - lib/css/app.css
 - lib/db/create_accounts.rb
+- lib/db/create_addresses.rb
 - lib/db/create_comments.rb
 - lib/db/create_posts.rb
 - lib/db/create_users.rb
@@ -229,30 +228,42 @@ files:
 - lib/package.json
 - lib/rubee.rb
 - lib/rubee/async/asyncable.rb
+- lib/rubee/async/fiber_queue.rb
 - lib/rubee/async/sidekiq_async.rb
 - lib/rubee/async/thread_async.rb
 - lib/rubee/async/thread_pool.rb
+- lib/rubee/autoload.rb
+- lib/rubee/configuration.rb
 - lib/rubee/controllers/base_controller.rb
 - lib/rubee/controllers/extensions/auth_tokenable.rb
 - lib/rubee/controllers/extensions/middlewarable.rb
 - lib/rubee/controllers/middlewares/auth_token_middleware.rb
 - lib/rubee/extensions/hookable.rb
 - lib/rubee/extensions/serializable.rb
+- lib/rubee/generator.rb
+- lib/rubee/logger.rb
 - lib/rubee/models/database_objectable.rb
 - lib/rubee/models/sequel_object.rb
-- lib/tests/account_model_test.rb
+- lib/rubee/router.rb
 - lib/tests/async/thread_async_test.rb
-- lib/tests/auth_tokenable_test.rb
-- lib/tests/comment_model_test.rb
+- lib/tests/controllers/auth_tokenable_test.rb
+- lib/tests/controllers/base_controller_test.rb
+- lib/tests/controllers/hookable_test.rb
+- lib/tests/controllers/rubeeapp_test.rb
 - lib/tests/example_models/account.rb
+- lib/tests/example_models/address.rb
 - lib/tests/example_models/comment.rb
 - lib/tests/example_models/post.rb
 - lib/tests/example_models/user.rb
+- lib/tests/logger_test.rb
+- lib/tests/models/account_model_test.rb
+- lib/tests/models/comment_model_test.rb
+- lib/tests/models/db_objectable_test.rb
+- lib/tests/models/seralizable_test.rb
+- lib/tests/models/user_model_test.rb
 - lib/tests/rubee_generator_test.rb
-- lib/tests/rubeeapp_test.rb
 - lib/tests/test.db
 - lib/tests/test_helper.rb
-- lib/tests/user_model_test.rb
 - readme.md
 homepage: https://github.com/nucleom42/rubee
 licenses:

data/lib/app/views/apples_.erb

@@ -1 +0,0 @@
-<h1>apples_ View</h1>

data/lib/app/views/s_.erb

@@ -1 +0,0 @@
-<h1>s_ View</h1>