ru.Bee 1.3.2 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5810b6eb69d752cea118184cc0fd70559a7b6c76024f3fa2cccca1eaedc7305e
-  data.tar.gz: 648ef60b8a9d94ec49c5cd8e31882873637660935097cadcca5124aad19198ba
+  metadata.gz: f60bb8f17e35447c9cedd635d719a6b0d988486f9fe04668e0e07763a99cb740
+  data.tar.gz: a56dcac76060f5bb9ec71959ef4d21fa7c3e9b858eb6088e873e3ba50e4684f0
 SHA512:
-  metadata.gz: 30c9cdc416a9875128b2ca186cf0a60ae9f85463f49492c625972d8a908a1acab524f024c926a2fcc05f519af3b5112f96bcc32a0953b756f57effdb7eaefe49
-  data.tar.gz: 21de68b11a410bd67aeea32707409ecc173b3af5dceab016675c41904cc6e452dcc889668c05ec1918e5a683049f02ebfce778fc3c0f2008e071ea49c8ffe5b1
+  metadata.gz: 03be1679bf032a1f292b4490a41286eb02f3a56984cf8dc7281715db53f880dc3ded8feb445ae41a22d60c2a4c3a5e47f8b8fe1be5f4c8188d26e57d403b746e
+  data.tar.gz: 0ffa4e0cc8c436d2ce7ac784c92465333d12ebaa67172f08bcfc55e59dd6f29472aa70211a3c2b766c234ef089b51d1c47a130cc6c0c8ab35e896f659b1ba43d

data/bin/rubee

@@ -1,17 +1,11 @@
 #!/usr/bin/env ruby
 
 require 'fileutils'
-require 'date'
-require 'irb'
-require 'sequel'
-require 'sqlite3'
-require 'json'
-require 'rack'
-require 'rackup'
 
 require_relative '../lib/inits/print_colors'
 require_relative '../lib/rubee'
 
+
 ENV['RACK_ENV'] ||= 'development'
 
 LIB_ROOT = File.expand_path('../lib', File.dirname(__FILE__))
@@ -29,42 +23,60 @@ LOGO
 command = ARGV.first
 
 def print_logo
-  puts "\e[36m" + (LOGO % Rubee::VERSION) + "\e[0m" # Cyan color
+  puts "\e[36m#{LOGO % Rubee::VERSION}\e[0m" # Cyan color
 end
 
 if command =~ /^(start)$|^(start:(\d+))$/
-  command, port = ARGV.first&.split(':')
+  _, port = ARGV.first&.split(':')
 
-  port ||= "7000"
+  port ||= '7000'
   print_logo
   color_puts "Starting takeoff of ruBee server on port #{port}...", color: :yellow
   exec("rackup #{ENV['RACKUP_FILE']} -p #{port}")
 elsif command =~ /^(start_dev)$|^(start_dev:(\d+))$/
-  command, port = ARGV.first&.split(':')
+  _, port = ARGV.first&.split(':')
 
-  port ||= "7000"
+  port ||= '7000'
   print_logo
 
   color_puts "Starting takeoff of ruBee server on port #{port} in dev mode...", color: :yellow
 
   exec("rerun -- rackup --port #{port} #{ENV['RACKUP_FILE']}")
-elsif command == "stop"
-  exec("pkill -f rubee")
-elsif command == "status"
-  exec("ps aux | grep rubee")
-elsif command == "project"
+elsif command == 'stop'
+  exec('pkill -f rubee')
+elsif command == 'status'
+  exec('ps aux | grep rubee')
+elsif command == 'react'
+  case ARGV[1]
+  when 'prepare'
+    if Rubee::PROJECT_NAME == 'rubee'
+      exec('cd ./lib && npm run prepare')
+    else
+      exec('npm run prepare')
+    end
+  when 'watch'
+    if Rubee::PROJECT_NAME == 'rubee'
+      exec('cd ./lib && npm run watch')
+    else
+      exec('npm run watch')
+    end
+  else
+    color_puts "Unknown command: #{command}", color: :red
+    exit 1
+  end
+elsif command == 'project'
   project_name = ARGV[1]
   if project_name.nil?
