ru.Bee 2.7.5 → 2.7.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bec1d1078b350a96e452be2ffbc136feb1e29fb3d05ec45269332b9eb896a3fb
-  data.tar.gz: 3dc67677e2d98194c0f66679f2fac5dbb8b2e58a10e7919b65a8bafd2172267b
+  metadata.gz: b96c111963e69a5ad1fb05d5b1b4e226122015a51a34ceb69ee93f1fe23a2426
+  data.tar.gz: f210ad9397a97e65b36fa924dd1c65ea8bc5b88a5bcf7d4643cb4408c6ce0706
 SHA512:
-  metadata.gz: fa8e128042bb5c8dbd246e59ac45c9c1d802f993150ce7b41ca903eaf09da88b36ad32a1a85163e524ce29a54dd7efaaada3ddc6a571005a2c10c939912020e5
-  data.tar.gz: a09c8a1c7181baef32d3cc5812520b984655797ed5ee40636d4ce8ba6f7898833b40fed3e68579d63e065c8a2f139cdfdb782f0140235d839ec81c2d9a555e36
+  metadata.gz: b30676699627fcc0f65bf02462ca12138f4226004d5927e6bbb64ad8caa37fc9f6da1ed7c26f40e577392b164bd696d62f89104fa1223347635f0a4fefb11b3c
+  data.tar.gz: 8ef41f6739a0c1771c7fab2e484fa1485e38f9a46e1a7fa8509ec40b95630c243008b92d9fa46299aa434480f62da0d6726fc08d9b08b44f4326fe4cc472c660

data/lib/rubee/cli/db.rb

@@ -12,7 +12,7 @@ module Rubee
           _, file_name = argv[1]&.split(':')
           file_names = if file_name == 'all'
             lib = Rubee::PROJECT_NAME == 'rubee' ? '/lib' : ''
-            Dir.glob(".#{lib}/db/*.rb").map do |file|
+            Dir.glob(".#{lib}/db/*.rb").sort.map do |file|
               File.basename(file, '.rb')
             end.reject { |file| file == 'structure' }
           else
@@ -20,7 +20,7 @@ module Rubee
           end
           file_names.each do |file|
             color_puts("Run #{file} file for #{ENV['RACK_ENV']} env", color: :cyan)
-            Object.const_get(file.split('_').map(&:capitalize).join).new.call
+            Object.const_get(file.gsub(/^\d+_/, '').split('_').map(&:capitalize).join).new.call
           end
           color_puts("Migration for #{file_name} completed", color: :green)
           unless Rubee::PROJECT_NAME == 'rubee'

data/lib/rubee/configuration.rb

@@ -17,6 +17,10 @@ module Rubee
     }
 
     class << self
