rubypitaya 2.4.0 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '093a7c67062ae87c5335220458fd7c8c1a1b97591a8f6ef87121c07aa544eb4d'
-  data.tar.gz: c0ab2dcd4a08ecda141a8d6ddfa646bb2e01dfb8648ddf78ac64a167a3f4593b
+  metadata.gz: d954de0e8be9b30865fd328f1126a35c520fa6bd3f553040bfead26594cb19eb
+  data.tar.gz: 0a0663e7dea4b076b57d93d08376d428ac12b87f4ce4068e3033c6298780faf0
 SHA512:
-  metadata.gz: af597a9e1481be99c5a93c42ffc3e12629d486acbd931b46e1c2c037f7f8806e1191e28e7669835622bb98d2940e5a00a889a51391bbc3502fff7ed7dacace9f
-  data.tar.gz: e3be1ef084dce3f1bd9cc77a4c4cab1b51f3d682329e7edbda3736487d3ebbf20d253336767eb97f62a11a191d3add2ba30d85a11669b5c28b9ef25cf2cbf91e
+  metadata.gz: 6ec34b4eba49194b30fc00871c034e721b13b3fdc7fb58b6942f9bb5e0a6ea693b7c23678453fed7ff72a18c743f2d78f9dfed0128e48770ab2e73e3c650ad41
+  data.tar.gz: 8a6cdc19ecebf38d7c47dc946166c63c408a3192e40b7a1432478e1bb7a947aed545cac1c46f6be2a9ece618a0f4007c555448ba67259390cafdf9b7d5bf6c1d

data/lib/rubypitaya/app-template/Gemfile

@@ -1,3 +1,10 @@
 source "https://rubygems.org"
 
-gem 'rubypitaya', '2.4.0'
+gem 'rubypitaya', '2.5.0'
+
+group :development do
+  gem 'pry', '0.12.2'
+  gem 'bundler', '1.17.2'
+  gem 'rspec', '3.8.0'
+  gem 'listen', '3.2.1'
+end

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

@@ -13,26 +13,26 @@ GEM
       tzinfo (~> 1.1)
       zeitwerk (~> 2.2)
     coderay (1.1.2)
-    concurrent-ruby (1.1.6)
+    concurrent-ruby (1.1.7)
     diff-lcs (1.3)
     etcdv3 (0.10.2)
       grpc (~> 1.17)
     eventmachine (1.2.7)
     ffi (1.12.2)
-    google-protobuf (3.11.4-x86_64-linux)
+    google-protobuf (3.13.0)
     googleapis-common-protos-types (1.0.5)
       google-protobuf (~> 3.11)
-    grpc (1.28.0-x86_64-linux)
-      google-protobuf (~> 3.11)
+    grpc (1.32.0)
+      google-protobuf (~> 3.13)
       googleapis-common-protos-types (~> 1.0)
