rubypitaya 1.8.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25a391f0036f4e8d9d60c427347d04209b84641a40059920090f2b686e5f11a5
-  data.tar.gz: 5dde38895cdbb78395d6dcd0fd9da14bdbed2157c6034ab2c110e732d6214a8e
+  metadata.gz: daa040aaa44dd5fda0dd5e44f8f74f29c6f774c9233735147243fc261d98f59e
+  data.tar.gz: 00f7d1a43a2d098356b090339fcf8db82f2a01520c674fb4df7e69c904deccc5
 SHA512:
-  metadata.gz: 8dce4ee9cb61f16efa395ced25a7bd40727e4136921c44c0a1694242be1eb47030ab1b8845f32079836a621000cc9847d2918b1d673a6b9e5c0a49047ac633de
-  data.tar.gz: 7fc2a58cc9e0dc34e76b3fa08f8337604cf32eaef3a7e93e684d3d5b5a6f1fc1ae68e669a019befeef05e42ead5c65bb378c7438902b9a3f0105f06dfc12325b
+  metadata.gz: b2ca865cc8ccdd2450d1d117baccea88f3acda3ca50615d7d75086e3489aee3e6cbe0a79cf279ef1be90062d59de4bf26f915cba91afc8992a4261379cc4b629
+  data.tar.gz: 17c1fe0d67e03065e12f0c6c2bc0f668314614a8eafd82e52fede90131e23da0b9fd0f8aa502a66c6fdc7a08c8e58db81c9cfef8a2d2ff9cee13468265c29010

data/lib/rubypitaya/app-template/Gemfile

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gem 'rubypitaya', '1.8.0'
+gem 'rubypitaya', '2.2.0'
 
 group :development do
   gem 'pry', '0.12.2'

data/lib/rubypitaya/app-template/Gemfile.lock

@@ -62,7 +62,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
     rspec-support (3.8.3)
-    rubypitaya (1.8.0)
+    rubypitaya (2.2.0)
       activerecord (= 6.0.2)
       etcdv3 (= 0.10.2)
       eventmachine (= 1.2.7)
@@ -85,7 +85,7 @@ DEPENDENCIES
   pry (= 0.12.2)
   rake (= 10.0)
   rspec (= 3.8.0)
-  rubypitaya (= 1.8.0)
+  rubypitaya (= 2.2.0)
 
 BUNDLED WITH
    1.17.2

data/lib/rubypitaya/app-template/Makefile

@@ -30,6 +30,10 @@ db-create:
 db-migrate:
 	@docker-compose run --service-ports --rm rubypitaya bundle exec rake db:migrate
 
+## Rollback migrations STEP=1
+db-rollback:
+	@docker-compose run --service-ports --rm -e STEP="$(STEP)" rubypitaya bundle exec rake db:rollback
+
 ## Drop database
 db-drop:
 	@docker-compose run --service-ports --rm rubypitaya bundle exec rake db:drop

data/lib/rubypitaya/app-template/Rakefile

@@ -24,15 +24,39 @@ namespace :db do
     environment_name = ENV.fetch("RUBYPITAYA_ENV") { 'development' }
     database_config = RubyPitaya::DatabaseConfig.new(environment_name, RubyPitaya::Path::DATABASE_CONFIG_PATH)
     connection_data = database_config.connection_data
-    migrations_path = RubyPitaya::Path::MIGRATIONS_FOLDER_PATH
+    migrations_paths = [RubyPitaya::Path::Core::MIGRATIONS_FOLDER_PATH]
+    migrations_paths += RubyPitaya::Path::Plugins::MIGRATIONS_FOLDER_PATHS
+    migrations_paths += [RubyPitaya::Path::MIGRATIONS_FOLDER_PATH]
 
     ActiveRecord::Base.establish_connection(connection_data)
-    ActiveRecord::Migrator.migrations_paths = [migrations_path]
+    ActiveRecord::Migrator.migrations_paths = migrations_paths
     ActiveRecord::Tasks::DatabaseTasks.migrate
     ActiveRecord::Base.connection.close
     puts 'Database migrated.'
   end
 
