ru.Bee 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 400c70fb533f9935fb838941de26bd78875f64a62e1d86bed2a817904ca63a7d
-  data.tar.gz: 23fe0b3b9334a0c34b5fb671806a58dfa0e7f2aeb48f487fe988eec2354bcdc0
+  metadata.gz: d4ecb77e79daf38768a10a5da26f7f1e3013734c864774e128ffb767d5d6d9a1
+  data.tar.gz: 1f9a6de22160db7ac4deb411278f4bb53bb94ee0a58893a9089a5eb99fd061fa
 SHA512:
-  metadata.gz: c2d8526cbce129652658679cc1edf861e33f8479b2c8e9e3849c640fc527dd6116dfe314fc7f1fa79f8d188655a1463320a701dc46f13166b870733ef1d3bc35
-  data.tar.gz: 386b45c69e6513448adf1ab10f6b9caf4cfc15d588b26f920dc6518489cbf6c9abc5f6404b007d65b6e9aaf71cb806cac391b3023156113e8f3e5958f3430868
+  metadata.gz: 312f2143e4244dec12bdd6e40a815eeb9a2cf70af31bea3ef2c5211ae4a491dc8532931ca4d0ef4529979d579f2c17e3ade73fd09c3f9f75a0b79697e3c93200
+  data.tar.gz: d53621c81d31e8b7e48b030762d5f58726756e3946da14a2774fd8c6239f96ccb87a4f8d4c533b862981a792a5c90a0755d22a66d6b5b5428d4df75d46ac8265

data/bin/rubee

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 require 'fileutils'
-
+require 'rubygems'
 require_relative '../lib/inits/print_colors'
 require_relative '../lib/rubee'
 
@@ -19,304 +19,10 @@ LOGO = <<-'LOGO'
  Ver: %s
 LOGO
 
-command = ARGV.first
-
-def print_logo
-  puts "\e[36m#{LOGO % Rubee::VERSION}\e[0m" # Cyan color
-end
-
-if command =~ /^(start)$|^(start:(\d+))$/
-  _, port = ARGV.first&.split(':')
-
-  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+))$/
-  _, port = ARGV.first&.split(':')
-
-  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 == '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
-    exit 1
-  end
-
-  if project_name == 'rubee'
-    color_puts "Error: Project 'rubee' is reserved", color: :red
-    exit 1
-  end
-
-  source_dir = File.expand_path('../lib', __dir__)
-  target_dir = File.expand_path("./#{project_name}", Dir.pwd)
-
-  if Dir.exist?(target_dir)
-    color_puts "Error: Project #{project_name} already exists!", color: :red
-    exit 1
-  end
-
-  # Create target directory
-  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 node_modules db inits]
-
-  # Copy files, excluding blacklisted ones
-  Dir.glob("#{source_dir}/**/*", File::FNM_DOTMATCH).each do |file|
-    relative_path = file.sub("#{source_dir}/", '')
-
-    # Skip blacklisted directories
-    next if blacklist_dirs.any? { |dir| relative_path.split('/').include?(dir) }
-
-    # Skip blacklisted files
-    next if blacklist_files.include?(File.basename(file))
-
-    target_path = File.join(target_dir, relative_path)
-
-    if File.directory?(file)
-      FileUtils.mkdir_p(target_path)
-    else
-      FileUtils.cp(file, target_path)
-    end
-  end
-
-  # create tests dir and copy test_helper.rb and user_model_test.rb
-  FileUtils.mkdir_p("#{target_dir}/tests")
-  FileUtils.mkdir_p("#{target_dir}/tests/models")
-  FileUtils.mkdir_p("#{target_dir}/tests/controllers")
-  FileUtils.cp("#{source_dir}/tests/models/user_model_test.rb", "#{target_dir}/tests/models/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 inits dir
-  FileUtils.mkdir_p("#{target_dir}/inits")
-
-  # 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
-  GEMFILE
-  # create a gemfile
-  File.open("#{target_dir}/Gemfile", 'w') do |file|
-    file.puts gemfile
-  end
-
-  # create test_helper.rb file
-  test_helper = <<~TESTHELPER
-    require "bundler/setup"
-    Bundler.require(:test)
-
-    require 'minitest/autorun'
-    require 'rack/test'
-    require 'rubee'
-
-    Rubee::Autoload.call
-  TESTHELPER
-
-  File.open("#{target_dir}/tests/test_helper.rb", 'w') do |file|
-    file.puts test_helper
-  end
-
-  color_puts "Project #{project_name} created successfully at #{target_dir}", color: :green
-
-elsif command == 'version'
-  color_puts "ruBee v#{Rubee::VERSION}", color: :yellow
-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
-  lib = Rubee::PROJECT_NAME == 'rubee' ? '/lib' : ''
-  if file_name
-    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
-    exec("ruby -Itest -e \"Dir.glob('.#{lib}/tests/**/*_test.rb').each { |file| require file }\"")
-  end
-elsif %w[generate gen].include?(command)
-  method, path = ARGV[1..2]
-  ENV['RACK_ENV'] ||= 'development'
-  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
-  Rubee::Generator.new(
-    route[:model]&.[](:name),
-    route[:model]&.[](:attributes),
-    "#{route[:controller]&.capitalize}Controller",
-    route[:action],
-    react: route[:react]
-  ).call
-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: }
-    end
-    Rubee::SequelObject.reconnect! unless command == 'init'
-  end
-
-  def ensure_database_exists(db_url)
-    uri = URI.parse(db_url)
-    case uri.scheme
-    when 'sqlite'
-      begin
-        Sequel.connect(db_url)
-        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)
-        end
-      end
-    when 'postgres'
-      begin
-        Sequel.connect(db_url)
-        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)
-      end
-    else
-      color_puts("Unsupported database type: #{db_url}", color: :red)
-    end
-  end
-
-  def generate_structure
-    schema_hash = {}
-
-    Rubee::SequelObject::DB.tables.each do |table|
-      schema_hash[table] = {}
-
-      Rubee::SequelObject::DB.schema(table).each do |column, details|
-        schema_hash[table][column] = details
-      end
-    end
-    formatted_hash = JSON.pretty_generate(schema_hash)
-      .gsub(/"(\w+)":/, '\1:') # Convert keys to symbols
-      .gsub(': null', ': nil') # Convert `null` to `nil`
-
-    File.open('db/structure.rb', 'w') do |file|
-      file.puts "STRUCTURE = #{formatted_hash}"
-    end
-
-    color_puts('db/structure.rb updated', color: :green)
-  end
-
-  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 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)
-        Object.const_get(file_name.split('_').map(&:capitalize).join).new.call
-      end
-    end
-    color_puts("Migration for #{file_name} completed", color: :green)
-    unless Rubee::PROJECT_NAME == 'rubee'
-      color_puts('Regenerate schema file', color: :cyan)
-      generate_structure
-    end
-  when 'init'
-    ensure_database_exists(Rubee::Configuration.get_database_url)
-  when 'structure'
-    generate_structure
-  else
-    color_puts("Unknown command: #{command}", color: :red)
-  end
-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: }
-    end
-    Rubee::Autoload.call
-    Rubee::SequelObject.reconnect!
-  end
-
-  def reload
-    app_files = Dir["./#{Rubee::APP_ROOT}/**/*.rb"]
-    app_files.each { |file| load(file) }
-    color_puts('Reloaded ..', color: :green)
-  end
-  begin
-    # Start IRB
-    IRB.start
-  rescue Exception
-    IRB.start
-  end
+if ['version', 'react', 'project'].include?(ARGV[0])
+  Rubee::Autoload.call([], white_list_dirs: ['rubee/cli'])
 else
