ru.Bee 1.1.4 → 1.1.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1357f41d8c3b31d032d0787838ef095b55a88891506472c1b1921180a8df419a
-  data.tar.gz: fa5539ac28e7e3102c804af72bcf75b4a661c92d5d6eb561878166b2454c00f7
+  metadata.gz: 6eac2d1bef53011170dd125951f1cc791ee58cfd8b9f71118e0f46e941f31d59
+  data.tar.gz: aad142cc3cd7b423dcb7e70f9e0d92cc9ba867256a7fd641608dda965ae404b8
 SHA512:
-  metadata.gz: 607c43f4a109ee2ec8bee211b1f8f01e8504f2b0b59ce8802c215a623e5791d222d235a2496f42b825d485c461ee287b7dfe246a7c9e6cef994ea88bae5413ac
-  data.tar.gz: 8db14bf2a2c08e507c6537a3a7d1413687cf3ab0b9caab3f8ed931277b212f1c488bbe0e3a828e5dab468b8c22573bddd1eaf6edfca7c5410d43fc6e757d9a5d
+  metadata.gz: d9b3cc6451562b84f972aba514f4ae709918d3f27786faa11d95a1954ab7a8153ee3ed168fb8b4d13496cdb329e2ba5b44d2861c791a99c6919ec76610056ea3
+  data.tar.gz: 7e5432d08f8d36940f397d8c50f0a3facf5bea9f86a2a6ecbf0733c0ac67e31c040f75a60429accf4d1c930bd3ddc53513b8996561097d995b524f8d5ed84001

data/bin/rubee

@@ -9,6 +9,7 @@ require 'json'
 require 'rack'
 require 'rackup'
 
+require_relative '../lib/version'
 require_relative '../lib/inits/print_colors'
 require_relative '../lib/rubee'
 
@@ -29,7 +30,7 @@ LOGO
 command = ARGV.first
 
 def print_logo
-  puts "\e[36m" + (LOGO % Rubee::VERSION) + "\e[0m" # Cyan color
+  puts "\e[36m" + (LOGO % VERSION) + "\e[0m" # Cyan color
 end
 
 if command =~ /^(start)$|^(start:(\d+))$/
@@ -59,11 +60,6 @@ elsif command == "project"
     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)
 
@@ -76,8 +72,8 @@ 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]
+  blacklist_dirs = %w[rubee]
 
   # Copy files, excluding blacklisted ones
   Dir.glob("#{source_dir}/**/*", File::FNM_DOTMATCH).each do |file|
@@ -98,10 +94,6 @@ elsif command == "project"
     end
   end
 
-  # create tests dir and copy test_helper.rb and user_model_test.rb
-  FileUtils.mkdir_p("#{target_dir}/tests")
-  FileUtils.cp("#{source_dir}/tests/user_model_test.rb", "#{target_dir}/tests/user_model_test.rb")
-
   # create a gemfile context
   gemfile = <<~GEMFILE
   source 'https://rubygems.org'
@@ -128,39 +120,22 @@ elsif command == "project"
     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 "ru.Bee v#{Rubee::VERSION}", color: :yellow
+  puts "ruBee v#{VERSION}"
 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}'\"")
+    exec("ruby -Itest -e \"require './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 }\"")
+    exec("ruby -Itest -e \"Dir.glob('./tests/**/*_test.rb').each { |file| require file }\"")
   end
-elsif ['generate', 'gen'].include? command
+elsif ['generate', 'g'].include? command
   method, path = ARGV[1..2]
   ENV['RACK_ENV'] ||= 'development'
 
@@ -179,12 +154,7 @@ elsif command == "db"
   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)
@@ -193,7 +163,7 @@ elsif command == "db"
       begin
         Sequel.connect(db_url)
         color_puts "Database #{ENV['RACK_ENV']} exists", color: :cyan
