ru.Bee 1.9.10 → 1.9.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7805c4792f55f480b720a6747dcaef3cd4f757df40fa0d64c28ddf7e861a44ab
-  data.tar.gz: deab881e9d463c26b3f41bf5e26b5c3c170a0dc77e999424a93f5ab0e58335fd
+  metadata.gz: eb5bb19ded65d916b743f77c4ac36e1cfc1e90f3c049490ec11c86532863fb11
+  data.tar.gz: 1e2793a785114f3dc18b890e1934bccc53d415ed0e0e456259a4825e2de5764d
 SHA512:
-  metadata.gz: d133e680a6c780d9ead48a6485a63b081bed90d694e11719394fbded1b051c6e89cdd67b6c5aaa755d43b3c3f1d36e71e8a8b7a26f6d3bcf09f8e08360585a1d
-  data.tar.gz: e61df271d59b85025afe5408f78e1281a35ae1803a0fd5506015eec8c1700a8604b8d0d0bf6ff15837bfe01a00bff9711711f8eac4a8e6615d3fb7ca09c9dd73
+  metadata.gz: 81a9a261a539fe64f458211d2bd279c76598f44450aafe8760ec773133ed394bfc6ca426778f167e2c3f2c1ad7b822c2c9ad95dd45f8e6f34dc2b4740cd98c1b
+  data.tar.gz: 649ad8dec2d61a49ba48adb14e509fd66eff6a9aaee5b16921626c05cada66f0c2b4bd613d495d31270e787953dc98c76a85e36849a1ed5a6075f95e19814b7e

data/lib/app/views/apples_.erb

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

data/lib/app/views/s_.erb

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

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

@@ -29,7 +29,13 @@ 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
+        if params[:email] && params[:password]
+          @authentificated_user ||= ::User.where(email: params[:email], password: params[:password]).first
+        elsif @request.cookies['jwt'] && valid_token?
+          token = @request.cookies['jwt']
+          hash = ::JWT.decode(token, Rubee::AuthTokenable::KEY, true, { algorithm: 'HS256' })
+          @authentificated_user ||= ::User.where(email: hash[0]['username']).first
+        end
       end
 
       def authentificate!

data/lib/rubee/extensions/hookable.rb

@@ -6,56 +6,62 @@ module Rubee
     end
 
     module ClassMethods
-      def before(method, handler, **options)
-        hooks = Module.new do
-          define_method(method) do |*args, &block|
-            if conditions_met?(options[:if], options[:unless])
-              handler.respond_to?(:call) ? handler.call : send(handler)
-            end
+      def before(*methods, handler, **options)
+        methods.each do |method|
+          hooks = Module.new do
+            define_method(method) do |*args, &block|
+              if conditions_met?(options[:if], options[:unless])
+                handler.respond_to?(:call) ? handler.call : send(handler)
+              end
 
-            super(*args, &block)
+              super(*args, &block)
+            end
           end
+          prepend(hooks)
         end
-        prepend(hooks)
       end
 
-      def after(method, handler, **options)
-        hooks = Module.new do
-          define_method(method) do |*args, &block|
-            result = super(*args, &block)
+      def after(*methods, handler, **options)
+        methods.each do |method|
+          hooks = Module.new do
+            define_method(method) do |*args, &block|
+              result = super(*args, &block)
 
-            if conditions_met?(options[:if], options[:unless])
-              handler.respond_to?(:call) ? handler.call : send(handler)
-            end
+              if conditions_met?(options[:if], options[:unless])
+                handler.respond_to?(:call) ? handler.call : send(handler)
+              end
 
-            result
+              result
+            end
           end
+          prepend(hooks)
         end
-        prepend(hooks)
       end
 
-      def around(method, handler, **options)
-        hooks = Module.new do
-          define_method(method) do |*args, &block|
-            if conditions_met?(options[:if], options[:unless])
-              if handler.respond_to?(:call)
-                result = nil
-                handler.call do
-                  result = super(*args, &block)
-                end
+      def around(*methods, handler, **options)
+        methods.each do |method|
+          hooks = Module.new do
+            define_method(method) do |*args, &block|
+              if conditions_met?(options[:if], options[:unless])
+                if handler.respond_to?(:call)
+                  result = nil
+                  handler.call do
+                    result = super(*args, &block)
+                  end
 
-                result
-              else
-                return send(handler) do
-                  super(*args, &block)
+                  result
+                else
+                  send(handler) do
+                    super(*args, &block)
+                  end
                 end
+              else
+                super(*args, &block)
               end
-            else
-              super(*args, &block)
             end
           end
+          prepend(hooks)
         end
-        prepend(hooks)
       end
     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.10'
+  VERSION = '1.9.12'
 
   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.10
+  version: 1.9.12
 platform: ruby
 authors:
 - Oleg Saltykov
@@ -44,8 +44,10 @@ 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
@@ -298,7 +300,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.8
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Fast and lightweight Ruby application server designed for minimalism and
   flexibility