rsodx 0.0.1 → 0.0.2

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

@@ -0,0 +1,58 @@
+require "fileutils"
+require_relative "scaffold_common"
+
+module Rsodx::Cli::Commands
+  class Scaffold < Dry::CLI::Command
+    include Rsodx::Cli::Commands::ScaffoldCommon
+    desc "Scaffold a new Rsodx project"
+
+    argument :name, required: true, desc: "Project name"
+
+    def call(arg)
+      @name = arg[:name]
+      @app_path = File.join(Dir.pwd, @name)
+
+      puts "🚀 Creating project: #{@name}"
+      create_folders
+      create_files
+      puts "✅ Done! Your project is ready at #{@app_path}"
+    rescue => e
+      abort "❌ Failed to scaffold: #{e.message}"
+    end
+
+    private
+
+    def create_folders
+      FOLDERS.each do |path|
+        FileUtils.mkdir_p(File.join(@app_path, path))
+      end
+    end
+
+    def create_files
+      write("Gemfile", GEMFILE)
+      write(".ruby-version", RUBY_VERSION)
+      write(".env", ENVFILE)
+      write(".gitignore", GITIGNORE)
+      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/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)
+      full_path = File.join(@app_path, relative_path)
+      File.write(full_path, content)
+    end
+  end
+end

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

@@ -0,0 +1,107 @@
+module Rsodx::Cli::Commands::ScaffoldCommon
+  RUBY_VERSION = "3.4.2".freeze
+
+  GITIGNORE = <<~GITIGNORE.freeze
+  .env
+  tmp/
+  GITIGNORE
+
+  #  path: "../rsodx"
+  GEMFILE = <<~GEMFILE.freeze
+    source "https://rubygems.org"
+  
+    gem "rsodx"
+    gem "pg"
+  GEMFILE
+
+  BINRSODX = <<~BINRSODX.freeze
+    #!/usr/bin/env ruby
+    
+    require "fileutils"
+    require "optparse"
+    require "rsodx"
+    
+    Rsodx::Cli.setup!
+    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 "rsodx"
+    Rsodx::Environment.load_dotenv(ENV["RACK_ENV"] || "development")
+    Rsodx::Connect.connect ENV["DATABASE_URL"]
+    Rsodx::Environment.load_initializers(File.expand_path("../..", __FILE__))
+    Rsodx::Boot.load_app_structure(File.expand_path("../..", __FILE__))
+  ENV_LOADER
+
+  ROUTE = <<~ROUTE.freeze
+    class Router < Rsodx::Router
+    end
+  ROUTE
+
+  APP = <<~APP.freeze
+    require "rsodx"
+    require_relative "../config/environment"
+    require_relative "router"
+    
+    class App < Rsodx::Base
+      use Router
+    end
+  APP
+
+  APP_SERVICE = <<~APP_SERVICE.freeze
+    class AppService < Rsodx::Service
+    end
+  APP_SERVICE
+
+  APP_CONTROLLER = <<~APP_CONTROLLER.freeze
+    class AppController < Rsodx::Controller
+    end
+  APP_CONTROLLER
+
+  APP_SERIALIZER = <<~APP_SERIALIZER.freeze
+    class AppSerializer < Rsodx::Serializer
+    end
+  APP_SERIALIZER
+
+  APP_PRESENTER = <<~APP_PRESENTER.freeze
+    class AppPresenter < Rsodx::Presenter
+    end
+  APP_PRESENTER
+
+  RAKEFILE = <<~RAKEFILE.freeze
+    require_relative "config/environment"
+    require "rsodx/tasks"
+  RAKEFILE
+
+  ENVFILE = <<~ENVFILE.freeze
+    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
+end

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

@@ -0,0 +1,27 @@
+require "dry/cli"
+
+module Rsodx::Cli::Commands
+  class Server < Dry::CLI::Command
+    desc "Start the Rsodx development server"
+
+    option :port, type: :integer, default: 9292, desc: "Port to run the server on"
+    option :env,  type: :string,  default: "development", desc: "Rack environment"
+
+    def call(args)
+      env = args[:env]
+      port = args[:port]
+      ENV["RACK_ENV"] = env
+
+      rackup_path = File.expand_path("config.ru", Dir.pwd)
+      unless File.exist?(rackup_path)
+        abort "❌ config.ru not found in #{Dir.pwd}"
+      end
+
+      pid = spawn("bundle exec rackup --port=#{port} --host=0.0.0.0 #{rackup_path}")
+      puts "🚀 Rsodx started!"
+      Process.wait(pid)
+    rescue => e
+      abort "❌ Failed to start server: #{e.class} - #{e.message}"
+    end
+  end
+end

