RubyGems - ru.Bee - Versions diffs - 1.1.32 → 1.3.0 - Mend

ru.Bee 1.1.32 → 1.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (26) hide show

checksums.yaml +4 -4
data/bin/rubee +30 -12
data/lib/app/views/layout.erb +46 -0
data/lib/app/views/welcome_header.erb +1 -0
data/lib/app/views/welcome_show.erb +5 -43
data/lib/db/create_accounts.rb +14 -0
data/lib/db/create_comments.rb +13 -0
data/lib/db/create_posts.rb +14 -0
data/lib/db/structure.rb +92 -0
data/lib/rubee/async/asyncable.rb +1 -1
data/lib/rubee/controllers/base_controller.rb +22 -4
data/lib/rubee/models/database_objectable.rb +52 -0
data/lib/rubee/models/sequel_object.rb +103 -15
data/lib/rubee.rb +13 -2
data/lib/tests/account_model_test.rb +19 -0
data/lib/tests/comment_model_test.rb +35 -0
data/lib/tests/example_models/account.rb +4 -0
data/lib/tests/example_models/comment.rb +4 -0
data/lib/tests/example_models/post.rb +5 -0
data/lib/tests/example_models/user.rb +4 -0
data/lib/{db → tests}/test.db +0 -0
data/lib/tests/test_helper.rb +1 -1
data/lib/tests/user_model_test.rb +172 -2
data/readme.md +173 -17
metadata +15 -4
data/lib/rubee/models/database_object.rb +0 -50

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '03808642660607dcc9ecbd0f6f2fbcfc510e48f28e4eb583a0aace626642142f'
-  data.tar.gz: 11156690b45851b45f1ebeae3dff18ee8c9b44e2f3bef0a84d63a123f5e603a6
+  metadata.gz: a01285afa9a2c3b5f9a08cd5cbd58ddbd300181a1cc4c5b823710c873e84300a
+  data.tar.gz: 241e42bbccbfe0731d83b80d58f5d40f0969c003b067660e53ace470294f2896
 SHA512:
-  metadata.gz: 5b48a1ccc2b3c7c9f7a5eb9492f8fca77488d842599d1a38a6d64f2f2534e41d1e69d69de7aa6d045935c98578ad9b77b36ccedbbd72f3b4086b8855e8e87b4d
-  data.tar.gz: 0c7067e04ddb2039b84a734a29ed743dcd187ea0ff8a21d076bd9c1c06d6413105c1c631b398c35186ee84c5a2d08c011cb24ed6b80bba0de57a3379f1d54d1b
+  metadata.gz: 2dbdeed01d5187c61ebbc3bc5773ce9d6150f6952fe634e76d4c8f22718b3c14091f591b879e9ecf94954672d8f9719ce1994f490966cc2d79aa899baca8e994
+  data.tar.gz: 91eaf06432d1f35f1c1450ea0af9bac800194bfc448bd055e7455294170682965f9e25122e2a6e64d9587049dbe6b91c6b062c6a345381cd11c3f22bb98fd60d

data/bin/rubee CHANGED Viewed

@@ -160,7 +160,7 @@ elsif command == "test"
     color_puts "Running all tests ...", color: :yellow
     exec("ruby -Itest -e \"Dir.glob('.#{lib}/tests/**/*_test.rb').each { |file| require file }\"")
   end
-elsif ['generate', 'g'].include? command
+elsif ['generate', 'gen'].include? command
   method, path = ARGV[1..2]
   ENV['RACK_ENV'] ||= 'development'
@@ -181,9 +181,9 @@ elsif command == "db"
   command, file_name = ARGV[1]&.split(':')
   if Rubee::PROJECT_NAME == 'rubee'
     Rubee::Configuration.setup(env=:test) do |config|
-      config.database_url = { url: "sqlite://test.db", env: }
+      config.database_url = { url: "sqlite://lib/tests/test.db", env: }
     end
-    Rubee::SequelObject.reconnect!
+    Rubee::SequelObject.reconnect! unless command == 'init'
   end
   def ensure_database_exists(db_url)
@@ -193,7 +193,7 @@ elsif command == "db"
       begin
         Sequel.connect(db_url)
         color_puts "Database #{ENV['RACK_ENV']} exists", color: :cyan
