ru.Bee 1.9.14 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5259ec5377cfbd7a49693fa00e3d472725a7c95ee573dad1cc76ac883fe2e276
-  data.tar.gz: 1e81a561bcd800bbced87c9efc0ff1d7795e248d52f37463d054c7bd19445157
+  metadata.gz: 4309600ffa9a5cff66e752b2068805b1b5a0f16471b6be7a5ac00c7e1326c75a
+  data.tar.gz: f8fd1a0ac518e24eb9c03885e39448a7f1f94bfce6f5a5bdfd5e99ea35987bf2
 SHA512:
-  metadata.gz: b745d2eb4ff623ab0c16cd6c972a656f981691afbfb6daeebc774cf2a0e2989f904cc00ccd277485599e64f6aa273663176e2dc36993067815f25059269b1d64
-  data.tar.gz: 6e9a8cb3555237fd765e8a8e0eb5ffe959bbd3f075ab6e67b0b91093491ee2203d05f15b4c4308c8800196b2bdbe07f593d7fed8cd9fd15c739455328f05639e
+  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/app/views/s_.erb

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

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/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.14'
+  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

@@ -18,7 +18,7 @@ Want to get a quick API server up and runing? You can do it for real quick!
 
 ## Production ready
 
-Take a look on the rubee demo site with all documentation stored in there: https://rubee.duckdns.org
+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
@@ -44,7 +44,6 @@ Transfer/sec:    140.07KB
 
 This demonstrates RUBEE’s efficient architecture and suitability for lightweight deployments — even on low-power hardware.
 
-
 ## Content
 
 - [Installation](#installation)
@@ -65,10 +64,10 @@ This demonstrates RUBEE’s efficient architecture and suitability for lightweig
 - [Modular](#modualar-application)
 - [Logger](#logger)
 
-<details>
-<summary id="content">📚 Documentation Content — Click to expand!</summary>
+You can read it on the demo [site](https://rubee.dedyn.io/)
 
-You can read it on the demo [site](https://rubee.duckdns.org/docs).
+🚧 The doc site is on uodate mode now. We are working on it.
+Please refer to downbelow documentation.
 
 ## Features
 
@@ -698,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|
@@ -1025,15 +1027,16 @@ When you trigger the controller action, the logs will look like this:
 
 [Back to content](#content)
 
-</details>
-
 ### Contributing
 
 If you are interested in contributing to RUBEE,
-please read the [Contributing](https://github.com/nucleom42/rubee/blob/main/CONTRIBUTING.md) guide.
+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.14
+  version: 1.10.0
 platform: ruby
 authors:
 - Oleg Saltykov
@@ -47,6 +47,7 @@ files:
 - 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