-    color_puts "Please indicate project name.", color: :red
+    color_puts 'Please indicate project name.', color: :red
     exit 1
   end
 
-  if project_name == "rubee"
+  if project_name == 'rubee'
     color_puts "Error: Project 'rubee' is reserved", color: :red
     exit 1
   end
 
-  source_dir = File.expand_path("../lib", __dir__)
+  source_dir = File.expand_path('../lib', __dir__)
   target_dir = File.expand_path("./#{project_name}", Dir.pwd)
 
   if Dir.exist?(target_dir)
@@ -76,12 +88,13 @@ elsif command == "project"
   FileUtils.mkdir_p(target_dir)
 
   # Define blacklist
-  blacklist_files = %w[rubee.rb print_colors.rb version.rb config.ru test_helper.rb Gemfile.lock test.yml test.db development.db production.db]
-  blacklist_dirs = %w[rubee tests .git .github .idea]
+  blacklist_files = %w[rubee.rb print_colors.rb version.rb config.ru test_helper.rb Gemfile.lock test.yml test.db
+                       development.db production.db]
+  blacklist_dirs = %w[rubee tests .git .github .idea node_modules db]
 
   # Copy files, excluding blacklisted ones
   Dir.glob("#{source_dir}/**/*", File::FNM_DOTMATCH).each do |file|
-    relative_path = file.sub("#{source_dir}/", "")
+    relative_path = file.sub("#{source_dir}/", '')
 
     # Skip blacklisted directories
     next if blacklist_dirs.any? { |dir| relative_path.split('/').include?(dir) }
@@ -102,26 +115,31 @@ elsif command == "project"
   FileUtils.mkdir_p("#{target_dir}/tests")
   FileUtils.cp("#{source_dir}/tests/user_model_test.rb", "#{target_dir}/tests/user_model_test.rb")
 
+  # create db dir
+  FileUtils.mkdir_p("#{target_dir}/db")
+  FileUtils.cp("#{source_dir}/db/structure.rb", "#{target_dir}/db/structure.rb")
+  FileUtils.cp("#{source_dir}/db/create_users.rb", "#{target_dir}/db/create_users.rb")
+
   # create a gemfile context
   gemfile = <<~GEMFILE
-  source 'https://rubygems.org'
-
-  gem 'ru.Bee'
-  gem 'sequel'
-  gem 'sqlite3'
-  gem 'rake'
-  gem 'rack'
-  gem 'rackup'
-  gem 'pry'
-  gem 'pry-byebug'
-  gem 'puma'
-  gem 'json'
-
-  group :development do
-    gem 'rerun'
-    gem 'minitest'
-    gem 'rack-test'
-  end
+    source 'https://rubygems.org'
+
+    gem 'ru.Bee'
+    gem 'sequel'
+    gem 'sqlite3'
+    gem 'rake'
+    gem 'rack'
+    gem 'rackup'
+    gem 'pry'
+    gem 'pry-byebug'
+    gem 'puma'
+    gem 'json'
+
+    group :development do
+      gem 'rerun'
+      gem 'minitest'
+      gem 'rack-test'
+    end
   GEMFILE
   # create a gemfile
   File.open("#{target_dir}/Gemfile", 'w') do |file|
@@ -130,14 +148,14 @@ elsif command == "project"
 
   # create test_helper.rb file
   test_helper = <<~TESTHELPER
-  require "bundler/setup"
-  Bundler.require(:test)
+    require "bundler/setup"
+    Bundler.require(:test)
 
-  require 'minitest/autorun'
-  require 'rack/test'
-  require 'rubee'
+    require 'minitest/autorun'
+    require 'rack/test'
+    require 'rubee'
 
