ru.Bee 1.9.5 → 1.9.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb15781bf76b459409f3b668f47a91dccc70dfd4a63e509c5dcd31aae43bb182
-  data.tar.gz: 7c153d39a196b593626cc981c0859fd932f1d366e4cd5f1009a5b9d81d2dd97c
+  metadata.gz: 03af86ee565e361f05a02908203f132f44c2e897d5b5bacf97d69d6b2856399c
+  data.tar.gz: 9d1cf27fc856d40fe10c057521f17be4916e840999babfa6797a64827b53a053
 SHA512:
-  metadata.gz: 53d83d13a2dc1a9e1937d343b460e480706a27a0dae7f4836bd1d4268db7ad8633f82a5cbccda82e25ad1a0b84d66633212e8972834839f4e6a8be27c8c70006
-  data.tar.gz: 474ce9040cbcff8c6a61f6d61c1615bfeba6ce3fc7b72565c25b27f4dae333e4c4dd285839cddba2b699ec612bbfe7a5b8a79c7e2a4abb9cb0fe517bfb4a6c9f
+  metadata.gz: 1375122c1165ede82010e967be939d884064b45290947ab68a109e94d7cd218f5e479aa6cae6cbf86e592765c223e422a500a8e8959cb7ee94514ab10175dc2e
+  data.tar.gz: 1509444ec809f496adf8a9e4552de7b96769845db2e68574876d0f90a7311a0765de62ec222c5ee2a3a937ad259b83b1de84a5ea75ed1ace5715a038413dc2fb

data/lib/Dockerfile

@@ -1,32 +1,42 @@
 # Use an official Ruby runtime as a parent image
-FROM ruby:3.4.1
+FROM docker.io/library/ruby:3.4.1
 
 # Set the working directory inside the container
 WORKDIR /app
 
-# Install system dependencies required for your app (e.g., build tools for gems like pg, etc.)
-RUN apt-get update -qq && apt-get install -y build-essential libpq-dev nodejs
+# Install system dependencies + Node 20 via n
+RUN apt-get update -qq && apt-get install -y \
+  curl \
+  build-essential \
+  libpq-dev \
+  python3 \
+  make \
+  g++ \
+  && curl -fsSL https://raw.githubusercontent.com/tj/n/master/bin/n | bash -s 20 \
+  && npm install -g npm
 
-# Copy Gemfile and Gemfile.lock, then install dependencies
-COPY ../Gemfile Gemfile.lock ./
-RUN bundle install
 
 # Copy the rest of the application files into the container
-COPY .. .
+COPY . .
+
+# Remove Gemfile.lock to make sure it's re-downloaded and install dependencies
+RUN rm -f Gemfile.lock \
+ && bundle lock --add-platform ruby \
+ && bundle install --redownload
 
-# Ensure scripts are executable (after the files are copied)
-RUN chmod +x ./bin/rubee
 
 # Set the environment variable RACK_ENV to production
 ENV RACK_ENV=production
 
-# Initialize the database (make sure this script exists in your project structure)
-RUN ./com/db init
+# init react app
+RUN rubee react prepare
 
-RUN ./com/db run:create_users
+# Initialize the database
+RUN rubee db init
+RUN rubee db run:all
 
 # Expose the port the app will run on
-EXPOSE 8080
+EXPOSE 7000
 
 # Run the app (ensure this command correctly starts your app)
-CMD ./com/rubee start:8080
+CMD rubee start

data/lib/rubee/cli/server.rb

@@ -16,8 +16,10 @@ LOGO
         end
 
         def start(argv)
-          _, port = argv.first&.split(':')
-          jit = argv[1]
+          # get params
+          options = argv.select { _1.start_with?('--') }
+          port = options.find { _1.start_with?('--port') }&.split('=')&.last
+          jit = options.find { _1.start_with?('--jit') }&.split('=')&.last
 
           port ||= '7000'
           print_logo
@@ -28,8 +30,9 @@ LOGO
         end
 
         def start_dev(argv)
-          _, port = argv.first&.split(':')
-          jit = argv[1]
+          options = argv.select { _1.start_with?('--') }
+          port = options.find { _1.start_with?('--port') }&.split('=')&.last
+          jit = options.find { _1.start_with?('--jit') }&.split('=')&.last
 
           port ||= '7000'
           print_logo

data/lib/rubee/generator.rb

@@ -124,13 +124,14 @@ module Rubee
     end
 
     def generate_sequel_schema(attribute)
+      prefix = @namespace == "" ? "" : "#{@app_name.snakeize}_"
       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'
+      table = attribute[:table] || name.gsub(/_id$/, '').gsub(':', '').pluralize
       options = attribute[:options] || {}
 
       lookup_hash = {

data/lib/rubee.rb

@@ -16,7 +16,7 @@ module Rubee
   JS_DIR = File.join(APP_ROOT, LIB, 'js') unless defined?(JS_DIR)
   CSS_DIR = File.join(APP_ROOT, LIB, 'css') unless defined?(CSS_DIR)
   ROOT_PATH = File.expand_path(File.join(__dir__, '..')) unless defined?(ROOT_PATH)
-  VERSION = '1.9.5'
+  VERSION = '1.9.7'
 
   require_relative 'rubee/router'
   require_relative 'rubee/logger'

data/lib/tests/rubee_generator_test.rb

@@ -124,7 +124,6 @@ describe 'Rubee::Generator' do
       _(lines.include?('return if Rubee::SequelObject::DB.tables.include?(:apples)')).must_equal(true)
       _(lines.include?('Rubee::SequelObject::DB.create_table(:apples) do')).must_equal(true)
       _(lines.include?('foreign_key :blue_id')).must_equal(true)
-      _(lines.include?(':replace_with_table_name')).must_equal(true)
       _(lines.include?('end')).must_equal(true)
     end
   end

data/readme.md

@@ -102,9 +102,9 @@ bundle install
 rubee start # or rubee start_dev for development
 
 # Sarting from veriosn 1.8.0, you can also start you rubee server with yjit compiler and enjoy speed boost.
-rubee start --yjit
+rubee start --jit=yjit
 # Option is available for dev environment too
-rubee start_dev --yjit
+rubee start_dev --jit=yjit
 ```
 
 5. Open your browser and go to http://localhost:7000
@@ -648,6 +648,10 @@ end
 
 ```bash
 rubee start
+# It will start to server on port 7000 (default)
+# You can change it by
+
+rubee start --port=3000
 ```
 
 3. Open your browser and navigate to http://localhost:3000/home

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ru.Bee
 version: !ruby/object:Gem::Version
-  version: 1.9.5
+  version: 1.9.7
 platform: ruby
 authors:
 - Oleg Saltykov