+  desc 'Rollback migrations'
+  task :rollback do
+    environment_name = ENV.fetch("RUBYPITAYA_ENV") { 'development' }
+    database_config = RubyPitaya::DatabaseConfig.new(environment_name, RubyPitaya::Path::DATABASE_CONFIG_PATH)
+    connection_data = database_config.connection_data
+
+    step = ENV["STEP"] ? ENV["STEP"].to_i : 1
+
+    if step == 0
+      puts ''
+      puts 'Error: No rollback to STEP=0'
+      puts ''
+      return
+    end
+
+    ActiveRecord::Base.establish_connection(connection_data)
+    ActiveRecord::Base.connection.migration_context.rollback(step)
+    ActiveRecord::Base.connection.close
+
+    puts 'Rollback done.'
+  end
+
   desc 'Drop the database'
   task :drop do
     environment_name = ENV.fetch("RUBYPITAYA_ENV") { 'development' }

data/lib/rubypitaya/app-template/app/models/user.rb

@@ -1,4 +1,3 @@
-require 'active_record'
-
-class User < ActiveRecord::Base
-end
+User.class_eval do
+  # has_one :player
+end

data/lib/rubypitaya/app-template/bin/console

@@ -14,14 +14,14 @@ ActiveSupport::LogSubscriber.colorize_logging = true
 
 Gem.find_files('rubypitaya/**/*.rb').each do |path|
   require path unless path.end_with?('spec.rb') ||
-                      path.include?('db/migrate') ||
+                      path.include?('db/migration') ||
                       path.include?('app-template')
 end
 
 app_files_path = File.join(RubyPitaya::Path::APP_FOLDER_PATH, '**/*.rb')
 Dir[app_files_path].each do |path|
   require path unless path.end_with?('spec.rb') ||
-                      path.include?('db/migrate')
+                      path.include?('db/migration')
 end
 
 require 'irb'

data/lib/rubypitaya/app-template/docker-compose.yml

@@ -34,7 +34,7 @@ services:
       - 'etcd'
       - 'redis'
     ports:
-      - '3252:3250'
+      - '3250:3250'
     environment:
       PITAYA_CLUSTER_RPC_SERVER_NATS_CONNECT: 'nats://nats:4222'
       PITAYA_CLUSTER_RPC_CLIENT_NATS_CONNECT: 'nats://nats:4222'

data/lib/rubypitaya/core/app/models/user.rb

@@ -0,0 +1,4 @@
+require 'active_record'
+
+class User < ActiveRecord::Base
+end

data/lib/rubypitaya/core/application_files_importer.rb

@@ -5,20 +5,26 @@ module RubyPitaya
   class ApplicationFilesImporter
 
     def import
-      app_files_path = "#{Path::APP_FOLDER_PATH}/**/*.rb"
+      @app_folder_paths = [Path::Core::APP_FOLDER_PATH, Path::APP_FOLDER_PATH] + Path::Plugins::APP_FOLDER_PATHS
 
-      Gem.find_files(app_files_path).each { |path| require path }
+      @app_folder_paths.each do |app_folder_path|
+        app_files_path = "#{app_folder_path}/**/*.rb"
+
+        Gem.find_files(app_files_path).each { |path| require path }
+      end
     end
 
     def auto_reload
       require 'listen'
 
-      @app_files_listener = Listen.to(Path::APP_FOLDER_PATH, only: /\.rb$/) do |modified, added, removed|
-        import_added_files(added)
-        reload_modified_files(modified)
-      end
+      @app_folder_paths.each do |app_folder_path|
+        @app_files_listener = Listen.to(app_folder_path, only: /\.rb$/) do |modified, added, removed|
+          import_added_files(added)
+          reload_modified_files(modified)
+        end
 
-      @app_files_listener.start
+        @app_files_listener.start
+      end
     end
 
     private

data/lib/rubypitaya/core/config.rb