-  Rubee::Autoload.call
+    Rubee::Autoload.call
   TESTHELPER
 
   File.open("#{target_dir}/tests/test_helper.rb", 'w') do |file|
@@ -146,9 +164,14 @@ elsif command == "project"
 
   color_puts "Project #{project_name} created successfully at #{target_dir}", color: :green
 
-elsif command == "version"
+elsif command == 'version'
   color_puts "ru.Bee v#{Rubee::VERSION}", color: :yellow
-elsif command == "test"
+elsif command == 'routes'
+  file = Rubee::PROJECT_NAME == 'rubee' ? File.join('/lib', 'config/routes.rb') : 'config/routes.rb'
+  routes = eval(File.read(file))
+
+  puts routes
+elsif command == 'test'
 
   ENV['RACK_ENV'] = 'test'
   file_name = ARGV[1] # Get the first argument
@@ -157,14 +180,14 @@ elsif command == "test"
     color_puts "Running #{file_name} test ...", color: :yellow
     exec("ruby -Itest -e \"require '.#{lib}/tests/#{file_name}'\"")
   else
-    color_puts "Running all tests ...", color: :yellow
+    color_puts 'Running all tests ...', color: :yellow
     exec("ruby -Itest -e \"Dir.glob('.#{lib}/tests/**/*_test.rb').each { |file| require file }\"")
   end
-elsif ['generate', 'gen'].include? command
+elsif %w[generate gen].include?(command)
   method, path = ARGV[1..2]
   ENV['RACK_ENV'] ||= 'development'
-
-  routes = eval(File.read('config/routes.rb'))
+  file = Rubee::PROJECT_NAME == 'rubee' ? File.join('/lib', 'config/routes.rb') : 'config/routes.rb'
+  routes = eval(File.read(file))
   route = routes.find { |route| route[:path] == path.to_s && route[:method] == method.to_sym }
   color_puts("Route not found with path: #{path} and method: #{method}", color: :red) unless route
 
@@ -172,16 +195,17 @@ elsif ['generate', 'gen'].include? command
     route[:model]&.[](:name),
     route[:model]&.[](:attributes),
     "#{route[:controller]&.capitalize}Controller",
-    route[:action]
+    route[:action],
+    react: route[:react]
   ).call
-elsif command == "db"
+elsif command == 'db'
   Rubee::Autoload.call
   ENV['RACK_ENV'] ||= 'development'
 
   command, file_name = ARGV[1]&.split(':')
   if Rubee::PROJECT_NAME == 'rubee'
-    Rubee::Configuration.setup(env=:test) do |config|
-      config.database_url = { url: "sqlite://lib/tests/test.db", env: }
+    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
@@ -189,29 +213,29 @@ elsif command == "db"
   def ensure_database_exists(db_url)
     uri = URI.parse(db_url)
     case uri.scheme
-    when "sqlite"
+    when 'sqlite'
       begin
         Sequel.connect(db_url)
