rsodx 0.0.5 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b217ac144c8fbb46a2bb7925dd8bb24c6d994527e395cc5b80d692678b0aafc3
-  data.tar.gz: 94a126bcac19393eb9eeefdb0188e20003f5c7d2e71dd4e0f609b9525727cfaf
+  metadata.gz: 3cf0b729bdc4f7c8028726664039d5370f7a859031cd128edd221d15f479e743
+  data.tar.gz: cd2b5dc997bef4c10dc51a0aa7c3e56413f1f55b38be7136240d35b02c66ce5c
 SHA512:
-  metadata.gz: afaf0f6269158079ce894bb3ae483c0414bd9c0a76797c0bc2ffa9b958f235a9bbc739205ec7ababae85a1f2d76cc1f27805828b8e920e275eea9ee7e1e645b1
-  data.tar.gz: 6bc50511150506c1736888779f0564b6c1896b6811c0f0b818f07573431fe733ecc0b21bd2470338e4f156e9d303a96fffdf9ffeef46fc6e85e94167a0019d6a
+  metadata.gz: 7905ace36dadb5da1e100d7257f4dba96697eedb1306d229655a4d12e42db9a20d7da40eeb0eec270d1c071c507b26a46fa8d615212e270f610711e7693502e0
+  data.tar.gz: 50291c0daaa94f34a7466c2bb15e2528a0aabf8d6be6be272e0953e2e34463670272bd010ef6aea2b38c82a81294e6c1f04b67317240b57fc2361f911ad3b188

data/README.md

@@ -69,6 +69,40 @@ bin/rsodx [command] [args]
 
 ---
 
+Конечно! Вот секция для `README.md` на английском — про команды `db:migrate` и `db:rollback`:
+
+---
+
+## 🛠 Database Commands
+
+The `rsodx` CLI provides simple tools for running Sequel migrations:
+
+### 🔼 `db:migrate`
+
+Runs all pending migrations in `db/migrations`.
+
+```bash
+bin/rsodx db:migrate
+```
+
+- Automatically creates the `schema_migrations` table if it doesn't exist.
+- Supports timestamped migrations (e.g. `20250417061127_create_users.rb`).
+- Prints a success message on completion.
+
+### 🔽 `db:rollback`
+
+Rolls back the last executed migration.
+
+```bash
+bin/rsodx db:rollback
+```
+
+- Determines the current version from the `schema_migrations` table.
+- Rolls back to the previous migration based on timestamp.
+- Skips rollback if only one migration is applied.
+
+---
+
 ## 🔧 Generators
 
 Generate various application components using simple commands:

data/lib/rsodx/cli/cli.rb

@@ -9,6 +9,31 @@ module Rsodx::Cli
   extend Dry::CLI::Registry
 
   def self.setup!
