framework 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1292045d0694939b8f12f2886ea2c70661d44a2fbe899941e1e773677447efef
-  data.tar.gz: 59ff906be745fbad82615507049a88b73979af31ceea39e8a9b603db4292bec0
+  metadata.gz: 3d306fda1beba1a5705e191bc0d832aac2d4d7ff225f4e9ece7290818c93a82e
+  data.tar.gz: e80f3a9069ebe9e26bfe8200d3f023ea213cacca283f1a1b97e7ab72d6b8c130
 SHA512:
-  metadata.gz: bb7275487125b9e2173fe980e46b60d7839e8a2a9d32e8f4a30ef7f7a244e035804430d8d073af59ffe406318437efcf63202e9ad4b4bce2904df2f193a389c4
-  data.tar.gz: 5cef0a92115cfd535d60e83020111a8561efd0fccb8b56a85f46b8dde625d379e4b4b6c05d0a66c6721a670a656e48708410a2045b7e2570e58df7b854cccc10
+  metadata.gz: 18e936df7bf63b2c7953349b9cc5b6c17819f6b668c56d5ba746517213c9f783fdc0212d310d3ea449d2987db4c5155d44401a11ba49282ec70217b1fa4e718d
+  data.tar.gz: cef1db46ba193e61ea3a5f4a69f5da5443b04e529185178388ea8108309ad419ff3ed696d971b3ddcb4a051d496abb2269b3fcc41a2efd29a599277dd4a05619

data/README.md