data/lib/rsodx/controller.rb

@@ -0,0 +1,4 @@
+module Rsodx
+  class Controller < Rsodx::Service
+  end
+end

data/lib/rsodx/delegate.rb

@@ -0,0 +1,16 @@
+require "forwardable"
+
+module Rsodx
+  module Delegate
+    def delegate(*methods, to:)
+      raise ArgumentError, "Missing target for delegation (to:)" unless to
+
+      mod = Module.new do
+        extend Forwardable
+        def_delegators to, *methods
+      end
+
+      include mod
+    end
+  end
+end

data/lib/rsodx/error.rb

@@ -1,6 +1,4 @@
 module Rsodx
-  module Error
-    class Error < StandardError; end
-    class ContractError < Error; end
+  class Error < StandardError
   end
 end

data/lib/rsodx/headers.rb

@@ -0,0 +1,31 @@
+module Rsodx
+  class Headers
+    attr_reader :headers
+
+    def initialize(request)
+      @headers = request.env.each_with_object({}) do |(k, v), memo|
+        if k.start_with?("HTTP_")
+          key = k.sub(/^HTTP_/, '').split('_').map(&:capitalize).join('-')
+          memo[key] = v
+        end
+      end
+    end
+
+    def [](key)
+      headers[key]
+    end
+
+    def authorization
+      headers["Authorization"]
+    end
+
+    def bearer_token
+      return nil unless authorization&.start_with?("Bearer ")
+      authorization.sub("Bearer ", "")
+    end
+
+    def to_h
+      headers
+    end
+  end
+end

data/lib/rsodx/presenter.rb

@@ -0,0 +1,19 @@
+require 'oj'
+module Rsodx
+  class Presenter < Rsodx::Service
+    def call
+      present
+    end
+
+    private
+
+    def present(dto: nil, **options)
+      dto ||= context.dto
+      Oj.dump(dto, { mode: :compat }.merge(options))
+    rescue => e
+      raise PresenterError, "Failed to present DTO: #{e.message}"
+    end
+
+    class PresenterError < StandardError; end
+  end
+end

data/lib/rsodx/request.rb

@@ -0,0 +1,39 @@
+module Rsodx
+  class Request
+    attr_reader :verb, :path, :request
+
+    def initialize(verb:, path:, request:)
+      @verb = verb.to_s.upcase
+      @path = path
+      @request = request
+      @parsed_payload = nil
+    end
+
+    def headers
+      @headers ||= Rsodx::Headers.new(request)
+    end
+
+    def params
+      request.params.transform_keys(&:to_sym).merge(payload)
+    end
+
+    def payload
+      return @parsed_payload if @parsed_payload
+
+      request.body.rewind
+      raw = request.body.read.strip
+
+      if raw.empty? || raw == 'null'
+        @parsed_payload = {}
+      elsif raw.start_with?("{") && raw.end_with?("}")
+        begin
+          @parsed_payload = JSON.parse(raw, symbolize_names: true)
+        rescue JSON::ParserError
+          @parsed_payload = {}
+        end
+      else
+        @parsed_payload = {}
+      end
+    end
+  end
+end

data/lib/rsodx/router_dsl.rb

@@ -7,38 +7,28 @@ module Rsodx
     end
 
     module ClassMethods
-      def route(verb, path, interactor, opts = {})
+      def route(verb, path, handler_class, options = {})
         define_route(verb, path) do
-          payload = begin
-                      request.body.rewind
-                      JSON.parse(request.body.read, symbolize_names: true)
-                    rescue JSON::ParserError
-                      {}
-                    end
+          req = Request.new(verb: verb, path: path, request: request)
+          result = Action.call(request: req, handler_class: handler_class, options: options)
 
-          ctx = {
-            params: params.to_h,
-            json: payload
-          }.merge(opts)
-
-          result = interactor.call(ctx)
-
-          status(result.error_code || 200)
+          content_type :json
+          status(result.error_code || result.code || 200)
 
           if result.success?
