ru.Bee 2.4.1 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4204ab4a146dba0a5c2be32845880e17d576b12d807f58de9024e8f31db8268
-  data.tar.gz: e5afe1588d9597034a3931a86631d1cc6f35cb63c4d03fa45a64bef30494c127
+  metadata.gz: 662d0d94e4f29f53da650705c4f04b15739ef9fc22d18e06e5f26ba9c5180a7b
+  data.tar.gz: 470c43de0b06a51164c499a83d34bdf361a9b3f9433a43d0b971395f4149494d
 SHA512:
-  metadata.gz: 814450e1ae8f4fd6e206aa7fcfc0b021901bd00a4c7e8831ff94df5cae97d4c019981b4870310048977a5ff4f5cc6160d876bd91fc035fdb236988759d550c1a
-  data.tar.gz: 389a39ca1bd6f3853a53aa918c4e658de405bf035b53b98f14aa9e428b9bf27b1fd0cb8ba8b62190f446d0e932b11d743d194b265c401bba37866df98280dbb1
+  metadata.gz: ab5b1e90290b4f2aefc52ca52187c8a8811d6d5e11016fbb826afb2aa119881aa4593d8d7cdc3c19c6aeb1a0a0f64695bae04897ff99dae1a2c3552b1ee1348b
+  data.tar.gz: 3bb1991be93a8cd7aedf38dad66355f79a35cdd6b0724508c4c5d8c5e951bcb457ead32edcb7cb52999550a9dd90482c50f84faaf16e613afdc73e02f5b5fce3

data/lib/rubee/cli/command.rb

@@ -18,13 +18,13 @@ module Rubee
           Rubee::CLI::React
         in /^project$/
           Rubee::CLI::Project
-        in /^version$/
+        in /^version|v$/
           Rubee::CLI::Version
         in /^routes$/
           Rubee::CLI::Routes
         in /^test$/
           Rubee::CLI::Test
-        in /^(generate|gen)$/
+        in /^(generate|gen|g)$/
           Rubee::CLI::Generate
         in /^db$/
           Rubee::CLI::Db

data/lib/rubee/cli/db.rb

@@ -37,6 +37,44 @@ module Rubee
           generate_structure
         end
 
+        def schema(_argv)
+          STRUCTURE.each do |table_name, columns|
+            # Table header
+            color_puts(
+              "--- #{table_name}",
+              color: :cyan,
+              style: :bold
+            )
+
+            columns.each do |column_name, meta|
+              parts = []
+
+              # column name
+              col_text = "- #{column_name}"
+              parts << col_text
+
+              # PK
+              if meta[:primary_key]
+                parts << "(PK)"
+              end
+
+              # type
+              if meta[:db_type]
+                parts << "type (#{meta[:db_type]})"
+              end
+
+              line = parts.join(", ")
+
+              color_puts(
+                line,
+                color: meta[:primary_key] ? :yellow : :gray
+              )
+            end
+
+            puts
+          end
+        end
+
         private
 
         def generate_structure

data/lib/rubee/models/sequel_object.rb

@@ -102,6 +102,7 @@ module Rubee
       # > user.comments
       # > [<comment1>, <comment2>]
       def owns_many(assoc, fk_name: nil, over: nil, **options)
+        original_assoc = assoc
         singularized_assoc_name = assoc.to_s.singularize
         fk_name ||= "#{name.to_s.downcase}_id"
         namespace = options[:namespace]
@@ -116,7 +117,7 @@ module Rubee
           if over
             sequel_dataset = klass
               .join(over.to_sym, "#{singularized_assoc_name.snakeize}_id".to_sym => :id)
-              .where(Sequel[over][fk_name.to_sym] => id)
+              .where(Sequel[over][fk_name.to_sym] => id).select_all(original_assoc).all
             self.class.serialize(sequel_dataset, klass)
           else
             klass.where(fk_name.to_sym => id)

data/lib/rubee.rb

@@ -20,7 +20,7 @@ module Rubee
     RUBEE_SUPPORT = { "Rubee::Support::Hash" => Hash, "Rubee::Support::String" => String }
   end
 
-  VERSION = '2.4.1'
+  VERSION = '2.5.0'
 
   require_relative 'rubee/router'
   require_relative 'rubee/logger'

data/lib/tests/async/thread_async_test.rb

@@ -27,7 +27,7 @@ describe 'TestAsyncRunnner' do
       subject
 
       Timeout.timeout(1) do
-        sleep(0.05) until User.count == 5
+        sleep(0.1) until User.count == 5
       end
 
       assert_equal 5, User.count

data/readme.md

@@ -221,6 +221,32 @@ This will generate the following files
 
 4. Fill the generated files with the logic you need and run the server again!
 
+5. You can find full snapshot of the schema in the STRUCTURE constant or in the db/structur.rb file.
+
+6. You can use rubee cli for printing out lates schema, out of STRUCUTRE constant
+```bash
+-> rubee db schema
+--- users
+- id, (PK), type (INTEGER)
+- email, type (varchar(255))
+- password, type (varchar(255))
+
+--- accounts
+- id, (PK), type (INTEGER)
+- addres, type (varchar(255))
+- user_id, type (INTEGER)
+
+--- posts
+- id, (PK), type (INTEGER)
+- user_id, type (INTEGER)
+- comment_id, type (INTEGER)
+
+--- comments
+- id, (PK), type (INTEGER)
+- text, type (varchar(255))
+- user_id, type (INTEGER)
+```
+
 [Back to content](#content)
 
 ## Model

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ru.Bee
 version: !ruby/object:Gem::Version
-  version: 2.4.1
+  version: 2.5.0
 platform: ruby
 authors:
 - Oleg Saltykov