-      rescue Exception => e
+      rescue => _
         if File.exist?(db_path = db_url.sub(/^sqlite:\/\//, ''))
           color_puts "Database #{ENV['RACK_ENV']} exists", color: :cyan
         else
@@ -239,24 +209,14 @@ elsif command == "db"
 
   if command == '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' }
-    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
+      color_puts "Run #{file_name} file for #{env} env", color: :cyan
+      Object.const_get(file_name.split('_').map(&:capitalize).join).new.call
     end
+    color_puts "Migration #{file_name} completed", color: :green
+    color_puts "Regenerate schema file", color: :cyan
+    generate_structure
   elsif command == 'init'
     ensure_database_exists(Rubee::Configuration.get_database_url)
   elsif command == 'structure'
@@ -269,25 +229,15 @@ elsif ['console'].include? command
   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 = Dir["./#{APP_ROOT}/**/*.rb"]
     app_files.each { |file| load file }
     color_puts "Reloaded ..", color: :green
   end
-  begin
-    # Start IRB
-    IRB.start
-  rescue Exception => e
-    IRB.start
-  end
+
+  # Start IRB
+  IRB.start
 else
   color_puts "Unknown command: #{command}", color: :red
 end

data/lib/app/views/welcome_show.erb

@@ -47,8 +47,6 @@
         <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/>
-        <p>Version: <%= Rubee::VERSION %></p>
     </div>
 </body>
 </html>

data/lib/db/structure.rb

@@ -30,97 +30,5 @@ STRUCTURE = {
       ruby_default: nil,
       max_length: 255
     }
-  },
-  accounts: {
-    id: {
-      generated: false,
-      allow_null: false,
-      default: nil,
-      db_type: "INTEGER",
-      primary_key: true,
-      auto_increment: true,
-      type: "integer",
-      ruby_default: nil
-    },
-    addres: {
-      generated: false,
-      allow_null: true,
-      default: nil,
-      db_type: "varchar(255)",
-      primary_key: false,
-      type: "string",
-      ruby_default: nil,
-      max_length: 255
-    },
-    user_id: {
-      generated: false,
-      allow_null: true,
-      default: nil,
-      db_type: "INTEGER",
-      primary_key: false,
-      type: "integer",
-      ruby_default: nil
-    }
-  },
-  posts: {
-    id: {
-      generated: false,
-      allow_null: false,
-      default: nil,
-      db_type: "INTEGER",
-      primary_key: true,
-      auto_increment: true,
-      type: "integer",
-      ruby_default: nil
-    },
-    user_id: {
-      generated: false,
-      allow_null: true,
-      default: nil,
-      db_type: "INTEGER",
-      primary_key: false,
-      type: "integer",
-      ruby_default: nil
-    },
-    comment_id: {
-      generated: false,
-      allow_null: true,
-      default: nil,
-      db_type: "INTEGER",
-      primary_key: false,
-      type: "integer",
-      ruby_default: nil
-    }
-  },
-  comments: {
-    id: {
-      generated: false,
-      allow_null: false,
-      default: nil,
-      db_type: "INTEGER",
-      primary_key: true,
-      auto_increment: true,
-      type: "integer",
-      ruby_default: nil
-    },
-    text: {
-      generated: false,
-      allow_null: true,
-      default: nil,
-      db_type: "varchar(255)",
-      primary_key: false,
-      type: "string",
-      ruby_default: nil,
-      max_length: 255
-    },
-    user_id: {
-      generated: false,
-      allow_null: true,
-      default: nil,
-      db_type: "INTEGER",
-      primary_key: false,
-      type: "integer",
-      ruby_default: nil
-    }
   }
 }

data/lib/rubee/async/asyncable.rb

@@ -1,5 +1,5 @@
 unless defined?(Rubee)
-  require_relative '../../../../rubee.rb'
+  require_relative '../../../../ee.rb'
   Rubee::Autoload.call
 end
 

data/lib/rubee/controllers/base_controller.rb

@@ -43,8 +43,7 @@ module Rubee
       else # rendering erb view is a default behavior
         view_file_name = self.class.name.split("Controller").first.downcase
         erb_file = render_view ? "#{render_view}.erb" : "#{view_file_name}_#{@route[:action]}.erb"
-        lib = Rubee::PROJECT_NAME == 'rubee' ? 'lib/' : ''
-        rendered_erb = ERB.new(File.open("#{lib}app/views/#{erb_file}").read).result(binding)
+        rendered_erb = ERB.new(File.open("app/views/#{erb_file}").read).result(binding)
         return [status, headers.merge("content-type" => "text/html"), [rendered_erb]]
       end
     end