+      def env
+        ENV['RACK_ENV']
+      end
+
       def setup(env, app = :app)
         unless @configuraiton[app.to_sym]
           @configuraiton[app.to_sym] = {
@@ -29,6 +33,14 @@ module Rubee
           end
         end
 
+        envs.each do |envi|
+          next if respond_to? "#{envi}?"
+
+          define_singleton_method "#{envi}?" do
+            envi.to_s == ENV['RACK_ENV']
+          end
+        end
+
         yield(self)
       end
 
@@ -129,8 +141,8 @@ module Rubee
           &.[](method_name.to_s.delete_prefix('get_').to_sym)
       end
 
-      def envs
-        @configuraiton.keys
+      def envs(app_name = :app)
+        @configuraiton[app_name.to_sym].keys
       end
     end
   end

data/lib/rubee/generator.rb

@@ -100,9 +100,10 @@ module Rubee
     end
 
     def generate_db_file
+      timestamp = Time.now.strftime('%Y%m%d%H%M%S')
       prefix = @namespace == "" ? "" : "#{@app_name.snakeize}_"
       table_name = "#{prefix}#{@plural_name}"
-      db_file = File.join(Rubee::APP_ROOT, Rubee::LIB, "db/create_#{table_name}.rb")
+      db_file = File.join(Rubee::APP_ROOT, Rubee::LIB, "db/#{timestamp}_create_#{table_name}.rb")
       if File.exist?(db_file)
         puts "DB file for #{table_name} already exists. Remove it if you want to regenerate"
         return

data/lib/rubee/models/sequel_object.rb

@@ -208,6 +208,14 @@ module Rubee
         ::Rubee::AssocArray.new([], self, query_dataset.where(**args))
       end
 
+      def find_first(args, options = {})
+        where(args, options).order(:id).limit(1).last
+      end
+
+      def find_last(args, options = {})
+        where(args, options).order(id: :desc).limit(1).last
+      end
+
       def order(args, options = {})
         query_dataset = options[:__query_dataset] || dataset
 

data/lib/rubee.rb

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

data/lib/tests/models/comment_model_test.rb

@@ -119,6 +119,26 @@ describe 'Comment model' do
     end
   end
 
+  describe 'find_first' do
+    it 'finds first record' do
+      Comment.destroy_all
+      comment_1 = Comment.create(text: 'test123123')
+      comment_2 = Comment.create(text: 'test123123')
+      _(Comment.find_first(text: 'test123123').id).must_equal(comment_1.id)
+      Comment.destroy_all
+    end
+  end
+
+  describe 'find_last' do
+    it 'finds last record' do
+      Comment.destroy_all
+      comment_1 = Comment.create(text: 'test123123')
+      comment_2 = Comment.create(text: 'test123123')
+      _(Comment.find_last(text: 'test123123').id).must_equal(comment_2.id)
+      Comment.destroy_all
+    end
+  end
+
   describe 'method' do
     it 'updates existing model' do
       comment = Comment.new(text: 'test 1')

data/lib/tests/rubee_generator_test.rb

@@ -4,8 +4,10 @@ describe 'Rubee::Generator' do
   describe 'generates Sequel schema lines' do
     after do
       File.delete('lib/app/models/apple.rb') if File.exist?('lib/app/models/apple.rb')
-      File.delete('lib/db/create_apples.rb') if File.exist?('lib/db/create_apples.rb')
+      # Delete any migration file with timestamp prefix
+      Dir.glob('lib/db/*_create_apples.rb').each { |f| File.delete(f) }
     end
+
     it 'for string with just name' do
       generator = Rubee::Generator.new(nil, nil, nil, nil)
 
@@ -30,23 +32,30 @@ describe 'Rubee::Generator' do
   describe 'generates Sequel file' do
     after do
       File.delete('lib/app/models/apple.rb') if File.exist?('lib/app/models/apple.rb')
-      File.delete('lib/db/create_apples.rb') if File.exist?('lib/db/create_apples.rb')
+      # Delete any migration file with timestamp prefix
+      Dir.glob('lib/db/*_create_apples.rb').each { |f| File.delete(f) }
     end
 
     it 'not without a model' do
       generator = Rubee::Generator.new(nil, nil, nil, nil)
       generator.call
 
-      _(File.exist?('lib/db/create_apples.rb')).must_equal(false)
+      # Check no migration files exist with any timestamp
+      _(Dir.glob('lib/db/*_create_apples.rb').empty?).must_equal(true)
     end
 
     it 'with a model only' do
       generator = Rubee::Generator.new('apple', nil, 'apples', nil)
       generator.call
 
-      _(File.exist?('lib/db/create_apples.rb')).must_equal(true)
+      # Find the migration file with timestamp prefix
+      migration_files = Dir.glob('lib/db/*_create_apples.rb')
+      _(migration_files.size).must_equal(1)
+
+      migration_file = migration_files.first
+      _(File.exist?(migration_file)).must_equal(true)
 
-      lines = File.readlines('lib/db/create_apples.rb').map(&:chomp).join("\n")
+      lines = File.readlines(migration_file).map(&:chomp).join("\n")
 
       _(lines.include?('class CreateApples')).must_equal(true)
       _(lines.include?('def call')).must_equal(true)
@@ -61,9 +70,11 @@ describe 'Rubee::Generator' do
 'apples', nil)
       generator.call
 
-      _(File.exist?('lib/db/create_apples.rb')).must_equal(true)
+      migration_files = Dir.glob('lib/db/*_create_apples.rb')
+      _(migration_files.size).must_equal(1)
 
-      lines = File.readlines('lib/db/create_apples.rb').map(&:chomp).join("\n")
+      migration_file = migration_files.first
+      lines = File.readlines(migration_file).map(&:chomp).join("\n")
 
       _(lines.include?('class CreateApples')).must_equal(true)
       _(lines.include?('def call')).must_equal(true)
@@ -79,9 +90,9 @@ describe 'Rubee::Generator' do
 [{ name: 'id', type: :bigint }, { name: 'colour', type: :string }, { name: 'weight', type: :integer }], 'apples', nil)
       generator.call
 
-      _(File.exist?('lib/db/create_apples.rb')).must_equal(true)
-
-      lines = File.readlines('lib/db/create_apples.rb').map(&:chomp).join("\n")
+      migration_files = Dir.glob('lib/db/*_create_apples.rb')
+      migration_file = migration_files.first
+      lines = File.readlines(migration_file).map(&:chomp).join("\n")
 
       _(lines.include?('class CreateApples')).must_equal(true)
       _(lines.include?('def call')).must_equal(true)
