rubypitaya 2.22.0 → 2.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7529399c736434f01aee685406c3d2763e6ecd167fcf0b783aac93a2aef7c0e4
-  data.tar.gz: 6eceae718f3027593dfd6d82a384b1c139a241e36decc0bc6d51553f59717567
+  metadata.gz: 3622a8779af46681d3a25d677021ef477a968e2a538d3dc7712c54a3bb5cd01d
+  data.tar.gz: d3357dc303db00fc1d29c208557547d60def38e432558a8286313dce4a9776df
 SHA512:
-  metadata.gz: 4f41f11c539540593b5da84a986c7baa2209a6108f2fb3ddeca6b6577509d96732704609dd13000b8c9e2573ac9acd3d2f58b55c1ffe8c45ccdbc1e507d9ff50
-  data.tar.gz: 3f1d834d5442848c9637491709ae0c7bff746e345e316afd13cec022d65a652591ea0a4ac01e42986132defd7feac209ebf934b782e4bf58274ffa21f670abb1
+  metadata.gz: 7f253dd21e9999acbe8ca3e6f64795f5c434a392cc7ad58749d5d0ac964fd1261e1440ef28a676489ce545bc406f39d5e1547242cee04575b666acfbe9dac4cb
+  data.tar.gz: 8ea11f029554fbb21abecb2f12dd69f6a40f6bff2dcb326e1bb28812be9261318bb650f8ff783b010fd68f5ac430de311263338d725b44e9715da914cc4ed2d6

data/lib/rubypitaya.rb

@@ -49,7 +49,14 @@ module RubyPitaya
       `git -C #{Path::PLUGINS_FOLDER_PATH} clone #{plugin_git_link}`
       FileUtils.rm_rf(plugin_git_path)
 
-      plugin_migrations_path = File.join(plugin_folder_path, 'db/migration/')
+      Dir.entries(plugin_folder_path).each do |entry|
+        entry_path = File.join(plugin_folder_path, entry)
+        FileUtils.rm_rf(entry_path) unless entry == 'app' ||
+                                           entry == '.' ||
+                                           entry == '..'
+      end
+
+      plugin_migrations_path = File.join(plugin_folder_path, 'app/migrations/')
       plugin_migrations_files = Dir[File.join(plugin_migrations_path, '*')]
       base_migration_timestamp = Time.now.utc.to_i
 

data/lib/rubypitaya/app-template/Gemfile

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gem 'rubypitaya', '2.22.0'
+gem 'rubypitaya', '2.23.0'
 
 group :development do
   gem 'pry', '0.14.0'

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

@@ -111,7 +111,7 @@ GEM
       rspec-support (~> 3.10.0)
     rspec-support (3.10.2)
     ruby2_keywords (0.0.5)
-    rubypitaya (2.22.0)
+    rubypitaya (2.23.0)
       activerecord (= 6.1.3)
       etcdv3 (= 0.10.2)
       mongo (= 2.15.0)
@@ -152,7 +152,7 @@ DEPENDENCIES
   listen (= 3.4.1)
   pry (= 0.14.0)
   rspec (= 3.10.0)
-  rubypitaya (= 2.22.0)
+  rubypitaya (= 2.23.0)
 
 BUNDLED WITH
    2.1.4

data/lib/rubypitaya/app-template/Makefile

@@ -49,7 +49,7 @@ update-dependencies:
 create-migration:
 	@docker-compose run --service-ports --rm rubypitaya-commands bundle exec rubypitaya create-migration $(NAME)
 
-## Add or update a plugim. GIT=[plugin-git-link]
+## Add or update a plugin. GIT=[plugin-http-git-link]
 add-plugin:
 	@docker-compose run --service-ports --rm rubypitaya-commands bundle exec rubypitaya add-plugin $(GIT)
 

data/lib/rubypitaya/app-template/app/app_initializer.rb

@@ -13,6 +13,9 @@ class AppInitializer < RubyPitaya::InitializerBase
   #        - get instance by key
   #  - redis
   #    - link: https://github.com/redis/redis-rb/