@@ -3,11 +3,10 @@ Ruby Framework
 
 [![Gem Version](https://badge.fury.io/rb/framework.svg)](http://badge.fury.io/rb/framework)
 
-Framework to build Ruby applications for all your needs. Inspired by Rails, but clear and clean from any web-related backend.
+Framework to build Ruby applications for all your needs. Rails without web perks.
 
 ### Features
 
-- Easy configuration to work with multiple databases
 - ActiveRecord interface
 - Customizable structure
 - YAML configuration
@@ -70,7 +69,7 @@ Pretty similar to Rails (just a sample):
 | | |____hello.rake
 |____config
 | |____application.yml
-| |____databases.yml
+| |____database.yml
 | |____environment.rb
 | |____initializers
 | | |____time_zone.rb

data/lib/framework/application.rb

@@ -1,12 +1,11 @@
 require 'framework/root'
 require 'framework/config'
-require 'action_dispatch/middleware/executor'
-require 'action_dispatch/middleware/reloader'
-require 'action_dispatch/middleware/callbacks'
+require 'active_support/reloader'
+require 'active_support/file_update_checker'
 
 module Framework
   class Application
-    CONFIG_PATH = "config/application.yml"
+    CONFIG_PATH = "config/application.yml".freeze
 
     attr_reader :env
     attr_accessor :logger
@@ -52,7 +51,7 @@ module Framework
 
     def create_database!(name = nil)
       name ||= 'default'
-      cfg = database_config[name][env]
+      cfg = name == 'default' ? database_config[env] : database_config.dig(env, name)
 
       case cfg['adapter']
       when 'postgresql'
@@ -70,7 +69,7 @@ module Framework
 
     def drop_database!(name = nil)
       name ||= 'default'
-      cfg = database_config[name][env]
+      cfg = name == 'default' ? database_config[env] : database_config.dig(env, name)
 
       case cfg['adapter']
       when 'postgresql'
@@ -84,15 +83,15 @@ module Framework
         raise "Unknown adapter '#{cfg['adapter']}'"
       end
 
-      puts "The database #{database_config[name][env]['database']} has been successfully dropped"
+      puts "The database #{cfg['database']} has been successfully dropped"
     end
 
     def migrate_database(version = nil)
-      ActiveRecord::MigrationContext.new(root.join("db/migrate")).migrate(version && version.to_i)
+      ActiveRecord::Migrator.migrate root.join("db/migrate"), version.try(:to_i)
     end
 
     def rollback_database(steps = 1)
-      ActiveRecord::MigrationContext.new(root.join("db/migrate")).rollback(steps)
+      ActiveRecord::Migrator.rollback root.join("db/migrate"), steps
     end
 
     # @return [Hash<String>]
@@ -102,8 +101,8 @@ module Framework
 
     # @return [String] Database name
     def database
-      adapter  = database_config['default'][env]['adapter']
-      database = database_config['default'][env]['database']
+      adapter  = database_config.dig(env, 'adapter')
+      database = database_config.dig(env, 'database')
       adapter == 'sqlite3' ? root.join("db/sqlite/#{env}/#{database}.db") : database
     end
 
@@ -112,7 +111,7 @@ module Framework
     end
 
     def db_connection(db_name = 'default')
-      ActiveRecord::Base.establish_connection(database_config[db_name][env])
+      ActiveRecord::Base.establish_connection(db_name == 'default' ? database_config.dig(env) : database_config.dig(env, db_name))
       ActiveRecord::Base.connection
     end
 
@@ -177,33 +176,43 @@ module Framework
     end
 
     def establish_database_connection
-      if database_config
-        database_config.each do |_, db_config|
-          ActiveRecord::Base.establish_connection(db_config[env])
+      env_dbs = database_config[env]
+
+      if env_dbs
+        # If all are hashes, then we have multiple connections
+        if env_dbs.all? { |item| item.is_a?(Hash) }
+          env_dbs.each do |_db_key, db_config|
+            ActiveRecord::Base.establish_connection(db_config.except('enable_logging'))
 
-          if db_config[env]['enable_logging']
-            ActiveRecord::Base.logger = Logger.new(STDOUT)
+            if db_config['enable_logging']
+              ActiveRecord::Base.logger = Logger.new(STDOUT)
+            end
           end
+        else
+          # We have flat one database
+          ActiveRecord::Base.establish_connection(env_dbs.except('enable_logging'))
         end
       end
     end
 
     # Used to create/drop db
     def establish_postgres_connection(name = 'default')
-      if database_config[name]
-        ActiveRecord::Base.establish_connection(database_config[name][env].merge('database' => 'postgres',
-                                                                                 'schema_search_path' => 'public'))
+      if database_config
+        conf = name == 'default' ? database_config.dig(env) : database_config.dig(env, name)
+
+        ActiveRecord::Base.establish_connection(conf.merge('database' => 'postgres',
+                                                           'schema_search_path' => 'public'))
       end
     end
 
     # @return [Hash]
     def load_application_config
-      @config = Framework::Config.new(YAML.load(erb(CONFIG_PATH).result)[env])
+      @config = Framework::Config.new(YAML.load(erb(CONFIG_PATH).result, aliases: true)[env])
     end
 
     # @return [Hash]
     def load_database_config
-      @database_config = YAML.load(erb('config/databases.yml').result)
+      @database_config = YAML.load(erb('config/database.yml').result, aliases: true)
     end
 
     # @param [String] path

data/lib/framework/generators/application_generator.rb

@@ -50,49 +50,26 @@ module Framework
     def create_database_config
       db_name = name.underscore
 
-      create_file 'config/databases.yml' do
+      create_file 'config/database.yml' do
         <<-CONFIG.strip_heredoc
-        # Defult database is used by default.
-        # Any models locating at app/models root directory will point to this database by default.
-        default:
-          development: &common
-            adapter: postgresql
-            username:
-            password:
-            database: #{db_name}_development
-            min_messages: WARNING
-            reconnect: true
-            pool: 5
-            encoding: unicode
-            host: localhost
-
-          test:
-            <<: *common
-            database: #{db_name}_test
-
-          production:
-            <<: *common
-            database: #{db_name}_production
-
-        # second_one:
-        #   development: &common
-        #     adapter: postgresql
-        #     username:
-        #     password:
-        #     database: second_sample_development
-        #     min_messages: WARNING
-        #     reconnect: true
-        #     pool: 5
-        #     encoding: unicode
-        #     host: localhost
-        #
-        #   test:
-        #     <<: *common
-        #     database: second_sample_test
-        #
-        #   production:
-        #     <<: *common
-        #     database: second_sample_production
+        development: &common
+          adapter: postgresql
+          username:
+          password:
+          database: #{db_name}_development
+          min_messages: WARNING
+          reconnect: true
+          pool: 5
+          encoding: unicode
+          host: localhost
+
+        test:
+          <<: *common
+          database: #{db_name}_test
+
+        production:
+          <<: *common
+          database: #{db_name}_production
         CONFIG
       end
     end
@@ -102,7 +79,7 @@ module Framework
         <<-CONFIG.strip_heredoc
         # Set up gems listed in the Gemfile.
         ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
-        require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
+        require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
 
         require 'framework'
 

data/lib/framework/generators/migration_generator.rb

@@ -19,7 +19,7 @@ module Framework
       migration_file << ERB.new(template).result(context)
       migration_file.close
 
-      p "Generated migration: #@path"
+      puts "Generated migration: #@path"
     end
 
     def templates_path

data/lib/framework/migration.rb

@@ -1,13 +1,4 @@
 module Framework
-  class Migration < ActiveRecord::Migration[6.0]
-
-    def self.use_database(db_name)
-      define_method :connection do
-        @connection ||= begin
-          Framework::Logger.whishper "Using database: #{db_name}"
-          Framework.app.db_connection(db_name)
-        end
-      end
-    end
+  class Migration < ActiveRecord::Migration[7.0]
   end
 end

data/lib/framework/templates/migration.rb.erb

@@ -1,6 +1,4 @@
-class <%= @migration_name %> < Framework::Migration
-  use_database :<%= @db_name %>
-
+class <%= @migration_name %> < ActiveRecord::Migration[7.0]
   def up
   end
 

data/lib/framework/version.rb

@@ -1,3 +1,3 @@
 module Framework
-  VERSION = '0.1.1'.freeze
+  VERSION = '0.1.2'.freeze
 end

data/lib/framework.rb

@@ -2,7 +2,6 @@ require 'active_record'
 require 'bundler'
 
 require 'framework/version'
-require 'framework/extensions/active_record/base_extension'
 require 'framework/logger'
 require 'framework/application'
 require 'framework/db_listener'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: framework
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Sergei Nikolaevich Zinin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-11 00:00:00.000000000 Z
+date: 2023-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.0.rc1
+        version: 7.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.0.rc1
+        version: 7.0.4
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.0.rc1
+        version: 7.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.0.rc1
+        version: 7.0.4
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.0.rc1
+        version: 7.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.0.rc1
+        version: 7.0.4
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement
@@ -70,82 +70,82 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 12.3.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 13.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 12.3.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 13.0.6
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: '1.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.20.3
+        version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: '1.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.20.3
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.16.6
+        version: '2.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.16.6
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.8.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '3.12'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.8.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '3.12'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.12.0
 description: Allows to quickly build well structured complex Ruby apps.
 email: zinin@xakep.ru
 executables:
@@ -162,7 +162,6 @@ files:
 - lib/framework/cli.rb
 - lib/framework/config.rb
 - lib/framework/db_listener.rb
-- lib/framework/extensions/active_record/base_extension.rb
 - lib/framework/generators/application_generator.rb
 - lib/framework/generators/migration_generator.rb
 - lib/framework/generators/multi_generator.rb
@@ -189,15 +188,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 3.2.1
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 3.2.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.9
+rubygems_version: 3.4.8
 signing_key: 
 specification_version: 4
 summary: Ruby Application Framework for all your needs.

data/lib/framework/extensions/active_record/base_extension.rb

@@ -1,38 +0,0 @@
-module Framework
-  module Extensions
-    module ActiveRecord
-      module BaseExtension
-        extend ActiveSupport::Concern
-
-        module ClassMethods
-
-          # @override
-          # def inherited(child_class)
-          #   super
-          #
-          #   unless child_class == ::ActiveRecord::SchemaMigration
-          #     if (chunks = child_class.name.split('::')).many?
-          #       child_class.store_full_sti_class = false
-          #       child_class.use_database(chunks.first.downcase)
-          #     end
-          #   end
-          # end
-
-          # Makes your model use different databases
-          # @param [String, Symbol] db_name
-          # @param [String] env
-          def use_database(db_name, env = nil)
-            env ||= Framework.app.env
-            env = env.to_s
-            db_name = db_name.to_s
-
-            # self.abstract_class = Framework.env != 'test'
-            # self.table_name = self.name.split('::').last.tableize if self.superclass == ::ActiveRecord::Base
-            establish_connection(Framework.app.database_config[db_name][env])
-          end
-        end
-      end
-    end
-  end
-end
-ActiveRecord::Base.send :include, Framework::Extensions::ActiveRecord::BaseExtension