ru.Bee 1.3.3 → 1.5.0

data/lib/rubee.rb

@@ -10,9 +10,11 @@ end
 
 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.3.3'
+  LIB = PROJECT_NAME == 'rubee' ? 'lib/' : '' unless defined?(LIB)
+  IMAGE_DIR = File.join(APP_ROOT, LIB, 'images') unless defined?(IMAGE_DIR)
+  JS_DIR = File.join(APP_ROOT, LIB, 'js') unless defined?(JS_DIR)
+  VERSION = '1.4.0'
 
   class Application
     include Singleton
@@ -23,12 +25,21 @@ module Rubee
       # register images paths
       request = Rack::Request.new(env)
       # Add default path for images
-      Router.draw { |route| route.get('/images/{path}', to: 'base#image', namespace: 'Rubee') }
+      Router.draw do |route|
+        route.get('/images/{path}', to: 'base#image', namespace: 'Rubee')
+        route.get('/js/{path}', to: 'base#js', namespace: 'Rubee')
+        route.get('/css/{path}', to: 'base#css', namespace: 'Rubee')
+      end
       # define route
       route = Router.route_for(request)
-      # init controller class
+      # if react is the view so we would like to delegate not cauth by rubee routes to it.
+      if Rubee::Configuration.react[:on] && !route
+        index = File.read(File.join(Rubee::APP_ROOT, Rubee::LIB, 'app/views', 'index.html'))
+        return [200, { 'content-type' => 'text/html' }, [index]]
+      end
+      # if not found return 404
       return [404, { 'content-type' => 'text/plain' }, ['Route not found']] unless route
-
+      # init controller class
       controller_class = if route[:namespace]
         "#{route[:namespace]}::#{route[:controller].capitalize}Controller"
       else
@@ -68,6 +79,15 @@ module Rubee
         @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_')
 
@@ -152,9 +172,8 @@ module Rubee
           require_relative file unless black_list.include?("#{file}.rb")
         end
         # app config and routes
-        lib = PROJECT_NAME == 'rubee' ? 'lib/' : ''
         unless black_list.include?('base_configuration.rb')