+  #  - mongo
+  #    - class: Mongo::Client
+  #    - link: https://docs.mongodb.com/ruby-driver/current/tutorials/quick-start/
   #  - config
   #    - class: RubyPitaya::Config
   #    - link: https://gitlab.com/LucianoPC/ruby-pitaya/-/blob/master/lib/rubypitaya/core/config.rb

data/lib/rubypitaya/app-template/app/handlers/player_handler.rb

@@ -11,6 +11,10 @@ class PlayerHandler < RubyPitaya::HandlerBase
   #  - @redis
   #    - link: https://github.com/redis/redis-rb/
   #
+  #  - @mongo
+  #    - class: Mongo::Client
+  #    - link: https://docs.mongodb.com/ruby-driver/current/tutorials/quick-start/
+  #
   #  - @config
   #    - info: Hash with config json files inside of 'app/config'
   #    - example:

data/lib/rubypitaya/app-template/app/setup/rubypitaya.yml

@@ -20,6 +20,12 @@ database:
   password: 'postgres'
   name: 'ruby_pitaya'
 
+mongo:
+  url: mongo:27017
+  user: 'user'
+  pass: 'password'
+  database: admin
+
 http:
   auth:
     user: 'user'

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

@@ -15,7 +15,7 @@ ActiveSupport::LogSubscriber.colorize_logging = true
 # Loading core files
 Gem.find_files('rubypitaya/**/*.rb').each do |path|
   require path unless path.end_with?('spec.rb') ||
-                      path.include?('db/migration') ||
+                      path.include?('app/migrations') ||
                       path.include?('core/templates') ||
                       path.include?('core/spec-helpers') ||
                       path.include?('app-template')
@@ -28,7 +28,7 @@ app_folder_paths.each do |app_folder_path|
 
   Dir[app_files_path].each do |path|
     require path unless path.end_with?('spec.rb') ||
-                        path.include?('db/migration') ||
+                        path.include?('app/migrations') ||
                         path.include?('spec_helper.rb')
   end
 end

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

@@ -26,6 +26,28 @@ services:
     ports:
       - '9100:5432'
 
+  mongo:
+    image: mongo:5.0.0
+    restart: always
+    ports:
+      - 27017:27017
+    environment:
+      MONGO_INITDB_ROOT_USERNAME: user
+      MONGO_INITDB_ROOT_PASSWORD: password
+
+  mongo-express:
+    depends_on:
+      - 'mongo'
+    image: mongo-express:0.54.0
+    restart: always
+    ports:
+      - 8081:8081
+    environment:
+      ME_CONFIG_MONGODB_ADMINUSERNAME: user
+      ME_CONFIG_MONGODB_ADMINPASSWORD: password
+      ME_CONFIG_MONGODB_SERVER: 'mongo'
+      ME_CONFIG_MONGODB_PORT: '27017'
+
   connector:
     image: 'registry.gitlab.com/lucianopc/pitaya-connector:0.1.0'
     depends_on:
@@ -49,6 +71,8 @@ services:
       - 'nats'
       - 'etcd'
       - 'redis'
+      - 'mongo'
+      - 'mongo-express'
       - 'connector'
     build:
       context: '.'

data/lib/rubypitaya/core/application_files_importer.rb

@@ -10,7 +10,9 @@ module RubyPitaya
       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 }
+        Gem.find_files(app_files_path).each do |path|
+          require path unless path.include?('app/migrations')
+        end
       end
     end
 

data/lib/rubypitaya/core/handler_base.rb

@@ -17,10 +17,11 @@ module RubyPitaya
       @postman = nil
     end
 
-    def set_attributes(bll, log, redis, setup, config, params, session, postman)
+    def set_attributes(bll, log, redis, mongo, setup, config, params, session, postman)
       @bll = bll
       @log = log
       @redis = redis
+      @mongo = mongo
       @setup = setup
       @config = config
       @params = params

data/lib/rubypitaya/core/handler_router.rb