-    i18n (1.8.2)
+    i18n (1.8.5)
       concurrent-ruby (~> 1.0)
     listen (3.2.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     method_source (0.9.2)
     middleware (0.1.0)
-    minitest (5.14.0)
+    minitest (5.14.2)
     nats (0.11.0)
       eventmachine (~> 1.2, >= 1.2)
     pg (0.21.0)
@@ -62,19 +62,20 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
     rspec-support (3.8.3)
-    rubypitaya (2.4.0)
+    rubypitaya (2.5.0)
       activerecord (= 6.0.2)
       etcdv3 (= 0.10.2)
       eventmachine (= 1.2.7)
       nats (= 0.11.0)
       pg (= 0.21.0)
       protobuf (= 3.10.0)
+      rake (= 10.0)
       redis (= 4.1.3)
     thor (1.0.1)
     thread_safe (0.3.6)
-    tzinfo (1.2.7)
+    tzinfo (1.2.8)
       thread_safe (~> 0.1)
-    zeitwerk (2.3.0)
+    zeitwerk (2.4.1)
 
 PLATFORMS
   ruby
@@ -83,9 +84,8 @@ DEPENDENCIES
   bundler (= 1.17.2)
   listen (= 3.2.1)
   pry (= 0.12.2)
-  rake (= 10.0)
   rspec (= 3.8.0)
-  rubypitaya (= 2.4.0)
+  rubypitaya (= 2.5.0)
 
 BUNDLED WITH
    1.17.2

data/lib/rubypitaya/app-template/Makefile

@@ -16,7 +16,7 @@ test:
 
 ## Run ruby irb console
 console:
-	@docker-compose run --service-ports --rm rubypitaya bundle exec ruby ./bin/console
+	@docker-compose run --service-ports --rm rubypitaya-console bundle exec ruby ./bin/console
 
 ## Run bash on container
 bash:

data/lib/rubypitaya/app-template/Rakefile

@@ -40,6 +40,9 @@ 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_paths = [RubyPitaya::Path::Core::MIGRATIONS_FOLDER_PATH]
+    migrations_paths += RubyPitaya::Path::Plugins::MIGRATIONS_FOLDER_PATHS
+    migrations_paths += [RubyPitaya::Path::MIGRATIONS_FOLDER_PATH]
 
     step = ENV["STEP"] ? ENV["STEP"].to_i : 1
 
@@ -51,6 +54,7 @@ namespace :db do
     end
 
     ActiveRecord::Base.establish_connection(connection_data)
+    ActiveRecord::Migrator.migrations_paths = migrations_paths
     ActiveRecord::Base.connection.migration_context.rollback(step)
     ActiveRecord::Base.connection.close
 

data/lib/rubypitaya/app-template/app/http/hello_world.rb

@@ -0,0 +1,27 @@
+require 'rubypitaya/core/http_routes'
+
+RubyPitaya::HttpRoutes.class_eval do
+
+    get '/hello-world/html' do
+      content_type 'text/html'
+
+      @message = "Hello World"
+
+      erb :hello_world
+    end
+
+    get '/hello-world/json' do
+      response = {
+        message: 'Hello World!'
+      }.to_json
+    end
+
+  private
+
+  def response_error(message)
+    response = {
+      code: StatusCodes::CODE_ERROR,
+      message: message,
+    }.to_json
+  end
+end

data/lib/rubypitaya/app-template/app/http/views/hello_world.erb

@@ -0,0 +1 @@
+<h3><%= @message %></h3>

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

@@ -44,6 +44,35 @@ services:
       SERVER_ROUTES: 'rubypitaya'
 
   rubypitaya:
+    depends_on:
+      - 'db'
+      - 'nats'
+      - 'etcd'
+      - 'redis'
+      - 'connector'
+    build:
+      context: '.'
+      dockerfile: 'docker/dev/Dockerfile'
+    working_dir: '/app/rubypitaya'
+    volumes:
+      - '.:/app/rubypitaya'
+    ports:
+      - '80:4567'
+    environment:
+      SERVER_NAME: 'rubypitaya'
+      RUBYPITAYA_ENV: 'development'
+      HISTFILE: '/app/rubypitaya/.bash-history'
+      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'
+      DATABASE_PASSWORD: 'postgres'
+      DATABASE_NAME: 'ruby_pitaya'
+
+  rubypitaya-console:
     depends_on:
       - 'db'
       - 'nats'

data/lib/rubypitaya/core/http_routes.rb

@@ -0,0 +1,25 @@
+require 'sinatra/base'
+require 'sinatra/reloader' if ENV['RUBYPITAYA_ENV'] == 'development'
+require 'rubypitaya/core/parameters'
+
+module RubyPitaya
+
+  class HttpRoutes < Sinatra::Base
+
+    if ENV['RUBYPITAYA_ENV'] == 'development'
+      register Sinatra::Reloader
+    end
+
+    before do
+      content_type :json
+
+      @bll = settings.bll
+      @config = settings.config
+
+      request_body = request.body.read
+      @params.merge!(JSON.parse(request_body)) if !request_body.blank?
+
+      @params = Parameters.new(@params)
+    end
+  end
+end

data/lib/rubypitaya/core/main.rb

@@ -75,11 +75,24 @@ module RubyPitaya
 
       @handler_router = HandlerRouter.new()
 
+      run_http
       run_server
     end
 
     private
 
+    def run_http
+      HttpRoutes.set :bll, @bll
+      HttpRoutes.set :config, @config
+      HttpRoutes.set :views, [Path::HTTP_VIEWS_PATH] + Path::Plugins::APP_CONFIG_FOLDER_PATHS;
+
+      Thread.new do
+        HttpRoutes.bind = '0.0.0.0'
+        HttpRoutes.port = '4567'
+        HttpRoutes.run!
+      end
+    end
+
     def run_server
       @is_shutting_down = false
 

data/lib/rubypitaya/core/path.rb

@@ -12,6 +12,8 @@ module RubyPitaya
 
     ROUTES_FILE_PATH = File.join(Dir.pwd, 'config/routes.rb')
 
+    HTTP_VIEWS_PATH = File.join(Dir.pwd, 'app/http/views')
+
     class Core
       APP_FOLDER_PATH = File.join(__dir__, 'app/')
       MIGRATIONS_FOLDER_PATH = File.join(__dir__, 'db/migration/')
@@ -22,6 +24,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/'))
       MIGRATIONS_FOLDER_PATHS = Dir.glob(File.join(Dir.pwd, 'plugins/*/db/migration'))
+      HTTP_VIEWS_PATHS = Dir.glob(File.join(Dir.pwd, 'plugins/*/app/http/views'))
     end
   end
 end

data/lib/rubypitaya/version.rb

@@ -1,3 +1,3 @@
 module RubyPitaya
-  VERSION = '2.4.0'
+  VERSION = '2.5.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubypitaya
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.5.0
 platform: ruby
 authors:
 - Luciano Prestes Cavalcanti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-10 00:00:00.000000000 Z
+date: 2020-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -80,6 +80,34 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.10.2
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+- !ruby/object:Gem::Dependency
+  name: sinatra-contrib
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: protobuf
   requirement: !ruby/object:Gem::Requirement
@@ -150,20 +178,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.17.2
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -213,6 +227,8 @@ files:
 - "./lib/rubypitaya/app-template/app/constants/status_codes.rb"
 - "./lib/rubypitaya/app-template/app/handlers/hello_world_handler.rb"
 - "./lib/rubypitaya/app-template/app/handlers/player_handler.rb"
+- "./lib/rubypitaya/app-template/app/http/hello_world.rb"
+- "./lib/rubypitaya/app-template/app/http/views/hello_world.erb"
 - "./lib/rubypitaya/app-template/app/models/player.rb"
 - "./lib/rubypitaya/app-template/app/models/user.rb"
 - "./lib/rubypitaya/app-template/bin/console"
@@ -248,6 +264,7 @@ files:
 - "./lib/rubypitaya/core/etcd_connector.rb"
 - "./lib/rubypitaya/core/handler_base.rb"
 - "./lib/rubypitaya/core/handler_router.rb"
+- "./lib/rubypitaya/core/http_routes.rb"
 - "./lib/rubypitaya/core/initializer_base.rb"
 - "./lib/rubypitaya/core/initializer_broadcast.rb"
 - "./lib/rubypitaya/core/initializer_content.rb"