-          require_relative File.join(APP_ROOT, lib,
+          require_relative File.join(APP_ROOT, LIB,
                                      'config/base_configuration')
         end
         # This is necessary prerequisitedb init step
@@ -164,7 +183,7 @@ module Rubee
           end
         end
 
-        require_relative File.join(APP_ROOT, lib, 'config/routes') unless black_list.include?('routes.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")
@@ -194,12 +213,13 @@ module Rubee
   end
 
   class Generator
-    def initialize(model_name, attributes, controller_name, action_name)
+    def initialize(model_name, model_attributes, controller_name, action_name, **options)
       @model_name = model_name&.downcase
-      @attributes = attributes
+      @model_attributes = model_attributes || []
       @plural_name = controller_name.to_s.gsub('Controller', '').downcase.to_s
       @action_name = action_name
       @controller_name = controller_name
+      @react = options[:react] || {}
     end
 
     def call
@@ -212,7 +232,7 @@ module Rubee
     private
 
     def generate_model
-      model_file = File.join("app/models/#{@model_name}.rb")
+      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
@@ -220,7 +240,7 @@ module Rubee
 
       content = <<~RUBY
         class #{@model_name.capitalize} < Rubee::SequelObject
-          attr_accessor #{@attributes.map { |hash| ":#{hash[:name]}" }.join(', ')}
+          #{'attr_accessor' + @model_attributes.map { |hash| ":#{hash[:name]}" }.join(', ') unless @model_attributes.empty?}
         end
       RUBY
 
@@ -229,7 +249,7 @@ module Rubee
     end
 
     def generate_controller
-      controller_file = File.join("app/controllers/#{@plural_name}_controller.rb")
+      controller_file = File.join(Rubee::APP_ROOT, Rubee::LIB, "app/controllers/#{@plural_name}_controller.rb")
       if File.exist?(controller_file)
         puts "Controller #{@plural_name} already exists. Remove it if you want to regenerate"
         return
@@ -248,22 +268,41 @@ module Rubee
     end
 
     def generate_view
-      view_file = File.join("app/views/#{@plural_name}_#{@action_name}.erb")
+      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 User() {
+
+            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 #{@plural_name}_#{@action_name} already exists. Remove it if you want to regenerate"
+        puts "View #{name} already exists. Remove it if you want to regenerate"
         return
       end
 
-      content = <<~ERB
-        <h1>#{@plural_name}_#{@action_name} View</h1>
-      ERB
-
       File.open(view_file, 'w') { |file| file.write(content) }
-      color_puts("View #{@plural_name}_#{@action_name} created", color: :green)
+      color_puts("View #{name} created", color: :green)
     end
 
     def generate_db_file
-      db_file = File.join("db/create_#{@plural_name}.rb")
+      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
@@ -272,6 +311,11 @@ module Rubee
       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
@@ -279,5 +323,40 @@ module Rubee
       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/rubee_generator_test.rb

@@ -0,0 +1,190 @@
+require_relative 'test_helper'
+
+describe 'Rubee::Generator' do
+  describe 'generates Sequel schema lines' do
+    after do
+      File.delete('lib/app/models/apple.rb') if File.exist?('lib/app/models/apple.rb')
+      File.delete('lib/db/create_apples.rb') if File.exist?('lib/db/create_apples.rb')
+    end
+    it 'for string with just name' do
+      generator = Rubee::Generator.new(nil, nil, nil, nil)
+
+      attribute = { name: 'something', type: :string }
+
+      text = generator.send(:generate_sequel_schema, attribute)
+
+      _(text).must_equal('String :something')
+    end
+
+    it 'for string name and options' do
+      generator = Rubee::Generator.new(nil, nil, nil, nil)
+
+      attribute = { name: 'something', type: :string, options: { curse: 'squirrel' } }
+
+      text = generator.send(:generate_sequel_schema, attribute)
+
+      _(text).must_equal("String :something, curse: 'squirrel'")
+    end
+  end
+
+  describe 'generates Sequel file' do
+    after do
+      File.delete('lib/app/models/apple.rb') if File.exist?('lib/app/models/apple.rb')
+      File.delete('lib/db/create_apples.rb') if File.exist?('lib/db/create_apples.rb')
+    end
+
+    it 'not without a model' do
+      generator = Rubee::Generator.new(nil, nil, nil, nil)
+      generator.call
+
+      _(File.exist?('lib/db/create_apples.rb')).must_equal false
+    end
+
+    it 'with a model only' do
+      generator = Rubee::Generator.new('apple', nil, 'apples', nil)
+      generator.call
+
+      _(File.exist?('lib/db/create_apples.rb')).must_equal true
+
+      lines = File.readlines('lib/db/create_apples.rb').map(&:chomp).join("\n")
+
+      _(lines.include?('class CreateApples')).must_equal true
+      _(lines.include?('def call')).must_equal true
+      _(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?('String')).must_equal false
+      _(lines.include?('end')).must_equal true
+    end
+
+    it 'with a model with attributes' do
+      generator = Rubee::Generator.new('apple', [{ name: 'title', type: :string }, {name: 'content', type: :text }], 'apples', nil)
+      generator.call
+
+      _(File.exist?('lib/db/create_apples.rb')).must_equal true
+
+      lines = File.readlines('lib/db/create_apples.rb').map(&:chomp).join("\n")
+
+      _(lines.include?('class CreateApples')).must_equal true
+      _(lines.include?('def call')).must_equal true
+      _(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?('String :title')).must_equal true
+      _(lines.include?('String :content, text: true')).must_equal true
+      _(lines.include?('end')).must_equal true
+    end
+
+    it 'with a model with different attributes' do
+      generator = Rubee::Generator.new('apple', [{name: 'id', type: :bigint}, {name: 'colour', type: :string }, {name: 'weight', type: :integer }], 'apples', nil)
+      generator.call
+
+      _(File.exist?('lib/db/create_apples.rb')).must_equal true
+
+      lines = File.readlines('lib/db/create_apples.rb').map(&:chomp).join("\n")
+
+      _(lines.include?('class CreateApples')).must_equal true
+      _(lines.include?('def call')).must_equal true
+      _(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?('Bignum :id')).must_equal true
+      _(lines.include?('String :colour')).must_equal true
+      _(lines.include?('Integer :weight')).must_equal true
+      _(lines.include?('end')).must_equal true
+    end
+
+    it 'with a model with an attribute with multiple names' do
+      generator = Rubee::Generator.new('apple', [{ name: ['blue_id', 'shoe_id'], type: :foreign_key, table: 'blue_and_shoe_join_tb' }], 'apples', nil)
+      generator.call
+
+      _(File.exist?('lib/db/create_apples.rb')).must_equal true
+
+      lines = File.readlines('lib/db/create_apples.rb').map(&:chomp).join("\n")
+
+      _(lines.include?('class CreateApples')).must_equal true
+      _(lines.include?('def call')).must_equal true
+      _(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, :shoe_id]')).must_equal true
+      _(lines.include?(':blue_and_shoe_join_tb')).must_equal true
+      _(lines.include?('end')).must_equal true
+    end
+
+    it 'with a model with a foreign_key without table' do
+      generator = Rubee::Generator.new('apple', [{ name: 'blue_id', type: :foreign_key }], 'apples', nil)
+      generator.call
+
+      _(File.exist?('lib/db/create_apples.rb')).must_equal true
+
+      lines = File.readlines('lib/db/create_apples.rb').map(&:chomp).join("\n")
+
+      _(lines.include?('class CreateApples')).must_equal true
+      _(lines.include?('def call')).must_equal true
+      _(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
+
+  describe 'generates Model file' do
+    after do
+      File.delete('lib/app/models/apple.rb') if File.exist?('lib/app/models/apple.rb')
+      File.delete('lib/db/create_apples.rb') if File.exist?('lib/db/create_apples.rb')
+    end
+
+    it 'not without a model' do
+      generator = Rubee::Generator.new(nil, nil, nil, nil)
+      generator.call
+
+      _(File.exist?('lib/app/models/apple.rb')).must_equal false
+    end
+
+    it 'with a model only' do
+      generator = Rubee::Generator.new('apple', nil, 'apples', nil)
+      generator.call
+
+      _(File.exist?('lib/app/models/apple.rb')).must_equal true
+
+      lines = File.readlines('lib/app/models/apple.rb').map(&:chomp).join("\n")
+
+      _(lines.include?('class Apple < Rubee::SequelObject')).must_equal true
+      _(lines.include?('attr_accessor')).must_equal false
+      _(lines.include?('end')).must_equal true
+    end
+
+    it 'with a model with attributes' do
+      generator = Rubee::Generator.new('apple', [{ name: 'title', type: :string }, {name: 'content', type: :text }], 'apples', nil)
+      generator.call
+
+      _(File.exist?('lib/app/models/apple.rb')).must_equal true
+
+      lines = File.readlines('lib/app/models/apple.rb').map(&:chomp).join("\n")
+
+      _(lines.include?('class Apple < Rubee::SequelObject')).must_equal true
+      _(lines.include?('attr_accessor')).must_equal true
+      _(lines.include?(':title, :content')).must_equal true
+      _(lines.include?('end')).must_equal true
+    end
+
+    it 'with a model with different attributes' do
+      generator = Rubee::Generator.new('apple', [{name: 'id', type: :bigInt}, {name: 'colour', type: :string }, {name: 'weight', type: :integer }], 'apples', nil)
+      generator.call
+
+      _(File.exist?('lib/app/models/apple.rb')).must_equal true
+
+      lines = File.readlines('lib/app/models/apple.rb').map(&:chomp).join("\n")
+
+      _(lines.include?('class Apple < Rubee::SequelObject')).must_equal true
+      _(lines.include?('attr_accessor')).must_equal true
+      _(lines.include?(':id, :colour, :weight')).must_equal true
+      _(lines.include?('end')).must_equal true
+    end
+  end
+
+  describe 'generates View file' do
+
+  end
+
+  describe 'generates Controller file' do
+  end
+end

data/lib/tests/rubeeapp_test.rb

@@ -19,4 +19,16 @@ class RubeeAppTest < Minitest::Test
 
     assert_equal(404, last_response.status)
   end
+
+  def test_react_home
+    Rubee::Configuration.setup(env = :test) { _1.react = { on: true, env: } }
+
+    get('/home')
+
+    assert_equal(200, last_response.status)
+    assert_includes(last_response.body, '<div id="app">')
+    assert_includes(last_response.body, 'bundle.js')
+
+    Rubee::Configuration.setup(env = :test) { _1.react = { on: false, env: } }
+  end
 end

data/lib/tests/user_model_test.rb

@@ -153,8 +153,13 @@ describe 'User model' do
       User.destroy_all(cascade: true)
     end
 
+    before do
+      User.destroy_all(cascade: true)
+    end
+
     describe 'when there are records' do
       it 'returns all records' do
+        # skip "This is Flaky test that blcoks dev, need to be fixed"
         user = User.new(email: 'ok-test@test.com', password: '123')
         user2 = User.new(email: 'ok-test2@test.com', password: '123')
         user.save