data/lib/rubee/controllers/extensions/auth_tokenable.rb

@@ -11,7 +11,7 @@ module Rubee
       base.include(InstanceMethods)
       base.extend(ClassMethods)
 
-      base.attach('Rubee::AuthTokenMiddleware')
+      base.attach('AuthTokenMiddleware')
     end
 
     module InstanceMethods

data/lib/rubee/models/database_object.rb

@@ -0,0 +1,50 @@
+module Rubee
+  class DatabaseObject
+    include Serializable
+    include Hookable
+
+    def destroy
+    end
+
+    def save
+    end
+
+    def update(args = {})
+    end
+
+    def reload
+    end
+
+    class << self
+      def last
+      end
+
+      def connection
+      end
+
+      def all
+      end
+
+      def find(id)
+      end
+
+      def where(args)
+      end
+
+      def create(attrs)
+      end
+
+      def pluralize_class_name
+        word = self.name.downcase
+          # Basic pluralization rules
+        if word.end_with?('y') && !%w[a e i o u].include?(word[-2])
+          word[0..-2] + 'ies' # Replace "y" with "ies"
+        elsif word.end_with?('s', 'x', 'z', 'ch', 'sh')
+          word + 'es' # Add "es" for certain endings
+        else
+          word + 's' # Default to adding "s"
+        end
+      end
+    end
+  end
+end

data/lib/rubee/models/sequel_object.rb

@@ -1,21 +1,9 @@
 module Rubee
-  class SequelObject
-    include Rubee::DatabaseObjectable
-
-    def destroy(cascade: false, **options)
-      if cascade
-        # find all tables with foreign key
-        tables_with_fk = DB.tables.select do |table|
-          DB.foreign_key_list(table).any? { |fk| fk[:table] == self.class.pluralize_class_name.to_sym }
-        end
-        # destroy related records
-        tables_with_fk.each do |table|
-          fk_name ||= "#{self.class.name.to_s.downcase}_id".to_sym
-          target_klass = Object.const_get(self.class.singularize(table.to_s).capitalize)
-          target_klass.where(fk_name => id).map(&:destroy)
-        end
-      end
-      self.class.dataset.where(id:).delete
+  class SequelObject < DatabaseObject
+    DB = Sequel.connect(Rubee::Configuration.get_database_url) rescue nil
+
+    def destroy
+      self.class.connection.where(id:).delete
     end
 
     def save
@@ -40,7 +28,7 @@ module Rubee
 
     def update(args = {})
       assign_attributes(args)
-      found_hash = self.class.dataset.where(id:)
+      found_hash = self.class.connection.where(id:)
       return self.class.find(id) if found_hash&.update(**args)
 
       false
@@ -56,122 +44,42 @@ module Rubee
 
     class << self
       def last
-        found_hash = dataset.order(:id).last
+        found_hash = connection.order(:id).last
         return self.new(**found_hash) if found_hash
 
         nil
       end
 
-      def first
-        found_hash = dataset.order(:id).first
-        return self.new(**found_hash) if found_hash
-
-        nil
-      end
-
-      # ## User
-      # owns_many :comments
-      # > user.comments
-      # > [<comment1>, <comment2>]
-      def owns_many(assoc, fk_name: nil, over: nil, **options)
-        singularized_assoc_name = singularize(assoc.to_s)
-        fk_name ||= "#{self.name.to_s.downcase}_id"
-
-        define_method(assoc) do
-          klass = Object.const_get(singularized_assoc_name.capitalize)
-          if over
-            sequel_dataset = klass
-              .join(over.to_sym, "#{singularized_assoc_name}_id".to_sym => :id)
-              .where(fk_name.to_sym => id)
-            self.class.serialize(sequel_dataset, klass)
-          else
-            klass.where(fk_name.to_sym => id)
-          end
-        end
-      end
-
-      # ## Comment
-      # owns_one :user
-      # > comment.user
-      # > <user>
-      def owns_one(assoc, options={})
-        Sequel::Model.one_to_one(assoc, **options)
-        fk_name ||= "#{self.name.to_s.downcase}_id"
-        define_method(assoc) do
-          Object.const_get(assoc.capitalize).where(fk_name.to_sym => id)&.first
-        end
-      end
-
-      # ## Account
-      # holds :user
-      # > account.user
-      # > <user>
-      def holds(assoc, fk_name: nil, **options)
-        fk_name ||= "#{assoc.to_s.downcase}_id"
-        define_method(assoc) do
-          target_klass = Object.const_get(assoc.capitalize)
-          target_klass.find(self.send(fk_name))
-        end
-      end
-
-      def reconnect!
-        return if defined?(DB) && !DB.nil?
-
-        const_set(:DB, Sequel.connect(Rubee::Configuration.get_database_url))
-      end
-
-      def dataset
-        @dataset ||= DB[pluralize_class_name.to_sym]
-      rescue Exception => _
-        reconnect!
-        retry
+      def connection
+        @connection ||= DB[pluralize_class_name.to_sym]
       end
 
       def all
