ru.Bee 2.2.1 → 2.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79e7b11e20b2e610c5559d28354d950b38a71e1bd19731b86f962ccc2f6851b0
-  data.tar.gz: 27b7137b3328a511782c412efd960aa68c93c3ac54f261383014390f45bea3d1
+  metadata.gz: 4958166a93833b8937bd8fddff68db21fac7fe6c4b10c9f3ad41aa41c81342b6
+  data.tar.gz: 8317204f759ec29ec13aaaba6a6ceac200963298cfc07256f4d0b03cb249a1dc
 SHA512:
-  metadata.gz: 05ac2caaca3d97b2c6eca2ba86848956406a68a871f30f9529be79ed95681f50f8beacadd32b0a0c537fbb6dd68581aeaaae2403804948526b83bad77e2657c5
-  data.tar.gz: 57cdb088e5165d4374a929969b890443594f765f296ea80adc722be6ef232a6d98cec5d07ffb86890692fdefa94089c5509b3a5d9a2fb3cf7e0be761b5787153
+  metadata.gz: 8d3e0faa28a8aa69cf8aa0727b290bd6888f52241dd87b8cb59b3c9e725331c6c80779cf79ff63a7e73e588e1663ab1d2d050842d5f7fdeeea3b8e50b3016bdb
+  data.tar.gz: e636773215ef25384a159b49024b1d965f3dbc1e5fff08b696779a7000637536e85e492dd6228bdd38f06757c6762bed59b9f8b42749dba1ebc674df05be1aa0

data/lib/inits/charged_hash.rb

@@ -12,5 +12,27 @@ module ChargedHash
     def wrap(value)
       value.is_a?(Hash) ? value.extend(ChargedHash) : value
     end
+
+    def keys_to_string!
+      keys_to(:string, self)
+    end
+
+    def keys_to_sym!
+      keys_to(:symbol, self)
+    end
+
+    def keys_to(type, obj)
+      case obj
+      when Hash
+        obj.each_with_object({}) do |(k, v), result|
+          key = k.to_s
+          result[key] = keys_to(type, v)
+        end
+      when Array
+        obj.map { |v| keys_to(type, v) }
+      else
+        obj
+      end
+    end
   end
 end

data/lib/inits/system.rb

@@ -3,5 +3,3 @@ def reload
   app_files.each { |file| load(file) }
   puts "\e[32mReloaded..\e[0m"
 end
-
-

data/lib/rubee/cli/attach.rb

@@ -80,7 +80,7 @@ module Rubee
           react_app_file = <<~REACT_APP_FILE
             import React from 'react';
 
-            export function #{new_app_name.camelize}App() {
+            export default function #{new_app_name.camelize}App() {
               return (
                 <h1>#{new_app_name.camelize}App</h1>
               );

data/lib/rubee/controllers/base_controller.rb

@@ -67,7 +67,7 @@ module Rubee
       in :unauthentificated
         [401, headers.merge('content-type' => 'text/plain'), ['Unauthentificated']]
       in :redirect
-        [302, headers.merge('location' => to.to_s), ['Unauthentificated']]
+        [302, headers.merge('location' => to.to_s), []]
       in :not_found
         [404, { 'content-type' => 'text/plain' }, ['Route not found']]
       else # rendering erb view is a default behavior

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

@@ -34,7 +34,7 @@ module Rubee
         elsif @request.cookies['jwt'] && valid_token?
           token = @request.cookies['jwt']
           hash = ::JWT.decode(token, Rubee::AuthTokenable::KEY, true, { algorithm: 'HS256' })
-          @authentificated_user ||= user_model.where(login => hash[0][login]).first
+          @authentificated_user ||= user_model.where(login => hash[0]["login"][login.to_s]).first
         end
       end
 

data/lib/rubee/generator.rb

@@ -6,6 +6,7 @@ module Rubee
     def initialize(model_name, model_attributes, controller_name, action_name, **options)
       @model_name = model_name&.downcase
       @model_attributes = model_attributes || []
+      @filtered_attributes = model_attributes.select { |attribute| !attribute[:name].include?('index') }
       @base_name = controller_name.to_s.gsub('Controller', '').downcase.to_s
       color_puts("base_name: #{@base_name}", color: :gray)
       @plural_name = @base_name.plural? ? @base_name : @base_name.pluralize
@@ -33,7 +34,7 @@ module Rubee
 
       content = <<~RUBY
         class #{@namespace}#{@model_name.camelize} < Rubee::SequelObject
-          #{'attr_accessor ' + @model_attributes.map { |hash| ":#{hash[:name]}" }.join(', ') unless @model_attributes.empty?}
+          #{'attr_accessor ' + @filtered_attributes.map { |hash| ":#{hash[:name]}" }.join(', ') unless @filtered_attributes.empty?}
         end
       RUBY
 

data/lib/rubee.rb

@@ -17,7 +17,7 @@ module Rubee
   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 = '2.2.1'
+  VERSION = '2.2.3'
 
   require_relative 'rubee/router'
   require_relative 'rubee/logger'

data/lib/tests/controllers/base_controller_test.rb

@@ -1,12 +1,29 @@
 require_relative '../test_helper'
 
-class WebSocketControllerTest < Minitest::Test
+class TestRedirectController < Rubee::BaseController
+  def index
+    response_with(type: :redirect, to: '/test')
+  end
+
+  def test
+    response_with(type: :json, object: { ok: :ok })
+  end
+end
+
+class BaseControllerTest < Minitest::Test
   include Rack::Test::Methods
 
   def app
     Rubee::Application.instance
   end
 
+  def setup
+    Rubee::Router.draw do |route|
+      route.get('/test', to: 'test_redirect#test')
+      route.get('/index', to: 'test_redirect#index')
+    end
+  end
+
   def test_retrieve_image
     get('/images/rubee.svg')
 
@@ -20,4 +37,12 @@ class WebSocketControllerTest < Minitest::Test
     assert_equal(200, last_response.status, "Unexpected response: #{last_response.body}")
     assert_equal('Image not found', last_response.body, "Unexpected response: #{last_response.body}")
   end
+
+  def test_redirect
+    get('/index')
+
+    assert_equal(302, last_response.status)
+    assert_equal('/test', last_response.headers['Location'])
+    assert_equal('', last_response.body)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ru.Bee
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.3
 platform: ruby
 authors:
 - Oleg Saltykov
@@ -45,10 +45,8 @@ files:
 - lib/app/controllers/welcome_controller.rb
 - lib/app/models/user.rb
 - lib/app/views/App.tsx
-- lib/app/views/apples_.erb
 - lib/app/views/index.html
 - lib/app/views/layout.erb
-- lib/app/views/s_.erb
 - lib/app/views/utils/redirectToBackend.tsx
 - lib/app/views/welcome_header.erb
 - lib/app/views/welcome_show.erb

data/lib/app/views/apples_.erb

@@ -1 +0,0 @@
-<h1>apples_ View</h1>

data/lib/app/views/s_.erb

@@ -1 +0,0 @@
-<h1>s_ View</h1>