krakenlab 2018.01.10dev1 → 2018.01.14dev

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1110dd471c7f67e66bcf1ba1b3d1240bbdbe0e26
-  data.tar.gz: c648d264140c8fedcc2dac8992f6ca4b9eabd0d1
+  metadata.gz: 8d21d0ba7e343c212f5a87e9d6eb416c3f0b1325
+  data.tar.gz: 6779c00d9f77ef162ba9e189c6ef9e13d1c75d04
 SHA512:
-  metadata.gz: 1f0d61d8fb936165bbae25af717c7bf8b05812ca4e42a6006ffd08931a3e2043f3c709838734c741e945dab1d1eb388064b2460734cf65514148d042de7fef63
-  data.tar.gz: 93fc1bc7bd5a7060404fbb82f9cf41ff98274dbc5e8d8fb7fe441a3f997d114bd49215333c5144b01012f60762e30773f797cb6aa290cca7148d471b476fef7e
+  metadata.gz: e4afe50eefebd76ecd253f2bf7b78679fef498b8271b6b10cbdc4e7ddb2aeb6e8953a781c23c3a6bfcd5196906344477880f92b33648ea1da93f5c558488afd7
+  data.tar.gz: db1817286a8f184253fbcd472efec950f887612d8a4c8558430905b92886acadae121cd8ae6bf80eb452dee9597628bc950a04388eaa4b56bc5f2f7da690fc6a

data/lib/kraken/constants/project.rb

@@ -1,11 +1,12 @@
 module Kraken
   APP_FILE = "require 'yaml'\n
 Kraken::Config.instance.setup do |config|
+  config.database static_env: 'development', redis_url: nil
   config.server name: 'app name', version: '1.0', handler: :godot_30
   config.add_trigger klass: Kraken::Trigger
 end\n
 Kraken::Migrations.configure do |c|
-  c.schema_format = :ruby
+  c.schema_format = :sql
   c.db_dir = 'db'
   c.yaml_config = 'config/db.yml'
   c.migrations_paths = ['db/migrate']
@@ -19,9 +20,16 @@ end
   end
 end".freeze
 
-  DB_FILE = "server:
+  DB_FILE = "development:
   adapter: postgresql
-  database: kraken
+  database: kraken_dev
+  encoding: utf8
+  host: localhost
+  username: postgres
+  password: postgres
+test:
+  adapter: postgresql
+  database: kraken_test
   encoding: utf8
   host: localhost
   username: postgres

data/lib/kraken/core/config.rb

@@ -1,13 +1,14 @@
 require 'singleton'
+require 'kraken/models/db'
 
 module Kraken
   # Configure the kraken framework.
-  # You can configure the server, postgre and redis.
-  # You can configure the events in server.
+  # Configure triggers, database and server settings
   # Yes! You can configure other plugins here!
   #
   #    Kraken::Config.instance.setup do |config|
-  #        config.server name: 'hehe'
+  #        config.server name: 'kraken app', version: 'valid version', handler: :default
+  #        config.database static_env: 'test', redis_url: nil
   #    end
   class Config
     include Singleton
@@ -28,6 +29,12 @@ module Kraken
       @server_handler = handler
     end
 
+    def database(static_env: nil, static_hash: nil, redis_url: nil)
+      Kraken::Db.load_active_record_config_from_env(static_env) unless static_env.nil?
+      Kraken::Db.load_active_record_config_from_hash(static_hash) unless static_hash.nil?
+      Kraken::Db.load_redis_config(redis_url)
+    end
+
     def add_trigger(klass: Kraken::Trigger)
       raise 'Klass needs to inherit Kraken::Trigger' unless klass <= Kraken::Trigger
 
@@ -35,5 +42,13 @@ module Kraken
       @triggers[klass.to_s.downcase] = klass
       Kraken::Log.info "trigger [#{klass.to_s.downcase}] loaded"
     end
+
+    def add_namespace(namespace: nil)
+      return if namespace.nil?
+      namespace.constants.select do |free_consts|
+        const = namespace.const_get(free_consts)
+        add_trigger(klass: const) if const <= Kraken::Trigger && const.is_a?(Class)
+      end
+    end
   end
 end

data/lib/kraken/models/db.rb

@@ -1,24 +1,31 @@
+require 'pg'
 require 'ohm'
 require 'yaml'
 require 'active_record'
 require 'active_record_migrations'
 
-# In db.rb file has some definitions to warp modules from other gens to Kraken framework.
 module Kraken
   StaticModel = ActiveRecord::Base
-  Migration = ActiveRecord::Migration
   Migrations = ActiveRecordMigrations
 
-  Ohm.redis = Redic.new
+  # This class made some configurations in database
+  class Db
+    class << self
+      # Use a ActiveRecord yml file
+      def load_active_record_config_from_env(category)
+        Kraken::StaticModel.establish_connection(YAML.safe_load(File.read('config/db.yml'))[category])
+      end
 
-  if File.exist? 'db/config.yml'
-    Kraken::StaticModel.establish_connection(YAML.safe_load(File.read('config/db.yml'))['development'])
-  else
-    Kraken::StaticModel.establish_connection(adapter: 'postgresql',
-                                             database: 'kraken',
-                                             host: 'localhost',
-                                             port: '5432',
-                                             username: 'postgres',
-                                             password: 'postgres')
+      # Use a hash to configure ActiveRecord
+      def load_active_record_config_from_hash(hash)
+        Kraken::StaticModel.establish_connection(hash)
+      end
+
+      # Configure the redis configuration!
+      def load_redis_config(url)
+        Ohm.redis = Redic.new if url.nil?
+        Ohm.redis = Redic.new unless url.nil?
+      end
+    end
   end
 end

data/lib/kraken/models/model.rb

@@ -20,6 +20,6 @@ module Kraken
       super()
     end
 
-    def on_delete(); end
+    def on_delete; end
   end
 end

data/lib/kraken/version.rb

@@ -1,3 +1,3 @@
 module Kraken
-  VERSION = '2018.01.10dev1'.freeze
+  VERSION = '2018.01.14dev'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: krakenlab
 version: !ruby/object:Gem::Version
-  version: 2018.01.10dev1
+  version: 2018.01.14dev
 platform: ruby
 authors:
 - Marlon Henry Schweigert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-09 00:00:00.000000000 Z
+date: 2018-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_record_migrations
@@ -367,7 +367,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Kraken Distribuited MMO Framework.