+    register_commands_with_alias(
+      group: "",
+      alias_prefix: "",
+      commands: {
+        "db:migrate" => ::Rsodx::Cli::Commands::Db::Migrate
+      }
+    )
+
+    register_commands_with_alias(
+      group: "",
+      alias_prefix: "",
+      commands: {
+        "db:rollback" => ::Rsodx::Cli::Commands::Db::Rollback
+      }
+    )
+
+    register_commands_with_alias(
+      group: "",
+      alias_prefix: "",
+      commands: {
+        "console" => ::Rsodx::Cli::Commands::Console,
+        "c"   => ::Rsodx::Cli::Commands::Console
+      }
+    )
+
     register_commands_with_alias(
       group: "",
       alias_prefix: "",

data/lib/rsodx/cli/commands/console.rb

@@ -0,0 +1,33 @@
+require "dry/cli"
+require "irb"
+require "irb/completion"
+
+module Rsodx::Cli::Commands
+  class Console < Dry::CLI::Command
+    desc "Start the Rsodx development console"
+
+    def call(*)
+      project_root = Rsodx.project_root
+      environment_path = File.join(project_root, "config", "environment.rb")
+
+      unless File.exist?(environment_path)
+        abort "❌ Could not find config/environment.rb in #{project_root}"
+      end
+
+      require environment_path
+
+      TOPLEVEL_BINDING.eval('def reload!; Rsodx.reload!; end')
+
+      puts Rsodx::LOGO
+      puts "🔬 Welcome to Rsodx console (#{ENV['RACK_ENV'] || 'development'})"
+      puts "Tip: access Rsodx modules, models, services, etc."
+
+      ARGV.clear
+      IRB.start
+    rescue LoadError => e
+      abort "❌ Failed to load: #{e.message}"
+    rescue StandardError => e
+      abort "❌ An error occurred: #{e.message}"
+    end
+  end
+end

data/lib/rsodx/cli/commands/db/migrate.rb

@@ -0,0 +1,20 @@
+require "sequel/extensions/migration"
+
+module Rsodx::Cli::Commands::Db
+  class Migrate < Dry::CLI::Command
+    desc "Migrate"
+
+    def call(*)
+      project_root = Rsodx.project_root
+      environment_path = File.join(project_root, "config", "environment.rb")
+
+      unless File.exist?(environment_path)
+        abort "❌ Could not find config/environment.rb in #{project_root}"
+      end
+
+      require environment_path
+
+      Sequel::Migrator.run(Rsodx::Connect.db, "db/migrations")
+    end
+  end
+end

data/lib/rsodx/cli/commands/db/rollback.rb

@@ -0,0 +1,27 @@
+require "sequel/extensions/migration"
+
+module Rsodx::Cli::Commands::Db
+  class Rollback < Dry::CLI::Command
+    desc "Rollback"
+
+    def call(*)
+      project_root = Rsodx.project_root
+      environment_path = File.join(project_root, "config", "environment.rb")
+
+      unless File.exist?(environment_path)
+        abort "❌ Could not find config/environment.rb in #{project_root}"
+      end
+
+      require environment_path
+      migration_table = :schema_migrations
+      migration_dir = 'db/migrations'
+
+      versions = Rsodx::Connect.db[migration_table].select(:filename).map { |r| r[:filename] }
+      version_numbers = versions.map { |f| f.to_s[/^\d+/].to_i }.sort
+
+      current_version = version_numbers.last
+      previous_version = version_numbers[-2] || 0
+      Sequel::Migrator.run(Rsodx::Connect.db, migration_dir, target: previous_version)
+    end
+  end
+end

data/lib/rsodx/cli/commands/scaffold.rb

@@ -28,8 +28,13 @@ module Rsodx::Cli::Commands
     private
 
     def create_folders
-      FOLDERS.each do |path|
-        FileUtils.mkdir_p(File.join(@app_path, path))
+      KEEPABLE_FOLDERS.each do |folder|
+        FileUtils.mkdir_p(File.join(@app_path, folder))
+        FileUtils.touch(File.join(@app_path, folder, '.keep'))
+      end
+
+      FRAMEWORK_FOLDERS.each do |folder|
+        FileUtils.mkdir_p(File.join(@app_path, folder))
       end
     end
 
@@ -41,18 +46,16 @@ module Rsodx::Cli::Commands
       write("config/environment.rb", ENV_LOADER)
       write("Rakefile", RAKEFILE)
       write("app/controllers/app_controller.rb", APP_CONTROLLER)
-      write("app/services/app_services.rb", APP_SERVICE)
+      write("app/services/app_service.rb", APP_SERVICE)
       write("app/serializers/app_serializer.rb", APP_SERIALIZER)
       write("app/presenters/app_presenter.rb", APP_PRESENTER)
       write("app/app.rb", APP)
       write("app/router.rb", ROUTE)
       write("config/environments/development.rb", "")
       write("config.ru", CONFIGRU)
-      write("bin/console", CONSOLE)
       write("bin/rsodx", BINRSODX)
 
       FileUtils.chmod("+x", File.join(@app_path, "bin/rsodx"))
-      FileUtils.chmod("+x", File.join(@app_path, "bin/console"))
     end
 
     def write(relative_path, content)

data/lib/rsodx/cli/commands/scaffold_common.rb

@@ -2,8 +2,8 @@ module Rsodx::Cli::Commands::ScaffoldCommon
   RUBY_VERSION = "3.4.2".freeze
 
   GITIGNORE = <<~GITIGNORE.freeze
-  .env
-  tmp/
+    .env
+    tmp/
   GITIGNORE
 
   #  path: "../rsodx"
@@ -25,32 +25,15 @@ module Rsodx::Cli::Commands::ScaffoldCommon
     Rsodx::CLI.call
   BINRSODX
 
-  CONSOLE = <<~CONSOLE.freeze
-    #!/usr/bin/env ruby
-
-    require "irb"
-    require "irb/completion"
-
-    def reload!
-      puts "🔄 Reloading..."
-      load File.expand_path("../config/environment.rb", __dir__)
-    end
-
-    require_relative "../config/environment"
-
-    puts "🔬 Welcome to Rsodx console (#{ENV['RACK_ENV'] || 'development'})"
-    puts "Tip: access Rsodx modules, models, services, etc."
-
-    IRB.start
-  CONSOLE
-
   CONFIGRU = <<~RACK.freeze
     require_relative "./app/app"
     run App
   RACK
 
   ENV_LOADER = <<~ENV_LOADER.freeze
+    require "zeitwerk"
     require "rsodx"
+
     Rsodx::Environment.load_dotenv(ENV["RACK_ENV"] || "development")
     
     Rsodx.configure do |config|
@@ -59,7 +42,8 @@ module Rsodx::Cli::Commands::ScaffoldCommon
     Rsodx::Connect.connect
 
     Rsodx::Environment.load_initializers(File.expand_path("../..", __FILE__))
-    Rsodx::Boot.load_app_structure(File.expand_path("../..", __FILE__))
+
+    Rsodx.loader
   ENV_LOADER
 
   ROUTE = <<~ROUTE.freeze
@@ -106,7 +90,23 @@ module Rsodx::Cli::Commands::ScaffoldCommon
     DATABASE_URL=postgres://rsodx:paSs4321@localhost:5432/rsodx_development
   ENVFILE
 
-  FOLDERS = %w[app/controllers app/services app/models app/presenters
-                 app/serializers config/initializers
-                 config/environments db/migrations spec bin].freeze
+  KEEPABLE_FOLDERS = %w[
+    lib
+    app/controllers
+    app/workers
+    app/services
+    app/models
+    app/presenters
+    app/serializers
+    config/initializers
+    config/environments
+    db/migrations
+    spec
+  ].freeze
+
+  FRAMEWORK_FOLDERS = %w[
+    bin
+    config
+  ].freeze
+
 end

data/lib/rsodx/configuration.rb

@@ -1,9 +1,20 @@
 module Rsodx
   class Configuration
-    attr_accessor :database_url
+    attr_accessor :database_url, :logger, :appname
 
     def initialize
-      @database_url = ENV["DATABASE_URL"]
+      @appname = Rsodx::RSODX_NAME
+      init_database
+      init_logger
+    end
+
+    private
+
+    def init_database
+      @database_url = ENV['DATABASE_URL']
+    end
+    def init_logger
+      @logger ||= Rsodx::Logger.new(Rsodx::LoggerAdapter.new($stdout))
     end
   end
 end

data/lib/rsodx/delegate.rb

@@ -2,12 +2,22 @@ require "forwardable"
 
 module Rsodx
   module Delegate
-    def delegate(*methods, to:)
+    def delegate(*methods, to:, prefix: nil)
       raise ArgumentError, "Missing target for delegation (to:)" unless to
 
       mod = Module.new do
         extend Forwardable
-        def_delegators to, *methods
+
+        methods.each do |method_name|
+          delegated_name = if prefix
+                             prefix_str = prefix == true ? to.to_s : prefix.to_s
+                             "#{prefix_str}_#{method_name}"
+                           else
+                             method_name
+                           end
+
+          def_delegator to, method_name, delegated_name
+        end
       end
 
       include mod

data/lib/rsodx/environment.rb

@@ -2,11 +2,17 @@ module Rsodx
   module Environment
     def self.load_dotenv(env = nil)
       require "dotenv"
-      Dotenv.load('.env', ".env.#{env}") if env
+      Rsodx.instance_variable_set(:@env, env.to_s.freeze) unless Rsodx.instance_variable_defined?(:@env)
+
+      Dotenv.overload(".env.#{env}") if env
     end
 
     def self.load_initializers(app_root)
       Dir[File.join(app_root, "config", "initializers", "*.rb")].sort.each { |file| require file }
     end
+
+    def self.env
+      @env || "development"
+    end
   end
 end

data/lib/rsodx/logger.rb

@@ -0,0 +1,51 @@
+require 'json'
+require 'time'
+require 'syslog/logger'
+
+module Rsodx
+  class Logger
+    attr_accessor :adapter, :options
+
+    LEVELS = %i[info debug warn error fatal].freeze
+    OPTIONS = { with_backtrace: false }.freeze
+    LogEntry = Struct.new(:timestamp, :appname, :level, :code, :message, :context, :backtrace)
+
+    def initialize(adapter, options = {})
+      raise ArgumentError, 'Invalid LoggerAdapter' unless adapter.is_a?(LoggerAdapter)
+      @adapter = adapter
+      @options = OPTIONS.merge(options).slice(*OPTIONS.keys)
+    end
+
+    def log(level = :info, code:, message:, context: {}, backtrace: nil)
+      raise ArgumentError, "Invalid log level: #{level}" unless LEVELS.include?(level)
+
+      entry = LogEntry.new(
+        timestamp: Time.now.utc.iso8601,
+        appname: appname,
+        level: level,
+        code: code,
+        message: message,
+        context: context,
+        backtrace: include_backtrace?(level) ? (backtrace || caller).take(10) : nil
+      )
+
+      adapter.puts(entry)
+    end
+
+    LEVELS.each do |level|
+      define_method(level) do |code, message, context = {}|
+        log(level, code: code, message: message, context: context)
+      end
+    end
+
+    private
+
+    def include_backtrace?(level)
+      options[:with_backtrace] || level == :debug
+    end
+
+    def appname
+      Rsodx.config.appname
+    end
+  end
+end

data/lib/rsodx/logger_adapter.rb

@@ -0,0 +1,32 @@
+module Rsodx
+  class LoggerAdapter
+    def initialize(target)
+      @target = target
+    end
+
+    def puts(log)
+      case @target
+      when IO
+        @target.puts(log_format(log).to_json)
+      when ::Logger
+        @target.send(log.level, log_format(log).to_json)
+      when Syslog::Logger
+        @target.send(log.level, "[#{log.appname}] [#{log.code}] #{log.message} #{log.context}")
+      else
+        raise "Unsupported log target: #{@target.class}"
+      end
+    end
+
+    def log_format(log)
+      {
+        app: log.appname,
+        timestamp: log.timestamp,
+        level: log.level,
+        code: log.code,
+        message: log.message,
+        context: (log.context.empty? ? nil : log.context),
+        backtrace: log.backtrace
+      }.compact
+    end
+  end
+end

data/lib/rsodx/service.rb

@@ -6,6 +6,7 @@ module Rsodx
     extend Delegate
 
     delegate :params, :object, to: :context
+    delegate :log, :info, :debug, :warn, :fatal, :error, to: :logger, prefix: :log
 
     class << self
       attr_accessor :contract_class
@@ -25,18 +26,11 @@ module Rsodx
     def halt(code, message)
       log_error(code, message)
       context.fail!(error_code: code, error: message)
+      Rsodx.config.logger&.error(code, message, context)
     end
 
-    private
-
-    def log_error(code, message)
-      puts JSON.pretty_generate({
-                                  level: "error",
-                                  code: code,
-                                  message: message,
-                                  context: context.to_h,
-                                  backtrace: caller
-                                })
+    def logger
+      Rsodx.config.logger
     end
   end
 end

data/lib/rsodx/tasks.rb

@@ -1,15 +1,2 @@
 return unless defined?(Rake::DSL) rescue false
 include Rake::DSL if defined?(Rake::DSL)
-
-require "sequel/extensions/migration"
-
-namespace :db do
-  task :migrate do
-    Sequel::Migrator.run(Rsodx::Connect.db, "db/migrations")
-  end
-
-  task :rollback do
-    target = Sequel::Migrator.apply(Rsodx::Connect.db, "db/migrations", :down) - 1
-    Sequel::Migrator.run(Rsodx::Connect.db, "db/migrations", target: target)
-  end
-end

data/lib/rsodx/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Rsodx
-  VERSION = "0.0.5"
+  VERSION = "0.1.1"
 end

data/lib/rsodx.rb

@@ -14,6 +14,8 @@ Dir.glob("#{base}/rsodx/**/*.rb").sort.each do |file|
 end
 
 module Rsodx
+  RSODX_NAME = 'Rsodx'.freeze
+
   class << self
     attr_accessor :config
 
@@ -22,6 +24,40 @@ module Rsodx
       yield(config)
     end
   end
+
+  def self.project_root
+    @root ||= Dir.pwd
+  end
+
+  def self.loader
+    @loader ||= begin
+                  loader = Zeitwerk::Loader.new
+
+      #  need to be merged with ScaffoldCommon
+      %w[
+        app/models
+        app/services
+        app/workers
+        app/presenters
+        app/serializers
+        app/controllers
+        app/lib
+      ].each do |subdir|
+                    path = File.join(project_root, subdir)
+                    loader.push_dir(path) if Dir.exist?(path)
+                  end
+
+                  loader.enable_reloading
+                  loader.setup
+                  loader
+                end
+  end
+
+  def self.reload!
+    puts "🔄 Reloading..."
+    loader.reload
+  end
 end
 
 Rsodx.config ||= Rsodx::Configuration.new
+Rsodx.loader

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: rsodx
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.1
 platform: ruby
 authors:
 - Eugene Pervushin
 bindir: bin
 cert_chain: []
-date: 2025-04-16 00:00:00.000000000 Z
+date: 2025-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -191,6 +191,62 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: zeitwerk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.7'
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.13'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.13'
+- !ruby/object:Gem::Dependency
+  name: irb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.15'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.15'
+- !ruby/object:Gem::Dependency
+  name: syslog
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
 description: Rsodx is a lightweight Ruby microframework designed for modular, service-oriented
   applications. Built with simplicity and performance in mind, it's perfect for small
   web apps, microservices, and CLI tools.
@@ -201,7 +257,6 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- LICENSE.txt
 - README.md
 - bin/console
 - bin/rsodx
@@ -211,6 +266,9 @@ files:
 - lib/rsodx/base.rb
 - lib/rsodx/boot.rb
 - lib/rsodx/cli/cli.rb
+- lib/rsodx/cli/commands/console.rb
+- lib/rsodx/cli/commands/db/migrate.rb
+- lib/rsodx/cli/commands/db/rollback.rb
 - lib/rsodx/cli/commands/generator.rb
 - lib/rsodx/cli/commands/generators/action.rb
 - lib/rsodx/cli/commands/generators/controller.rb
@@ -229,6 +287,8 @@ files:
 - lib/rsodx/environment.rb
 - lib/rsodx/error.rb
 - lib/rsodx/headers.rb
+- lib/rsodx/logger.rb
+- lib/rsodx/logger_adapter.rb
 - lib/rsodx/presenter.rb
 - lib/rsodx/request.rb
 - lib/rsodx/router.rb

data/LICENSE.txt

@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2025 Первушин
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.