-            { success: true, data: result.data }.to_json
+            result.json_response
           else
             { success: false, error: result.error }.to_json
           end
         end
       end
 
-      %i[get post put patch delete].each do |verb|
+      %i[get post put patch delete head options].each do |verb|
         define_method(verb) do |path, interactor = nil, **opts, &block|
           if interactor
             route(verb, path, interactor, opts)
           else
-            super(path, &block)
+            define_route(verb, path, &block)
           end
         end
       end

data/lib/rsodx/serializer.rb

@@ -0,0 +1,24 @@
+module Rsodx
+  class Serializer < Rsodx::Service
+    def call
+      context.dto = serialize_object
+    rescue => e
+      halt(500, e.message)
+    end
+
+    private
+
+    def serialize_object
+      case object
+      when Hash
+        object
+      when OpenStruct
+        object.to_h
+      else
+        raise NotSerializableError, "Can't serialize #{object.class.name}"
+      end
+    end
+
+    class NotSerializableError < StandardError; end
+  end
+end

data/lib/rsodx/{interactor.rb → service.rb}

@@ -1,8 +1,11 @@
 require "interactor"
 require "json"
 module Rsodx
-  class Interactor
+  class Service
     include ::Interactor
+    extend Delegate
+
+    delegate :params, :object, to: :context
 
     class << self
       attr_accessor :contract_class
@@ -21,7 +24,7 @@ module Rsodx
 
     def halt(code, message)
       log_error(code, message)
-      context.fail!(error_code: code, error: Rsodx::Error::ContractError.new(message))
+      context.fail!(error_code: code, error: message)
     end
 
     private

data/lib/rsodx/tasks.rb

@@ -3,11 +3,6 @@ include Rake::DSL if defined?(Rake::DSL)
 
 require "sequel/extensions/migration"
 
-desc "Запуск Puma-сервера"
-task :server do
-  sh "bundle exec puma -p 9292 config.ru"
-end
-
 namespace :db do
   task :migrate do
     Sequel::Migrator.run(DB.connect, "db/migrations")

data/lib/rsodx/version.rb

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

data/lib/rsodx.rb

@@ -1,7 +1,16 @@
 # frozen_string_literal: true
 
-Dir[File.join(__dir__, "rsodx/*.rb")].sort.each { |f| require_relative f }
-Dir[File.join(__dir__, "rsodx/**/*.rb")].sort.each { |f| require_relative f }
+require_relative 'rsodx/delegate'
+require_relative 'rsodx/service'
+
+base = File.expand_path(__dir__)
+
+Dir.glob("#{base}/rsodx/*.rb").sort.each do |file|
+  require_relative file.sub("#{base}/", "")
+end
+Dir.glob("#{base}/rsodx/**/*.rb").sort.each do |file|
+  require_relative file.sub("#{base}/", "")
+end
 
 module Rsodx
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: rsodx
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Eugene Pervushin
 bindir: bin
 cert_chain: []
-date: 2025-04-14 00:00:00.000000000 Z
+date: 2025-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -23,6 +23,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '13.1'
+- !ruby/object:Gem::Dependency
+  name: rackup
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -149,6 +163,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
+- !ruby/object:Gem::Dependency
+  name: oj
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.16'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.16'
+- !ruby/object:Gem::Dependency
+  name: dry-cli
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -193,22 +235,32 @@ files:
 - bin/rsodx
 - bin/setup
 - lib/rsodx.rb
+- lib/rsodx/action.rb
 - lib/rsodx/base.rb
 - lib/rsodx/boot.rb
-- lib/rsodx/cli/generate.rb
-- lib/rsodx/cli/generate_interactor.rb
-- lib/rsodx/cli/generate_migration.rb
-- lib/rsodx/cli/handler.rb
-- lib/rsodx/cli/scaffold.rb
-- lib/rsodx/cli/server.rb
+- lib/rsodx/cli/cli.rb
+- lib/rsodx/cli/commands/generator.rb
+- lib/rsodx/cli/commands/generators/action.rb
+- lib/rsodx/cli/commands/generators/controller.rb
+- lib/rsodx/cli/commands/generators/migration.rb
+- lib/rsodx/cli/commands/generators/presenter.rb
+- lib/rsodx/cli/commands/generators/serializer.rb
+- lib/rsodx/cli/commands/scaffold.rb
+- lib/rsodx/cli/commands/scaffold_common.rb
+- lib/rsodx/cli/commands/server.rb
 - lib/rsodx/connect.rb
 - lib/rsodx/contract.rb