-        dataset.map do |record_hash|
+        connection.map do |record_hash|
           self.new(**record_hash)
         end
       end
 
       def find(id)
-        found_hash = dataset.where(id:)&.first
+        found_hash = connection.where(id:)&.first
         return self.new(**found_hash) if found_hash
 
         nil
       end
 
       def where(args)
-        dataset.where(**args).map do |record_hash|
+        connection.where(**args).map do |record_hash|
           self.new(**record_hash)
         end
       end
 
-      def order(*args)
-        dataset.order(*args).map do |record_hash|
-          self.new(**record_hash)
-        end
-      end
-
-      def join(assoc, args)
-        dataset.join(assoc, **args)
-      end
-
       def create(attrs)
-        out_id = dataset.insert(**attrs)
+        out_id = connection.insert(**attrs)
         self.new(**(attrs.merge(id: out_id)))
       end
 
-      def destroy_all(cascade: false)
-        all.each{ |record| record.destroy(cascade:) }
-      end
-
-      def serialize(suquel_dataset, klass = nil)
-        klass ||= self
-        suquel_dataset.map do |record_hash|
-          target_klass_fields = DB[pluralize(klass.name.downcase).to_sym].columns
-          klass_attributes = record_hash.filter{ target_klass_fields.include? _1 }
-          klass.new(**klass_attributes)
-        end
+      def destroy_all
+        all.each(&:destroy)
       end
     end
   end

data/lib/rubee/tests/auth_tokenable_test.rb

@@ -0,0 +1,29 @@
+require_relative 'test_helper'
+
+class RubeeAppTest < Minitest::Test
+  include Rack::Test::Methods
+
+  def app
+    Rubee::Application.instance
+  end
+
+  def setup
+    Rubee::Autoload.call
+  end
+
+  def teardown
+    # detach auth methods
+     if WelcomeController.instance_variable_defined?(:@auth_methods)
+       WelcomeController.send(:remove_instance_variable, :@auth_methods)
+     end
+  end
+
+  def test_welcome_controller_included_auth_tokenable
+    WelcomeController.include(Rubee::AuthTokenable)
+    WelcomeController.auth_methods :show
+
+    get '/'
+
+    assert_equal last_response.status, 401
+  end
+end

data/lib/rubee/tests/rubeeapp_test.rb

@@ -0,0 +1,24 @@
+require_relative 'test_helper'
+
+class RubeeAppTest < Minitest::Test
+  include Rack::Test::Methods
+
+  def app
+    Rubee::Application.instance
+  end
+
+
+  def test_welcome_route
+    get '/'
+
+    assert_equal 200, last_response.status, "Unexpected response: #{last_response.body}"
+    assert_includes last_response.body, 'All set up and running!'
+  end
+
+
+  def test_not_found_route
+    get '/random'
+
+    assert_equal 404, last_response.status
+  end
+end

data/lib/rubee/tests/test_helper.rb

@@ -0,0 +1,10 @@
+require "bundler/setup"
+Bundler.require(:test)
+
+require 'minitest/autorun'
+require 'rack/test'
+require 'rubee'
+
+Rubee::Autoload.call
+
+

data/lib/rubee/tests/user_model_test.rb