@@ -54,8 +54,8 @@ module RubyPitaya
       @handler_name_map = @handler_name_map.to_h
     end
 
-    def call(handler_name, action_name, session, postman, redis, setup, config,
-             bll, log, params)
+    def call(handler_name, action_name, session, postman, redis, mongo, setup,
+             config, bll, log, params)
       unless @handler_name_map.include?(handler_name)
         return {
           code: StatusCodes::CODE_HANDLER_NOT_FOUND,
@@ -72,11 +72,11 @@ module RubyPitaya
       handler = @handler_name_map[handler_name]
 
       if !handler.class.authenticated_action_name?(action_name)
-        handler.set_attributes(bll, log, redis, setup, config, params, session, postman)
+        handler.set_attributes(bll, log, redis, mongo, setup, config, params, session, postman)
         handler.send(action_name)
       else
         if session.authenticated?
-          handler.set_attributes(bll, log, redis, setup, config, params, session, postman)
+          handler.set_attributes(bll, log, redis, mongo, setup, config, params, session, postman)
           handler.send(action_name)
         else
           return {

data/lib/rubypitaya/core/helpers/setup_helper.rb

@@ -18,7 +18,7 @@ ActiveRecord::Migration.maintain_test_schema!
 # Loading core files
 Gem.find_files('rubypitaya/**/*.rb').each do |path|
   require path unless path.end_with?('spec.rb') ||
-                      path.include?('db/migration') ||
+                      path.include?('app/migrations') ||
                       path.include?('core/templates') ||
                       path.include?('core/spec-helpers') ||
                       path.include?('app-template')
@@ -31,6 +31,6 @@ app_folder_paths.each do |app_folder_path|
 
   Dir[app_files_path].each do |path|
     require path unless path.end_with?('spec.rb') ||
-                        path.include?('db/migration')
+                        path.include?('app/migrations')
   end
 end

data/lib/rubypitaya/core/http_routes.rb

@@ -20,6 +20,7 @@ module RubyPitaya
       content_type :json
 
       @bll = settings.bll
+      @mongo = settings.mongo
       @setup = settings.setup
       @config = settings.config
 

data/lib/rubypitaya/core/initializer_content.rb

@@ -2,11 +2,12 @@ module RubyPitaya
 
   class InitializerContent
 
-    attr_reader :bll, :log, :redis, :setup, :config
+    attr_reader :bll, :log, :redis, :mongo, :setup, :config
 
-    def initialize(bll, log, redis, setup, config)
+    def initialize(bll, log, redis, mongo, setup, config)
       @bll = bll
       @log = log
+      @mongo = mongo
       @redis = redis
       @setup = setup
       @config = config

data/lib/rubypitaya/core/main.rb

@@ -16,8 +16,9 @@ require 'rubypitaya/core/handler_router'
 require 'rubypitaya/core/etcd_connector'
 require 'rubypitaya/core/nats_connector'
 require 'rubypitaya/core/database_config'
-require 'rubypitaya/core/redis_connector'
 require 'rubypitaya/core/instance_holder'
+require 'rubypitaya/core/mongo_connector'
+require 'rubypitaya/core/redis_connector'
 require 'rubypitaya/core/database_connector'
 require 'rubypitaya/core/initializer_content'
 require 'rubypitaya/core/initializer_broadcast'
@@ -71,6 +72,14 @@ module RubyPitaya
       @database_connector = DatabaseConnector.new(@database_config)
       @database_connector.connect
 
+      @mongo_address = @setup['rubypitaya.mongo.url']
+      @mongo_user = @setup['rubypitaya.mongo.user']
+      @mongo_password = @setup['rubypitaya.mongo.pass']
+      @mongo_database_name = @setup['rubypitaya.mongo.database']
+      @mongo_connector = MongoConnector.new(@mongo_address, @mongo_user,
+                                            @mongo_password, @mongo_database_name)
+      @mongo_connector.connect
+
       @session = Session.new
       @postman = Postman.new(@nats_connector)
       @config = Config.new
@@ -81,6 +90,7 @@ module RubyPitaya
       @initializer_content = InitializerContent.new(@bll,
                                                     @log,
                                                     @redis_connector.redis,
+                                                    @mongo_connector.mongo,
                                                     @setup,
                                                     @config)
       @initializer_broadcast = InitializerBroadcast.new
@@ -97,6 +107,8 @@ module RubyPitaya
     def run_http
       HttpRoutes.set :bll, @bll
       HttpRoutes.set :log, @log
+      HttpRoutes.set :redis, @redis_connector.redis
+      HttpRoutes.set :mongo, @mongo_connector.mongo
       HttpRoutes.set :setup, @setup
       HttpRoutes.set :config, @config
       HttpRoutes.set :views, [Path::HTTP_VIEWS_PATH] + Path::Plugins::HTTP_VIEWS_PATHS
@@ -172,7 +184,8 @@ module RubyPitaya
 
         response = @handler_router.call(handler_name, action_name, @session,
                                         @postman, @redis_connector.redis,
-                                        @setup, @config, @bll, @log, params)
+                                        @mongo_connector.mongo, @setup, @config,
+                                        @bll, @log, params)
 
         delta_time_seconds = ((Time.now.to_f - start_time_seconds) * 1000).round(2)
 

data/lib/rubypitaya/core/mongo_connector.rb

@@ -0,0 +1,25 @@
+require 'mongo'
+
+module RubyPitaya
+
+  class MongoConnector
+
+    def initialize(mongo_address, mongo_user, mongo_password, mongo_database_name)
+      @mongo_address = mongo_address
+      @mongo_user = mongo_user
+      @mongo_password = mongo_password
+      @mongo_database_name = mongo_database_name
+    end
+
+    def connect
+      @mongo_client = Mongo::Client.new([@mongo_address],
+                                        user: @mongo_user,
+                                        password: @mongo_password,
+                                        database: @mongo_database_name)
+    end
+
+    def mongo
+      @mongo_client
+    end
+  end
+end

data/lib/rubypitaya/core/path.rb

@@ -8,7 +8,7 @@ module RubyPitaya
     HANDLERS_FOLDER_PATH = File.join(Dir.pwd, 'app/handlers/')
     APP_CONFIG_FOLDER_PATH = File.join(Dir.pwd, 'app/config/')
     APP_SETUP_FOLDER_PATH = File.join(Dir.pwd, 'app/setup/')
-    MIGRATIONS_FOLDER_PATH = File.join(Dir.pwd, 'db/migration/')
+    MIGRATIONS_FOLDER_PATH = File.join(Dir.pwd, 'app/migrations/')
     PLUGINS_FOLDER_PATH = File.join(Dir.pwd, 'plugins/')
 
     ROUTES_FILE_PATH = File.join(Dir.pwd, 'config/routes.rb')
@@ -18,7 +18,7 @@ module RubyPitaya
 
     class Core
       APP_FOLDER_PATH = File.join(__dir__, 'app/')
-      MIGRATIONS_FOLDER_PATH = File.join(__dir__, 'db/migration/')
+      MIGRATIONS_FOLDER_PATH = File.join(__dir__, 'app/migrations/')
     end
 
     class Plugins
@@ -26,7 +26,7 @@ module RubyPitaya
       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/'))
       APP_SETUP_FOLDER_PATHS = Dir.glob(File.join(Dir.pwd, 'plugins/*/app/setup/'))
-      MIGRATIONS_FOLDER_PATHS = Dir.glob(File.join(Dir.pwd, 'plugins/*/db/migration'))
+      MIGRATIONS_FOLDER_PATHS = Dir.glob(File.join(Dir.pwd, 'plugins/*/app/migrations/'))
       HTTP_VIEWS_PATHS = Dir.glob(File.join(Dir.pwd, 'plugins/*/app/http/views'))
     end
   end

data/lib/rubypitaya/core/spec-helpers/handler_spec_helper.rb

@@ -22,6 +22,7 @@ module RubyPitaya
       @@response = {}
 
       initialize_redis
+      initialize_mongo
 
       @@handler_router ||= HandlerRouter.new()
 
@@ -29,6 +30,7 @@ module RubyPitaya
       @@initializer_content = InitializerContent.new(@@bll,
                                                      @@log,
                                                      @@redis_connector.redis,
+                                                     @@mongo_connector.mongo,
                                                      @@setup,
                                                      @@config)
       @@initializer_broadcast = InitializerBroadcast.new
@@ -40,7 +42,8 @@ module RubyPitaya
 
       @@response = @@handler_router.call(handler_name, action_name, @@session,
                                          @@postman, @@redis_connector.redis,
-                                         @@setup, @@config, @@bll, @@log, params)
+                                         @@mongo_connector.mongo, @@setup,
+                                         @@config, @@bll, @@log, params)
     end
 
     def response