+- lib/rsodx/controller.rb
+- lib/rsodx/delegate.rb
 - lib/rsodx/environment.rb
 - lib/rsodx/error.rb
-- lib/rsodx/interactor.rb
-- lib/rsodx/interactors/healthcheck.rb
+- lib/rsodx/headers.rb
+- lib/rsodx/presenter.rb
+- lib/rsodx/request.rb
 - lib/rsodx/router.rb
 - lib/rsodx/router_dsl.rb
+- lib/rsodx/serializer.rb
+- lib/rsodx/service.rb
 - lib/rsodx/tasks.rb
 - lib/rsodx/version.rb
 - spec/rsodx_spec.rb

data/lib/rsodx/cli/generate.rb

@@ -1,17 +0,0 @@
-module Rsodx::Cli
-  class Generate
-    def self.run(args)
-      type = args.shift
-      name = args.shift
-      case type
-      when "interactor", "in"
-        GenerateInteractor.new(name).create
-      when "migration"
-        GenerateMigration.new(name).create
-      else
-        puts "Unknown generate type: #{type}"
-        exit(1)
-      end
-    end
-  end
-end

data/lib/rsodx/cli/generate_interactor.rb

@@ -1,34 +0,0 @@
-module Rsodx
-  module Cli
-    class GenerateInteractor
-      def initialize(name)
-        @name = name
-        @file_name = File.join("app/interactors", snake_case(name) + ".rb")
-      end
-
-      def create
-        puts "📦 Creating interactor: #{@file_name}"
-        FileUtils.mkdir_p("app/interactors")
-        File.write(@file_name, content)
-      end
-
-      def content
-        <<~RUBY
-        class #{@name} < AppInteractor
-          def call
-            # implement logic here
-          end
-        end
-        RUBY
-      end
-
-      def snake_case(str)
-        str.gsub(/::/, '/').
-          gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
-          gsub(/([a-z\d])([A-Z])/,'\1_\2').
-          tr("-", "_").
-          downcase
-      end
-    end
-  end
-end

data/lib/rsodx/cli/generate_migration.rb

@@ -1,43 +0,0 @@
-require "fileutils"
-require "time"
-
-module Rsodx::Cli
-  class GenerateMigration
-    def initialize(name)
-      @name = name
-      @timestamp = Time.now.utc.strftime("%Y%m%d%H%M%S")
-      @file_name = File.join("db/migrations", "#{@timestamp}_#{snake_case(name)}.rb")
-    end
-
-    def create
-      puts "📦 Creating migration: #{@file_name}"
-      FileUtils.mkdir_p("db/migrations")
-      File.write(@file_name, content)
-    end
-
-    private
-
-    def content
-      <<~RUBY
-        Sequel.migration do
-          change do
-            # create_table(:example) do
-            #   primary_key :id
-            #   String :name
-            #   DateTime :created_at
-            #   DateTime :updated_at
-            # end
-          end
-        end
-      RUBY
-    end
-
-    def snake_case(str)
-      str.gsub(/::/, '/')
-         .gsub(/([A-Z]+)([A-Z][a-z])/,'\\1_\\2')
-         .gsub(/([a-z\\d])([A-Z])/,'\\1_\\2')
-         .tr("-", "_")
-         .downcase
-    end
-  end
-end

data/lib/rsodx/cli/handler.rb

@@ -1,26 +0,0 @@
-require_relative "scaffold"
-
-module Rsodx::Cli
-  class Handler
-    def self.run
-      command = ARGV.shift
-      case command
-      when "s", "server"
-        Rsodx::Cli::Server.run
-      when "generate", "g"
-        Rsodx::Cli::Generate.run(ARGV)
-      when "new"
-        name = ARGV.shift
-        if name.nil? || name.empty?
-          puts "Usage: rsodx new <project_name>"
-          exit(1)
-        end
-        Scaffold.new(name).create
-      else
-        puts "Unknown command: #{command}"
-        puts "Usage: rsodx new <project_name>"
-        exit(1)
-      end
-    end
-  end
-end