@@ -98,9 +109,9 @@ describe 'Rubee::Generator' do
 [{ name: ['blue_id', 'shoe_id'], type: :foreign_key, table: 'blue_and_shoe_join_tb' }], 'apples', nil)
       generator.call
 
-      _(File.exist?('lib/db/create_apples.rb')).must_equal(true)
-
-      lines = File.readlines('lib/db/create_apples.rb').map(&:chomp).join("\n")
+      migration_files = Dir.glob('lib/db/*_create_apples.rb')
+      migration_file = migration_files.first
+      lines = File.readlines(migration_file).map(&:chomp).join("\n")
 
       _(lines.include?('class CreateApples')).must_equal(true)
       _(lines.include?('def call')).must_equal(true)
@@ -115,9 +126,9 @@ describe 'Rubee::Generator' do
       generator = Rubee::Generator.new('apple', [{ name: 'blue_id', type: :foreign_key }], 'apples', nil)
       generator.call
 
-      _(File.exist?('lib/db/create_apples.rb')).must_equal(true)
-
-      lines = File.readlines('lib/db/create_apples.rb').map(&:chomp).join("\n")
+      migration_files = Dir.glob('lib/db/*_create_apples.rb')
+      migration_file = migration_files.first
+      lines = File.readlines(migration_file).map(&:chomp).join("\n")
 
       _(lines.include?('class CreateApples')).must_equal(true)
       _(lines.include?('def call')).must_equal(true)
@@ -126,12 +137,24 @@ describe 'Rubee::Generator' do
       _(lines.include?('foreign_key :blue_id')).must_equal(true)
       _(lines.include?('end')).must_equal(true)
     end
+
+    it 'generates migration file with timestamp prefix' do
+      generator = Rubee::Generator.new('apple', nil, 'apples', nil)
+      generator.call
+
+      migration_files = Dir.glob('lib/db/*_create_apples.rb')
+      _(migration_files.size).must_equal(1)
+
+      # Verify timestamp prefix format (YYYYMMDDHHMMSS_create_apples.rb)
+      filename = File.basename(migration_files.first)
+      _(filename).must_match(/^\d{14}_create_apples\.rb$/)
+    end
   end
 
   describe 'generates Model file' do
     after do
       File.delete('lib/app/models/apple.rb') if File.exist?('lib/app/models/apple.rb')
-      File.delete('lib/db/create_apples.rb') if File.exist?('lib/db/create_apples.rb')
+      Dir.glob('lib/db/*_create_apples.rb').each { |f| File.delete(f) }
     end
 
     it 'not without a model' do

data/readme.md

@@ -221,6 +221,12 @@ This will generate the following files:
 ```bash
 rubee db run:all
 ```
+For supporting ordering in migrations, while you create files manually,
+you would benefit by prefixing the migration file with a number.
+So that will ensure that the migration is run in the proper order and won't be interupted
+with related errors.
+In case you create migration file over `rubee generate /{get} {path}` command, the timestamp
+prefix will be added automatically.
 
 4. Fill the generated files with the logic you need and run the server again.
 
@@ -374,7 +380,16 @@ Get all records scoped by a field
 irb(main):005> User.where(email: "ok23@ok.com")
 => [#<User:0x000000010cfaa5c0 @email="ok23@ok.com", @id=2, @password="123">]
 ```
-
+Get the first record. It is a shortcut for `User.where(email: "ok23@ok.com").order(:id).limit(1).last`
+```ruby
+irb(main):006> User.find_first(email: "ok23@ok.com")
+=> #<User:0x000000010cfaa5c0 @email="ok23@ok.com", @id=2, @password="123">
+```
+Get the last record. It is a shortcut for `User.where(email: "ok23@ok.com").order(id: :desc).limit(1).last`
+```ruby
+irb(main):007> User.find_last(email: "ok23@ok.com")
+=> #<User:0x000000010cfaa5c0 @email="ok23@ok.com", @id=2, @password="123">
+```
 Get all records
 ```ruby
 irb(main):001> User.all
@@ -719,6 +734,9 @@ Generates:
 ```bash
 rubee db run:create_cabbages
 ```
+If you migration file prefixed with timestamp or mannually added number, you don't need to include It
+in the command `rubee db run:202603101300_create_cabbages`, just `rubee db run:create_cabbages` will be
+sufficient enough
 
 5. Fill the controller with content
 ```ruby
@@ -1039,6 +1057,15 @@ Available extensions:
 "test".plural?     # => false
 ```
 
+In the code base, out of the box, you can check current environtment with:
+```ruby
+Rubee::Configuration.env
+# => :development
+
+Rubee::Configuration.development?
+# => true
+```
+
 [Back to content](#content)
 
 ## JWT based authentication

metadata

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