ru.Bee 1.9.13 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67b4b7a2e0717e400e958cabecbab8ad3fd47725015ba3ef1ee9245fe1ea9e12
-  data.tar.gz: 51de37c21accea30e09def16555077af3a6076110c69746a6245e2a79e242f94
+  metadata.gz: 4309600ffa9a5cff66e752b2068805b1b5a0f16471b6be7a5ac00c7e1326c75a
+  data.tar.gz: f8fd1a0ac518e24eb9c03885e39448a7f1f94bfce6f5a5bdfd5e99ea35987bf2
 SHA512:
-  metadata.gz: 9453e184e417bd47d87729d307c171cdf35d1f482f0a326432dd5a4d740ea007995420f4d9163b3c82b1d0e297bfcc133479ec4127d9b0520b1a7fc81969c8a9
-  data.tar.gz: e45a5a0ac96acb7306788bd95d760231494b1db18ebc4439fed99bd6571876c83579187b3836a54f869afcef1be9383af88d1d7d89766063c22b19c729fbc061
+  metadata.gz: ed3f43069f1b6c7e9dd3633e54ca9eb76b5fe8ed11c944690959f8c971623a33b688e156a8996477c49ce177f5702f2a6a87196299b881bb1f8c6d8a42ee725c
+  data.tar.gz: d560d5c3272d758b1f082c1a036e092f95e86d8cbb6243ff44fff39b1872b46cea410e96d31b6317ac6a916619ce6dd539e5054f3998af0712d5d86c4f029b6a

data/lib/app/models/user.rb

@@ -2,5 +2,5 @@
 # If you remove or modify it, make sure all changes are inlined
 # with AuthTokenMiddleware and AuthTokenable modules
 class User < Rubee::SequelObject
-  attr_accessor :id, :email, :password
+  attr_accessor :id, :email, :password, :created, :updated
 end

data/lib/db/create_accounts.rb

@@ -6,6 +6,9 @@ class CreateAccounts
       primary_key(:id)
       String(:addres)
       foreign_key(:user_id, :users)
+      # timestamps
+      datetime(:created)
+      datetime(:updated)
     end
 
     Account.create(addres: '13th Ave, NY', user_id: User.all.first.id)

data/lib/db/create_addresses.rb

@@ -10,6 +10,9 @@ class CreateAddresses
       String(:street)
       String(:apt)
       foreign_key(:user_id, :users)
+      # timestamps
+      datetime(:created)
+      datetime(:updated)
     end
 
     # Address.create(street: '13th Ave', city: 'NY', state: 'NY', zip: '55555', user_id: User.all.first.id)

data/lib/db/create_comments.rb

@@ -6,6 +6,10 @@ class CreateComments
       primary_key(:id)
       String(:text)
       Integer(:user_id)
+      # timestamps
+      datetime(:created)
+      datetime(:updated)
+
     end
 
     User.create(email: 'ok@ok.com', password: 'password')

data/lib/db/create_posts.rb

@@ -6,6 +6,9 @@ class CreatePosts
       primary_key(:id)
       foreign_key(:user_id, :users)
       foreign_key(:comment_id, :comments)
+      # timestamps
+      datetime(:created)
+      datetime(:updated)
     end
 
     Post.create(user_id: User.all.first.id, comment_id: Comment.all.first.id)

data/lib/db/create_users.rb

@@ -9,6 +9,9 @@ class CreateUsers
       String(:email)
       String(:password)
       index(:email)
+      # timestamps
+      datetime(:created)
+      datetime(:updated)
     end
 
     User.create(email: 'ok@ok.com', password: 'password')

data/lib/rubee/cli/react.rb

@@ -22,6 +22,14 @@ module Rubee
             exec('npm run watch')
           end
         end
+
+        def build(_argv)
+          if Rubee::PROJECT_NAME == 'rubee'
+            exec('cd ./lib && npm run build')
+          else
+            exec('npm run build')
+          end
+        end
       end
     end
   end

data/lib/rubee/extensions/hookable.rb

@@ -7,8 +7,18 @@ module Rubee
 
     module ClassMethods
       def before(*methods, handler, **options)