-      rescue => _
+      rescue Exception => e
         if File.exist?(db_path = db_url.sub(/^sqlite:\/\//, ''))
           color_puts "Database #{ENV['RACK_ENV']} exists", color: :cyan
         else
@@ -237,14 +237,22 @@ elsif command == "db"
   end
-    if command == 'run'
+  if command == 'run'
     Rubee::Autoload.call
+    file_names = if file_name == 'all'
+      lib = Rubee::PROJECT_NAME == 'rubee' ? '/lib' : ''
+      Dir.glob(".#{lib}/db/*.rb").map { |file| File.basename(file, '.rb') }.select { |file| file != 'structure' }
+    else
+      [file_name]
+    end
     Rubee::Configuration.envs.each do |env|
       ENV['RACK_ENV'] = env.to_s
-      color_puts "Run #{file_name} file for #{env} env", color: :cyan
-      Object.const_get(file_name.split('_').map(&:capitalize).join).new.call
+      file_names.each do |file_name|
+        color_puts "Run #{file_name} file for #{env} env", color: :cyan
+        Object.const_get(file_name.split('_').map(&:capitalize).join).new.call
+      end
     end
-    color_puts "Migration #{file_name} completed", color: :green
+    color_puts "Migration for #{file_name} completed", color: :green
     unless Rubee::PROJECT_NAME == 'rubee'
       color_puts "Regenerate schema file", color: :cyan
       generate_structure
@@ -261,15 +269,25 @@ elsif ['console'].include? command
   ENV['RACK_ENV'] ||= 'development'
   Rubee::Autoload.call
+  if Rubee::PROJECT_NAME == 'rubee'
+    Rubee::Configuration.setup(env=:test) do |config|
+      config.database_url = { url: "sqlite://lib/tests/test.db", env: }
+    end
+    Rubee::Autoload.call
+    Rubee::SequelObject.reconnect!
+  end
   def reload
-    app_files = Dir["./#{APP_ROOT}/**/*.rb"]
+    app_files = Dir["./#{Rubee::APP_ROOT}/**/*.rb"]
     app_files.each { |file| load file }
     color_puts "Reloaded ..", color: :green
   end
-  # Start IRB
-  IRB.start
+  begin
+    # Start IRB
+    IRB.start
+  rescue Exception => e
+    IRB.start
+  end
 else
   color_puts "Unknown command: #{command}", color: :red
 end

data/lib/app/views/layout.erb ADDED Viewed

@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title><%= @title || '' %></title>
+    <style>
+        body {
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            height: 100vh;
+            margin: 0;
+            background-color: #fdf6a5;
+            text-align: center;
+            font-family: Arial, sans-serif;
+        }
+        .container {
+            padding: 20px;
+            background: white;
+            border-radius: 10px;
+            box-shadow: 0 4px 8px rgba(0, 0, 0, 0.2);
+        }
+        img {
+            width: 50px;
+            height: auto;
+            margin-top: 10px;
+        }
+        h1 {
+            font-size: 1.8rem;
+            margin: 10px 0;
+        }
+        @media (max-width: 600px) {
+            h1 {
+                font-size: 1.5rem;
+            }
+            img {
+                width: 60px;
+            }
+        }
+    </style>
+</head>
+<body>
+    <%= _yield_template %>
+</body>
+</html>

data/lib/app/views/welcome_header.erb ADDED Viewed

	@@ -0,0 +1 @@
1	+ <h1>All set up and running!</h1>

data/lib/app/views/welcome_show.erb CHANGED Viewed

@@ -1,52 +1,14 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Setup Complete</title>
-    <style>
-        body {
-            display: flex;
-            justify-content: center;
-            align-items: center;
-            height: 100vh;
-            margin: 0;
-            background-color: #fdf6a5;
-            text-align: center;
-            font-family: Arial, sans-serif;
-        }
-        .container {
-            padding: 20px;
-            background: white;
-            border-radius: 10px;
-            box-shadow: 0 4px 8px rgba(0, 0, 0, 0.2);
-        }
-        img {
-            width: 50px;
-            height: auto;
-            margin-top: 10px;
-        }
-        h1 {
-            font-size: 1.8rem;
-            margin: 10px 0;
-        }
-        @media (max-width: 600px) {
-            h1 {
-                font-size: 1.5rem;
-            }
-            img {
-                width: 60px;
-            }
-        }
-    </style>
-</head>
-<body>
     <div class="container">
-        <h1>All set up and running!</h1>
+        <%= render_template :welcome_header %>
         <br/>
         <img src="images/rubee.svg" alt="ruBee">
         <br/>
         <p>rubee homepage: <a href="https://github.com/nucleom42/rubee"><br/>https://github.com/nucleom42/rubee</a></p>
+        <br/>
+        <p>Version: <%= Rubee::VERSION %></p>
     </div>
-</body>
-</html>

data/lib/db/create_accounts.rb ADDED Viewed

@@ -0,0 +1,14 @@
+class CreateAccounts
+  def call
+    unless Rubee::SequelObject::DB.tables.include?(:accounts)
+      Rubee::SequelObject::DB.create_table :accounts do
+        primary_key :id
+        String :addres
+        foreign_key :user_id, :users
+      end
+      Account.create(addres: "13th Ave, NY", user_id: User.all.first.id)
+      Account.create(addres: "14th Ave, NY", user_id: User.all.last.id)
+    end
+  end
+end

data/lib/db/create_comments.rb ADDED Viewed

@@ -0,0 +1,13 @@
+class CreateComments
+  def call
+    unless Rubee::SequelObject::DB.tables.include?(:comments)
+      Rubee::SequelObject::DB.create_table :comments do
+        primary_key :id
+        String :text
+        Integer :user_id
+      end
+      User.create(email: "ok@ok.com", password: "password")
+    end
+  end
+end

data/lib/db/create_posts.rb ADDED Viewed

@@ -0,0 +1,14 @@
+class CreatePosts
+  def call
+    unless Rubee::SequelObject::DB.tables.include?(:posts)
+      Rubee::SequelObject::DB.create_table :posts do
+        primary_key :id
+        foreign_key :user_id, :users
+        foreign_key :comment_id, :comments
+      end
+      Post.create(user_id: User.all.first.id, comment_id: Comment.all.first.id)
+      Post.create(user_id: User.all.last.id, comment_id: Comment.all.last.id)
+    end
+  end
+end

data/lib/db/structure.rb CHANGED Viewed

@@ -30,5 +30,97 @@ STRUCTURE = {
       ruby_default: nil,
       max_length: 255
     }
+  },
+  accounts: {
+    id: {
+      generated: false,
+      allow_null: false,
+      default: nil,
+      db_type: "INTEGER",
+      primary_key: true,
+      auto_increment: true,
+      type: "integer",
+      ruby_default: nil
+    },
+    addres: {
+      generated: false,
+      allow_null: true,
+      default: nil,
+      db_type: "varchar(255)",
+      primary_key: false,
+      type: "string",
+      ruby_default: nil,
+      max_length: 255
+    },
+    user_id: {
+      generated: false,
+      allow_null: true,
+      default: nil,
+      db_type: "INTEGER",
+      primary_key: false,
+      type: "integer",
+      ruby_default: nil
+    }
+  },
+  posts: {
+    id: {
+      generated: false,
+      allow_null: false,
+      default: nil,
+      db_type: "INTEGER",
+      primary_key: true,
+      auto_increment: true,
+      type: "integer",
+      ruby_default: nil
+    },
+    user_id: {
+      generated: false,
+      allow_null: true,
+      default: nil,
+      db_type: "INTEGER",
+      primary_key: false,
+      type: "integer",
+      ruby_default: nil
+    },
+    comment_id: {
+      generated: false,
+      allow_null: true,
+      default: nil,
+      db_type: "INTEGER",
+      primary_key: false,
+      type: "integer",
+      ruby_default: nil
+    }
+  },
+  comments: {
+    id: {
+      generated: false,
+      allow_null: false,
+      default: nil,
+      db_type: "INTEGER",
+      primary_key: true,
+      auto_increment: true,
+      type: "integer",
+      ruby_default: nil
+    },
+    text: {
+      generated: false,
+      allow_null: true,
+      default: nil,
+      db_type: "varchar(255)",
+      primary_key: false,
+      type: "string",
+      ruby_default: nil,
+      max_length: 255
+    },
+    user_id: {
+      generated: false,
+      allow_null: true,
+      default: nil,
+      db_type: "INTEGER",
+      primary_key: false,
+      type: "integer",
+      ruby_default: nil
+    }
   }
 }