-  color_puts "Unknown command: #{command}", color: :red
+  Rubee::Autoload.call
 end
+
+Rubee::CLI::Command.new(ARGV).call

data/lib/app/views/index.html

@@ -6,7 +6,7 @@
     <title>React App</title>
   </head>
   <body>
-    <div id="app"></div>
+    <div id="App"></div>
     <script type="module" src="/js/bundle.js"></script>
   </body>
 </html>

data/lib/inits/charged_hash.rb

@@ -0,0 +1,16 @@
+module ChargedHash
+  refine Hash do
+    def [](key)
+      return wrap(super(key)) if key?(key)
+
+      alt_key = key.is_a?(Symbol) ? key.to_s : key.to_sym
+      wrap(super(alt_key))
+    end
+
+    private
+
+    def wrap(value)
+      value.is_a?(Hash) ? value.extend(ChargedHash) : value
+    end
+  end
+end

data/lib/inits/charged_string.rb

@@ -20,6 +20,18 @@ module ChargedString
       !plural?
     end
 
+    def camelize
+      self.split('_').map { _1.capitalize }.join
+    end
+
+    def snakeize
+      self.gsub(/::/, '_')
+        .gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
+        .gsub(/([a-z\d])([A-Z])/, '\1_\2')
+        .tr('-', '_')
+        .downcase
+    end
+
     def singularize
       if end_with?('ies') && length > 3
         "#{self[0..-4]}y" # Convert "ies" to "y"

data/lib/js/app.js

@@ -1,13 +1,13 @@
 import React from "react";
 import { createRoot } from "react-dom/client";
-import { App } from "../app/views/app.tsx";
+import { App } from "../app/views/App.tsx";
 
 document.addEventListener("DOMContentLoaded", () => {
-  const container = document.getElementById("app");
+  const container = document.getElementById("App");
   if (container) {
     const root = createRoot(container);
     root.render(<App />);
   } else {
-    console.error('React root element "#app" not found in DOM.');
+    console.error('React root element "#App" not found in DOM.');
   }
 });