-        color_puts "Database #{ENV['RACK_ENV']} exists", color: :cyan
-      rescue Exception => e
-        if File.exist?(db_path = db_url.sub(/^sqlite:\/\//, ''))
-          color_puts "Database #{ENV['RACK_ENV']} exists", color: :cyan
+        color_puts("Database #{ENV['RACK_ENV']} exists", color: :cyan)
+      rescue Exception
+        if File.exist?(db_path = db_url.sub(%r{^sqlite://}, ''))
+          color_puts("Database #{ENV['RACK_ENV']} exists", color: :cyan)
         else
           Sequel.sqlite(db_path)
-          color_puts "Database #{ENV['RACK_ENV']} created", color: :green
+          color_puts("Database #{ENV['RACK_ENV']} created", color: :green)
         end
       end
-    when "postgres"
+    when 'postgres'
       begin
         Sequel.connect(db_url)
-        color_puts "Database #{ENV['RACK_ENV']} exists", color: :cyan
-      rescue => _
-        con = Sequel.connect(Rubee::Configuration.get_database_url.gsub(/(\/test|\/development|\/production)/, ''))
+        color_puts("Database #{ENV['RACK_ENV']} exists", color: :cyan)
+      rescue StandardError => _e
+        con = Sequel.connect(Rubee::Configuration.get_database_url.gsub(%r{(/test|/development|/production)}, ''))
         con.run("CREATE DATABASE #{ENV['RACK_ENV']}")
-        color_puts "Database #{ENV['RACK_ENV']} created", color: :green
+        color_puts("Database #{ENV['RACK_ENV']} created", color: :green)
       end
     else
-      color_puts "Unsupported database type: #{db_url}", color: :red
+      color_puts("Unsupported database type: #{db_url}", color: :red)
     end
   end
 
@@ -226,52 +250,54 @@ elsif command == "db"
       end
     end
     formatted_hash = JSON.pretty_generate(schema_hash)
-                         .gsub(/\"(\w+)\":/, '\1:')  # Convert keys to symbols
-                         .gsub(': null', ': nil')   # Convert `null` to `nil`
+      .gsub(/"(\w+)":/, '\1:') # Convert keys to symbols
+      .gsub(': null', ': nil') # Convert `null` to `nil`
 
-    File.open("db/structure.rb", 'w') do |file|
+    File.open('db/structure.rb', 'w') do |file|
       file.puts "STRUCTURE = #{formatted_hash}"
     end
 
-    color_puts "db/structure.rb updated", color: :green
+    color_puts('db/structure.rb updated', color: :green)
   end
 
-
-  if command == 'run'
+  case command
+  when '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' }
+      Dir.glob(".#{lib}/db/*.rb").map do |file|
+        File.basename(file, '.rb')
+      end.reject { |file| file == 'structure' }
     else
       [file_name]
     end
     Rubee::Configuration.envs.each do |env|
       ENV['RACK_ENV'] = env.to_s
       file_names.each do |file_name|
-        color_puts "Run #{file_name} file for #{env} env", color: :cyan
+        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 for #{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
+      color_puts('Regenerate schema file', color: :cyan)
       generate_structure
     end
-  elsif command == 'init'
+  when 'init'
     ensure_database_exists(Rubee::Configuration.get_database_url)
-  elsif command == 'structure'
+  when 'structure'
     generate_structure
   else
-    color_puts "Unknown command: #{command}", color: :red
+    color_puts("Unknown command: #{command}", color: :red)
   end
-elsif ['console'].include? command
+elsif ['console'].include?(command)
   ARGV.clear
   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: }
+    Rubee::Configuration.setup(env = :test) do |config|
+      config.database_url = { url: 'sqlite://lib/tests/test.db', env: }
     end
     Rubee::Autoload.call
     Rubee::SequelObject.reconnect!
@@ -279,13 +305,13 @@ elsif ['console'].include? command
 
   def reload
     app_files = Dir["./#{Rubee::APP_ROOT}/**/*.rb"]
-    app_files.each { |file| load file }
-    color_puts "Reloaded ..", color: :green
+    app_files.each { |file| load(file) }
+    color_puts('Reloaded ..', color: :green)
   end
   begin
     # Start IRB
     IRB.start
-  rescue Exception => e
+  rescue Exception
     IRB.start
   end
 else

data/lib/app/views/app.tsx

@@ -0,0 +1,27 @@
+import React from "react";
+import { BrowserRouter as Router, Routes, Route, Link } from "react-router-dom";
+
+const Home = () => (
+  <div>
+    <h2>Reactive Bee</h2>
+    <p>Welcome to Reactive Bee ...</p>
+    <img src="images/rubee.svg" alt="rubee"></img>
+    <nav>
+        <Link to="/home">Home</Link><br />
+    </nav>
+  </div>
+);
+
+const NotFound = () => <h2>404 Not Found</h2>;
+
+export function App() {
+  return (
+    <Router>
+      <Routes>
+        <Route path="/home" element={<Home />} />
+        <Route path="*" element={<NotFound />} />
+      </Routes>
+    </Router>
+  );
+}
+

data/lib/app/views/index.html

@@ -0,0 +1,47 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>React App</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 id="app"></div>
+    <script type="module" src="./../../js/bundle.js"></script>
+  </body>
+</html>

data/lib/app/views/layout.erb

@@ -40,7 +40,7 @@
         }
     </style>
 </head>
-<body>
-    <%= _yield_template %>
-</body>
+    <body>
+        <%= _yield_template %>
+    </body>
 </html>

data/lib/app/views/utils/redirectToBackend.tsx

@@ -0,0 +1,9 @@
+import { useEffect } from "react";
+
+export function RedirectToBackend({ url }: { url: string }) {
+  useEffect(() => {
+    window.location.replace(url);
+  }, []);
+
+  return null; // or a spinner while redirecting
+}

data/lib/app/views/welcome_show.erb

@@ -1,7 +1,7 @@
 <div class="container">
     <%= render_template :welcome_header %>
     <br/>
-    <img src="images/rubee.svg" alt="ruBee">
+    <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/>

data/lib/config/base_configuration.rb

@@ -1,11 +1,20 @@
-Rubee::Configuration.setup(env=:development) do |config|
-  config.database_url = { url: "sqlite://db/development.db", env: }
+Rubee::Configuration.setup(env = :development) do |config|
+  config.database_url = { url: 'sqlite://db/development.db', env: }
+
+  # Uncomment, if you want to use react
+  # config.react = { on: true, env: }
 end
 
-Rubee::Configuration.setup(env=:test) do |config|
-  config.database_url = { url: "sqlite://db/test.db", env: }
+Rubee::Configuration.setup(env = :test) do |config|
+  config.database_url = { url: 'sqlite://db/test.db', env: }
+
+  # Uncomment, if you want to use react
+  # config.react = { on: true, env: } # required if you want to use react
 end
 
-Rubee::Configuration.setup(env=:production) do |config|
-  config.database_url = { url: "sqlite://db/production.db", env: }
+Rubee::Configuration.setup(env = :production) do |config|
+  config.database_url = { url: 'sqlite://db/production.db', env: }
+
+  # Uncomment,if you want to use react
+  # config.react = { on: true, env: } # required if you want to use react
 end

data/lib/config/routes.rb

@@ -1,3 +1,4 @@
 Rubee::Router.draw do |router|
-  router.get "/", to: "welcome#show" # override it for your app
+  router.get('/', to: 'welcome#show') # override it for your app
 end
+

data/lib/db/create_accounts.rb

@@ -1,14 +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
+    return if Rubee::SequelObject::DB.tables.include?(:accounts)
 
-      Account.create(addres: "13th Ave, NY", user_id: User.all.first.id)
-      Account.create(addres: "14th Ave, NY", user_id: User.all.last.id)
+    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

data/lib/db/create_comments.rb

@@ -1,13 +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
+    return if Rubee::SequelObject::DB.tables.include?(:comments)
 
-      User.create(email: "ok@ok.com", password: "password")
+    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

data/lib/db/create_posts.rb

@@ -1,14 +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
+    return if Rubee::SequelObject::DB.tables.include?(:posts)
 
-      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)
+    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

data/lib/db/create_users.rb

@@ -2,15 +2,15 @@
 # Please make sure you executed it before using AuthTokenable module
 class CreateUsers
   def call
-    unless Rubee::SequelObject::DB.tables.include?(:users)
-      Rubee::SequelObject::DB.create_table :users do
-        primary_key :id
-        String :email
-        String :password
-        index :email
-      end
+    return if Rubee::SequelObject::DB.tables.include?(:users)
 
-      User.create(email: "ok@ok.com", password: "password")
+    Rubee::SequelObject::DB.create_table(:users) do
+      primary_key(:id)
+      String(:email)
+      String(:password)
+      index(:email)
     end
+
+    User.create(email: 'ok@ok.com', password: 'password')
   end
 end