rubypitaya 2.9.3 → 2.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea061a423e6810b67f1a1256c58ca9f37b1f0494abe0808f999a3b1b4db2a955
-  data.tar.gz: ca8eb926d63d2331911e835c9d06e167092dea7be8f5e7433530ae50a9bea674
+  metadata.gz: f715584daee7e41961573298815c7491f05318788e930e8b0de6f414b7a587f0
+  data.tar.gz: 4f58032331e851a38f9eae43a15567a1442dd5833c3b6d4bea5ea2103f2d98f5
 SHA512:
-  metadata.gz: 72ca0233433069c86b70fb0235bb7dcd47441cac23bf994019456f16a130b60e0f6801ed4d1fe1c3bfa12cce4c6f3bab7821fe49fd4167bef2f6a11a5bc62f8c
-  data.tar.gz: 77a113fb20486be58a6403c421553955dd8e451f76d2ae4ab788f4ffeefb04d10a99f9e7f72a9d3a5eb00e484076d226008afa5365068c4a9a87e80f279efd7d
+  metadata.gz: 2961139116024ceb46fbedb687b62c3f6a74ea4c665516e17df9e3eac4777a4b32318d0e5e187a60f4505cdd70493222a5489b570ea7d2ea6aaec76ae60bc1f1
+  data.tar.gz: e428979eadc827613e1fc47e1948451d4e0af1b5c18c1eb325c5f241cf6b7ff29da013646303e73f94e7c2fd8f0a7098be8a8dec1c39667708d180eabf526508

data/lib/rubypitaya/app-template/Gemfile

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

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

@@ -70,7 +70,7 @@ GEM
       rspec-support (~> 3.8.0)
     rspec-support (3.8.3)
     ruby2_keywords (0.0.2)
-    rubypitaya (2.9.3)
+    rubypitaya (2.10.0)
       activerecord (= 6.0.2)
       etcdv3 (= 0.10.2)
       eventmachine (= 1.2.7)
@@ -108,7 +108,7 @@ DEPENDENCIES
   listen (= 3.2.1)
   pry (= 0.12.2)
   rspec (= 3.8.0)
-  rubypitaya (= 2.9.3)
+  rubypitaya (= 2.10.0)
 
 BUNDLED WITH
    1.17.2

data/lib/rubypitaya/app-template/Makefile

@@ -71,6 +71,10 @@ db-drop:
 db-reset:
 	@docker-compose run --service-ports --rm rubypitaya bundle exec rake db:reset
 
+## Setup test database
+db-test-setup:
+	@docker-compose run --service-ports --rm rubypitaya bundle exec rake db:test:setup
+
 ## + Deployment commands
 
 ## Build image to production environment

data/lib/rubypitaya/app-template/Rakefile

@@ -16,7 +16,7 @@ namespace :db do
     ActiveRecord::Base.connection.create_database(database_config.database_name)
     ActiveRecord::Base.connection.close
 
-    puts 'Database created.'
+    puts "Database #{database_config.database_name} created."
   end
 
   desc 'Migrate the database'
@@ -32,7 +32,8 @@ namespace :db do
     ActiveRecord::Migrator.migrations_paths = migrations_paths
     ActiveRecord::Tasks::DatabaseTasks.migrate
     ActiveRecord::Base.connection.close
-    puts 'Database migrated.'
+
+    puts "Database #{database_config.database_name} migrated."
   end
 
   desc 'Rollback migrations'
@@ -72,7 +73,7 @@ namespace :db do
     ActiveRecord::Base.connection.drop_database(database_config.database_name)
     ActiveRecord::Base.connection.close
 
-    puts 'Database deleted.'
+    puts "Database #{database_config.database_name} deleted."
   end
 
   desc 'migration status'
@@ -90,8 +91,6 @@ namespace :db do
       puts "#{status.center(8)}  #{version.ljust(14)}  #{name}"
     end
     ActiveRecord::Base.connection.close
-
-    puts 'Rollback done.'
   end
 
   desc 'Reset the database'
@@ -102,4 +101,17 @@ namespace :db do
 
     puts 'Database reset finish.'
   end
+
+  namespace :test do
+    desc 'Setup test database'
+    task :setup do
+      ENV['RUBYPITAYA_ENV'] = 'test'
+
+      Rake::Task['db:drop'].invoke
+      Rake::Task['db:create'].invoke
+      Rake::Task['db:migrate'].invoke
+
+      puts 'Database reset finish.'
+    end
+  end
 end

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

@@ -18,6 +18,7 @@ Gem.find_files('rubypitaya/**/*.rb').each do |path|
   require path unless path.end_with?('spec.rb') ||
                       path.include?('db/migration') ||
                       path.include?('core/templates') ||
+                      path.include?('core/spec-helpers') ||
                       path.include?('app-template')
 end
 

data/lib/rubypitaya/app-template/spec/hello_world_handler_spec.rb