data/lib/rubee/async/asyncable.rb CHANGED Viewed

@@ -1,5 +1,5 @@
 unless defined?(Rubee)
-  require_relative '../../../../ee.rb'
+  require_relative '../../../../rubee.rb'
   Rubee::Autoload.call
 end

data/lib/rubee/controllers/base_controller.rb CHANGED Viewed

@@ -18,7 +18,7 @@ module Rubee
       end
     end
-    def response_with type: nil, object: nil, status: 200, mime_type: nil, render_view: nil, headers: {}, to: nil, file: nil, filename: nil
+    def response_with type: nil, object: nil, status: 200, mime_type: nil, render_view: nil, headers: {}, to: nil, file: nil, filename: nil, **options
       case type&.to_sym
       in :json
         rendered_json = object.is_a?(Array) ? object&.map(&:to_h).to_json : object.to_json
@@ -42,13 +42,31 @@ module Rubee
         return [302, headers.merge("location" => "#{to}"), ["Unauthentificated"]]
       else # rendering erb view is a default behavior
         view_file_name = self.class.name.split("Controller").first.downcase
-        erb_file = render_view ? "#{render_view}.erb" : "#{view_file_name}_#{@route[:action]}.erb"
+        erb_file = render_view ? "#{render_view}" : "#{view_file_name}_#{@route[:action]}"
         lib = Rubee::PROJECT_NAME == 'rubee' ? 'lib/' : ''
-        rendered_erb = ERB.new(File.open("#{lib}app/views/#{erb_file}").read).result(binding)
-        return [status, headers.merge("content-type" => "text/html"), [rendered_erb]]
+        view = render_template(erb_file, { object:, **(options[:locals] || {}) })
+        whole_erb = if File.exist?(layout_path = "#{lib}app/views/#{options[:layout] || 'layout'}.erb")
+          context = Object.new
+          context.define_singleton_method(:_yield_template) { view }
+          layout = File.read(layout_path)
+          ERB.new(layout).result(context.instance_eval { binding })
+        else
+          ERB.new(view).result(binding)
+        end
+        return [status, headers.merge("content-type" => "text/html"), [whole_erb]]
       end
     end
+    def render_template(file_name, locals = {})
+      lib = Rubee::PROJECT_NAME == 'rubee' ? 'lib/' : ''
+      path = "#{lib}app/views/#{file_name}.erb"
+      erb_template = ERB.new(File.read(path))
+      erb_template.result(binding)
+    end
     def params
       inputs = @request.env['rack.input'].read
       body = JSON.parse(@request.body.read.strip) rescue body = {}

data/lib/rubee/models/database_objectable.rb ADDED Viewed

@@ -0,0 +1,52 @@
+module Rubee
+  module DatabaseObjectable
+    def self.included(base)
+      base.extend ClassMethods
+      base.include InstanceMethods
+      base.prepend Initializer
+      base.include Rubee::Hookable
+      base.include Rubee::Serializable
+    end
+    module ClassMethods
+      def pluralize_class_name
+        pluralize(self.name.downcase)
+      end
+      def pluralize(word)
+        if word.end_with?('y') && !%w[a e i o u].include?(word[-2])
+          word[0..-2] + 'ies' # Replace "y" with "ies"
+        elsif word.end_with?('s', 'x', 'z', 'ch', 'sh')
+          word + 'es' # Add "es" for certain endings
+        else
+          word + 's' # Default to adding "s"
+        end
+      end
+      def singularize(word)
+        if word.end_with?('ies') && word.length > 3
+          word[0..-4] + 'y' # Convert "ies" to "y"
+        elsif word.end_with?('es') && %w[s x z ch sh].any? { |ending| word[-(ending.length + 2)..-3] == ending }
+          word[0..-3] # Remove "es" for words like "foxes", "buses"
+        elsif word.end_with?('s') && word.length > 1
+          word[0..-2] # Remove "s" for regular plurals
+        else
+          word # Return as-is if no plural form is detected
+        end
+      end
+      def accessor_names
+        instance_methods(false)
+          .select { |m| method_defined?("#{m}=") }  # Check if setter exists
+      end
+    end
+    module InstanceMethods
+    end
+    module Initializer
+    end
+  end
+end

