orbit-rb 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b74c5688905fd2955181080ff01041a27234d65
-  data.tar.gz: e6696a577daa1fa3fbf0176d57600e3d164173e3
+  metadata.gz: 3cd05f089c935285ebf82824a8565989a895a677
+  data.tar.gz: 7ce1e6f2482d364fb13195de7331e628ab50d54d
 SHA512:
-  metadata.gz: 011afb5588defb88810229b862eaf925b9020da5665c9b88c7df01e74d36af5ddf6b6eaa1ea68e161b0a27e22b83ac12a44d517acba849234bbf529d542974bc
-  data.tar.gz: 9db074c686fb0de31aed54a818227f67e0b27da34776f0934e195b95ce00e85a110b9f5d0a164f992cdf2a764323928b63da15f7cebec17f22432e6bc3c45f1a
+  metadata.gz: 5d07f2acee95a2dd0ef99401faaadccfe263dae3fdcca0e290e20c774176f4c4aa7a7392085838a8155d3a567fca202120e53d7bb23c2061258a9507a8f7bb30
+  data.tar.gz: dda7e52d01b2d78f8912134103ba966559938ae66ad9830cd7967384298598d665ba9dfe380708f556da648956fea3e759f37f35aebe2f28077728ee69aede19

data/lib/orbit/config.rb

@@ -1,10 +1,13 @@
 require 'rack'
 require 'rack/protection'
+require 'logger'
 
 module Orbit
   class Config
     include Singleton
-    attr_accessor :app_path, :logger_class, :path_class, :request_class, :response_class, :route_class, :router_class, :session_secret
+    attr_accessor :app_path, :rack_logger_class, :logger_class, :log_level,
+                  :log_appname, :log_file, :path_class, :request_class,
+                  :response_class, :route_class, :router_class, :session_secret
 
     def initialize
       instantiate
@@ -17,7 +20,11 @@ module Orbit
       @session_secret = 'session_secret'
 
       # Classes
-      @logger_class = Rack::Logger
+      @rack_logger_class = Rack::Logger
+      @logger_class = Logger
+      @log_level = Logger::DEBUG
+      @log_file = STDOUT
+      @log_appname = 'Orbit App'
       @path_class   = Orbit::Routing::Path
       @request_class = Orbit::Request
       @response_class = Orbit::Response
@@ -33,6 +40,15 @@ module Orbit
       @instance.logger_class
     end
 
+    def self.logger
+      @_logger ||= begin
+        logger_class.new(@instance.log_file).tap do |logger|
+          logger.level = @instance.log_level
+          logger.progname = @instance.log_appname
+        end
+      end
+    end
+
     def self.path_class
       @instance.path_class
     end

data/lib/orbit/controller.rb

@@ -7,6 +7,14 @@ module Orbit
       @response = Orbit::Config.response_class.new
     end
 
+    def self.layout(_layout = nil)
+      if _layout
+        @layout = "#{Dir.pwd}/#{_layout}"
+      else
+        @layout
+      end
+    end
+
     def self.execute_action(request, action)
       new(request).execute_action(action)
     end
@@ -21,6 +29,22 @@ module Orbit
       end
     end
 
+    def render(template)
+      root_path = Dir.pwd
+
+      template_location = "#{root_path}/#{template}"
+
+      templates = [template_location, self.class.layout].compact
+
+      templates.inject(nil) do | prev, template |
+        _render(template) { prev }
+      end
+    end
+
+    def locals
+      @_locals ||= TemplateBinding.locals(params)
+    end
+
     def self.path(path)
       @base_path ||= superclass != Orbit::Controller ? superclass.base_path : ''
       @base_path += path
@@ -128,7 +152,7 @@ module Orbit
       sep = '_'
       # Turn unwanted chars into the separator
       parameterized_string = string.to_s.gsub(/[^a-z0-9\-_]+/i, sep)
-      
+
       re_sep = Regexp.escape(sep)
       # No more than one of the separator in a row.
       parameterized_string.gsub!(/#{re_sep}{2,}/, sep)
@@ -137,5 +161,15 @@ module Orbit
 
       parameterized_string.downcase
     end
+
+    def _render(template)
+      file = File.read(template)
+
+      ERB.new(file).result(locals.variables { yield })
+    end
+
+    private_class_method :create_method
+    private_class_method :update_method
+    private_class_method :parameterize
   end
 end

data/lib/orbit/loaders/directory_loader.rb

@@ -4,10 +4,19 @@ module Orbit
       attr_reader :reloader
 
       def initialize
-        base_path = "#{Dir.pwd}/#{Orbit::Config.app_path}"
-        
+        base_path = "#{Dir.pwd}"
+        @files = []
+
+        if Orbit::Config.app_path.is_a?(String)
+          @files.push Dir["#{base_path}/#{Orbit::Config.app_path}/**/*.rb"]
+        else
+          Orbit::Config.app_path.each do |path|
+            @files.push Dir["#{base_path}/#{path}/**/*.rb"]
+          end
+        end
+
         @retries = 0
-        @files = Dir["#{base_path}/**/*.rb"]
+        @files = @files.flatten
         @reloader = FileReloader.new(files)
       end
 

data/lib/orbit/template_binding.rb

@@ -0,0 +1,34 @@
+module Orbit
+  class TemplateBinding
+    def initialize(hash)
+      @variables = binding
+
+      hash.each do |key, value|
+        @variables.local_variable_set(key.to_sym, value)
+      end
+    end
+
+    def self.locals(hash)
+      new(hash).locals
+    end
+
+    def locals
+      self
+    end
+
+    def variables
+      binding.tap do |bind|
+        @variables.local_variables.each do |var|
+          binding.local_variable_set(var, @variables.local_variable_get(var))
+        end
+      end
+    end
+
+    def method_missing(method, *args, &block)
+      if method.to_s[-1] == '='
+        var_name = method.to_s[0..-2].to_sym
+        @variables.local_variable_set(var_name, args.first)
+      end
+    end
+  end
+end

data/lib/orbit/version.rb

@@ -1,3 +1,3 @@
 module Orbit
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/lib/orbit.rb

@@ -27,7 +27,7 @@ module Orbit
     def load_middleware
       builder.use Rack::MethodOverride
       builder.use Rack::Head
-      builder.use config.logger_class
+      builder.use config.rack_logger_class
 
       use_session
       use_protection

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orbit-rb
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Caio Torres
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-14 00:00:00.000000000 Z
+date: 2016-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -112,6 +112,7 @@ files:
 - lib/orbit/routing/pattern.rb
 - lib/orbit/routing/route.rb
 - lib/orbit/singleton.rb
+- lib/orbit/template_binding.rb
 - lib/orbit/version.rb
 - orbit.gemspec
 homepage: https://github.com/efreesen/orbit
@@ -135,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Orbit is a Ruby Framework focused on simplicity and flexibility.