@@ -0,0 +1,60 @@
+require_relative 'test_helper'
+
+describe 'User model' do
+  describe ".create" do
+    after do
+      User.destroy_all
+    end
+
+    describe 'when data is valid' do
+      it 'persists to db' do
+        user = User.create(email: "ok-test@test.com", password: "123")
+
+         _(user.persisted?).must_equal true
+      end
+    end
+
+    describe 'when data is invalid' do
+      it 'is not changing users number' do
+        initial_count = User.all.count
+        User.create(wrong: "test@test") rescue nil
+
+        _(User.all.count).must_equal initial_count
+      end
+    end
+  end
+
+  describe '.save' do
+    after do
+      User.destroy_all
+    end
+
+    describe 'when data is valid' do
+      it 'persists to db' do
+        user = User.new(email: "ok-test@test.com", password: "123")
+        user.save
+
+        _(user.persisted?).must_equal true
+      end
+    end
+
+    describe 'when save existing user' do
+      it 'persists to db' do
+        user = User.new(email: "ok-test@test.com", password: "123")
+        user.save
+
+        _(user.reload.password).must_equal "123"
+      end
+    end
+
+    describe 'when data is invalid' do
+      it 'is not changing users number' do
+        initial_count = User.all.count
+        user = User.new(wrong: "test@test") rescue nil
+        user.save rescue nil
+
+        _(User.all.count).must_equal initial_count
+      end
+    end
+  end
+end

data/lib/rubee.rb

@@ -8,7 +8,6 @@ module Rubee
   APP_ROOT = File.expand_path(Dir.pwd) unless defined?(APP_ROOT)
   IMAGE_DIR = File.join(APP_ROOT, 'images') unless defined?(IMAGE_DIR)
   PROJECT_NAME = File.basename(APP_ROOT) unless defined?(PROJECT_NAME)
-  VERSION = '1.1.4'
 
   class Application
     include Singleton
@@ -123,8 +122,6 @@ module Rubee
         # 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)
@@ -149,18 +146,8 @@ module Rubee
           require_relative file unless black_list.include?("#{file}.rb")
         end
         # app config and routes
-        lib = PROJECT_NAME == 'rubee' ? 'lib/' : ''
-        require_relative File.join(APP_ROOT, lib, "config/base_configuration") unless black_list.include?('base_configuration.rb')
-        # This is necessary prerequisitedb init step
-        unless defined?(Rubee::SequelObject::DB)
-          if PROJECT_NAME == 'rubee'
-            Rubee::Configuration.setup(env=:test) do |config|
-              config.database_url = { url: "sqlite://lib/tests/test.db", env: }
-            end
-          end
-        end
-
-        require_relative File.join(APP_ROOT, lib, "config/routes") unless black_list.include?('routes.rb')
+        require_relative File.join(APP_ROOT, "config/base_configuration") unless black_list.include?('base_configuration.rb')
+        require_relative File.join(APP_ROOT, "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")
@@ -174,7 +161,7 @@ module Rubee
         end
         require_relative File.join(root_directory, "rubee/controllers/base_controller") unless black_list.include?('base_controller.rb')
         # rubee models
-        require_relative File.join(root_directory, "rubee/models/database_objectable") unless black_list.include?('database_objectable.rb')
+        require_relative File.join(root_directory, "rubee/models/database_object") unless black_list.include?('database_object.rb')
         require_relative File.join(root_directory, "rubee/models/sequel_object") unless black_list.include?('sequel_object.rb')
       end
     end

data/lib/tests/auth_tokenable_test.rb

@@ -19,7 +19,7 @@ class RubeeAppTest < Minitest::Test
   end
 
   def test_welcome_controller_included_auth_tokenable
-    WelcomeController.include(Rubee::AuthTokenable)
+    WelcomeController.include(AuthTokenable)
     WelcomeController.auth_methods :show
 
     get '/'

data/lib/tests/test_helper.rb

@@ -3,12 +3,8 @@ Bundler.require(:test)
 
 require 'minitest/autorun'
 require 'rack/test'
-require_relative '../../lib/rubee'
+require 'rubee'
 
 Rubee::Autoload.call
-Rubee::Configuration.setup(env=:test) do |config|
-  config.database_url = { url: "sqlite://lib/tests/test.db", env: }
-end
-Rubee::SequelObject.reconnect!
 
 

data/lib/tests/user_model_test.rb

