ru.Bee 1.9.12 → 1.9.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb5bb19ded65d916b743f77c4ac36e1cfc1e90f3c049490ec11c86532863fb11
-  data.tar.gz: 1e2793a785114f3dc18b890e1934bccc53d415ed0e0e456259a4825e2de5764d
+  metadata.gz: 67b4b7a2e0717e400e958cabecbab8ad3fd47725015ba3ef1ee9245fe1ea9e12
+  data.tar.gz: 51de37c21accea30e09def16555077af3a6076110c69746a6245e2a79e242f94
 SHA512:
-  metadata.gz: 81a9a261a539fe64f458211d2bd279c76598f44450aafe8760ec773133ed394bfc6ca426778f167e2c3f2c1ad7b822c2c9ad95dd45f8e6f34dc2b4740cd98c1b
-  data.tar.gz: 649ad8dec2d61a49ba48adb14e509fd66eff6a9aaee5b16921626c05cada66f0c2b4bd613d495d31270e787953dc98c76a85e36849a1ed5a6075f95e19814b7e
+  metadata.gz: 9453e184e417bd47d87729d307c171cdf35d1f482f0a326432dd5a4d740ea007995420f4d9163b3c82b1d0e297bfcc133479ec4127d9b0520b1a7fc81969c8a9
+  data.tar.gz: e45a5a0ac96acb7306788bd95d760231494b1db18ebc4439fed99bd6571876c83579187b3836a54f869afcef1be9383af88d1d7d89766063c22b19c729fbc061

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.12'
+  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.12
+  version: 1.9.13
 platform: ruby
 authors:
 - Oleg Saltykov