rubypitaya 1.2.9 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a34f05283342d1f35366034211370ce5564c8f7c1e033c69bf6efc5aa7cfde6
-  data.tar.gz: b1ec31931d1306144373921202b10882ea6942c77986dcaafb61800dab879ce3
+  metadata.gz: 8ce9fce444231d413f663d1af94356f0a04204af86050e6041a24f3b2bf37d8d
+  data.tar.gz: cc4c79730ea4e46891bff56f635c0135c62adc0f5ce06c6a473567bd46a48b78
 SHA512:
-  metadata.gz: 65b562f383a9c5d8f21ba37763a5f79a9fbab1f2af016f23e5f008178ff5917894daacc4df6b35819d7db6bbf91d45c53cb020ea41ef0ce382cb6d68606f4849
-  data.tar.gz: 83cf65e5020902691cd3149220efe2345123ae93a6c3bd057945e7b03a50642100e70f328fe13fcab8994047b9d67df0c9b94dadf593cc14952862f8a4b602e9
+  metadata.gz: 46fff9b02c5d40577864c21bd226d7b412b93d70af22612b3dfe39409546d2b14361f2f63d0ba0f4c07db5fe118908d4700b804c5ad134f7ceb06e8c94b5cdc2
+  data.tar.gz: 40b3def401682e4f98e6efaabaad9afc384128f6e0a39a3ae495d36643155bab86c1913969fd3ac35f647275836b06c24aafd818dcf7e2657618ffb1754587ee

data/lib/rubypitaya/app-template/Gemfile

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gem 'rubypitaya', '1.2.9'
+gem 'rubypitaya', '1.5.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.2.9)
+    rubypitaya (1.5.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.2.9)
+  rubypitaya (= 1.5.0)
 
 BUNDLED WITH
    1.17.2

data/lib/rubypitaya/app-template/Rakefile

@@ -40,6 +40,7 @@ namespace :db do
     connection_data = database_config.connection_data_without_database
 
     ActiveRecord::Base.establish_connection(connection_data)
+    ActiveRecord::Base.connection.select_all "SELECT pg_terminate_backend(pg_stat_activity.pid) FROM pg_stat_activity WHERE datname='#{database_config.database_name}' AND pid <> pg_backend_pid();"
     ActiveRecord::Base.connection.drop_database(database_config.database_name)
     ActiveRecord::Base.connection.close
 

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

@@ -1,11 +1,13 @@
-class HelloWorldHandler < RubyPitaya::HandlerBase
+module MyApp
+  class HelloWorldHandler < RubyPitaya::HandlerBase
 
-  non_authenticated_actions :sayHello
+    non_authenticated_actions :sayHello
 
-  def sayHello
-    response = {
-      code: 'RP-200', 
-      msg: 'Hello!'
-    }
+    def sayHello
+      response = {
+        code: 'RP-200',
+        msg: 'Hello!'
+      }
+    end
   end
-end
+end

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

@@ -7,16 +7,24 @@ require 'rubypitaya'
 require 'rubypitaya/core/database_config'
 
 environment_name = ENV.fetch("RUBYPITAYA_ENV") { 'development' }
-database_config = DatabaseConfig.new(environment_name, Path::DATABASE_CONFIG_PATH)
+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
 
 Gem.find_files('rubypitaya/**/*.rb').each do |path|
-  require path unless path.end_with?('spec.rb') || path.include?('db/migrate')
+  require path unless path.end_with?('spec.rb') ||
+                      path.include?('db/migrate') ||
+                      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')
 end
 
 require 'irb'
 IRB.start(__FILE__)
 
-ActiveRecord::Base.connection.close
+ActiveRecord::Base.connection.close

data/lib/rubypitaya/app-template/config/routes.rb

@@ -0,0 +1,11 @@
+class Routes < RubyPitaya::RoutesBase
+
+  # class:      RoutesBase
+  # methods:
+  #  - match('new_handler_name', to: 'ClassHandler')
+  #    - Defines a new name to handler
+
+  def setup
+    # match('helloHandler', to: 'MyApp::HelloWorldHandler')
+  end
+end

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

@@ -63,6 +63,7 @@ services:
       NATS_URL: 'nats://nats:4222'
       ETCD_URL: 'http://etcd:2379'
       ETCD_PREFIX: 'rubypitaya/'