@@ -105,5 +108,22 @@ module RubyPitaya
 
       @@redis_connector.redis.flushall
     end
+
+    def initialize_mongo
+      @@mongo_connector ||= nil
+
+      if @@mongo_connector.nil?
+        @@core_setup ||= Setup.new
+        mongo_address = @@core_setup['rubypitaya.mongo.url']
+        mongo_user = @@core_setup['rubypitaya.mongo.user']
+        mongo_password = @@core_setup['rubypitaya.mongo.pass']
+        mongo_database_name = @@core_setup['rubypitaya.mongo.database']
+        @@mongo_connector = MongoConnector.new(mongo_address, mongo_user,
+                                              mongo_password, mongo_database_name)
+        @@mongo_connector.connect
+      end
+
+      @@mongo_connector.mongo.collections.map(&:drop)
+    end
   end
 end

data/lib/rubypitaya/version.rb

@@ -1,3 +1,3 @@
 module RubyPitaya
-  VERSION = '2.22.0'
+  VERSION = '2.23.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubypitaya
 version: !ruby/object:Gem::Version
-  version: 2.22.0
+  version: 2.23.0
 platform: ruby
 authors:
 - Luciano Prestes Cavalcanti
@@ -258,12 +258,12 @@ files:
 - "./lib/rubypitaya/app-template/app/handlers/player_handler.rb"
 - "./lib/rubypitaya/app-template/app/http/hello_world_http.rb"
 - "./lib/rubypitaya/app-template/app/http/views/hello_world.erb"
