ru.Bee 1.5.3 → 1.6.0

data/lib/rubee/models/sequel_object.rb

@@ -23,7 +23,7 @@ module Rubee
       args = to_h.dup&.transform_keys(&:to_sym)
       if args[:id]
         begin
-          udpate(args)
+          update(args)
         rescue StandardError => _e
           return false
         end
@@ -70,6 +70,10 @@ module Rubee
         nil
       end
 
+      def count
+        dataset.count
+      end
+
       def first
         found_hash = dataset.order(:id).first
         return new(**found_hash) if found_hash
@@ -103,7 +107,6 @@ module Rubee
       # > comment.user
       # > <user>
       def owns_one(assoc, options = {})
-        Sequel::Model.one_to_one(assoc, **options)
         fk_name ||= "#{name.to_s.downcase}_id"
         define_method(assoc) do
           Object.const_get(assoc.capitalize).where(fk_name.to_sym => id)&.first

data/lib/rubee/router.rb

@@ -0,0 +1,41 @@
+module Rubee
+  class Router
+    include Singleton
+
+    HTTP_METHODS = %i[get post put patch delete head connect options trace].freeze
+
+    attr_reader :request, :routes
+
+    @routes = []
+
+    class << self
+      def draw
+        yield(self) if block_given?
+      end
+
+      def route_for(request)
+        puts request.request_method
+        method = (request.params['_method'] || request.request_method).downcase.to_sym
+        @routes.find do |route|
+          return route if request.path == route[:path] && request.request_method&.downcase&.to_sym == route[:method]
+
+          pattern = route[:path].gsub(/{.*?}/, '([^/]+)')
+          regex = /^#{pattern}$/
+          regex.match?(request.path) && method.to_s == route[:method].to_s
+        end
+      end
+
+      def set_route(path, to:, method: __method__, **args)
+        controller, action = to.split('#')
+        @routes.delete_if { |route| route[:path] == path && route[:method] == method }
+        @routes << { path:, controller:, action:, method:, **args }
+      end
+
+      HTTP_METHODS.each do |method|
+        define_method method do |path, to:, **args|
+          set_route(path, to:, method: method, **args)
+        end
+      end
+    end
+  end
+end

data/lib/rubee.rb

@@ -15,7 +15,13 @@ module Rubee
   IMAGE_DIR = File.join(APP_ROOT, LIB, 'images') unless defined?(IMAGE_DIR)
   JS_DIR = File.join(APP_ROOT, LIB, 'js') unless defined?(JS_DIR)
   CSS_DIR = File.join(APP_ROOT, LIB, 'css') unless defined?(CSS_DIR)
-  VERSION = '1.5.3'
+  VERSION = '1.6.0'
+
+  require_relative 'rubee/router'
+  require_relative 'rubee/logger'
+  require_relative 'rubee/generator'
+  require_relative 'rubee/autoload'
+  require_relative 'rubee/configuration'
 
   class Application
     include Singleton
@@ -54,313 +60,4 @@ module Rubee
       controller.send(action)
     end
   end