data/lib/rubee/models/sequel_object.rb CHANGED Viewed

@@ -1,9 +1,21 @@
 module Rubee
-  class SequelObject < DatabaseObject
-    DB = Sequel.connect(Rubee::Configuration.get_database_url) rescue nil
-    def destroy
-      self.class.connection.where(id:).delete
+  class SequelObject
+    include Rubee::DatabaseObjectable
+    def destroy(cascade: false, **options)
+      if cascade
+        # find all tables with foreign key
+        tables_with_fk = DB.tables.select do |table|
+          DB.foreign_key_list(table).any? { |fk| fk[:table] == self.class.pluralize_class_name.to_sym }
+        end
+        # destroy related records
+        tables_with_fk.each do |table|
+          fk_name ||= "#{self.class.name.to_s.downcase}_id".to_sym
+          target_klass = Object.const_get(self.class.singularize(table.to_s).capitalize)
+          target_klass.where(fk_name => id).map(&:destroy)
+        end
+      end
+      self.class.dataset.where(id:).delete
     end
     def save
@@ -28,7 +40,7 @@ module Rubee
     def update(args = {})
       assign_attributes(args)
-      found_hash = self.class.connection.where(id:)
+      found_hash = self.class.dataset.where(id:)
       return self.class.find(id) if found_hash&.update(**args)
       false
@@ -44,46 +56,122 @@ module Rubee
     class << self
       def last
-        found_hash = connection.order(:id).last
+        found_hash = dataset.order(:id).last
+        return self.new(**found_hash) if found_hash
+        nil
+      end
+      def first
+        found_hash = dataset.order(:id).first
         return self.new(**found_hash) if found_hash
         nil
       end
+      # ## User
+      # owns_many :comments
+      # > user.comments
+      # > [<comment1>, <comment2>]
+      def owns_many(assoc, fk_name: nil, over: nil, **options)
+        singularized_assoc_name = singularize(assoc.to_s)
+        fk_name ||= "#{self.name.to_s.downcase}_id"
+        define_method(assoc) do
+          klass = Object.const_get(singularized_assoc_name.capitalize)
+          if over
+            sequel_dataset = klass
+              .join(over.to_sym, "#{singularized_assoc_name}_id".to_sym => :id)
+              .where(fk_name.to_sym => id)
+            self.class.serialize(sequel_dataset, klass)
+          else
+            klass.where(fk_name.to_sym => id)
+          end
+        end
+      end
+      # ## Comment
+      # owns_one :user
+      # > comment.user
+      # > <user>
+      def owns_one(assoc, options={})
+        Sequel::Model.one_to_one(assoc, **options)
+        fk_name ||= "#{self.name.to_s.downcase}_id"
+        define_method(assoc) do
+          Object.const_get(assoc.capitalize).where(fk_name.to_sym => id)&.first
+        end
+      end
+      # ## Account
+      # holds :user
+      # > account.user
+      # > <user>
+      def holds(assoc, fk_name: nil, **options)
+        fk_name ||= "#{assoc.to_s.downcase}_id"
+        define_method(assoc) do
+          target_klass = Object.const_get(assoc.capitalize)
+          target_klass.find(self.send(fk_name))
+        end
+      end
       def reconnect!
+        return if defined?(DB) && !DB.nil?
         const_set(:DB, Sequel.connect(Rubee::Configuration.get_database_url))
       end
-      def connection
-        @connection ||= DB[pluralize_class_name.to_sym]
+      def dataset
+        @dataset ||= DB[pluralize_class_name.to_sym]
+      rescue Exception => _
+        reconnect!
+        retry
       end
       def all
-        connection.map do |record_hash|
+        dataset.map do |record_hash|
           self.new(**record_hash)
         end
       end
       def find(id)
-        found_hash = connection.where(id:)&.first
+        found_hash = dataset.where(id:)&.first
         return self.new(**found_hash) if found_hash
         nil
       end
       def where(args)
-        connection.where(**args).map do |record_hash|
+        dataset.where(**args).map do |record_hash|
+          self.new(**record_hash)
+        end
+      end
+      def order(*args)
+        dataset.order(*args).map do |record_hash|
           self.new(**record_hash)
         end
       end
+      def join(assoc, args)
+        dataset.join(assoc, **args)
+      end
       def create(attrs)
-        out_id = connection.insert(**attrs)
+        out_id = dataset.insert(**attrs)
         self.new(**(attrs.merge(id: out_id)))
       end
-      def destroy_all
-        all.each(&:destroy)
+      def destroy_all(cascade: false)
+        all.each{ |record| record.destroy(cascade:) }
+      end
+      def serialize(suquel_dataset, klass = nil)
+        klass ||= self
+        suquel_dataset.map do |record_hash|
+          target_klass_fields = DB[pluralize(klass.name.downcase).to_sym].columns
+          klass_attributes = record_hash.filter{ target_klass_fields.include? _1 }
+          klass.new(**klass_attributes)
+        end
       end
     end
   end