+        if options[:class_methods]
+          methods.each do |method|
+            define_method(method) do |*args, &block|
+              self.class.send(method, *args, &block)
+            end
+
+            private(method)
+          end
+        end
+
         methods.each do |method|
-          hooks = Module.new do
+          hook = Module.new do
             define_method(method) do |*args, &block|
               if conditions_met?(options[:if], options[:unless])
                 handler.respond_to?(:call) ? handler.call : send(handler)
@@ -17,13 +27,24 @@ module Rubee
               super(*args, &block)
             end
           end
-          prepend(hooks)
+
+          prepend(hook)
         end
       end
 
       def after(*methods, handler, **options)
+        if options[:class_methods]
+          methods.each do |method|
+            define_method(method) do |*args, &block|
+              self.class.send(method, *args, &block)
+            end
+
+            private(method)
+          end
+        end
+
         methods.each do |method|
-          hooks = Module.new do
+          hook = Module.new do
             define_method(method) do |*args, &block|
               result = super(*args, &block)
 
@@ -34,13 +55,24 @@ module Rubee
               result
             end
           end
-          prepend(hooks)
+
+          prepend(hook)
         end
       end
 
       def around(*methods, handler, **options)
+        if options[:class_methods]
+          methods.each do |method|
+            define_method(method) do |*args, &block|
+              self.class.send(method, *args, &block)
+            end
+
+            private(method)
+          end
+        end
+
         methods.each do |method|
-          hooks = Module.new do
+          hook = Module.new do
             define_method(method) do |*args, &block|
               if conditions_met?(options[:if], options[:unless])
                 if handler.respond_to?(:call)
@@ -60,7 +92,8 @@ module Rubee
               end
             end
           end
-          prepend(hooks)
+
+          prepend(hook)
         end
       end
     end
@@ -68,6 +101,10 @@ module Rubee
     module InstanceMethods
       private
 
+      def handle_class_method
+        self.class.send(name, *args, &block)
+      end
+
       def conditions_met?(if_condition = nil, unless_condition = nil)
         return true if if_condition.nil? && unless_condition.nil?
 

data/lib/rubee/models/sequel_object.rb

@@ -4,6 +4,8 @@ module Rubee
     using ChargedString
     using ChargedHash
 
+    before :save, :update, :set_timestamps
+
     def destroy(cascade: false, **_options)
       if cascade
         # find all tables with foreign key
@@ -41,14 +43,15 @@ module Rubee
       true
     end
 
-    def assign_attributes(args = {})
-      to_h.each_key do |attr|
+    def assign_attributes(args={})
+      self.class.dataset.columns do |attr|
         send("#{attr}=", args[attr.to_sym]) if args[attr.to_sym]
       end
     end
 
-    def update(args = {})
+    def update(args={})
       assign_attributes(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) }
 
@@ -63,6 +66,15 @@ module Rubee
       self.class.find(id)
     end
 
+    private
+
+    def set_timestamps
+      return unless respond_to?(:created) && respond_to?(:updated)
+
+      self.created ||= Time.now
+      self.updated = Time.now
+    end
+
     class << self
       def last
         found_hash = dataset.order(:id).last
@@ -191,6 +203,10 @@ module Rubee
       end
 
       def create(attrs)
+        if dataset.columns.include?(:created) && dataset.columns.include?(:updated)
+          attrs.merge!(created: Time.now, updated: Time.now)
+        end
+
         out_id = Rubee::DBTools.with_retry { dataset.insert(**attrs) }
         new(**attrs.merge(id: out_id))
       end

data/lib/rubee.rb

@@ -16,7 +16,7 @@ module Rubee
   JS_DIR = File.join(APP_ROOT, LIB, 'js') unless defined?(JS_DIR)
   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 = '1.9.13'
+  VERSION = '1.10.0'
 
   require_relative 'rubee/router'
   require_relative 'rubee/logger'

data/lib/tests/example_models/account.rb

@@ -1,5 +1,5 @@
 class Account < Rubee::SequelObject
-  attr_accessor :id, :addres, :user_id
+  attr_accessor :id, :addres, :user_id, :created, :updated
 
   holds :user
 end

data/lib/tests/example_models/address.rb

