rubypitaya 1.4.1 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c48497c9641d832115ba3afc04d0a5fca2ddda41432d7e575ac51df4b1043ecc
-  data.tar.gz: ca9b999ce0c3e1944b82928413b31e76437101eb2be55ff8e7b71d5a6e352e5c
+  metadata.gz: 8ce9fce444231d413f663d1af94356f0a04204af86050e6041a24f3b2bf37d8d
+  data.tar.gz: cc4c79730ea4e46891bff56f635c0135c62adc0f5ce06c6a473567bd46a48b78
 SHA512:
-  metadata.gz: 88f66376c9de1733ab53c64e81ce5f4cf43f00de6f8a4c6607f3d48beb5ce37817fcdb87f4649f12c4b96b381050bb3d51d8ae7c1abb3452d68467062e4082d0
-  data.tar.gz: cf4917a58e56c6dc275d2a0e40072a0e65ca5022703c5e9acce40cfbd2a9e590113d3726473bd5de3f79678fc06d307306820f6062d1f6a0d03fbf531b51f63f
+  metadata.gz: 46fff9b02c5d40577864c21bd226d7b412b93d70af22612b3dfe39409546d2b14361f2f63d0ba0f4c07db5fe118908d4700b804c5ad134f7ceb06e8c94b5cdc2
+  data.tar.gz: 40b3def401682e4f98e6efaabaad9afc384128f6e0a39a3ae495d36643155bab86c1913969fd3ac35f647275836b06c24aafd818dcf7e2657618ffb1754587ee

data/lib/rubypitaya/app-template/Gemfile

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

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/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/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'
@@ -69,7 +70,8 @@ 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

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,3 +1,3 @@
 module RubyPitaya
-  VERSION = "1.4.1"
+  VERSION = "1.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubypitaya
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.5.0
 platform: ruby
 authors:
 - Luciano Prestes Cavalcanti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-20 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