data/lib/rubee.rb CHANGED Viewed

@@ -8,7 +8,7 @@ module Rubee
   APP_ROOT = File.expand_path(Dir.pwd) unless defined?(APP_ROOT)
   IMAGE_DIR = File.join(APP_ROOT, 'images') unless defined?(IMAGE_DIR)
   PROJECT_NAME = File.basename(APP_ROOT) unless defined?(PROJECT_NAME)
-  VERSION = '1.1.32'
+  VERSION = '1.2.0'
   class Application
     include Singleton
@@ -123,6 +123,8 @@ module Rubee
         # autoload all rbs
         root_directory = File.dirname(__FILE__)
         priority_order_require(root_directory, black_list)
+        # ensure sequel object is connected
+        Rubee::SequelObject.reconnect!
         Dir.glob(File.join(APP_ROOT, '**', '*.rb')).sort.each do |file|
           base_name = File.basename(file)
@@ -149,6 +151,15 @@ module Rubee
         # app config and routes
         lib = PROJECT_NAME == 'rubee' ? 'lib/' : ''
         require_relative File.join(APP_ROOT, lib, "config/base_configuration") unless black_list.include?('base_configuration.rb')
+        # This is necessary prerequisitedb init step
+        unless defined?(Rubee::SequelObject::DB)
+          if PROJECT_NAME == 'rubee'
+            Rubee::Configuration.setup(env=:test) do |config|
+              config.database_url = { url: "sqlite://lib/tests/test.db", env: }
+            end
+          end
+        end
         require_relative File.join(APP_ROOT, lib, "config/routes") unless black_list.include?('routes.rb')
         # rubee extensions
         Dir[File.join(root_directory, "rubee/extensions/**", '*.rb')].each do |file|
@@ -163,7 +174,7 @@ module Rubee
         end
         require_relative File.join(root_directory, "rubee/controllers/base_controller") unless black_list.include?('base_controller.rb')
         # rubee models
-        require_relative File.join(root_directory, "rubee/models/database_object") unless black_list.include?('database_object.rb')
+        require_relative File.join(root_directory, "rubee/models/database_objectable") unless black_list.include?('database_objectable.rb')
         require_relative File.join(root_directory, "rubee/models/sequel_object") unless black_list.include?('sequel_object.rb')
       end
     end

data/lib/tests/account_model_test.rb ADDED Viewed

@@ -0,0 +1,19 @@
+require_relative 'test_helper'
+describe 'Account model' do
+  describe 'holds :user' do
+    after do
+      Account.destroy_all cascade: true
+    end
+    describe 'when it holds user_id' do
+      it 'returns associated User record' do
+        user = User.new(email: "ok-test@test.com", password: "123")
+        user.save
+        account = Account.new(user_id: user.id, addres: "test")
+        account.save
+        _(account.user.id).must_equal user.id
+      end
+    end
+  end
+end

data/lib/tests/comment_model_test.rb ADDED Viewed

@@ -0,0 +1,35 @@
+require_relative 'test_helper'
+describe 'Comment model' do
+  describe 'owns_many :users, over: :posts' do
+    before do
+      comment = Comment.new(text: "test")
+      comment.save
+      user = User.new(email: "ok-test@test.com", password: "123")
+      user.save
+      post = Post.new(user_id: user.id, comment_id: comment.id)
+      post.save
+    end
+    after do
+      Comment.destroy_all cascade: true
+    end
+    describe 'when there are associated comment records' do
+      it 'returns all records' do
+        _(Comment.where(text: "test").last.users.count).must_equal 1
+        _(Comment.where(text: "test").last.users.first.email).must_equal "ok-test@test.com"
+      end
+    end
+    describe 'sequel dataset query' do
+      it 'returns all records' do
+        result = Comment.dataset.join(:posts, comment_id: :id)
+          .where(comment_id: Comment.where(text: "test").last.id)
+          .then { |dataset| Comment.serialize(dataset) }
+        _(result.first.text).must_equal "test"
+      end
+    end
+  end
+end

data/lib/tests/example_models/account.rb ADDED Viewed

@@ -0,0 +1,4 @@
+class Account < Rubee::SequelObject
+  attr_accessor :id, :addres, :user_id
+  holds :user
+end

data/lib/tests/example_models/comment.rb ADDED Viewed

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

data/lib/tests/example_models/post.rb ADDED Viewed

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

data/lib/tests/example_models/user.rb ADDED Viewed

@@ -0,0 +1,4 @@
+class User < Rubee::SequelObject
+  attr_accessor :id, :email, :password
+  owns_many :accounts, cascade: true
+end

data/lib/{db → tests}/test.db RENAMED Viewed

Binary file

data/lib/tests/test_helper.rb CHANGED Viewed

@@ -7,7 +7,7 @@ require_relative '../../lib/rubee'
 Rubee::Autoload.call
 Rubee::Configuration.setup(env=:test) do |config|
-  config.database_url = { url: "sqlite://test.db", env: }
+  config.database_url = { url: "sqlite://lib/tests/test.db", env: }
 end
 Rubee::SequelObject.reconnect!

data/lib/tests/user_model_test.rb CHANGED Viewed

@@ -3,7 +3,7 @@ require_relative 'test_helper'
 describe 'User model' do
   describe ".create" do
     after do