@@ -1,5 +1,5 @@
 class Address < Rubee::SequelObject
-  attr_accessor :id, :street, :apt, :city, :state, :zip, :user_id
+  attr_accessor :id, :street, :apt, :city, :state, :zip, :user_id, :created, :updated
 
   holds :user
 end

data/lib/tests/example_models/comment.rb

@@ -1,5 +1,5 @@
 class Comment < Rubee::SequelObject
-  attr_accessor :id, :text, :user_id
+  attr_accessor :id, :text, :user_id, :created, :updated
 
   owns_many :users, over: :posts
 end

data/lib/tests/example_models/post.rb

@@ -1,5 +1,5 @@
 class Post < Rubee::SequelObject
-  attr_accessor :id, :user_id, :comment_id
+  attr_accessor :id, :user_id, :comment_id, :created, :updated
 
   holds :comment
   holds :user

data/lib/tests/example_models/user.rb

@@ -1,5 +1,5 @@
 class User < Rubee::SequelObject
-  attr_accessor :id, :email, :password
+  attr_accessor :id, :email, :password, :created, :updated
 
   owns_many :accounts, cascade: true
   owns_one :address, cascade: true

data/lib/tests/models/user_model_test.rb

@@ -1,4 +1,5 @@
 require_relative '../test_helper'
+
 describe 'User model' do
   describe '.create' do
     after do
@@ -11,6 +12,18 @@ describe 'User model' do
 
         _(user.persisted?).must_equal(true)
       end
+
+      it 'set created field' do
+        user = User.create(email: 'ok-test@test.com', password: '123')
+
+        _(user.created.is_a?(Time)).must_equal(true)
+      end
+
+      it 'set updated field' do
+        user = User.create(email: 'ok-test@test.com', password: '123')
+
+        _(user.updated.is_a?(Time)).must_equal(true)
+      end
     end
 
     describe 'when data is invalid' do
@@ -39,6 +52,15 @@ describe 'User model' do
 
         _(user.persisted?).must_equal(true)
       end
+
+      it 'updates updated field' do
+        user = User.create(email: 'ok-test@test.com', password: '123')
+        after_create_updated = user.updated
+
+        user.email = 'ok-test2@test.com'
+        user.save
+        _(user.updated > after_create_updated).must_equal(true)
+      end
     end
 
     describe 'when save existing user' do
@@ -108,6 +130,25 @@ describe 'User model' do
 
         _(user.reload.password).must_equal('1234')
       end
+
+      it 'updates updated field' do
+        user = User.create(email: 'ok-test@test.com', password: '123')
+        after_create_updated = user.updated
+
+        user.update(email: 'ok-test2@test.com')
+        _(user.updated > after_create_updated).must_equal(true)
+      end
+    end
+
+    describe 'when udpate existing user with no argumants' do
+      it 'update updated field' do
+        user = User.new(email: 'ok-test@test.com', password: '123')
+        user.save
+        updated_field_before_update = user.updated
+
+        user.update
+        _(user.updated > updated_field_before_update).must_equal(true)
+      end
     end
   end
 

data/readme.md