data/lib/rubee/async/thread_async.rb

@@ -1,7 +1,7 @@
 module Rubee
   class ThreadAsync
     def perform_async(**args)
-      color_puts('WARN: ThreadAsync engine is not yet recommended for production', color: :yellow)
+      color_puts('WARN: ThreadAsync engine is experimental!', color: :yellow)
       ThreadPool.instance.enqueue(args[:_class], args[:options])
     end
   end

data/lib/rubee/async/thread_pool.rb

@@ -3,8 +3,8 @@ require 'singleton'
 module Rubee
   class ThreadPool
     include Singleton
-    THREADS_LIMIT = Rubee::Configuration.get_threads_limit || 4
-    FIBERS_LIMIT = Rubee::Configuration.get_fibers_limit || 4
+    THREADS_LIMIT = Rubee::Configuration.get_threads_limit || 4 unless defined?(THREADS_LIMIT)
+    FIBERS_LIMIT = Rubee::Configuration.get_fibers_limit || 4 unless defined?(FIBERS_LIMIT)
 
     def initialize
       @tasks = Queue.new

data/lib/rubee/autoload.rb

@@ -1,14 +1,15 @@
 module Rubee
   class Autoload
     class << self
-      def call(black_list = [])
+      def call(black_list = [], **options)
+        load_whitelisted(options[:white_list_dirs]) && return if options[:white_list_dirs]
         # autoload all rbs
-        root_directory = File.expand_path(File.join(__dir__, '..',))
+        root_directory = File.join(Rubee::ROOT_PATH, '/lib')
         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|
+        Dir.glob(File.join(Rubee::APP_ROOT, '**', '*.rb')).sort.each do |file|
           base_name = File.basename(file)
 
           unless base_name.end_with?('_test.rb') || (black_list + ['rubee.rb', 'test_helper.rb']).include?(base_name)
@@ -17,13 +18,21 @@ module Rubee
         end
       end
 
+      def load_whitelisted(white_list_dirs)
+        white_list_dirs.each do |dir|
+          Dir[File.join(Rubee::ROOT_PATH, '/lib', "#{dir}/**", '*.rb')].each do |file|
+            require_relative file
+          end
+        end
+      end
+
       def priority_order_require(root_directory, black_list)
         # rubee inits
         Dir[File.join(root_directory, 'inits/**', '*.rb')].each do |file|
           require_relative file unless black_list.include?("#{file}.rb")
         end
         # app inits
-        Dir[File.join(APP_ROOT, 'inits/**', '*.rb')].each do |file|
+        Dir[File.join(Rubee::APP_ROOT, 'inits/**', '*.rb')].each do |file|
           require_relative file unless black_list.include?("#{file}.rb")
         end
         # rubee async
@@ -32,17 +41,17 @@ module Rubee
         end
         # app config and routes
         unless black_list.include?('base_configuration.rb')