-      User.destroy_all
+      User.destroy_all cascade: true
     end
     describe 'when data is valid' do
@@ -26,7 +26,7 @@ describe 'User model' do
   describe '.save' do
     after do
-      User.destroy_all
+      User.destroy_all cascade: true
     end
     describe 'when data is valid' do
@@ -57,4 +57,174 @@ describe 'User model' do
       end
     end
   end
+  describe '.update' do
+    after do
+      User.destroy_all cascade: true
+    end
+    describe 'when data is valid' do
+      it 'persists to db' do
+        user = User.new(email: "ok-test@test.com", password: "123")
+        user.save
+        user.update(password: "1234")
+        _(user.reload.password).must_equal "1234"
+      end
+    end
+  end
+  describe '.destroy' do
+    after do
+      User.destroy_all cascade: true
+    end
+    describe 'when there is no related recrods' do
+      it 'delete the record' do
+        user = User.new(email: "ok-test@test.com", password: "123")
+        user.save
+        user.destroy
+        assert_nil user.reload
+      end
+    end
+    describe 'when there are related recrods' do
+      it 'does not delete the record' do
+        user = User.new(email: "ok-test@test.com", password: "123")
+        user.save
+        Account.new(user_id: user.id, addres: "test").save
+        user.destroy rescue nil
+        _(user.reload.id).must_equal user.id
+      end
+    end
+    describe 'when there are related recrods but passed cascade=true' do
+      it 'deletes the record' do
+        user = User.new(email: "ok-test@test.com", password: "123")
+        user.save
+        Account.new(user_id: user.id, addres: "test").save
+        user.destroy cascade: true
+        assert_nil user.reload
+      end
+    end
+  end
+  describe '.find' do
+    after do
+      User.destroy_all cascade: true
+    end
+    describe 'when trhere is a record' do
+      it 'returns a record' do
+        user = User.new(email: "ok-test@test.com", password: "123")
+        user.save
+        _(User.find(user.id).email).must_equal user.email
+      end
+    end
+    describe 'when there is no record' do
+      it 'returns nil' do
+        assert_nil User.find(1)
+      end
+    end
+  end
+  describe '.all' do
+    after do
+      User.destroy_all cascade: true
+    end
+    describe 'when there are records' do
+      it 'returns all records' do
+        user = User.new(email: "ok-test@test.com", password: "123")
+        user2 = User.new(email: "ok-test2@test.com", password: "123")
+        user.save
+        user2.save
+        _(User.all.count).must_equal 2
+      end
+    end
+  end
+  describe '.where' do
+    after do
+      User.destroy_all cascade: true
+    end
+    describe 'when there are records' do
+      it 'returns all records' do
+        user = User.new(email: "ok-test@test.com", password: "123")
+        user2 = User.new(email: "ok-test2@test.com", password: "123")
+        user.save
+        user2.save
+        _(User.where(email: "ok-test2@test.com").count).must_equal 1
+      end
+    end
+  end
+  describe '.first' do
+    after do
+      User.destroy_all cascade: true
+    end
+    describe 'when there are records' do
+      it 'returns first record' do
+        user = User.new(email: "ok-test@test.com", password: "123")
+        user2 = User.new(email: "ok-test2@test.com", password: "123")
+        user.save
+        user2.save
+        _(User.first.email).must_equal user.email
+      end
+    end
+  end
+  describe '.last' do
+    after do
+      User.destroy_all cascade: true
+    end
+    describe 'when there are records' do
+      it 'returns last record' do
+        user = User.new(email: "ok-test@test.com", password: "123")
+        user2 = User.new(email: "ok-test2@test.com", password: "123")
+        user.save
+        user2.save
+        _(User.last.email).must_equal user2.email
+      end
+    end
+  end
+  describe '.order' do
+    after do
+      User.destroy_all cascade: true
+    end
+    describe 'when there are records' do
+      it 'returns ordered records' do
+        user = User.new(email: "abc@test.com", password: "123")
+        user2 = User.new(email: "defg@test.com", password: "123")
+        user.save
+        user2.save
+        _(User.order(:email).first.email).must_equal user.email
+      end
+    end
+  end
+  describe 'owns_many' do
+    after do
+      User.destroy_all cascade: true
+    end
+    describe 'when there are associated account records' do
+      it 'returns all records' do
+        user = User.new(email: "ok-test@test.com", password: "123")
+        user.save
+        account = Account.new(user_id: user.id, addres: "test")
+        account.save
+        _(user.accounts.count).must_equal 1
+      end
+    end
+  end
 end

data/readme.md CHANGED Viewed