+      ETCD_LEASE_SECONDS: '60'
       REDIS_URL: 'redis://redis:6379'
       DATABASE_HOST: 'db'
       DATABASE_USER: 'postgres'

data/lib/rubypitaya/core/etcd_connector.rb

@@ -6,35 +6,71 @@ module RubyPitaya
   class EtcdConnector
 
     def initialize(server_uuid, desktop_name, server_name, etcd_prefix,
-                  etcd_address, allow_reconnect)
+                   etcd_address, allow_reconnect, lease_seconds)
       @server_uuid = server_uuid
       @server_name = server_name
       @desktop_name = desktop_name
       @etcd_prefix = etcd_prefix
       @etcd_address = etcd_address
       @allow_reconnect = allow_reconnect
+      @lease_seconds = lease_seconds
+
+      @renew_connection_seconds = lease_seconds / 2.0
+
+      @renew_connection_key = nil
+      @renew_connection_value = nil
+      @renew_connection_thread = nil
     end
 
     def connect
+      connection_key = get_connection_key
+      connection_value = get_connection_value
+
       @connection = Etcdv3.new(endpoints: @etcd_address,
                               allow_reconnect: @allow_reconnect)
-      @connection.put(connection_key, connection_value)
+
+      @lease = @connection.lease_grant(@lease_seconds)
+
+      @connection.put(connection_key, connection_value, lease: @lease.ID)
+
+      @renew_connection_key = connection_key
+      @renew_connection_value = connection_value
+
+      renew_connection
     end
 
     def disconnect
-      @connection.del(connection_key)
+      @connection.del(get_connection_key)
     end
 
     private
 
-    def connection_key
+    def get_connection_key
       "#{@etcd_prefix}servers/#{@server_name}/#{@server_uuid}"
     end
 
-    def connection_value
+    def get_connection_value
       JSON.generate(get_server_data)
     end
 
+    def renew_connection
+      stop_renew_connection
+
+      @renew_connection_thread = Thread.new do
+        loop do
+          sleep(@renew_connection_seconds)
+
+          @lease = @connection.lease_grant(@lease_seconds)
+          @connection.put(@renew_connection_key, @renew_connection_value,
+                          lease: @lease.ID)
+        end
+      end
+    end
+
+    def stop_renew_connection
+      @renew_connection_thread.exit unless @renew_connection_thread.nil?
+    end
+
     def get_server_data
       {
         id: @server_uuid,

data/lib/rubypitaya/core/handler_router.rb

@@ -4,11 +4,26 @@ module RubyPitaya
 
   class HandlerRouter
 
-    def initialize(handler_folder_path)
+    def initialize(handler_folder_path, routes_path)
+      import_routes_file(routes_path)
       import_handler_files(handler_folder_path)
+
+      import_routes_class
       import_handler_classes
     end
 
+    def import_routes_file(routes_path)
+      require routes_path
+    end
+
+    def import_routes_class
+      routes_classes = ObjectSpace.each_object(RoutesBase.singleton_class).select do |klass|
+        klass != RoutesBase
+      end
+
+      @routes = routes_classes.first.new
+    end
+
     def import_handler_files(handler_folder_path)
       Gem.find_files("#{handler_folder_path}/*.rb").each { |path| require path }
     end
@@ -22,6 +37,8 @@ module RubyPitaya
 
       @handler_name_map = @handlers.map do |handler|
         handler_name = handler.class.to_s
+        handler_name = @routes.get_new_handler_name(handler_name)
+        handler_name = handler_name.split('::').last
         handler_name = handler_name[0].downcase + handler_name[1..-1]
 
         [handler_name, handler]

data/lib/rubypitaya/core/main.rb

@@ -7,6 +7,7 @@ require 'rubypitaya/core/config'
 require 'rubypitaya/core/session'
 require 'rubypitaya/core/postman'
 require 'rubypitaya/core/parameters'
+require 'rubypitaya/core/routes_base'
 require 'rubypitaya/core/handler_router'
 require 'rubypitaya/core/etcd_connector'
 require 'rubypitaya/core/nats_connector'
@@ -24,7 +25,6 @@ module RubyPitaya
 
     attr_reader :redis_connector, :config, :bll
 
-    private
     def initialize
       @environment_name = ENV.fetch("RUBYPITAYA_ENV") { 'development' }
       @is_development_environment = @environment_name == 'development'
@@ -39,10 +39,12 @@ module RubyPitaya
 
       @etcd_prefix = ENV['ETCD_PREFIX']
       @etcd_address = ENV['ETCD_URL']
+      @etcd_lease_seconds = ENV['ETCD_LEASE_SECONDS'].to_i
       @allow_reconnect = false
       @etcd_connector = EtcdConnector.new(@service_uuid, @desktop_name,
                                           @server_name, @etcd_prefix,
-                                          @etcd_address, @allow_reconnect)
+                                          @etcd_address, @allow_reconnect,
+                                          @etcd_lease_seconds)
       @etcd_connector.connect
 
       @nats_address = ENV['NATS_URL']