@@ -3,7 +3,7 @@ require_relative 'test_helper'
 describe 'User model' do
   describe ".create" do
     after do
-      User.destroy_all cascade: true
+      User.destroy_all
     end
 
     describe 'when data is valid' do
@@ -26,7 +26,7 @@ describe 'User model' do
 
   describe '.save' do
     after do
-      User.destroy_all cascade: true
+      User.destroy_all
     end
 
     describe 'when data is valid' do
@@ -57,174 +57,4 @@ describe 'User model' do
       end
     end
   end
-
-  describe '.update' do
-    after do
-      User.destroy_all cascade: true
-    end
-
-    describe 'when data is valid' do
-      it 'persists to db' do
-        user = User.new(email: "ok-test@test.com", password: "123")
-        user.save
-        user.update(password: "1234")
-
-        _(user.reload.password).must_equal "1234"
-      end
-    end
-  end
-
-  describe '.destroy' do
-    after do
-      User.destroy_all cascade: true
-    end
-
-    describe 'when there is no related recrods' do
-      it 'delete the record' do
-        user = User.new(email: "ok-test@test.com", password: "123")
-        user.save
-        user.destroy
-
-        assert_nil user.reload
-      end
-    end
-
-    describe 'when there are related recrods' do
-      it 'does not delete the record' do
-        user = User.new(email: "ok-test@test.com", password: "123")
-        user.save
-        Account.new(user_id: user.id, addres: "test").save
-        user.destroy rescue nil
-
-        _(user.reload.id).must_equal user.id
-      end
-    end
-
-    describe 'when there are related recrods but passed cascade=true' do
-      it 'deletes the record' do
-        user = User.new(email: "ok-test@test.com", password: "123")
-        user.save
-        Account.new(user_id: user.id, addres: "test").save
-        user.destroy cascade: true
-
-        assert_nil user.reload
-      end
-    end
-  end
-
-  describe '.find' do
-    after do
-      User.destroy_all cascade: true
-    end
-
-    describe 'when trhere is a record' do
-      it 'returns a record' do
-        user = User.new(email: "ok-test@test.com", password: "123")
-        user.save
-        _(User.find(user.id).email).must_equal user.email
-      end
-    end
-
-    describe 'when there is no record' do
-      it 'returns nil' do
-        assert_nil User.find(1)
-      end
-    end
-  end
-
-  describe '.all' do
-    after do
-      User.destroy_all cascade: true
-    end
-
-    describe 'when there are records' do
-      it 'returns all records' do
-        user = User.new(email: "ok-test@test.com", password: "123")
-        user2 = User.new(email: "ok-test2@test.com", password: "123")
-        user.save
-        user2.save
-        _(User.all.count).must_equal 2
-      end
-    end
-  end
-
-  describe '.where' do
-    after do
-      User.destroy_all cascade: true
-    end
-
-    describe 'when there are records' do
-      it 'returns all records' do
-        user = User.new(email: "ok-test@test.com", password: "123")
-        user2 = User.new(email: "ok-test2@test.com", password: "123")
-        user.save
-        user2.save
-        _(User.where(email: "ok-test2@test.com").count).must_equal 1
-      end
-    end
-  end
-
-  describe '.first' do
-    after do
-      User.destroy_all cascade: true
-    end
-
-    describe 'when there are records' do
-      it 'returns first record' do
-        user = User.new(email: "ok-test@test.com", password: "123")
-        user2 = User.new(email: "ok-test2@test.com", password: "123")
-        user.save
-        user2.save
-        _(User.first.email).must_equal user.email
-      end
-    end
-  end
-
-  describe '.last' do
-    after do
-      User.destroy_all cascade: true
-    end
-
-    describe 'when there are records' do
-      it 'returns last record' do
-        user = User.new(email: "ok-test@test.com", password: "123")
-        user2 = User.new(email: "ok-test2@test.com", password: "123")
-        user.save
-        user2.save
-        _(User.last.email).must_equal user2.email
-      end
-    end
-  end
-
-  describe '.order' do
-    after do
-      User.destroy_all cascade: true
-    end
-
-    describe 'when there are records' do
-      it 'returns ordered records' do
-        user = User.new(email: "abc@test.com", password: "123")
-        user2 = User.new(email: "defg@test.com", password: "123")
-        user.save
-        user2.save
-        _(User.order(:email).first.email).must_equal user.email
-      end
-    end
-  end
-
-  describe 'owns_many' do
-    after do
-      User.destroy_all cascade: true
-    end
-
-    describe 'when there are associated account records' do
-      it 'returns all records' do
-        user = User.new(email: "ok-test@test.com", password: "123")
-        user.save
-        account = Account.new(user_id: user.id, addres: "test")
-        account.save
-        _(user.accounts.count).must_equal 1
-      end
-    end
-  end
 end