+- "./lib/rubypitaya/app-template/app/migrations/1606736477_create_player_migration.rb"
 - "./lib/rubypitaya/app-template/app/models/player.rb"
 - "./lib/rubypitaya/app-template/app/models/user.rb"
 - "./lib/rubypitaya/app-template/app/setup/rubypitaya.yml"
 - "./lib/rubypitaya/app-template/bin/console"
 - "./lib/rubypitaya/app-template/config/routes.rb"
-- "./lib/rubypitaya/app-template/db/migration/1606736477_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"
@@ -316,13 +316,13 @@ files:
 - "./lib/rubypitaya/app-template/spec/hello_world_handler_spec.rb"
 - "./lib/rubypitaya/app-template/spec/player_handler_spec.rb"
 - "./lib/rubypitaya/app-template/spec/spec_helper.rb"
+- "./lib/rubypitaya/core/app/migrations/0000000001_create_user_migration.rb"
 - "./lib/rubypitaya/core/app/models/user.rb"
 - "./lib/rubypitaya/core/application_files_importer.rb"
 - "./lib/rubypitaya/core/config.rb"
 - "./lib/rubypitaya/core/config_core.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"
@@ -333,6 +333,7 @@ files:
 - "./lib/rubypitaya/core/initializer_content.rb"
 - "./lib/rubypitaya/core/instance_holder.rb"
 - "./lib/rubypitaya/core/main.rb"
+- "./lib/rubypitaya/core/mongo_connector.rb"
 - "./lib/rubypitaya/core/nats_connector.rb"
 - "./lib/rubypitaya/core/parameters.rb"
 - "./lib/rubypitaya/core/path.rb"