rubypitaya 2.4.4 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb195bab202604c6eccf3bf77c6a61a63accd532c0cb2a5717b65f88d5a2f820
-  data.tar.gz: 61f32399ad655d8896ce4e88d4143dfe5bcf3b11272fa61729226503bd670881
+  metadata.gz: d954de0e8be9b30865fd328f1126a35c520fa6bd3f553040bfead26594cb19eb
+  data.tar.gz: 0a0663e7dea4b076b57d93d08376d428ac12b87f4ce4068e3033c6298780faf0
 SHA512:
-  metadata.gz: be967053676552234531e322b6bd5e1202e3d2c8425c83f7476bc03371797193f23c644ff8d883eae5c380da208b96003b23d5fdc7bccb4edadd85659917cd3c
-  data.tar.gz: 308c1ba083efd8c8c576c5f597ccd13cc195cb77960166eeadf3aeff2a3e3ef314b84135483327e4c737a168fe026f0fedd176411b74cb3d9e4c2a2e62b92a36
+  metadata.gz: 6ec34b4eba49194b30fc00871c034e721b13b3fdc7fb58b6942f9bb5e0a6ea693b7c23678453fed7ff72a18c743f2d78f9dfed0128e48770ab2e73e3c650ad41
+  data.tar.gz: 8a6cdc19ecebf38d7c47dc946166c63c408a3192e40b7a1432478e1bb7a947aed545cac1c46f6be2a9ece618a0f4007c555448ba67259390cafdf9b7d5bf6c1d

data/lib/rubypitaya/app-template/Gemfile

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gem 'rubypitaya', '2.4.4'
+gem 'rubypitaya', '2.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 (2.4.4)
+    rubypitaya (2.5.0)
       activerecord (= 6.0.2)
       etcdv3 (= 0.10.2)
       eventmachine (= 1.2.7)
@@ -85,7 +85,7 @@ DEPENDENCIES
   listen (= 3.2.1)
   pry (= 0.12.2)
   rspec (= 3.8.0)
-  rubypitaya (= 2.4.4)
+  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/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.4'
+  VERSION = '2.5.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubypitaya
 version: !ruby/object:Gem::Version
-  version: 2.4.4
+  version: 2.5.0
 platform: ruby
 authors:
 - Luciano Prestes Cavalcanti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-25 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
@@ -199,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"
@@ -234,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"