@@ -2,16 +2,17 @@ module RubyPitaya
 
   class Config
 
-    def initialize(configs_folder_path)
-      @configs_folder_path = configs_folder_path
-
-      path_to_all_files = File.join(@configs_folder_path, '**/*.json')
-      config_files = Dir.glob(path_to_all_files)
-
+    def initialize()
       @config = {}
+      @configs_folder_paths = [Path::APP_CONFIG_FOLDER_PATH] + Path::Plugins::APP_CONFIG_FOLDER_PATHS
 
-      config_files.each do |config_file|
-        load_config_file(config_file)
+      @configs_folder_paths.each do |configs_folder_path|
+        path_to_all_files = File.join(configs_folder_path, '**/*.json')
+        config_files = Dir.glob(path_to_all_files)
+
+        config_files.each do |config_file|
+          load_config_file(configs_folder_path, config_file)
+        end
       end
     end
 
@@ -20,27 +21,30 @@ module RubyPitaya
     end
 
     def [](key)
-      @config[key]
+      split_key = key.split('/')
+      @config.dig(*split_key)
     end
 
     def auto_reload
       require 'listen'
 
-      @config_files_listener = Listen.to(@configs_folder_path, only: /\.json$/) do |modified, added, removed|
-        import_added_files(added)
-        reload_modified_files(modified)
-      end
+      @configs_folder_paths.each do |configs_folder_path|
+        config_files_listener = Listen.to(configs_folder_path, only: /\.json$/) do |modified, added, removed|
+          import_added_files(configs_folder_path, added)
+          reload_modified_files(configs_folder_path, modified)
+        end
 
-      @config_files_listener.start
+        config_files_listener.start
+      end
     end
 
     private
 
-    def load_config_file(file_path)
+    def load_config_file(configs_folder_path, file_path)
       config_text = File.open(file_path, &:read)
       config_hash = JSON.parse(config_text)
 
