rad_core 0.0.25 → 0.0.26

data/Rakefile

@@ -3,8 +3,10 @@ require 'rake_ext'
 project(
   name: 'rad',
   official_name: 'rad_core',
+  bin: 'bin',
+  dirs: 'bin',
   gem: true,
-  summary: 'General purposed Web/App Framework',
+  summary: 'Simple and highly customizable Web Framework encouraging to build an app as a set of low-coupled components instead of monolith',
 
   author: 'Alexey Petrushin',
   homepage: 'http://github.com/alexeypetrushin/rad_core'

data/bin/rad

@@ -0,0 +1,33 @@
+#!/usr/bin/env ruby
+# sadly it's impossible to pass '-Ku' argument to ruby via shebang, use RUBYOPT to set it, something like:
+# $ export RUBYOPT="-Ku -rrubygems"        
+
+require 'rad'
+require 'rad/cli/helper'
+
+# version
+if ARGV.first =~ /-v|version|-version/
+  puts "Rad #{Rad::VERSION}"
+  exit
+end
+
+# mode and environment
+mode = (%w(server console).include? ARGV.first) ? ARGV.shift : 'server'
+environment = (%w(production development test).include? ARGV.first) ? ARGV.shift : :development
+rad.mode = environment
+
+# config options
+ARGV.each do |expression|
+  name, value = expression.split('=')
+  name.sub!(/^-+/, '')
+  if name =~ /\./
+    component_name, key = name.split('.').collect{|s| s.to_sym}
+    rad.config[component_name] ||= {}
+    rad.config[component_name][key] = value
+  else
+    rad.config[name.to_sym] = value
+  end
+end
+  
+# running
+Rad::Cli::Helper.send "run_#{mode}"

data/lib/components/configurators.rb

@@ -0,0 +1,5 @@
+rad.register :configurators, depends_on: :environment do  
+  require 'rad/configurators/_require'
+  
+  Rad::Conveyors.new
+end

data/lib/components/environment.production.yml

@@ -0,0 +1 @@
+backtrace_filters: []

data/lib/components/environment.yml

@@ -1,3 +1,32 @@
 available_languages:
   - :en
-language: :en
+language: :en
+
+backtrace_filters:
+  - /timeout.rb
+  - rubygems/custom_require
+  - /bin/spec
+  - /monitor
+  - /synchronize
+  - internal:lib/
+        
+  - /gems/haml
+  - /gems/tilt
+  - /gems/rack
+  - /gems/rspec
+  - /gems/thin
+  - /gems/eventmachine
+  - /gems/mongoid
+
+  - lib/fake_gem
+  - /class_loader
+  - /micon
+      
+  - /kit/
+  - /rad/
+  - /face/
+  
+  # - /rad/template
+  # - /rad/_support
+  # - /face/view_builder
+  # - /face/view_helper

data/lib/components/http.yml

@@ -2,7 +2,18 @@ host: 'localhost'
 port: 4000
 static: true
 url_root: '/'
-default_format: 'html'  
+default_format: 'html'
+
+# used in forgery protection and captcha
+browser_generated_types:
+  - text/html
+  - text/plain
+  - text/javascript
+  - application/x-www-form-urlencoded
+  - multipart/form-data  
+browser_generated_formats:
+  - html
+  - js
 
 # session sample
 # session:

data/lib/components/web.rb

@@ -1,5 +1,5 @@
-rad.register :web, depends_on: [:html, :router, :controller, :http] do
-  require 'rad/core_web/_require'
+rad.register :web, depends_on: [:html, :router, :controller, :http, :configurators] do  
+  require 'rad/web/_require'
   
   load 'rad/profiles/web.rb'
   load 'rad/profiles/mailer.rb'

data/lib/rad/_support/active_support.rb

@@ -49,7 +49,7 @@ require 'active_support/all'
 # Hacks
 # 
 %w(
-  micelaneous
+  miscellaneous
   time
 ).each{|f| require "rad/_support/active_support/#{f}"}
 require 'yaml_fix'

data/lib/rad/_support/exception.rb

@@ -1,45 +1,14 @@
-Exception.metaclass_eval do
-  attr_accessor :filters
-end
-
-Exception.filters = []
-Exception.filters = %w(
-  /gems/haml
-  /gems/tilt
-  /gems/facets
-  /gems/rack
-  /gems/mongrel
-  /gems/rspec
-  /gems/thin
-  
-  /timeout.rb
-  /bin/spec
-  
-  lib/fake_gem
-  rubygems/custom_require
-  
-  /rad/template
-  /rad/template
-  
-  /face/view_builder
-  /face/view_helper    
-  
-  /rad/_support
-  
-  /monitor
-  /synchronize
-  /class_loader
-  /micon
-  
-  internal:lib/
-)
-
-# Uncomment this line to disable filtering
-# Exception.filters = []
-
 Exception.class_eval do
   alias_method :set_backtrace_without_filter, :set_backtrace
   def set_backtrace array
-    set_backtrace_without_filter array.sfilter(::Exception.filters)
+    begin
+      if environment = rad.environment? && rad.environment
+        set_backtrace_without_filter array.sfilter(environment.backtrace_filters)
+      else
+        set_backtrace_without_filter array
+      end
+    rescue
+      set_backtrace_without_filter array
+    end
   end
 end

data/lib/rad/_support/string.rb

@@ -12,10 +12,16 @@ class String
     gsub(/[&"><]/){|special| HTML_ESCAPE_MAP[special]}
   end
   
-  def url_escape    
+  def url_escape
+    # TODO2 change to Rack::Utils.escape
     CGI.escape self
   end
   
+  def url_unescape
+    # TODO2 change to Rack::Utils.unescape
+    CGI.unescape self
+  end
+  
   JS_ESCAPE_MAP = {
     '\\'    => '\\\\',
     '</'    => '<\/',

data/lib/rad/cli/helper.rb

@@ -0,0 +1,34 @@
+module Helper
+  RUNTIME_DIR = 'runtime'
+
+  class << self
+    inject logger: :logger
+    
+    def run_console
+      prepare_running_environment
+
+      require 'irb'
+      IRB.start        
+    end
+
+    def run_server
+      app = prepare_running_environment
+  
+      rad.http.run app, rad.http.host, rad.http.port
+    end
+      
+    def use_runtime_path!
+      runtime_path = "./#{RUNTIME_DIR}"
+      Dir.chdir runtime_path if Dir.exist? runtime_path
+    end
+
+    protected
+      def prepare_running_environment
+        use_runtime_path!
+        
+        require 'rack'
+        app, options = Rack::Builder.parse_file 'config.ru'
+        app
+      end
+  end
+end

data/lib/rad/configurators/_require.rb

@@ -0,0 +1,13 @@
+# %w(
+#   abstract
+#   runtime
+#   web
+# ).each{|f| require "rad/configurators/#{f}"}
+
+class Micon::Core
+  def configure configurator_name, dir, &block      
+    configurator_class = "Rad::Configurators::#{configurator_name.to_s.classify}".constantize      
+    configurator = configurator_class.new dir
+    block.call configurator if block
+  end
+end

data/lib/rad/configurators/abstract.rb

@@ -0,0 +1,24 @@
+rad.configurators
+
+class Abstract
+  def initialize dir
+    @dir = File.expand_path(dir)
+  end
+  
+  # def config options = {}
+  #   rad.config.merge_config! "#{dir}/config/config.yml", options
+  # end
+  
+  def routes
+    routes_file = "#{dir}/config/routes.rb"
+    load routes_file if File.exist? routes_file
+  end
+  
+  def locales
+    I18n.load_path += Dir["#{dir}/config/locales/**/*.{rb,yml}"]
+    I18n.load_path += Dir["#{dir}/config/locales/*.{rb,yml}"]
+  end
+  
+  protected        
+    attr_reader :dir #, :after_config, :after_environment
+end

data/lib/rad/configurators/runtime.rb

@@ -0,0 +1,4 @@
+rad.configurators
+
+class Runtime < Abstract
+end

data/lib/rad/configurators/web.rb

@@ -0,0 +1,34 @@
+rad.configurators
+
+class Web < Abstract      
+  def asset_paths *relative_paths
+    relative_paths = relative_paths.first if relative_paths.first.is_a? Array
+    relative_paths.each do |relative_path|
+      path = "#{dir}/#{relative_path}"
+      rad.assets.paths << path unless rad.assets.paths.include? path
+    end
+  end
+  
+  def load_paths *relative_paths
+    relative_paths = relative_paths.first if relative_paths.first.is_a? Array
+    relative_paths.each do |relative_path|
+      path = "#{dir}/#{relative_path}"
+      $LOAD_PATH << path unless $LOAD_PATH.include? path
+    end
+  end
+  
+  def template_paths *relative_paths
+    rad.template
+    
+    relative_paths = relative_paths.first if relative_paths.first.is_a? Array
+    relative_paths.each do |relative_path|
+      path = "#{dir}/#{relative_path}"
+      rad.template.paths << path unless rad.template.paths.include? path
+    end
+  end
+  
+  def autoload_paths *relative_paths
+    relative_paths = relative_paths.first if relative_paths.first.is_a? Array        
+    relative_paths.each{|d| autoload_dir "#{dir}/#{d}", true}
+  end      
+end

data/lib/rad/controller/_abstract/{micelaneous.rb → miscellaneous.rb}

@@ -1,4 +1,4 @@
-module Rad::Controller::Abstract::Micelaneous
+module Rad::Controller::Abstract::Miscellaneous
   # 
   # respond_to
   # 

data/lib/rad/controller/_abstract/render.rb

@@ -13,46 +13,67 @@ module Rad::Controller::Abstract::Render
     @_layout = layout
   end
 
-  def render *args        
-    options = rad.template.parse_arguments *args
-    content = render_with_parsed_arguments options, args
+  def render *args
+    options = rad.template.parse_arguments *args        
+    
+    instance_variables = {      
+      controller_name: self.class.controller_name
+    }
+
+    instance_variable_names.each do |name|
+      instance_variables[name[1..-1]] = instance_variable_get name unless name =~ /^@_/
+    end
+    
+    instance_variables[:action_name] = options[:action] if options[:action]
+    
+    context = self.class.context_class.new(instance_variables, self)            
+     
+    options.reverse_merge! \
+      context: context,
+      format: params.format,
+      exact_format: true,      
+      relative_path_resolver: self.class
+
+    content = render_content options
+    content = render_layout content, options
+
     throw :halt, content
   end
 
   protected
-    def render_action options
-      instance_variables = {
-        action_name: (options[:action] || workspace.action).to_sym,
-        controller_name: self.class.controller_name
-      }
-      instance_variable_names.each do |name|
-        instance_variables[name[1..-1]] = instance_variable_get name unless name =~ /^@_/
+    def render_content options      
+      if special_format = SPECIAL_FORMAT_HANDLERS.keys.find{|f| options.include? f}            
+        handler = SPECIAL_FORMAT_HANDLERS[special_format]
+        if special_format.to_s != params.format
+          raise "You trying responing with '#{special_format}' to the '#{params.format}' requested format!"
+        end
+        handler.call options[special_format]
+      elsif options.include? :inline            
+        options[:inline]
+      elsif options[:template] == :nothing
+        ''
+      else                  
+        if action = options.delete(:action)          
+          options[:template].must_be.blank          
+          options[:template] = action
+          
+          options.reverse_merge! \
+            prefixes: [''],
+            if_not_exist: '/rad_default_templates/blank_template'
+        end
+        options[:template].must_be.present
+        options[:template] = options[:template].to_s                      
+        
+        rad.template.render options
       end
-      context = self.class.context_class.new(instance_variables, self)            
-       
-      options[:template] ||= options.delete(:action)
-      options[:template].must_be.present
-      options[:template] = options[:template].to_s
-      
-      options.reverse_merge!(
-        context: context,
-        format: params.format,
-        exact_format: true,
-        prefixes: ['']
-      )
-
-      # rendering content
-      content, context = render_content options            
-
-      # rendering layout
-      options[:content] = context
-      render_layout options, content
     end
-    
-    def render_layout options, content
+      
+    def render_layout content, options
       layout = options.include?(:layout) ? options[:layout] : self._layout
-      if layout # and rad.template.exist? layout, options         
-        rad.template.render layout, options do |*args|
+      
+      if layout and rad.template.exist? layout, options        
+        options = options.merge template: layout
+        rad.template.render options do |*args|
           if args.empty?
             content
           else
@@ -66,26 +87,6 @@ module Rad::Controller::Abstract::Render
       end
     end
 
-    def render_content options          
-      rad.template.basic_render options.merge(relative_path_resolver: self.class, if_not_exist: '/rad_default_templates/blank_template')
-    end
-    
-    def render_with_parsed_arguments options, original_args
-      if special_format = SPECIAL_FORMAT_HANDLERS.keys.find{|f| options.include? f}            
-        handler = SPECIAL_FORMAT_HANDLERS[special_format]
-        if special_format.to_s != params.format
-          raise "You trying responing with '#{special_format}' to the '#{params.format}' requested format!"
-        end
-        handler.call options[special_format]
-      elsif options.include? :inline            
-        options[:inline]
-      elsif options[:template] == :nothing
-        ''
-      else                        
-        render_action options
-      end
-    end
-
   module ClassMethods
     def layout layout, options = {}
       before options do |controller|

data/lib/rad/controller/_abstract.rb

@@ -1,16 +1,24 @@
 module Rad::Controller::Abstract
+  inherit OpenConstructor
   inherit Rad::Filters
-  inherit Rad::Controller::Abstract::Render, Rad::Controller::Abstract::Micelaneous
+  inherit Rad::Controller::Abstract::Render, Rad::Controller::Abstract::Miscellaneous
 
   inject workspace: :workspace, logger: :logger
 
-  def params
-    workspace.params
-  end    
-
-  # def response
-  #   workspace.response
-  # end
+  attr_accessor :action_name
+  attr_required :action_name
+  
+  attr_writer :params
+  def params; @params ||= Rad::Conveyors::Params.new end
+    
+  def call action, *args
+    catch :halt do
+      run_callbacks :action, method: action do          
+        send action, *args
+        render action: action
+      end
+    end
+  end
 
   module ClassMethods
     inject workspace: :workspace, logger: :logger

data/lib/rad/controller/_context.rb

@@ -1,15 +1,9 @@
 class Rad::Controller::Context < Rad::Template::Context
-  attr_reader :controller
+  attr_reader :controller, :controller_name, :action_name
+  delegate :params, :request, :response, to: :controller
+  
   def initialize instance_variables, controller
     super instance_variables
     @controller = controller
   end
-
-  def controller_name
-    @controller_name #workspace.controller.class.controller_name
-  end
-
-  def action_name
-    @action_name #workspace.action.to_sym
-  end
 end

data/lib/rad/controller/_http.rb

@@ -1,22 +1,28 @@
 module Rad::Controller::Http
   inherit Rad::Controller::Abstract
 
-  # def response
-  #   workspace.response
-  # end
+  def request; rad.workspace? ? workspace.request : nil end
+  def response; rad.workspace? ? workspace.response : nil end
+
+  def render *args
+    if args.size == 1 and (status = Rad::Http::Response.decode_status_message(args.first))          
+      response.set! status: status
+      throw :halt, ""
+    else
+      super
+    end
+  end
 
   protected
-    def render_with_parsed_arguments options, original_args                 
-      response = workspace.response
-      response.set!(
-        status: options[:status] || :ok, 
-        content_type: options[:content_type] || Mime[params.format]
-      )
+    def render_content options
+      if response
+        response.set!(
+          status: options[:status] || :ok, 
+          content_type: options[:content_type] || Mime[params.format]
+        )
+      end
     
-      if original_args.size == 1 and (status = Rad::Http::Response.decode_status_message(original_args.first))          
-        response.set! status: status
-        throw :halt, ""
-      elsif options[:location]
+      if options[:location]
         redirect_to options[:location]
       else          
         super
@@ -36,11 +42,10 @@ module Rad::Controller::Http
     private
       def enable_protection_from_get_requests!
         unless respond_to? :protect_from_get_request
-          define_method :protect_from_get_request do                              
-            request = workspace.request
+          define_method :protect_from_get_request do
             get = !(request.post? or request.put? or request.delete?)                
-            if get and !self.class.actions_allowed_for_get_request.include?(workspace.action)
-              raise "GET request not allowed for :#{workspace.action} action!"
+            if get and !self.class.actions_allowed_for_get_request.include?(action_name)
+              raise "GET request not allowed for :#{action_name} action!"
             end            
           end
           before :protect_from_get_request

data/lib/rad/controller/_require.rb

@@ -11,7 +11,7 @@ end
 %w(    
   _abstract/render
   _abstract/responder
-  _abstract/micelaneous   
+  _abstract/miscellaneous   
   _abstract
   _context
   

data/lib/rad/controller/processors/controller_caller.rb

@@ -5,22 +5,14 @@ class ControllerCaller < Rad::Conveyors::Processor
     # prepare
     response = workspace.response.must_be.defined
     klass = workspace.class.must_be.present
-    raise "The controller class #{klass} must be a Rad::Controller::Abstract!" unless klass.is? Rad::Controller::Abstract
-    controller = workspace.controller = klass.new                  
-    action = workspace.action = workspace.method_name
+    raise "The controller class #{klass} must be a Rad::Controller::Abstract!" unless klass.is? Rad::Controller::Abstract    
+    action_name = workspace.action_name = workspace.method_name
     format = workspace.params.format
 
     # call
-    
-    workspace.content = catch :halt do
-      controller.run_callbacks :action, method: action do          
-        # call controller
-        controller.send action
-
-        # render view
-        controller.render action: action
-      end
-    end
+    controller = workspace.controller = klass.new
+    controller.set! params: workspace.params, action_name: workspace.action_name
+    workspace.content = controller.call action_name
   end          
 
 end

data/lib/rad/controller/processors/controller_error_handling.rb

@@ -8,7 +8,7 @@ class ControllerErrorHandling < Rad::Conveyors::Processor
       next_processor.call          
     rescue StandardError => e
       if rad.test?
-        e.set_backtrace e.backtrace.sfilter(Exception.filters)
+        # e.set_backtrace e.backtrace.sfilter(Exception.filters)
         raise e
       elsif rad.production?
         error_shown_to_user = StandardError.new "Internal error!"
@@ -17,7 +17,7 @@ class ControllerErrorHandling < Rad::Conveyors::Processor
         error_shown_to_user = e
       end
       
-      workspace.response.clear if workspace.response?
+      workspace.response.clear if workspace.response      
       format = workspace.params.format
       handler = SPECIAL_ERROR_HANDLERS[format] || DEFAULT_ERROR_HANDLER
       workspace.content = handler.call error_shown_to_user, format

data/lib/rad/environment/_environment.rb

@@ -11,6 +11,10 @@ class Rad::Environment
   
   attr_accessor :language
   
+  attr_writer :backtrace_filters
+  def backtrace_filters; @backtrace_filters ||= [] end
+  
+  
   class << self      
     inject logger: :logger
   end    

data/lib/rad/environment/_logger.rb

@@ -13,19 +13,19 @@ class Rad::Logger
   end
   
   def info obj
-    write obj_to_string(obj) + "\n"
+    write obj_to_string(obj)
   end
 
   def warn obj
-    write "WARN: " + obj_to_string(obj) + "\n"
+    write "WARN: " + obj_to_string(obj)
   end
 
   def error obj
-    write "ERROR: " + obj_to_string(obj) + "\n"
+    write "ERROR: " + obj_to_string(obj)
   end
   
   def debug obj
-    write obj_to_string(obj).gsub(/BSON::ObjectId\(([a-z0-9'"]+)\)/, "\\1") + "\n"
+    write obj_to_string(obj).gsub(/BSON::ObjectId\(([a-z0-9'"]+)\)/, "\\1")
   end
 
   protected
@@ -45,7 +45,7 @@ class Rad::Logger
     
     def obj_to_string obj
       if obj.is_a? Exception
-        backtrace = (obj.backtrace && obj.backtrace.sfilter(Exception.filters)) || []
+        backtrace = obj.backtrace || []
         %{\
 #{obj.message}
   #{backtrace.join("\n  ")}