@@ -68,13 +70,43 @@ module RubyPitaya
       @initializer_broadcast = InitializerBroadcast.new
       @initializer_broadcast.run(@initializer_content)
 
-      @handler_router = HandlerRouter.new(Path::HANDLERS_FOLDER_PATH)
+      @handler_router = HandlerRouter.new(Path::HANDLERS_FOLDER_PATH,
+                                          Path::ROUTES_FILE_PATH)
+
+      run_server
+    end
+
+    private
+
+    def run_server
+      @is_shutting_down = false
 
-      puts "Server started!"
-      run_nats_connection
+      catch :sig_shutdown do
+        Signal.trap("SIGINT") { throw :sig_shutdown }
+        Signal.trap("SIGQUIT") { throw :sig_shutdown }
+        Signal.trap("SIGTERM") { throw :sig_shutdown }
+
+        puts "Server started!"
+        run_nats_connection
+      end
+
+      Signal.trap("SIGINT", nil)
+      Signal.trap("SIGQUIT", nil)
+      Signal.trap("SIGTERM", nil)
+
+      shutdown_server
+    end
+
+    def shutdown_server
+      return if @is_shutting_down
+      @is_shutting_down = true
+
+      puts "Server shutting down..."
 
       @etcd_connector.disconnect
       @database_connector.disconnect
+
+      exit(0)
     end
 
     def run_nats_connection
@@ -113,9 +145,6 @@ module RubyPitaya
 
         response
       end
-      rescue SystemExit, Interrupt
-        puts "Quit!"
-        return 0
       rescue Exception => error
         puts "ERROR: #{error}"
         puts error.backtrace

data/lib/rubypitaya/core/path.rb

@@ -9,5 +9,7 @@ module RubyPitaya
     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/')
+
+    ROUTES_FILE_PATH = File.join(Dir.pwd, 'config/routes.rb')
   end
 end

data/lib/rubypitaya/core/routes_base.rb

@@ -0,0 +1,36 @@
+
+module RubyPitaya
+
+  class RoutesBase
+
+    def initialize
+      @handler_name_map = {}
+
+      setup
+    end
+
+    def setup
+    end
+
+    def match(route_name, to:)
+      handler_name, action_name = to.split('#')
+      new_handler_name, new_action_name = route_name.split('.')
+
+      if new_action_name.nil?
+        set_handler_name(handler_name, new_handler_name)
+      end
+    end
+
+    def get_new_handler_name(handler_name)
+      return handler_name unless @handler_name_map.include?(handler_name)
+
+      @handler_name_map[handler_name]
+    end
+
+    private
+
+    def set_handler_name(handler_name, new_handler_name)
+      @handler_name_map[handler_name] = new_handler_name
+    end
+  end
+end

data/lib/rubypitaya/version.rb

@@ -1,4 +1,3 @@
 module RubyPitaya
-  VERSION = "1.2.9"
+  VERSION = "1.5.0"
 end
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubypitaya
 version: !ruby/object:Gem::Version
-  version: 1.2.9
+  version: 1.5.0
 platform: ruby
 authors:
 - Luciano Prestes Cavalcanti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-27 00:00:00.000000000 Z
+date: 2020-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -203,6 +203,7 @@ files:
 - "./lib/rubypitaya/app-template/app/models/user.rb"
 - "./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/docker-compose.yml"
@@ -227,6 +228,7 @@ files:
 - "./lib/rubypitaya/core/path.rb"
 - "./lib/rubypitaya/core/postman.rb"
 - "./lib/rubypitaya/core/redis_connector.rb"
+- "./lib/rubypitaya/core/routes_base.rb"
 - "./lib/rubypitaya/core/session.rb"
 - "./lib/rubypitaya/version.rb"
 - bin/rubypitaya