@@ -6,7 +6,7 @@
 ![GitHub Repo stars](https://img.shields.io/github/stars/nucleom42/rubee?style=social)
 
 
-# <img src="lib/images/rubee.svg" alt="ruBee" height="40"> ... ruBee
+# <img src="lib/images/rubee.svg" alt="RUBEE" height="40"> ... RUBEE
 
 Rubee is a Ruby-based framework designed to streamline the development of modular monolith applications. \
 It offers a structured approach to building scalable, maintainable, and React-ready projects, \
@@ -15,6 +15,35 @@ making it an ideal choice for developers seeking a balance between monolithic si
 Want to get a quick API server up and runing? You can do it for real quick!
 <br />
 [![Watch the demo](https://img.youtube.com/vi/ko7H70s7qq0/hqdefault.jpg)](https://www.youtube.com/watch?v=ko7H70s7qq0)
+
+## Production ready
+
+Take a look on the rubee demo site with all documentation stored in there: https://rubee.dedyn.io/
+Want to explore how it built? https://github.com/nucleom42/rubee-site
+
+## Stress tested
+
+```bash
+wrk -t4 -c100 -d30s https://rubee.duckdns.org/docs
+Running 30s test @ https://rubee.duckdns.org/docs
+  4 threads and 100 connections
+  Thread Stats   Avg      Stdev     Max   +/- Stdev
+    Latency   304.95ms   33.22ms 551.86ms   90.38%
+    Req/Sec    82.25     42.37   280.00     69.86%
+  9721 requests in 30.02s, 4.11MB read
+Requests/sec:    323.78
+Transfer/sec:    140.07KB
+```
+
+- Short output explanation:
+- Requests/sec: ~324
+- Average latency: ~305 ms
+- Total requests handled: 9,721
+- Hardware: Raspberry Pi 5(8 Gb) (single board computer)
+- Server: Rubee app hosted via Nginx + HTTPS
+
+This demonstrates RUBEE’s efficient architecture and suitability for lightweight deployments — even on low-power hardware.
+
 ## Content
 
 - [Installation](#installation)
@@ -35,44 +64,49 @@ Want to get a quick API server up and runing? You can do it for real quick!
 - [Modular](#modualar-application)
 - [Logger](#logger)
 
+You can read it on the demo [site](https://rubee.dedyn.io/)
+
+🚧 The doc site is on uodate mode now. We are working on it.
+Please refer to downbelow documentation.
+
 ## Features
 
-🐝 Lightweight – A minimal footprint focused on serving Ruby applications efficiently.
+Lightweight – A minimal footprint focused on serving Ruby applications efficiently.
 <br>
-🧩 Modular – A modular approach to application development. Build modular monoliths with ease by attaching \
+Modular – A modular approach to application development. Build modular monoliths with ease by attaching \
 as many subprojects as you need.
 <br>
-📜 Contract-driven – Define your API contracts in a simple, declarative way, then generate all the boilerplate you need.
+Contract-driven – Define your API contracts in a simple, declarative way, then generate all the boilerplate you need.
 <br>
-⚡ Fast – Optimized for speed, providing quick responses. (Everything is relative, we know! 😄)
+Fast – Optimized for speed, providing quick responses. (Everything is relative, we know! 😄)
 <br>
-🧱 Rack-powered – Built on Rack. The full Rack API is available for easy integration.
+Rack-powered – Built on Rack. The full Rack API is available for easy integration.
 <br>
-🗄️ Databases – Supports SQLite3, PostgreSQL, MySQL, and more via the Sequel gem.
+Databases – Supports SQLite3, PostgreSQL, MySQL, and more via the Sequel gem.
 <br>
-🖼️ Views – JSON, ERB, and plain HTML out of the box.
+Views – JSON, ERB, and plain HTML out of the box.
 <br>
-⚛️  React Ready – React is supported as a first-class Rubee view engine.
+React Ready – React is supported as a first-class Rubee view engine.
 <br>
-📦 Bundlable – Charge your Rubee app with any gem you need. Update effortlessly via Bundler.
+Bundlable – Charge your Rubee app with any gem you need. Update effortlessly via Bundler.
 <br>
-🧬 ORM-agnostic – Models are native ORM objects, but you can use them as blueprints for any data source.
+ORM-agnostic – Models are native ORM objects, but you can use them as blueprints for any data source.
 <br>
-🔐 Authenticatable – Easily add JWT authentication to any controller action.
+Authenticatable – Easily add JWT authentication to any controller action.
 <br>
-🪝 Hooks – Add logic before, after, or around any controller action.
+Hooks – Add logic before, after, or around any controller action.
 <br>
-🧪 Testable – Run all or selected tests using fast, beloved Minitest.
+Testable – Run all or selected tests using fast, beloved Minitest.
 <br>
-👷 Asyncable – Plug in async adapters and use any popular background job engine.
+Asyncable – Plug in async adapters and use any popular background job engine.
 <br>
-⌨️  Console – Start an interactive console and reload on the fly.
+Console – Start an interactive console and reload on the fly.
 <br>
-⚙️  Background Jobs – Schedule and process background jobs using your preferred async stack.
+Background Jobs – Schedule and process background jobs using your preferred async stack.
 
 ## Installation
 
-1. Install ruBee
+1. Install RUBEE
 ```bash
 gem install ru.Bee
 ```
@@ -97,7 +131,7 @@ Make sure:
 bundle install
 ```
 
-4. Run ruBee server. Default port is 7000
+4. Run RUBEE server. Default port is 7000
 ```bash
 rubee start # or rubee start_dev for development
 
@@ -158,7 +192,7 @@ This will generate the following files
 [Back to content](#content)
 
 ## Model
-Model in ruBee is just simple ruby object that can be serilalized in the view
+Model in RUBEE is just simple ruby object that can be serilalized in the view
 in the way it required (ie json).
 Here below is a simple example on how it can be used by rendering json from in memory object
 
@@ -510,13 +544,13 @@ Will generate:
 
 ### Modualar application
 
-You can also use ruBee to create modular applications.\
+You can also use RUBEE to create modular applications.\
 And attach as many subprojects you need.
 Main philosophy of attach functinality is to keep the main project clean and easy to maintain. It will still\
 share data with the main app. So where to define a border between the main app and subprojects is up to developer.
 Howerver by attching new subproject you will get a new folder and files configured and namespaced respectively.
 
-So if you need to extend your main app with a separate project, you can do it easily in ruBee.
+So if you need to extend your main app with a separate project, you can do it easily in RUBEE.
 1. Attach new subrpoject
 
 ```bash
@@ -585,7 +619,7 @@ rubee start # or rubee start_dev for development
 [Back to content](#content)
 
 ## Views
-View in ruBee is just a plain html/erb/react file that can be rendered from the controller.
+View in RUBEE is just a plain html/erb/react file that can be rendered from the controller.
 
 ## Templates over erb
 
@@ -663,6 +697,9 @@ So that will ensure all cahnges applying instantly.
 
 6. You can generate react view from the route by indicating the view name explicitly
 
+7. Do not forget to rebuild react app in production by running `rubee react build`. This is unnecessary in development,
+when you use `rubee react watch` tho. So it does rebuild automatically.
+
 ```ruby
 # config/routes.rb
 Rubee::Router.draw do |router|
@@ -727,7 +764,7 @@ function Users() {
 
 ## Object hooks
 
-In ruBee by extending Hookable module any Ruby object can be charged with hooks (logic),
+In RUBEE by extending Hookable module any Ruby object can be charged with hooks (logic),
 that can be executed before, after and around a specific method execution.
 
 Here below a controller example. However it can be used in any Ruby object, like Model etc.
@@ -858,7 +895,7 @@ rubee test auth_tokenable_test.rb # run specific tests
 [Back to content](#content)
 
 
-If you want to run any ruBee command within a specific ENV make sure you added it before a command.
+If you want to run any RUBEE command within a specific ENV make sure you added it before a command.
 For instance if you want to run console in test environment you need to run the following command
 
 ```bash
@@ -992,11 +1029,14 @@ When you trigger the controller action, the logs will look like this:
 
 ### Contributing
 
-If you are interested in contributing to ruBee,
-please read the [Contributing](https://github.com/nucleom42/rubee/blob/main/CONTRIBUTING.md) guide.
+If you are interested in contributing to RUBEE,
+please read the [Contributing]()https://github.com/nucleom42/rubee/blob/main/contribution.md) guide.
 Also feel free to open an [issue](https://github.com/nucleom42/rubee/issues) if you apot one.
 Have an idea or you wnat to discuss something?
 Please open a [discussion](https://github.com/nucleom42/rubee/discussions)
 
+## Roadmap
+Please refer the [Roadmap](https://github.com/nucleom42/rubee/blob/main/roadmap.md)
+
 ## License
 This project is released under the [MIT License](https://github.com/nucleom42/rubee/blob/main/LICENSE).

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ru.Bee
 version: !ruby/object:Gem::Version
-  version: 1.9.13
+  version: 1.10.0
 platform: ruby
 authors:
 - Oleg Saltykov
@@ -300,7 +300,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 3.7.0
 specification_version: 4
 summary: Fast and lightweight Ruby application server designed for minimalism and
   flexibility