@@ -0,0 +1,19 @@
+require 'rubypitaya/core/spec-helpers/rubypitaya_spec_helper'
+
+module MyApp
+
+  RSpec.describe 'HelloWorldHandler', type: :request do
+    context 'sayHello' do
+      it 'success' do
+        request("rubypitaya.helloWorldHandler.sayHello")
+
+        expected_response = {
+          code: 'RP-200',
+          data: { message: 'Hello!' } 
+        }
+
+        expect(response).to eq(expected_response)
+      end
+    end
+  end
+end

data/lib/rubypitaya/app-template/spec/player_handler_spec.rb

@@ -0,0 +1,50 @@
+require 'rubypitaya/core/spec-helpers/rubypitaya_spec_helper'
+
+module MyApp
+
+  RSpec.describe 'PlayerHandler', type: :request do
+    context 'authenticate' do
+      it 'create_new_user' do
+        setup = {'initial_player.wallet.gold' => 10}
+        config = {'initial_player' => {'name' => 'Guest'}}
+
+        set_setup(setup)
+        set_config(config)
+
+        params = {}
+        request("rubypitaya.playerHandler.authenticate", params)
+
+        player = ::MyApp::Player.last
+
+        expect(response[:code]).to eq('RP-200')
+        expect(response[:data][:name]).to eq('Guest')
+        expect(response[:data][:gold]).to eq(10)
+
+        expect(::User.count).to eq(1)
+        expect(::MyApp::Player.count).to eq(1)
+        expect(player.name).to eq('Guest')
+        expect(player.gold).to eq(10)
+      end
+    end
+
+    context 'getInfo' do
+      it 'success' do
+        player = ::MyApp::Player.create(name: 'Someone', gold: 12, user: User.new)
+
+        authenticate(player.user_id)
+
+        request("rubypitaya.playerHandler.getInfo")
+
+        expect(response[:code]).to eq('RP-200')
+        expect(response[:data]).to eq(player.to_hash)
+      end
+
+      it 'error_not_authenticated' do
+        request("rubypitaya.playerHandler.getInfo")
+
+        expect(response[:code]).to eq(RubyPitaya::StatusCodes::CODE_NOT_AUTHENTICATED)
+        expect(response[:msg]).to eq('Not authenticated')
+      end
+    end
+  end
+end

data/lib/rubypitaya/core/setup.rb

@@ -24,11 +24,6 @@ module RubyPitaya
       @config.dig(*split_key)
     end
 
-    def get_config_from_env_var(key)
-      env_key = key.gsub('.', '_').upcase
-      ENV.fetch(env_key) { nil }
-    end
-
     def auto_reload
       require 'listen'
 
@@ -48,6 +43,11 @@ module RubyPitaya
 
     private
 
+    def get_config_from_env_var(key)
+      env_key = key.gsub('.', '_').upcase
+      ENV.fetch(env_key) { nil }
+    end
+
     def load_config_file(configs_folder_path, file_path)
       config_text = File.open(file_path, &:read)
       config_hash = YAML.load(ERB.new(config_text).result)

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

@@ -0,0 +1,24 @@
+module RubyPitaya
+
+  class ConfigSpecHelper
+
+    def initialize
+      @config_mock = {}
+    end
+
+    def [](key)
+      @config_mock[key]
+    end
+
+    def auto_reload
+    end
+
+    def config_mock=(value)
+      @config_mock = value
+    end
+
+    def config_core_override=(value)
+      config_mock = value
+    end
+  end
+end

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

@@ -0,0 +1,79 @@
+require 'rubypitaya/core/handler_router'
+require 'rubypitaya/core/redis_connector'
+require 'rubypitaya/core/spec-helpers/setup_spec_helper'
+require 'rubypitaya/core/spec-helpers/config_spec_helper'
+require 'rubypitaya/core/spec-helpers/postman_spec_helper'
+
+module RubyPitaya
+
+  module HandlerSpecHelper
+
+    def initialize(context)
+      @@context = context
+
+      @@bll = InstanceHolder.new
+      @@log = Logger.new('/dev/null')
+      @@setup = SetupSpecHelper.new
+      @@config = ConfigSpecHelper.new
+      @@session = Session.new
+      @@postman = PostmanSpecHelper.new
+
+      @@response = {}
+
+      initialize_redis
+
+      @@handler_router ||= HandlerRouter.new()
+
+
+      @@initializer_content = InitializerContent.new(@@bll,
+                                                     @@log,
+                                                     @@redis_connector.redis,
+                                                     @@setup,
+                                                     @@config)
+      @@initializer_broadcast = InitializerBroadcast.new
+      @@initializer_broadcast.run(@@initializer_content)
+    end
+
+    def request(route, params = {})
+      handler_name, action_name = route.split('.')[1..-1]
+
+      @@response = @@handler_router.call(handler_name, action_name, @@session,
+                                         @@postman, @@redis_connector.redis,
+                                         @@setup, @@config, @@bll, @@log, params)
+    end
+
+    def response
+      @@response
+    end
+
+    def authenticate(user_id)
+      @@session.uid = user_id
+    end
+
+    def set_config(config)
+      @@config.config_mock = config
+    end
+
+    def set_setup(setup)
+      @@setup.setup_mock = setup
+    end
+
+    def set_postman(postman)
+      @@postman.postman_mock = postman
+    end
+
+    private
+
+    def initialize_redis
+      @@redis_connector ||= nil
+
+      if @@redis_connector.nil?
+        redis_address = ENV['REDIS_URL']
+        @@redis_connector = RedisConnector.new(redis_address)
+        @@redis_connector.connect
+      end
+
+      @@redis_connector.redis.flushall
+    end
+  end
+end

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