data/lib/version.rb

@@ -0,0 +1 @@
+VERSION = '1.1.1'

data/readme.md

@@ -107,7 +107,7 @@ Here below is a simple example on how it can be used by rendering json from in m
 
   def show
     # in memory example
-apples = [Apple.new(colour: 'red', weight: '1lb'), Apple.new(colour: 'green', weight: '1lb')]
+    apples = [Apple.new(colour: 'red', weight: '1lb'), Apple.new(colour: 'green', weight: '1lb')]
     apple = apples.find { |apple| apple.colour = params[:colour] }
 
     response_with object: apple, type: :json
@@ -128,24 +128,6 @@ However, you can simply turn it to ORM object by extending database class.
     attr_accessor :id, :colour, :weight
   end
 ```
-Rubee::SequelObject methods:
-
-- `apple.save`
-- `apple.destroy(cascade: true)` # default false
-- `apple.destroy_all`
-- `apple.update(colour: 'red')`
-- `apple.persisted?`
-- `apple.reload`
-- `apple.assign_attributes(colour: 'red', weight: '1lb')`
-- `Apple.last`
-- `Apple.where(colour: 'red')`
-- `Apple.last`
-- `Apple.all`
-- `Apple.create(colour: 'red', weight: '1lb')`
-- `Apple.destroy_all`
-- `Apple.serialize`
-- `Apple.serialize(Apple.dataset.joins(:trees).where(tree: { colour: 'brown' }))`
-...
 
 So in the controller you would need to query your target object now.
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: ru.Bee
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.31
 platform: ruby
 authors:
 - Oleg Saltykov
 bindir: bin
 cert_chain: []
-date: 2025-03-31 00:00:00.000000000 Z
+date: 2025-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -39,7 +39,6 @@ extra_rdoc_files: []
 files:
 - LICENSE
 - bin/rubee
-- bin/test.db
 - lib/Dockerfile
 - lib/app/controllers/welcome_controller.rb
 - lib/app/models/user.rb
@@ -47,11 +46,9 @@ files:
 - lib/config.ru
 - lib/config/base_configuration.rb
 - lib/config/routes.rb
-- lib/db/create_accounts.rb
-- lib/db/create_comments.rb
-- lib/db/create_posts.rb
 - lib/db/create_users.rb
 - lib/db/structure.rb
+- lib/db/test.db
 - lib/images/rubee.svg
 - lib/inits/print_colors.rb
 - lib/rubee.rb
@@ -65,19 +62,17 @@ files:
 - lib/rubee/controllers/middlewares/auth_token_middleware.rb
 - lib/rubee/extensions/hookable.rb
 - lib/rubee/extensions/serializable.rb
-- lib/rubee/models/database_objectable.rb
+- lib/rubee/models/database_object.rb
 - lib/rubee/models/sequel_object.rb
-- lib/tests/account_model_test.rb
+- lib/rubee/tests/auth_tokenable_test.rb
+- lib/rubee/tests/rubeeapp_test.rb
+- lib/rubee/tests/test_helper.rb
+- lib/rubee/tests/user_model_test.rb
 - lib/tests/auth_tokenable_test.rb
-- lib/tests/comment_model_test.rb
-- lib/tests/example_models/account.rb
-- lib/tests/example_models/comment.rb
-- lib/tests/example_models/post.rb
-- lib/tests/example_models/user.rb
 - lib/tests/rubeeapp_test.rb
-- lib/tests/test.db
 - lib/tests/test_helper.rb
 - lib/tests/user_model_test.rb
+- lib/version.rb
 - readme.md
 homepage: https://github.com/nucleom42/rubee
 licenses:

data/lib/db/create_accounts.rb

@@ -1,14 +0,0 @@
-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
-
-      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
-end

data/lib/db/create_comments.rb

@@ -1,13 +0,0 @@
-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
-
-      User.create(email: "ok@ok.com", password: "password")
-    end
-  end
-end

data/lib/db/create_posts.rb

@@ -1,14 +0,0 @@
-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
-
-      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
-end

data/lib/rubee/models/database_objectable.rb

@@ -1,52 +0,0 @@
-module Rubee
-  module DatabaseObjectable
-    def self.included(base)
-      base.extend ClassMethods
-      base.include InstanceMethods
-      base.prepend Initializer
-
-      base.include Rubee::Hookable
-      base.include Rubee::Serializable
-    end
-
-    module ClassMethods
-      def pluralize_class_name
-        pluralize(self.name.downcase)
-      end
-
-      def pluralize(word)
-        if word.end_with?('y') && !%w[a e i o u].include?(word[-2])
-          word[0..-2] + 'ies' # Replace "y" with "ies"
-        elsif word.end_with?('s', 'x', 'z', 'ch', 'sh')
-          word + 'es' # Add "es" for certain endings
-        else
-          word + 's' # Default to adding "s"
-        end
-      end
-
-      def singularize(word)
-        if word.end_with?('ies') && word.length > 3
-          word[0..-4] + 'y' # Convert "ies" to "y"
-        elsif word.end_with?('es') && %w[s x z ch sh].any? { |ending| word[-(ending.length + 2)..-3] == ending }
-          word[0..-3] # Remove "es" for words like "foxes", "buses"
-        elsif word.end_with?('s') && word.length > 1
-          word[0..-2] # Remove "s" for regular plurals
-        else
-          word # Return as-is if no plural form is detected
-        end
-      end
-
-      def accessor_names
-        instance_methods(false)
-          .select { |m| method_defined?("#{m}=") }  # Check if setter exists
-      end
-    end
-
-    module InstanceMethods
-    end
-
-    module Initializer
-    end
-  end
-end
-

data/lib/tests/account_model_test.rb

@@ -1,19 +0,0 @@
-require_relative 'test_helper'
-
-describe 'Account model' do
-  describe 'holds :user' do
-    after do
-      Account.destroy_all cascade: true
-    end
-
-    describe 'when it holds user_id' do
-      it 'returns associated User record' do
-        user = User.new(email: "ok-test@test.com", password: "123")
-        user.save
-        account = Account.new(user_id: user.id, addres: "test")
-        account.save
-        _(account.user.id).must_equal user.id
-      end
-    end
-  end
-end

data/lib/tests/comment_model_test.rb

@@ -1,22 +0,0 @@
-require_relative 'test_helper'
-
-describe 'Comment model' do
-  describe 'owns_many :users, over: :posts' do
-    after do
-      Comment.destroy_all cascade: true
-    end
-
-    describe 'when there are associated comment records' do
-      it 'returns all records' do
-        comment = Comment.new(content: "test")
-        comment.save
-        user = User.new(email: "ok-test@test.com", password: "123")
-        user.save
-        post = Post.new(user_id: user.id, comment_id: comment.id)
-        post.save
-        _(comment.users.count).must_equal 1
-        _(comment.users.first.email).must_equal user.email
-      end
-    end
-  end
-end

data/lib/tests/example_models/account.rb

@@ -1,4 +0,0 @@
-class Account < Rubee::SequelObject
-  attr_accessor :id, :addres, :user_id
-  holds :user
-end

data/lib/tests/example_models/comment.rb

@@ -1,4 +0,0 @@
-class Comment < Rubee::SequelObject
-  attr_accessor :id, :content
-  owns_many :users, over: :posts
-end

data/lib/tests/example_models/post.rb

@@ -1,5 +0,0 @@
-class Post < Rubee::SequelObject
-  attr_accessor :id, :user_id, :comment_id
-  holds :comment
-  holds :user
-end

data/lib/tests/example_models/user.rb

@@ -1,4 +0,0 @@
-class User < Rubee::SequelObject
-  attr_accessor :id, :email, :password
-  owns_many :accounts, cascade: true
-end