ru.Bee 1.9.7 → 1.9.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 03af86ee565e361f05a02908203f132f44c2e897d5b5bacf97d69d6b2856399c
-  data.tar.gz: 9d1cf27fc856d40fe10c057521f17be4916e840999babfa6797a64827b53a053
+  metadata.gz: 7805c4792f55f480b720a6747dcaef3cd4f757df40fa0d64c28ddf7e861a44ab
+  data.tar.gz: deab881e9d463c26b3f41bf5e26b5c3c170a0dc77e999424a93f5ab0e58335fd
 SHA512:
-  metadata.gz: 1375122c1165ede82010e967be939d884064b45290947ab68a109e94d7cd218f5e479aa6cae6cbf86e592765c223e422a500a8e8959cb7ee94514ab10175dc2e
-  data.tar.gz: 1509444ec809f496adf8a9e4552de7b96769845db2e68574876d0f90a7311a0765de62ec222c5ee2a3a937ad259b83b1de84a5ea75ed1ace5715a038413dc2fb
+  metadata.gz: d133e680a6c780d9ead48a6485a63b081bed90d694e11719394fbded1b051c6e89cdd67b6c5aaa755d43b3c3f1d36e71e8a8b7a26f6d3bcf09f8e08360585a1d
+  data.tar.gz: e61df271d59b85025afe5408f78e1281a35ae1803a0fd5506015eec8c1700a8604b8d0d0bf6ff15837bfe01a00bff9711711f8eac4a8e6615d3fb7ca09c9dd73

data/lib/rubee/cli/project.rb

@@ -106,6 +106,7 @@ module Rubee
             gem 'pry-byebug'
             gem 'puma'
             gem 'json'
+            gem 'jwt'
 
             group :development do
               gem 'rerun'

data/lib/rubee/controllers/base_controller.rb

@@ -73,7 +73,7 @@ module Rubee
         view_file_name = self.class.name.split('Controller').first.gsub('::', '').snakeize
         erb_file = render_view ? render_view.to_s : "#{view_file_name}_#{@route[:action]}"
         lib = Rubee::PROJECT_NAME == 'rubee' ? 'lib/' : ''
-        path_parts = self.class.instance_method(@route[:action]).source_location[0].split('/').reverse
+        path_parts = Module.const_source_location(self.class.name)&.first&.split('/')&.reverse
         controller_index = path_parts.find_index { |part| part == 'controllers' }
         app_name = path_parts[controller_index + 1]
         view = render_template(erb_file, { object:, **(options[:locals] || {}) }, app_name:)

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

@@ -29,7 +29,7 @@ module Rubee
 
       def authentificated_user
         # User model must be created with email and password properties at least
-        @authentificated_user ||= User.where(email: params[:email], password: params[:password]).first
+        @authentificated_user ||= ::User.where(email: params[:email], password: params[:password]).first
       end
 
       def authentificate!
@@ -37,7 +37,7 @@ module Rubee
 
         # Generate token
         payload = { username: params[:email], exp: Time.now.to_i + EXPIRE }
-        @token = JWT.encode(payload, KEY, 'HS256')
+        @token = ::JWT.encode(payload, KEY, 'HS256')
         # Set jwt token to the browser within cookie, so next browser request will include it.
         # make sure it passed to response_with headers options
         @token_header = { 'set-cookie' => "jwt=#{@token}; path=/; httponly; secure" }

data/lib/rubee/controllers/middlewares/auth_token_middleware.rb

@@ -31,12 +31,12 @@ module Rubee
       hash = decode_jwt(token)
       email = hash[:username]
 
-      User.where(email:)&.any? if email
+      ::User.where(email:)&.any? if email
     end
 
     def decode_jwt(token)
       decoded_array = begin
-        JWT.decode(token, AuthTokenable::KEY, true, { algorithm: 'HS256' })
+        ::JWT.decode(token, AuthTokenable::KEY, true, { algorithm: 'HS256' })
                       rescue StandardError
                         []
       end

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.7'
+  VERSION = '1.9.10'
 
   require_relative 'rubee/router'
   require_relative 'rubee/logger'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ru.Bee
 version: !ruby/object:Gem::Version
-  version: 1.9.7
+  version: 1.9.10
 platform: ruby
 authors:
 - Oleg Saltykov
@@ -44,10 +44,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>