@@ -0,0 +1,21 @@
+module RubyPitaya
+
+  class PostmanSpecHelper
+
+    def initialize
+      @postman_mock = nil
+    end
+
+    def bind_session(session)
+      response = @postman_mock&.bind_session(session)
+      response ||= {}
+      response
+    end
+
+    def push_to_user(uid, message_route, payload)
+      response = @postman_mock&.push_to_user(uid, message_route, payload)
+      response ||= {}
+      response
+    end
+  end
+end

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

@@ -0,0 +1,49 @@
+require 'rspec'
+require 'active_record'
+
+require 'rubypitaya/core/database_config'
+require 'rubypitaya/core/spec-helpers/handler_spec_helper'
+
+ENV['RUBYPITAYA_ENV'] = 'test'
+
+# Database connection
+environment_name = ENV.fetch("RUBYPITAYA_ENV") { 'development' }
+database_config = RubyPitaya::DatabaseConfig.new(environment_name, RubyPitaya::Path::DATABASE_CONFIG_PATH)
+ActiveRecord::Base.establish_connection(database_config.connection_data)
+# ActiveRecord::Base.logger = ActiveSupport::Logger.new(STDOUT)
+# ActiveSupport::LogSubscriber.colorize_logging = true
+
+connection_data = database_config.connection_data
+migrations_paths = [RubyPitaya::Path::Core::MIGRATIONS_FOLDER_PATH]
+migrations_paths += RubyPitaya::Path::Plugins::MIGRATIONS_FOLDER_PATHS
+migrations_paths += [RubyPitaya::Path::MIGRATIONS_FOLDER_PATH]
+ActiveRecord::Migrator.migrations_paths = migrations_paths
+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?('core/templates') ||
+                      path.include?('core/spec-helpers') ||
+                      path.include?('app-template')
+end
+
+# Loading application files
+app_folder_paths = RubyPitaya::Path::Plugins::APP_FOLDER_PATHS + [RubyPitaya::Path::APP_FOLDER_PATH]
+app_folder_paths.each do |app_folder_path|
+  app_files_path = File.join(app_folder_path, '**/*.rb')
+
+  Dir[app_files_path].each do |path|
+    require path unless path.end_with?('spec.rb') ||
+                        path.include?('db/migration')
+  end
+end
+
+RSpec.configure do |config|
+  config.include RubyPitaya::HandlerSpecHelper
+
+  config.before(:each) do
+    ActiveRecord::Base.descendants.each { |c| c.delete_all unless c == ActiveRecord::SchemaMigration }
+  end
+end

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

@@ -0,0 +1,20 @@
+module RubyPitaya
+
+  class SetupSpecHelper
+
+    def initialize
+      @setup_mock = {}
+    end
+
+    def [](key)
+      @setup_mock[key]
+    end
+
+    def auto_reload
+    end
+
+    def setup_mock=(value)
+      @setup_mock = value
+    end
+  end
+end

data/lib/rubypitaya/version.rb

@@ -1,3 +1,3 @@
 module RubyPitaya
-  VERSION = '2.9.3'
+  VERSION = '2.10.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubypitaya
 version: !ruby/object:Gem::Version
-  version: 2.9.3
+  version: 2.10.0
 platform: ruby
 authors:
 - Luciano Prestes Cavalcanti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-30 00:00:00.000000000 Z
+date: 2021-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -274,6 +274,8 @@ 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/app-template/spec/hello_world_handler_spec.rb"
+- "./lib/rubypitaya/app-template/spec/player_handler_spec.rb"
 - "./lib/rubypitaya/core/app/models/user.rb"
 - "./lib/rubypitaya/core/application_files_importer.rb"
 - "./lib/rubypitaya/core/config.rb"
@@ -298,6 +300,11 @@ files:
 - "./lib/rubypitaya/core/routes_base.rb"
 - "./lib/rubypitaya/core/session.rb"
 - "./lib/rubypitaya/core/setup.rb"
+- "./lib/rubypitaya/core/spec-helpers/config_spec_helper.rb"
+- "./lib/rubypitaya/core/spec-helpers/handler_spec_helper.rb"
+- "./lib/rubypitaya/core/spec-helpers/postman_spec_helper.rb"
+- "./lib/rubypitaya/core/spec-helpers/rubypitaya_spec_helper.rb"
+- "./lib/rubypitaya/core/spec-helpers/setup_spec_helper.rb"
 - "./lib/rubypitaya/core/status_codes.rb"
 - "./lib/rubypitaya/core/templates/template_migration.rb.erb"
 - "./lib/rubypitaya/version.rb"