-      path_array = file_path.sub(/^#{@configs_folder_path}/, '')[0..-6]
+      path_array = file_path.sub(/^#{configs_folder_path}/, '')[0..-6]
                               .split('/')
 
       set_config_value(path_array, config_hash)
@@ -50,17 +54,17 @@ module RubyPitaya
         puts error.backtrace
     end
 
-    def import_added_files(files_path)
+    def import_added_files(configs_folder_path, files_path)
       files_path.each do |path|
-        load_config_file(path)
+        load_config_file(configs_folder_path, path)
 
         puts "ADDED config: #{path}"
       end
     end
 
-    def reload_modified_files(files_path)
+    def reload_modified_files(configs_folder_path, files_path)
       files_path.each do |path|
-        load_config_file(path)
+        load_config_file(configs_folder_path, path)
 
         puts "MODIFIED @config: #{path}"
       end
@@ -75,7 +79,7 @@ module RubyPitaya
         if is_last_index
           config[key] = value
         else
-          config[key] = {}
+          config[key] = {} unless config.key?(key)
           config = config[key]
         end
       end

data/lib/rubypitaya/core/handler_router.rb

@@ -4,9 +4,15 @@ module RubyPitaya
 
   class HandlerRouter
 
-    def initialize(handler_folder_path, routes_path)
+    def initialize()
+      routes_path = Path::ROUTES_FILE_PATH
+      handler_folder_paths = [Path::HANDLERS_FOLDER_PATH] + Path::Plugins::HANDLERS_FOLDER_PATHS
+
       import_routes_file(routes_path)
-      import_handler_files(handler_folder_path)
+
+      handler_folder_paths.each do |handler_folder_path|
+        import_handler_files(handler_folder_path)
+      end
 
       import_routes_class
       import_handler_classes

data/lib/rubypitaya/core/main.rb

@@ -62,7 +62,7 @@ module RubyPitaya
 
       @session = Session.new
       @postman = Postman.new(@nats_connector)
-      @config = Config.new(Path::APP_CONFIG_FOLDER_PATH)
+      @config = Config.new()
       @config.auto_reload if @is_development_environment
 
       @bll = InstanceHolder.new
@@ -71,8 +71,7 @@ module RubyPitaya
       @initializer_broadcast = InitializerBroadcast.new
       @initializer_broadcast.run(@initializer_content)
 
-      @handler_router = HandlerRouter.new(Path::HANDLERS_FOLDER_PATH,
-                                          Path::ROUTES_FILE_PATH)
+      @handler_router = HandlerRouter.new()
 
       run_server
     end

data/lib/rubypitaya/core/path.rb

@@ -8,8 +8,20 @@ module RubyPitaya
     APP_FOLDER_PATH = File.join(Dir.pwd, 'app/')
     HANDLERS_FOLDER_PATH = File.join(Dir.pwd, 'app/handlers/')
     APP_CONFIG_FOLDER_PATH = File.join(Dir.pwd, 'app/config/')
-    MIGRATIONS_FOLDER_PATH = File.join(Dir.pwd, 'db/migrate/')
+    MIGRATIONS_FOLDER_PATH = File.join(Dir.pwd, 'db/migration/')
 
     ROUTES_FILE_PATH = File.join(Dir.pwd, 'config/routes.rb')
+
+    class Core
+      APP_FOLDER_PATH = File.join(__dir__, 'app/')
+      MIGRATIONS_FOLDER_PATH = File.join(__dir__, 'db/migration/')
+    end
+
+    class Plugins
+      APP_FOLDER_PATHS = Dir.glob(File.join(Dir.pwd, 'plugins/*/app/'))
+      HANDLERS_FOLDER_PATHS = Dir.glob(File.join(Dir.pwd, 'plugins/*/app/handlers'))
+      APP_CONFIG_FOLDER_PATHS = Dir.glob(File.join(Dir.pwd, 'plugins/*/app/config/'))
+      MIGRATIONS_FOLDER_PATHS = Dir.glob(File.join(Dir.pwd, 'plugins/*/db/migration'))
+    end
   end
 end

data/lib/rubypitaya/version.rb

@@ -1,3 +1,3 @@
 module RubyPitaya
-  VERSION = "1.8.0"
+  VERSION = '2.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubypitaya
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Luciano Prestes Cavalcanti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-29 00:00:00.000000000 Z
+date: 2020-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -204,8 +204,7 @@ files:
 - "./lib/rubypitaya/app-template/bin/console"
 - "./lib/rubypitaya/app-template/config/database.yml"
 - "./lib/rubypitaya/app-template/config/routes.rb"
-- "./lib/rubypitaya/app-template/db/migrate/001_create_user_migration.rb"
-- "./lib/rubypitaya/app-template/db/migrate/002_create_player_migration.rb"
+- "./lib/rubypitaya/app-template/db/migration/0000000002_create_player_migration.rb"
 - "./lib/rubypitaya/app-template/docker-compose.yml"
 - "./lib/rubypitaya/app-template/docker/dev/Dockerfile"
 - "./lib/rubypitaya/app-template/docker/entrypoint.sh"
@@ -225,10 +224,12 @@ files:
 - "./lib/rubypitaya/app-template/kubernetes/statefulset-nats.yaml"
 - "./lib/rubypitaya/app-template/kubernetes/statefulset-postgres.yaml"
 - "./lib/rubypitaya/app-template/kubernetes/statefulset-redis.yaml"
+- "./lib/rubypitaya/core/app/models/user.rb"
 - "./lib/rubypitaya/core/application_files_importer.rb"
 - "./lib/rubypitaya/core/config.rb"
 - "./lib/rubypitaya/core/database_config.rb"
 - "./lib/rubypitaya/core/database_connector.rb"
+- "./lib/rubypitaya/core/db/migration/0000000001_create_user_migration.rb"
 - "./lib/rubypitaya/core/etcd_connector.rb"
 - "./lib/rubypitaya/core/handler_base.rb"
 - "./lib/rubypitaya/core/handler_router.rb"