@@ -6,11 +6,11 @@
 ![GitHub Repo stars](https://img.shields.io/github/stars/nucleom42/rubee?style=social)
-# <img src="lib/images/rubee.svg" alt="ru.Bee" height="40"> ... ru.Bee
+# <img src="lib/images/rubee.svg" alt="ruBee" height="40"> ... ruBee
-ru.Bee is a fast and lightweight Ruby application server designed for minimalism and flexibility .
+ruBee is a fast and lightweight Ruby application server designed for minimalism and flexibility .
-The main philosophy of ru.Bee is to focus on Ruby language explicit implementation of the MVC web application.
+The main philosophy of ruBee is to focus on Ruby language explicit implementation of the MVC web application.
 Want to get a quick API server up and runing? You can do it for real quick!
 <br />
@@ -27,7 +27,7 @@ All greaet features are yet to come!
 - **Router**: Router driven - generates all required files from the routes.
 - **Databases**: Sqlite3, Postgres, Mysql and many more supported by sequel gem.
 - **Views**: Json, ERB and plain HTML
-- **Bundlable** Charge your ru.Bee with any gem you need and update your project with bundle.
+- **Bundlable** Charge your ruBee with any gem you need and update your project with bundle.
 - **ORM** All models are natively ORM objects, however you can use it as a blueurpint for any datasources.
 - **Authentificatable** Add JWT authentification easily to any controller action.
 - **Hooks** Add logic before, after and around any action.
@@ -36,7 +36,7 @@ All greaet features are yet to come!
 ## Installation
-1. Install ru.Bee
+1. Install ruBee
 ```bash
 gem install ru.Bee
 ```
@@ -50,7 +50,7 @@ cd my_project
 3. Install dependencies
 ***Prerequisites***<br />
-**ru.Bee** is using **Sqlite** as a default database. However you can pick up any other database supported by sequel gem.
+**ruBee** is using **Sqlite** as a default database. However you can pick up any other database supported by sequel gem.
 Aside that, make sure:
 **Ruby** language (3+) is installed
 **Bundler** is installed
@@ -59,7 +59,7 @@ Aside that, make sure:
 bundle install
 ```
-4. Run ru.Bee server. Default port is 7000
+4. Run ruBee server. Default port is 7000
 ```bash
 rubee start
 ```
@@ -97,7 +97,7 @@ rubee generate get /apples
 4. Fill those files with the logic you need and run the server again!
 ## Model
-Model in ru.Bee 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
@@ -107,7 +107,7 @@ Here below is a simple example on how it can be used by rendering json from in m
   def show
     # in memory example
-    apples = [Apple.new(colour: 'red', weight: '1lb'), Apple.new(colour: 'green', weight: '1lb')]
+apples = [Apple.new(colour: 'red', weight: '1lb'), Apple.new(colour: 'green', weight: '1lb')]
     apple = apples.find { |apple| apple.colour = params[:colour] }
     response_with object: apple, type: :json
@@ -145,12 +145,144 @@ So in the controller you would need to query your target object now.
   end
 ```
+#### Rubee::SequelObject base methods:
+Initiate new record in memory
+```Ruby
+irb(main):015> user = User.new(email: "llo@ok.com", password: 543)
+=> #<User:0x000000010cda23b8 @email="llo@ok.com", @password=543>
+```
+Save record in db
+```Ruby
+=> #<User:0x000000010cda23b8 @email="llo@ok.com", @password=543>
+irb(main):018> user.save
+=> true
+```
+Update record with new value
+```Ruby
+irb(main):019> user.update(email: "update@email.com")
+=> #<User:0x000000010c39b298 @email="update@email.com", @id=3, @password="543">
+```
+Check whether it includes id
+```Ruby
+irb(main):015> user = User.new(email: "llo@ok.com", password: 543)
+=> #<User:0x000000010cda23b8 @email="llo@ok.com", @password=543>
+irb(main):016> user.persisted?
+=> false
+```
+Get the record from the database
+```Ruby
+irb(main):011> user = User.last
+=> #<User:0x000000010ccea178 @email="ok23@ok.com", @id=2, @password="123">
+irb(main):012> user.email = "new@ok.com"
+=> "new@ok.com"
+irb(main):013> user
+=> #<User:0x000000010ccea178 @email="new@ok.com", @id=2, @password="123">
+irb(main):014> user.reload
+=> #<User:0x000000010c488548 @email="ok23@ok.com", @id=2, @password="123"> # not persited data was updated from db
+```
+Assign attributes without persisiting it to db
+```Ruby
+irb(main):008> User.last.assign_attributes(email: "bb@ok.com")
+=> {"id" => 2, "email" => "ok23@ok.com", "password" => "123"
+```
+Get all records scoped by field
+```Ruby
+irb(main):005> User.where(email: "ok23@ok.com")
+=> [#<User:0x000000010cfaa5c0 @email="ok23@ok.com", @id=2, @password="123">]
+```
+Get all record
+```Ruby
+irb(main):001> User.all
+=> [#<User:0x000000010c239a30 @email="ok@ok.com", @id=1, @password="password">]
+```
+Find by id
+```Ruby
+irb(main):002> user = User.find 1
+=> #<User:0x000000010c2f7cd8 @email="ok@ok.com", @id=1, @password="password">
+```
+Get last record
+```Ruby
+irb(main):003> User.last
+=> #<User:0x000000010c2f7cd8 @email="ok@ok.com", @id=1, @password="password">
+```
+Create new persited record
+```Ruby
+irb(main):004> User.create(email: "ok23@ok.com", password: 123)
+=> #<User:0x000000010c393818 @email="ok23@ok.com", @id=2, @password=123>
+```
+Destroy record and all related records
+```Ruby
+irb(main):021> user.destroy(cascade: true)
+=> 1
+```
+Destroy all records one by one
+```Ruby
+irb(main):022> User.destroy_all
+=> [#<User:0x000000010d42df98 @email="ok@ok.com", @id=1, @password="password">, #<User:0x000000010d42de80 @email="ok23@ok.com", @id=2, @password="123">
+irb(main):023> User.all
+=> []
+```
+Use complex queries chains and when ready serialize it back to Rubee object.
+```Ruby
+# user model
+class User < Rubee::SequelObject
+  attr_accessor :id, :email, :password
+  owns_many :comments, over: :posts
+end
+# comment model
+class Comment < Rubee::SequelObject
+  attr_accessor :id, :text, :user_id
+  owns_many :users, over: :posts
+end
+# join post model
+class Post < Rubee::SequelObject
+  attr_accessor :id, :user_id, :comment_id
+  holds :comment
+  holds :user
+end
+```
+```Ruby
+irb(main):001> comment = Comment.new(text: "test")
+irb(main):002> comment.save
+irb(main):003> user = User.new(email: "ok-test@test.com", password: "123")
+irb(main):004> user.save
+irb(main):005> post = Post.new(user_id: user.id, comment_id: comment.id)
+irb(main):006> post.save
+=> true
+irb(main):007> comment
+=> #<Comment:0x000000012281a650 @id=21, @text="test">
+irb(main):008> result = Comment.dataset.join(:posts, comment_id: :id)
+irb(main):009>  .where(comment_id: Comment.where(text: "test").last.id)
+irb(main):010>  .then { |dataset| Comment.serialize(dataset) }
+=> [#<Comment:0x0000000121889998 @id=30, @text="test", @user_id=702>]
+```
+This is recommended when you want to run one query and serialize it back to Rubee object only once.
+So it may safe some resources.
 ## Views
-View in ru.Bee is just a plain html/erb file that can be rendered from the controller.
+View in ruBee is just a plain html/erb file that can be rendered from the controller.
 ## Object hooks
-In ru.Bee 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.
@@ -268,7 +400,7 @@ rubee console # start the console
 rubee test # run all tests
 rubee test auth_tokenable_test.rb # run specific tests
 ```
-If you want to run any ru.Bee 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
@@ -349,8 +481,32 @@ end
 TestAsyncRunnner.new.perform_async(options: {"email"=> "new@new.com", "password"=> "123"})
 ```
-## TODOs
-- [x] Token authorization API
-- [ ] Document authorization API
-- [ ] Add test coverage
-- [ ] Fix bugs
+### Contributing
+You are more than welcome to contribute to ruBee! To do so, please follow these steps:
+1. Fork the repository by clicking the "Fork" button on the GitHub page.
+2. Clone your fork:
+```bash
+git clone https://github.com/your-username/rubee.git
+```
+3. Create a new branch for your feature or bug fix:
+```bash
+git checkout -b feature/your-feature-name
+```
+4. Make your changes and commit them with descriptive messages:
+```bash
+git commit -m "Add feature: [brief description of feature]"
+```
+5. Push your changes to your fork:
+```bash
+git push origin feature/your-feature-name
+```
+6. Submit a pull request to the main branch of the original repository.
+Let's make it shine even brighter!

metadata CHANGED Viewed

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: ru.Bee
 version: !ruby/object:Gem::Version
-  version: 1.1.32
+  version: 1.3.0
 platform: ruby
 authors:
 - Oleg Saltykov
 bindir: bin
 cert_chain: []
-date: 2025-03-22 00:00:00.000000000 Z
+date: 2025-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -43,13 +43,17 @@ files:
 - lib/Dockerfile
 - lib/app/controllers/welcome_controller.rb
 - lib/app/models/user.rb
+- lib/app/views/layout.erb
+- lib/app/views/welcome_header.erb
 - lib/app/views/welcome_show.erb
 - lib/config.ru
 - lib/config/base_configuration.rb
 - lib/config/routes.rb
+- lib/db/create_accounts.rb
+- lib/db/create_comments.rb
+- lib/db/create_posts.rb
 - lib/db/create_users.rb
 - lib/db/structure.rb
-- lib/db/test.db
 - lib/images/rubee.svg
 - lib/inits/print_colors.rb
 - lib/rubee.rb
@@ -63,10 +67,17 @@ files:
 - lib/rubee/controllers/middlewares/auth_token_middleware.rb
 - lib/rubee/extensions/hookable.rb
 - lib/rubee/extensions/serializable.rb
-- lib/rubee/models/database_object.rb
+- lib/rubee/models/database_objectable.rb
 - lib/rubee/models/sequel_object.rb
+- lib/tests/account_model_test.rb
 - lib/tests/auth_tokenable_test.rb
+- lib/tests/comment_model_test.rb
+- lib/tests/example_models/account.rb
+- lib/tests/example_models/comment.rb
+- lib/tests/example_models/post.rb
+- lib/tests/example_models/user.rb
 - lib/tests/rubeeapp_test.rb
+- lib/tests/test.db
 - lib/tests/test_helper.rb
 - lib/tests/user_model_test.rb
 - readme.md

data/lib/rubee/models/database_object.rb DELETED Viewed

@@ -1,50 +0,0 @@
-module Rubee
-  class DatabaseObject
-    include Serializable
-    include Hookable
-    def destroy
-    end
-    def save
-    end
-    def update(args = {})
-    end
-    def reload
-    end
-    class << self
-      def last
-      end
-      def connection
-      end
-      def all
-      end
-      def find(id)
-      end
-      def where(args)
-      end
-      def create(attrs)
-      end
-      def pluralize_class_name
-        word = self.name.downcase
-          # Basic pluralization rules
-        if word.end_with?('y') && !%w[a e i o u].include?(word[-2])
-          word[0..-2] + 'ies' # Replace "y" with "ies"
-        elsif word.end_with?('s', 'x', 'z', 'ch', 'sh')
-          word + 'es' # Add "es" for certain endings
-        else
-          word + 's' # Default to adding "s"
-        end
-      end
-    end
-  end
-end