-          require_relative File.join(APP_ROOT, LIB,
+          require_relative File.join(Rubee::APP_ROOT, Rubee::LIB,
                                      'config/base_configuration')
         end
         # This is necessary prerequisitedb init step
-        if !defined?(Rubee::SequelObject::DB) && (PROJECT_NAME == 'rubee')
+        if Rubee::PROJECT_NAME == 'rubee'
           Rubee::Configuration.setup(env = :test) do |config|
             config.database_url = { url: 'sqlite://lib/tests/test.db', env: }
           end
         end
 
-        require_relative File.join(APP_ROOT, LIB, 'config/routes') unless black_list.include?('routes.rb')
+        require_relative File.join(Rubee::APP_ROOT, Rubee::LIB, 'config/routes') unless black_list.include?('routes.rb')
         # rubee extensions
         Dir[File.join(root_directory, 'rubee/extensions/**', '*.rb')].each do |file|
           require_relative file unless black_list.include?("#{file}.rb")
@@ -67,7 +76,11 @@ module Rubee
 
         require_relative File.join(root_directory,
                                    'rubee/models/sequel_object')
+
+        Dir[File.join(root_directory, 'rubee/cli/**', '*.rb')].each do |file|
+          require_relative file
+        end
       end
     end
   end
-end
+end

data/lib/rubee/cli/attach.rb

@@ -0,0 +1,124 @@
+module Rubee
+  module CLI
+    class Attach
+      using ChargedString
+
+      class << self
+        def call(command, argv)
+          send(command, argv)
+        end
+
+        def attach(argv)
+          new_app_name = argv[1]
+
+          # create project folde
+          if new_app_name.nil?
+            color_puts('Please indicate app name.', color: :red)
+            exit(1)
+          end
+
+          if new_app_name == 'rubee'
+            color_puts("Error: App 'rubee' name is reserved", color: :red)
+            exit(1)
+          end
+          target_dir = File.join(Rubee::APP_ROOT, new_app_name)
+
+          if Dir.exist?(target_dir)
+            color_puts("Error: App #{new_app_name} already exists!", color: :red)
+            exit(1)
+          end
+
+          # create controllers models view folders
+          FileUtils.mkdir_p(target_dir)
+          # creare controllers models views dirs
+          ['controllers', 'models', 'views'].each do |dir|
+            FileUtils.mkdir_p("#{target_dir}/#{dir}")
+          end
+
+          config_file = <<~CONFIG_FILE
+            Rubee::Configuration.setup(env = :test, app = :#{new_app_name}) do |config|
+            end
+            Rubee::Configuration.setup(env = :developmenti, app = :#{new_app_name}) do |config|
+            end
+            Rubee::Configuration.setup(env = :production, app = :#{new_app_name}) do |config|
+            end
+          CONFIG_FILE
+
+          File.open("#{target_dir}/#{new_app_name}_configuration.rb", 'w') do |file|
+            file.puts config_file
+          end
+
+          # create app routes.rb file
+          route_file = <<~ROUTE_FILE
+            Rubee::Router.draw do |router|
+            end
+          ROUTE_FILE
+
+          File.open("#{target_dir}/#{new_app_name}_routes.rb", 'w') do |file|
+            file.puts route_file
+          end
+
+          # copy views
+          copy_files(
+            File.join(Rubee::ROOT_PATH, '/lib/app/views'),
+            "#{target_dir}/views",
+            %w[welcome_header.erb welcome_show.erb App.tsx],
+            %w[utils],
+            app_name: new_app_name
+          )
+
+          # create namespace module
+          module_content = <<~RUBY
+            module #{new_app_name.camelize}
+            end
+          RUBY
+
+          File.open("#{target_dir}/#{new_app_name.snakeize}_namespace.rb", 'w') { |file| file.write(module_content) }
+          color_puts("App #{new_app_name} attached!", color: :green)
+
+          # create react app file
+          react_app_file = <<~REACT_APP_FILE
+            import React from 'react';
+
+            export function #{new_app_name.camelize}App() {
+              return (
+                <h1>#{new_app_name.camelize}App</h1>
+              );
+            }
+          REACT_APP_FILE
+
+          File.open("#{target_dir}/views/#{new_app_name.camelize}App.tsx", 'w') do |file|
+            file.puts react_app_file
+          end
+        end
+
+        private
+
+        def copy_files(source_dir, target_dir, blacklist_files = [], blacklist_dirs = [], **options)
+          Dir.glob("#{source_dir}/**/*", File::FNM_DOTMATCH).each do |file|
+            relative_path = file.sub("#{source_dir}/", '')
+            next if blacklist_dirs.any? { |dir| relative_path.split('/').include?(dir) }
+            next if blacklist_files.include?(File.basename(file))
+
+            target_path = File.join(target_dir, relative_path)
+            if File.directory?(file)
+              FileUtils.mkdir_p(target_path)
+            else
+              FileUtils.cp(file, target_path)
+            end
+          end
+          return unless options[:app_name]
+          # rename copied file with prefixing base name with app_name
+          Dir["#{target_dir}/**/*"].each do |f|
+            ext = File.extname(f).delete('.')
+            if %w[ts tsx js jsx].include?(ext)
+              File.rename(f, f.gsub(File.basename(f), "#{options[:app_name].camelize}#{File.basename(f)}"))
+            else
+              File.rename(f, f.gsub(File.basename(f), "#{options[:app_name].snakeize}_#{File.basename(f)}"))
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rubee/cli/command.rb

@@ -0,0 +1,41 @@
+module Rubee
+  module CLI
+    class Command
+      def initialize(argv)
+        @command = argv[0]
+        @argv = argv
+      end
+
+      def call
+        factory.call(@command, @argv)
+      end
+
+      def factory
+        case @command
+        in /^(start|start_dev|stop|status)$/
+          Rubee::CLI::Server
+        in /^react$/
+          Rubee::CLI::React
+        in /^project$/
+          Rubee::CLI::Project
+        in /^version$/
+          Rubee::CLI::Version
+        in /^routes$/
+          Rubee::CLI::Routes
+        in /^test$/
+          Rubee::CLI::Test
+        in /^(generate|gen)$/
+          Rubee::CLI::Generate
+        in /^db$/
+          Rubee::CLI::Db
+        in /^(console|c)$/
+          Rubee::CLI::Console
+        in /^(attach|att)$/
+          Rubee::CLI::Attach
+        else
+          proc { color_puts("Unknown command: #{@command}", color: :red) }
+        end
+      end
+    end
+  end
+end