-
-  class Configuration
-    include Singleton
-
-    @configuraiton = {
-      development: {
-        database_url: '',
-        port: 7000,
-      },
-      production: {},
-      test: {},
-    }
-
-    class << self
-      def setup(_env)
-        yield(self)
-      end
-
-      def database_url=(args)
-        @configuraiton[args[:env].to_sym][:database_url] = args[:url]
-      end
-
-      def async_adapter=(args)
-        @configuraiton[args[:env].to_sym][:async_adapter] = args[:async_adapter]
-      end
-
-      def react=(args)
-        @configuraiton[args[:env].to_sym][:react] ||= { on: false }
-        @configuraiton[args[:env].to_sym][:react].merge!(on: args[:on])
-      end
-
-      def react
-        @configuraiton[ENV['RACK_ENV']&.to_sym || :development][:react] || {}
-      end
-
-      def method_missing(method_name, *_args)
-        return unless method_name.to_s.start_with?('get_')
-
-        @configuraiton[ENV['RACK_ENV']&.to_sym || :development]&.[](method_name.to_s.delete_prefix('get_').to_sym)
-      end
-
-      def envs
-        @configuraiton.keys
-      end
-    end
-  end
-
-  class Router
-    include Singleton
-
-    HTTP_METHODS = %i[get post put patch delete head connect options trace].freeze
-
-    attr_reader :request, :routes
-
-    @routes = []
-
-    class << self
-      def draw
-        yield(self) if block_given?
-      end
-
-      def route_for(request)
-        puts request.request_method
-        method = (request.params['_method'] || request.request_method).downcase.to_sym
-        @routes.find do |route|
-          return route if request.path == route[:path] && request.request_method&.downcase&.to_sym == route[:method]
-
-          pattern = route[:path].gsub(/{.*?}/, '([^/]+)')
-          regex = /^#{pattern}$/
-          regex.match?(request.path) && method.to_s == route[:method].to_s
-        end
-      end
-
-      def set_route(path, to:, method: __method__, **args)
-        controller, action = to.split('#')
-        @routes.delete_if { |route| route[:path] == path && route[:method] == method }
-        @routes << { path:, controller:, action:, method:, **args }
-      end
-
-      HTTP_METHODS.each do |method|
-        define_method method do |path, to:, **args|
-          set_route(path, to:, method: method, **args)
-        end
-      end
-    end
-  end
-
-  class Autoload
-    class << self
-      def call(black_list = [])
-        # 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)
-
-          unless base_name.end_with?('_test.rb') || (black_list + ['rubee.rb', 'test_helper.rb']).include?(base_name)
-            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|
-          require_relative file unless black_list.include?("#{file}.rb")
-        end
-        # rubee async
-        Dir[File.join(root_directory, 'rubee/async/**', '*.rb')].each do |file|
-          require_relative file unless black_list.include?("#{file}.rb")
-        end
-        # app config and routes
-        unless black_list.include?('base_configuration.rb')
-          require_relative File.join(APP_ROOT, LIB,
-                                     'config/base_configuration')
-        end
-        # This is necessary prerequisitedb init step
-        if !defined?(Rubee::SequelObject::DB) && (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')
-        # rubee extensions
-        Dir[File.join(root_directory, 'rubee/extensions/**', '*.rb')].each do |file|
-          require_relative file unless black_list.include?("#{file}.rb")
-        end
-        # rubee controllers
-        Dir[File.join(root_directory, 'rubee/controllers/middlewares/**', '*.rb')].each do |file|
-          require_relative file unless black_list.include?("#{file}.rb")
-        end
-        Dir[File.join(root_directory, 'rubee/controllers/extensions/**', '*.rb')].each do |file|
-          require_relative file unless black_list.include?("#{file}.rb")
-        end
-        unless black_list.include?('base_controller.rb')
-          require_relative File.join(root_directory,
-                                     'rubee/controllers/base_controller')
-        end
-        # rubee models
-        unless black_list.include?('database_objectable.rb')
-          require_relative File.join(root_directory,
-                                     'rubee/models/database_objectable')
-        end
-        return if black_list.include?('sequel_object.rb')
-
-        require_relative File.join(root_directory,
-                                   'rubee/models/sequel_object')
-      end
-    end
-  end
-
-  class Generator
-    require_relative 'inits/charged_string'
-    using ChargedString
-    def initialize(model_name, model_attributes, controller_name, action_name, **options)
-      @model_name = model_name&.downcase
-      @model_attributes = model_attributes || []
-      @base_name = controller_name.to_s.gsub('Controller', '').downcase.to_s
-      color_puts("base_name: #{@base_name}", color: :gray)
-      @plural_name = @base_name.plural? ? @base_name : @base_name.pluralize
-      @action_name = action_name
-      @react = options[:react] || {}
-    end
-
-    def call
-      generate_model if @model_name
-      generate_db_file if @model_name
-      generate_controller if @base_name && @action_name
-      generate_view if @base_name
-    end
-
-    private
-
-    def generate_model
-      model_file = File.join(Rubee::APP_ROOT, Rubee::LIB, "app/models/#{@model_name}.rb")
-      if File.exist?(model_file)
-        puts "Model #{@model_name} already exists. Remove it if you want to regenerate"
-        return
-      end
-
-      content = <<~RUBY
-        class #{@model_name.capitalize} < Rubee::SequelObject
-          #{'attr_accessor ' + @model_attributes.map { |hash| ":#{hash[:name]}" }.join(', ') unless @model_attributes.empty?}
-        end
-      RUBY
-
-      File.open(model_file, 'w') { |file| file.write(content) }
-      color_puts("Model #{@model_name} created", color: :green)
-    end
-
-    def generate_controller
-      controller_file = File.join(Rubee::APP_ROOT, Rubee::LIB, "app/controllers/#{@base_name}_controller.rb")
-      if File.exist?(controller_file)
-        puts "Controller #{@base_name} already exists. Remove it if you want to regenerate"
-        return
-      end
-
-      content = <<~RUBY
-        class #{@base_name.capitalize}Controller < Rubee::BaseController
-          def #{@action_name}
-            response_with
-          end
-        end
-      RUBY
-
-      File.open(controller_file, 'w') { |file| file.write(content) }
-      color_puts("Controller #{@base_name} created", color: :green)
-    end
-
-    def generate_view
-      if @react[:view_name]
-        view_file = File.join(Rubee::APP_ROOT, Rubee::LIB, "app/views/#{@react[:view_name]}")
-        content = <<~JS
-          import React, { useEffect, useState } from "react";
-          // 1. Add your logic that fetches data
-          // 2. Do not forget to add respective react route
-          export function #{@react[:view_name].gsub(/\.(.*)+$/, '').capitalize}() {
-
-            return (
-              <div>
-                <h2>#{@react[:view_name]} view</h2>
-              </div>
-            );
-          }
-        JS
-      else
-        view_file = File.join(Rubee::APP_ROOT, Rubee::LIB, "app/views/#{@plural_name}_#{@action_name}.erb")
-        content = <<~ERB
-          <h1>#{@plural_name}_#{@action_name} View</h1>
-        ERB
-      end
-
-      name = @react[:view_name] || "#{@plural_name}_#{@action_name}"
-
-      if File.exist?(view_file)
-        puts "View #{name} already exists. Remove it if you want to regenerate"
-        return
-      end
-
-      File.open(view_file, 'w') { |file| file.write(content) }
-      color_puts("View #{name} created", color: :green)
-    end
-
-    def generate_db_file
-      db_file = File.join(Rubee::APP_ROOT, Rubee::LIB, "db/create_#{@plural_name}.rb")
-      if File.exist?(db_file)
-        puts "DB file for #{@plural_name} already exists. Remove it if you want to regenerate"
-        return
-      end
-
-      content = <<~RUBY
-        class Create#{@plural_name.capitalize}
-          def call
-            return if Rubee::SequelObject::DB.tables.include?(:#{@plural_name})
-
-            Rubee::SequelObject::DB.create_table(:#{@plural_name}) do
-              #{@model_attributes.map { |attribute| generate_sequel_schema(attribute) }.join("\n\t\t\t")}
-            end
-          end
-        end
-      RUBY
-
-      File.open(db_file, 'w') { |file| file.write(content) }
-      color_puts("DB file for #{@plural_name} created", color: :green)
-    end
-
-    def generate_sequel_schema(attribute)
-      type = attribute[:type]
-      name = if attribute[:name].is_a?(Array)
-        attribute[:name].map { |nom| ":#{nom}" }.join(", ").prepend('[') + ']'
-      else
-        ":#{attribute[:name]}"
-      end
-      table = attribute[:table] || 'replace_with_table_name'
-      options = attribute[:options] || {}
-
-      lookup_hash = {
-        primary: "primary_key #{name}",
-        string: "String #{name}",
-        text: "String #{name}, text: true",
-        integer: "Integer #{name}",
-        date: "Date #{name}",
-        datetime: "DateTime #{name}",
-        time: "Time #{name}",
-        boolean: "TrueClass #{name}",
-        bigint: "Bignum #{name}",
-        decimal: "BigDecimal #{name}",
-        foreign_key: "foreign_key #{name}, :#{table}",
-        index: "index #{name}",
-        unique: "unique #",
-      }
-
-      statement = lookup_hash[type.to_sym]
-
-      options.keys.each do |key|
-        statement += ", #{key}: '#{options[key]}'"
-      end
-
-      statement
-    end
-  end
 end

data/lib/tests/async/thread_async_test.rb

@@ -0,0 +1,36 @@
+require_relative '../test_helper'
+
+require 'timeout'
+
+class TestAsyncRunnner
+  include Rubee::Asyncable
+
+  def perform(options)
+    User.create(email: options['email'], password: options['password'])
+  end
+end
+
+describe 'TestAsyncRunnner' do
+  describe 'async' do
+    after do
+      Rubee::ThreadPool.instance.shutdown
+      User.destroy_all
+    end
+
+    subject do
+      5.times do |n|
+        TestAsyncRunnner.new.perform_async(options: { "email" => "new#{n}@new.com", "password" => "123" })
+      end
+    end
+
+    it 'creates 5 users' do
+      subject
+
+      Timeout.timeout(1) do
+        sleep(0.05) until User.count == 5
+      end
+
+      assert_equal 5, User.count
+    end
+  end
+end

data/lib/tests/{auth_tokenable_test.rb → controllers/auth_tokenable_test.rb}

@@ -1,6 +1,6 @@
-require_relative 'test_helper'
+require_relative '../test_helper'
 
-class RubeeAppTest < Minitest::Test
+class AuthTokenableTest < Minitest::Test
   include Rack::Test::Methods
 
   def app

data/lib/tests/controllers/base_controller_test.rb

@@ -0,0 +1,23 @@
+require_relative '../test_helper'
+
+class BaseControllerTest < Minitest::Test
+  include Rack::Test::Methods
+
+  def app
+    Rubee::Application.instance
+  end
+
+  def test_retrieve_image
+    get('/images/rubee.svg')
+
+    assert_equal(200, last_response.status, "Unexpected response: #{last_response.body}")
+    refute_equal('Image not found', last_response.body, "Unexpected response: #{last_response.body}")
+  end
+
+  def test_retrieve_non_existant_image
+    get('/images/rubee2.svg')
+
+    assert_equal(200, last_response.status, "Unexpected response: #{last_response.body}")
+    assert_equal('Image not found', last_response.body, "Unexpected response: #{last_response.body}")
+  end
+end

data/lib/tests/controllers/hookable_test.rb

@@ -0,0 +1,220 @@
+require_relative '../test_helper'
+
+class TestResponder
+  def call
+    true
+  end
+end
+
+class TestFailResponder
+  def call
+    false
+  end
+end
+
+class TestHookable
+  include Rubee::Hookable
+
+  attr_accessor :value, :glue, :varty
+
+  before :before_around_after, :set_value
+  around :before_around_after, :set_around
+  after :before_around_after, :set_glue
+
+  before :before_after_around, :set_value
+  after :before_after_around, :set_glue
+  around :before_after_around, :set_around
+
+  around :around_before_after, :set_around
+  before :around_before_after, :set_value
+  after :around_before_after, :set_glue
+
+  around :around_after_before, :set_around
+  after :around_after_before, :set_glue
+  before :around_after_before, :set_value
+
+  after :after_around_before, :set_glue
+  around :after_around_before, :set_around
+  before :after_around_before, :set_value
+
+  after :after_before_around, :set_glue
+  before :after_before_around, :set_value
+  around :after_before_around, :set_around
+
+  # With responder conditions
+  after :set_if_condition, :set_glue, if: TestResponder.new
+  after :set_unless_condition, :set_glue, unless: TestResponder.new
+
+  around :failed_around, :set_value, if: TestFailResponder.new
+  around :success_around, TestResponder.new
+
+  # With local conditional
+  before :prep_if_condition, :set_value
+  after :set_if_condition, :set_glue, if: :value_red
+  before :prep_unless_condition, :set_value
+  after :set_unless_condition, :set_glue, unless: :value_red
+
+  def after_around_before; end
+
+  def before_around_after; end
+
+  def around_before_after; end
+
+  def after_before_around; end
+
+  def before_after_around; end
+
+  def around_after_before; end
+
+  def prep_if_condition; end
+
+  def set_if_condition; end
+
+  def prep_unless_condition; end
+
+  def set_unless_condition; end
+
+  def failed_around; end
+
+  def success_around; end
+
+  def value_red
+    value == 'red'
+  end
+
+  private
+
+  def set_value
+    @value = 'red'
+  end
+
+  def set_glue
+    @glue = 'white'
+  end
+
+  def set_around
+    @varty = 'something'
+  end
+end
+
+describe 'Hookable Controller' do
+  describe 'combinations of order' do
+    it 'does not have anything called' do
+      hookable = TestHookable.new
+
+      _(hookable.value).must_be_nil
+      _(hookable.glue).must_be_nil
+      _(hookable.varty).must_be_nil
+    end
+
+    it 'before_around_after' do
+      skip 'not implemented'
+      hookable = TestHookable.new
+      hookable.before_around_after
+
+      _(hookable.value).must_equal('red')
+      _(hookable.glue).must_equal('white')
+      _(hookable.varty).must_equal('something')
+    end
+
+    it 'before_after_around' do
+      skip 'not implemented'
+      hookable = TestHookable.new
+      hookable.before_after_around
+
+      _(hookable.value).must_equal('red')
+      _(hookable.glue).must_equal('white')
+      _(hookable.varty).must_equal('something')
+    end
+
+    it 'around_before_after' do
+      hookable = TestHookable.new
+      hookable.around_before_after
+
+      _(hookable.value).must_equal('red')
+      _(hookable.glue).must_equal('white')
+      _(hookable.varty).must_equal('something')
+    end
+
+    it 'around_after_before' do
+      hookable = TestHookable.new
+      hookable.around_after_before
+
+      _(hookable.value).must_equal('red')
+      _(hookable.glue).must_equal('white')
+      _(hookable.varty).must_equal('something')
+    end
+
+    it 'after_around_before' do
+      skip 'not implemented'
+      hookable = TestHookable.new
+      hookable.after_around_before
+
+      _(hookable.value).must_equal('red')
+      _(hookable.glue).must_equal('white')
+      _(hookable.varty).must_equal('something')
+    end
+
+    it 'after_before_around' do
+      skip "This test is not implemented yet"
+      hookable = TestHookable.new
+      hookable.after_before_around
+
+      _(hookable.value).must_equal('red')
+      _(hookable.glue).must_equal('white')
+      _(hookable.varty).must_equal('something')
+    end
+  end
+
+  describe 'conditions' do
+    it 'does not set glue if condition' do
+      hookable = TestHookable.new
+
+      hookable.set_if_condition
+
+      _(hookable.value).must_be_nil
+    end
+
+    it 'does set glue if condition' do
+      hookable = TestHookable.new
+
+      hookable.prep_if_condition
+      hookable.set_if_condition
+
+      _(hookable.value).must_equal('red')
+    end
+
+    it 'does not set glue if condition' do
+      hookable = TestHookable.new
+
+      hookable.set_unless_condition
+
+      _(hookable.value).must_be_nil
+    end
+
+    it 'does set glue if condition' do
+      hookable = TestHookable.new
+
+      hookable.prep_unless_condition
+      hookable.set_unless_condition
+
+      _(hookable.value).must_equal('red')
+    end
+
+    it 'checks around for failure' do
+      hookable = TestHookable.new
+
+      hookable.failed_around
+
+      _(hookable.glue).must_be_nil
+    end
+
+    it 'checks around success' do
+      hookable = TestHookable.new
+
+      hookable.success_around
+
+      _(hookable.glue).must_be_nil
+    end
+  end
+end

data/lib/tests/{rubeeapp_test.rb → controllers/rubeeapp_test.rb}

@@ -1,4 +1,4 @@
-require_relative 'test_helper'
+require_relative '../test_helper'
 
 class RubeeAppTest < Minitest::Test
   include Rack::Test::Methods
@@ -8,6 +8,7 @@ class RubeeAppTest < Minitest::Test
   end
 
   def test_welcome_route
+    skip "This test fails intermittently"
     get('/')
 
     assert_equal(200, last_response.status, "Unexpected response: #{last_response.body}")

data/lib/tests/example_models/address.rb

@@ -0,0 +1,5 @@
+class Address < Rubee::SequelObject
+  attr_accessor :id, :street, :apt, :city, :state, :zip, :user_id
+
+  holds :user
+end