ru.Bee 1.9.11 → 1.9.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6943917dd749518abbf2713483ef1ef969717235159cabf67f5f59b868691c35
-  data.tar.gz: 065ee4dc8c293bb742e7a3c08efbc37999a5750ca2bfd55b66701c062447c3c5
+  metadata.gz: 67b4b7a2e0717e400e958cabecbab8ad3fd47725015ba3ef1ee9245fe1ea9e12
+  data.tar.gz: 51de37c21accea30e09def16555077af3a6076110c69746a6245e2a79e242f94
 SHA512:
-  metadata.gz: 9bf232de88ee04cbf5efa697a04b6af0c8ad952f4141c55e49e9572d0daf3ff72834cd2de39a24d5482d7d4927e8835534e2b900974f5dd9b89722c38148a5be
-  data.tar.gz: a5f250547b602fbd94e0d283e325a4409e923c2c0d8afd2d74f031138aaa3fb49839655c46f060aac30f652a812297d93cf302075b70d7de2782c28484229f1a
+  metadata.gz: 9453e184e417bd47d87729d307c171cdf35d1f482f0a326432dd5a4d740ea007995420f4d9163b3c82b1d0e297bfcc133479ec4127d9b0520b1a7fc81969c8a9
+  data.tar.gz: e45a5a0ac96acb7306788bd95d760231494b1db18ebc4439fed99bd6571876c83579187b3836a54f869afcef1be9383af88d1d7d89766063c22b19c729fbc061

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
-        if !@request.cookies['jwt'] && params[:email] && params[:password]
+        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']

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/models/sequel_object.rb

@@ -86,15 +86,21 @@ module Rubee
       # owns_many :comments
       # > user.comments
       # > [<comment1>, <comment2>]
-      def owns_many(assoc, fk_name: nil, over: nil, **_options)
+      def owns_many(assoc, fk_name: nil, over: nil, **options)
         singularized_assoc_name = assoc.to_s.singularize
         fk_name ||= "#{name.to_s.downcase}_id"
+        namespace = options[:namespace]
 
         define_method(assoc) do
-          klass = Object.const_get(singularized_assoc_name.capitalize)
+          assoc = if namespace
+            "::#{namespace.to_s.camelize}::#{singularized_assoc_name.camelize}"
+          else
+            singularized_assoc_name.camelize
+          end
+          klass = Object.const_get(assoc)
           if over
             sequel_dataset = klass
-              .join(over.to_sym, "#{singularized_assoc_name}_id".to_sym => :id)
+              .join(over.to_sym, "#{singularized_assoc_name.snakeize}_id".to_sym => :id)
               .where(fk_name.to_sym => id)
             self.class.serialize(sequel_dataset, klass)
           else
@@ -107,10 +113,16 @@ module Rubee
       # owns_one :user
       # > comment.user
       # > <user>
-      def owns_one(assoc, options = {})
+      def owns_one(assoc, fk_name: nil, **options)
         fk_name ||= "#{name.to_s.downcase}_id"
+        namespace = options[:namespace]
         define_method(assoc) do
-          Object.const_get(assoc.capitalize).where(fk_name.to_sym => id)&.first
+          assoc = if namespace
+            "::#{namespace.to_s.camelize}::#{assoc.to_s.camelize}"
+          else
+            assoc.to_s.camelize
+          end
+          Object.const_get(assoc).where(fk_name.to_sym => id)&.first
         end
       end
 
@@ -118,10 +130,16 @@ module Rubee
       # holds :user
       # > account.user
       # > <user>
-      def holds(assoc, fk_name: nil, **_options)
+      def holds(assoc, fk_name: nil, **options)
+        namespace = options[:namespace]
         fk_name ||= "#{assoc.to_s.downcase}_id"
         define_method(assoc) do
-          target_klass = Object.const_get(assoc.capitalize)
+          klass_string = if namespace
+            "::#{namespace.to_s.camelize}::#{assoc.to_s.camelize}"
+          else
+            assoc.to_s.camelize
+          end
+          target_klass = Object.const_get(klass_string)
           target_klass.find(send(fk_name))
         end
       end
@@ -184,7 +202,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.camelize.to_sym].columns
+          target_klass_fields = DB[klass.name.pluralize.downcase.to_s.camelize.to_sym].columns
           klass_attributes = record_hash.filter { target_klass_fields.include?(_1) }
           klass.new(**klass_attributes)
         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.11'
+  VERSION = '1.9.13'
 
   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.11
+  version: 1.9.13
 platform: ruby
 authors:
 - Oleg Saltykov
@@ -300,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