ru.Bee 2.4.2 → 2.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c385384e96fe32c753b81051b7bcb24d8d623d2c61898ee8602e5bbfe2bdd9a1
-  data.tar.gz: 239f84f0499d800d899894d29b4df27305d94a7728d3b4d5bfbfaf150e9379e0
+  metadata.gz: 47aeb2d5c2977b5a43aa3e316548b391ded4310aa5687fc41ccc6526fbf72320
+  data.tar.gz: 5b913ab15c67a441e494d5fa79f693e7a4985b787c6fd71dd0655a3e0ed2045c
 SHA512:
-  metadata.gz: 0777d3758de544f5455f61378ded65d83fa56502b1c8b9343d3d8fc7edaf545664e003bb7b6f11d90fda858ec9f3c67d917e3333e0fe5e3b891004bb83450b88
-  data.tar.gz: aa7b2833b2cdfef147e37dcdcfc1e30508b392aa56f885e3cb578d5276db5a32237a1140e76938be606fd78da5f11204cbf32aba20575e2b91116a4c3b936e29
+  metadata.gz: e6c6c022f4427f76b1e6a68caed12382f2881205fc1e90331e1722d97947b92539dfecb0cbb4210b72fb388a5cb2afd3a4646767ea6ec1464c4ba8b2f8217977
+  data.tar.gz: '0905fe0144ac5cdb68214afd2dfcb89b60e22a8728fce5e0b910857428fda4be9bd9c8ac062c84bc1b9329cf38316c9234b7672b22d6d52f04d6d1f7bc86e70a'

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

@@ -243,8 +243,10 @@ module Rubee
       def validate_before_persist!
         before(:save, proc { |model| raise Rubee::Validatable::Error, model.errors.to_s }, if: :invalid?)
         before(:update, proc do |model, args|
-          if (instance = model.class.new(*args)) && instance.invalid?
-            raise Rubee::Validatable::Error, instance.errors.to_s
+          dup__instance = model.dup
+          dup__instance.assign_attributes(**args[0])
+          if dup__instance.invalid?
+            raise Rubee::Validatable::Error, dup__instance.errors.to_s
           end
         end)
       end

data/lib/rubee.rb

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

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.2
+  version: 2.5.1
 platform: ruby
 authors:
 - Oleg Saltykov