ru.Bee 1.1.3 → 1.1.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e8955bd33a079fb958c40784fa0eff94bae99964644fc03eeba77afb442382e
-  data.tar.gz: 605a6479ae2db28de410d9dd78c80995af794c1ccc8c0d02981241aa69e2a749
+  metadata.gz: '03808642660607dcc9ecbd0f6f2fbcfc510e48f28e4eb583a0aace626642142f'
+  data.tar.gz: 11156690b45851b45f1ebeae3dff18ee8c9b44e2f3bef0a84d63a123f5e603a6
 SHA512:
-  metadata.gz: 908ca83c33213cbe985b7b88a989b236aafe4a7ea02a1206da6bc4a25234f2fcc5188ea020cb9dc73424d5a9c50aa565f6edb7f83f5b4b5af46a5cad5090bdcf
-  data.tar.gz: f85099cede5b96316373f0b4babb062dff1dad206743042325e1afaca76ef9b6ee57464349c4b47c785e39798c76a6c3034ac8ba87925eb0a5d0713e9a3548b8
+  metadata.gz: 5b48a1ccc2b3c7c9f7a5eb9492f8fca77488d842599d1a38a6d64f2f2534e41d1e69d69de7aa6d045935c98578ad9b77b36ccedbbd72f3b4086b8855e8e87b4d
+  data.tar.gz: 0c7067e04ddb2039b84a734a29ed743dcd187ea0ff8a21d076bd9c1c06d6413105c1c631b398c35186ee84c5a2d08c011cb24ed6b80bba0de57a3379f1d54d1b

data/bin/rubee

@@ -9,7 +9,6 @@ require 'json'
 require 'rack'
 require 'rackup'
 
-require_relative '../lib/version'
 require_relative '../lib/inits/print_colors'
 require_relative '../lib/rubee'
 
@@ -30,7 +29,7 @@ LOGO
 command = ARGV.first
 
 def print_logo
-  puts "\e[36m" + (LOGO % VERSION) + "\e[0m" # Cyan color
+  puts "\e[36m" + (LOGO % Rubee::VERSION) + "\e[0m" # Cyan color
 end
 
 if command =~ /^(start)$|^(start:(\d+))$/
@@ -60,6 +59,11 @@ 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)
 
@@ -72,8 +76,8 @@ elsif command == "project"
   FileUtils.mkdir_p(target_dir)
 
   # Define blacklist
-  blacklist_files = %w[rubee.rb print_colors.rb version.rb config.ru]
-  blacklist_dirs = %w[rubee]
+  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]
 
   # Copy files, excluding blacklisted ones
   Dir.glob("#{source_dir}/**/*", File::FNM_DOTMATCH).each do |file|
@@ -94,6 +98,10 @@ 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'
@@ -120,20 +128,37 @@ 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"
-  puts "ruBee v#{VERSION}"
+  color_puts "ru.Bee v#{Rubee::VERSION}", color: :yellow
 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 './tests/#{file_name}'\"")
+    exec("ruby -Itest -e \"require '.#{lib}/tests/#{file_name}'\"")
   else
     color_puts "Running all tests ...", color: :yellow
-    exec("ruby -Itest -e \"Dir.glob('./tests/**/*_test.rb').each { |file| require file }\"")
+    exec("ruby -Itest -e \"Dir.glob('.#{lib}/tests/**/*_test.rb').each { |file| require file }\"")
   end
 elsif ['generate', 'g'].include? command
   method, path = ARGV[1..2]
@@ -154,7 +179,12 @@ 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://test.db", env: }
+    end
+    Rubee::SequelObject.reconnect!
+  end
 
   def ensure_database_exists(db_url)
     uri = URI.parse(db_url)
@@ -207,7 +237,7 @@ elsif command == "db"
   end
 
 
-  if command == 'run'
+    if command == 'run'
     Rubee::Autoload.call
     Rubee::Configuration.envs.each do |env|
       ENV['RACK_ENV'] = env.to_s
@@ -215,8 +245,10 @@ elsif command == "db"
       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
+    unless Rubee::PROJECT_NAME == 'rubee'
+      color_puts "Regenerate schema file", color: :cyan
+      generate_structure
+    end
   elsif command == 'init'
     ensure_database_exists(Rubee::Configuration.get_database_url)
   elsif command == 'structure'

data/lib/rubee/controllers/base_controller.rb

@@ -43,7 +43,8 @@ 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"
-        rendered_erb = ERB.new(File.open("app/views/#{erb_file}").read).result(binding)
+        lib = Rubee::PROJECT_NAME == 'rubee' ? 'lib/' : ''
+        rendered_erb = ERB.new(File.open("#{lib}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('AuthTokenMiddleware')
+      base.attach('Rubee::AuthTokenMiddleware')
     end
 
     module InstanceMethods

data/lib/rubee/models/sequel_object.rb

@@ -50,6 +50,10 @@ module Rubee
         nil
       end
 
+      def reconnect!
+        const_set(:DB, Sequel.connect(Rubee::Configuration.get_database_url))
+      end
+
       def connection
         @connection ||= DB[pluralize_class_name.to_sym]
       end

data/lib/rubee.rb

@@ -8,6 +8,7 @@ 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.32'
 
   class Application
     include Singleton
@@ -146,8 +147,9 @@ module Rubee
           require_relative file unless black_list.include?("#{file}.rb")
         end
         # app config and routes
-        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')
+        lib = PROJECT_NAME == 'rubee' ? 'lib/' : ''
+        require_relative File.join(APP_ROOT, lib, "config/base_configuration") unless black_list.include?('base_configuration.rb')
+        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")

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

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

data/lib/tests/test_helper.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: ru.Bee
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.32
 platform: ruby
 authors:
 - Oleg Saltykov
 bindir: bin
 cert_chain: []
-date: 2025-03-17 00:00:00.000000000 Z
+date: 2025-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -39,13 +39,10 @@ extra_rdoc_files: []
 files:
 - LICENSE
 - bin/rubee
+- bin/test.db
 - lib/Dockerfile
 - lib/app/controllers/welcome_controller.rb
 - lib/app/models/user.rb
-- lib/app/tests/auth_tokenable_test.rb
-- lib/app/tests/rubeeapp_test.rb
-- lib/app/tests/test_helper.rb
-- lib/app/tests/user_model_test.rb
 - lib/app/views/welcome_show.erb
 - lib/config.ru
 - lib/config/base_configuration.rb
@@ -68,11 +65,10 @@ files:
 - lib/rubee/extensions/serializable.rb
 - lib/rubee/models/database_object.rb
 - lib/rubee/models/sequel_object.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/version.rb
+- lib/tests/auth_tokenable_test.rb
+- lib/tests/rubeeapp_test.rb
+- lib/tests/test_helper.rb
+- lib/tests/user_model_test.rb
 - readme.md
 homepage: https://github.com/nucleom42/rubee
 licenses:

data/lib/app/tests/test_helper.rb

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

data/lib/rubee/tests/auth_tokenable_test.rb

@@ -1,29 +0,0 @@
-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(AuthTokenable)
-    WelcomeController.auth_methods :show
-
-    get '/'
-
-    assert_equal last_response.status, 401
-  end
-end

data/lib/rubee/tests/rubeeapp_test.rb

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

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

@@ -1,60 +0,0 @@
-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/version.rb

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