ru.Bee 1.6.0 → 1.8.0

data/lib/rubee/generator.rb

@@ -2,6 +2,7 @@ module Rubee
   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 || []
@@ -10,6 +11,8 @@ module Rubee
       @plural_name = @base_name.plural? ? @base_name : @base_name.pluralize
       @action_name = action_name
       @react = options[:react] || {}
+      @app_name = options[:app_name] || :app
+      @namespace = @app_name == :app ? '' : "#{@app_name.camelize}::"
     end
 
     def call
@@ -22,14 +25,14 @@ module Rubee
     private
 
     def generate_model
-      model_file = File.join(Rubee::APP_ROOT, Rubee::LIB, "app/models/#{@model_name}.rb")
+      model_file = File.join(Rubee::APP_ROOT, Rubee::LIB, "#{@app_name.to_s.snakeize}/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
+        class #{@namespace}#{@model_name.camelize} < Rubee::SequelObject
           #{'attr_accessor ' + @model_attributes.map { |hash| ":#{hash[:name]}" }.join(', ') unless @model_attributes.empty?}
         end
       RUBY
@@ -39,14 +42,14 @@ module Rubee
     end
 
     def generate_controller
-      controller_file = File.join(Rubee::APP_ROOT, Rubee::LIB, "app/controllers/#{@base_name}_controller.rb")
+      controller_file = File.join(Rubee::APP_ROOT, Rubee::LIB, "#{@app_name}/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
+        class #{@namespace}#{@base_name.camelize}Controller < Rubee::BaseController
           def #{@action_name}
             response_with
           end
@@ -58,29 +61,33 @@ module Rubee
     end
 
     def generate_view
+      prefix = @namespace == "" ? "" : "#{@app_name.snakeize}_"
       if @react[:view_name]
-        view_file = File.join(Rubee::APP_ROOT, Rubee::LIB, "app/views/#{@react[:view_name]}")
+        view_file = File.join(Rubee::APP_ROOT, Rubee::LIB, "#{@app_name}/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}() {
+          export function #{@react[:view_name].gsub(/\.(.*)+$/, '').camelize}() {
 
             return (
               <div>
-                <h2>#{@react[:view_name]} view</h2>
+                <h2>#{@react[:view_name].gsub(/\.(.*)+$/, '').camelize} view</h2>
               </div>
             );
           }
         JS
-      else
-        view_file = File.join(Rubee::APP_ROOT, Rubee::LIB, "app/views/#{@plural_name}_#{@action_name}.erb")
+      else # erb
+        view_file = File.join(
+          Rubee::APP_ROOT, Rubee::LIB,
+          "#{@app_name}/views/#{prefix}#{@plural_name}_#{@action_name}.erb"
+        )
         content = <<~ERB
-          <h1>#{@plural_name}_#{@action_name} View</h1>
+          <h1>#{prefix}#{@plural_name}_#{@action_name} View</h1>
         ERB
       end
 
-      name = @react[:view_name] || "#{@plural_name}_#{@action_name}"
+      name = @react[:view_name] || "#{prefix}#{@plural_name}_#{@action_name}"
 
       if File.exist?(view_file)
         puts "View #{name} already exists. Remove it if you want to regenerate"
@@ -92,18 +99,19 @@ module Rubee
     end
 
     def generate_db_file
-      db_file = File.join(Rubee::APP_ROOT, Rubee::LIB, "db/create_#{@plural_name}.rb")
+      table_name = @namespace == "" ? @plural_name : "#{@namespace.snakeize}_#{@plural_name}"
+      db_file = File.join(Rubee::APP_ROOT, Rubee::LIB, "db/create_#{table_name}.rb")
       if File.exist?(db_file)
-        puts "DB file for #{@plural_name} already exists. Remove it if you want to regenerate"
+        puts "DB file for #{table_name} already exists. Remove it if you want to regenerate"
         return
       end
 
       content = <<~RUBY
-        class Create#{@plural_name.capitalize}
+        class Create#{table_name.camelize}
           def call
-            return if Rubee::SequelObject::DB.tables.include?(:#{@plural_name})
+            return if Rubee::SequelObject::DB.tables.include?(:#{table_name})
 
-            Rubee::SequelObject::DB.create_table(:#{@plural_name}) do
+            Rubee::SequelObject::DB.create_table(:#{table_name}) do
               #{@model_attributes.map { |attribute| generate_sequel_schema(attribute) }.join("\n\t\t\t")}
             end
           end
@@ -111,7 +119,7 @@ module Rubee
       RUBY
 
       File.open(db_file, 'w') { |file| file.write(content) }
-      color_puts("DB file for #{@plural_name} created", color: :green)
+      color_puts("DB file for #{table_name} created", color: :green)
     end
 
     def generate_sequel_schema(attribute)
@@ -149,4 +157,4 @@ module Rubee
       statement
     end
   end
-end
+end

data/lib/rubee/models/database_objectable.rb

@@ -12,7 +12,7 @@ module Rubee
 
     module ClassMethods
       def pluralize_class_name
-        name.pluralize.downcase
+        name.pluralize.downcase.snakeize
       end
 
       def accessor_names

data/lib/rubee/models/sequel_object.rb

@@ -2,6 +2,7 @@ module Rubee
   class SequelObject
     include Rubee::DatabaseObjectable
     using ChargedString
+    using ChargedHash
 
     def destroy(cascade: false, **_options)
       if cascade
@@ -179,7 +180,7 @@ module Rubee
       def serialize(suquel_dataset, klass = nil)
         klass ||= self
         suquel_dataset.map do |record_hash|
-          target_klass_fields = DB[klass.name.pluralize.downcase.to_sym].columns
+          target_klass_fields = DB[klass.name.pluralize.downcase.camelize.to_sym].columns
           klass_attributes = record_hash.filter { target_klass_fields.include?(_1) }
           klass.new(**klass_attributes)
         end

data/lib/rubee/router.rb

@@ -2,7 +2,7 @@ module Rubee
   class Router
     include Singleton
 
-    HTTP_METHODS = %i[get post put patch delete head connect options trace].freeze
+    HTTP_METHODS = %i[get post put patch delete head connect options trace].freeze unless defined?(HTTP_METHODS)
 
     attr_reader :request, :routes
 
@@ -14,7 +14,6 @@ module Rubee
       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]
@@ -38,4 +37,4 @@ module Rubee
       end
     end
   end
-end
+end

data/lib/rubee.rb

@@ -15,7 +15,8 @@ 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.6.0'
+  ROOT_PATH = File.expand_path(File.join(__dir__, '..')) unless defined?(ROOT_PATH)
+  VERSION = '1.8.0'
 
   require_relative 'rubee/router'
   require_relative 'rubee/logger'
@@ -25,13 +26,15 @@ module Rubee
 
   class Application
     include Singleton
+    using(ChargedString)
 
     def call(env)
       # autoload rb files
       Autoload.call
+
       # register images paths
       request = Rack::Request.new(env)
-      # Add default path for images
+      # Add default path for assets
       Router.draw do |route|
         route.get('/images/{path}', to: 'base#image', namespace: 'Rubee')
         route.get('/js/{path}', to: 'base#js', namespace: 'Rubee')
@@ -48,9 +51,9 @@ module Rubee
       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"
+        "#{route[:namespace].to_s.camelize}::#{route[:controller].camelize}Controller"
       else
-        "#{route[:controller].capitalize}Controller"
+        "#{route[:controller].camelize}Controller"
       end
       # instantiate controller
       controller = Object.const_get(controller_class).new(request, route)

data/lib/tests/cli/attach_test.rb

@@ -0,0 +1,36 @@
+require_relative '../test_helper'
+
+describe 'Rubee::CLI::Attach' do
+  describe 'when run attach command over cli' do
+    it 'calls Rubee::CLI::Attach.call' do
+      called = false
+
+      Rubee::CLI::Attach.stub(:call, ->(*_args) { called = true }) do
+        Rubee::CLI::Command.new(['attach', 'carrot']).call
+      end
+
+      assert called, "Expected Rubee::CLI::Attach.run to be called"
+    end
+  end
+
+  describe 'when attach executed' do
+    it 'creates new folder carrot' do
+      Rubee::CLI::Command.new(['attach', 'carrot']).call unless Dir.exist?('carrot')
+      assert Dir.exist?('carrot'), "Expected 'carrot' folder to be created"
+      FileUtils.rm_rf('carrot')
+    end
+
+    it 'creates inside of the project folder expected content' do
+      Rubee::CLI::Command.new(['attach', 'carrot']).call unless Dir.exist?('carrot')
+      %w[controllers models views].each do |dir|
+        assert Dir.exist?("carrot/#{dir}"), "Expected 'carrot/#{dir}' folder to be created"
+      end
+
+      %w[carrot_configuration carrot_routes carrot_namespace].each do |file|
+        assert File.exist?("carrot/#{file}.rb"), "Expected 'carrot/#{file}.rb' file to be created"
+      end
+
+      FileUtils.rm_rf('carrot')
+    end
+  end
+end

data/lib/tests/controllers/rubeeapp_test.rb

@@ -27,7 +27,7 @@ class RubeeAppTest < Minitest::Test
     get('/home')
 
     assert_equal(200, last_response.status)
-    assert_includes(last_response.body, '<div id="app">')
+    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: } }

data/lib/tests/test_helper.rb

@@ -38,3 +38,4 @@ def capture_stdout
 ensure
   $stdout = old_stdout
 end
+