rad_core 0.0.13 → 0.0.14

data/lib/rad/router.rb

@@ -1,29 +1 @@
-require 'rad/conveyor'
-
-%w(
-  configurator
-  simple_router
-  router
-  default_format_processor  
-  
-  core_routing_helper  
-  
-  processors/router  
-).each{|f| require "rad/router/core/#{f}"}
-
-# {AliasRouter: 'alias_router', RestfulRouter: 'restful_router'}.each do |klass, path|
-#   Rad.autoload klass, "rad/router/routers/#{path}"
-# end
-%w(
-  abstract_router
-  alias_router
-  restful_router
-).each{|f| require "rad/router/routers/#{f}"}
-
-Rad::Config::DEFAULTS.merge!(
-  default_path: '/'
-)
-
-Rad.metaclass do
-  delegate :routes, to: Rad::Routes::Configurator
-end
+rad.router

data/lib/rad/spec/controller.rb

@@ -1,18 +1,16 @@
-require 'rad/spec/environment'
+Rspec.configure do |config|
+  config.before :all do |context|
+    self.response, self.workspace = nil
+  end
+end
 
 rspec do
   attr_accessor :response, :workspace
-
-  def self.with_controller
-    before :each do
-      self.response = nil
-    end
-  end
   
   def ccall klass, method, params = {}, workspace_variables = {}, &block
-    self.response = Rad::Response.new
+    self.response = Rad::Http::Response.new
     workspace_variables = {
-      class: klass, method_name: method, params: Rad::Params.new(params), response: response
+      class: klass, method_name: method, params: Rad::Conveyors::Params.new(params), response: response
     }.merge(workspace_variables)
     
     if block            
@@ -25,16 +23,27 @@ rspec do
       self.workspace = rad.conveyors.web.call workspace_variables
     end
     
-    if Rad.const_defined?(:HttpController) and klass and klass.is?(::Rad::HttpController)
+    if klass and klass.name =~ /Http/
       response.content_type.must_be.present
       response.status.must_be.present
     end
     
     workspace.content
   end
+  
+  def self.with_abstract_controller
+    before do
+      rad.controller
+            
+      rad.conveyors.web do |web|
+        web.use Rad::Controller::Processors::ControllerCaller
+      end
+    end
+    after{rad.reset :conveyors}
+  end
 end
 
-Rad::AbstractController.class_eval do
+Rad::Controller::Abstract.class_eval do
   def render_ok
     render inline: 'ok'
   end

data/lib/rad/spec/environment.rb

@@ -1,51 +1,35 @@
 require 'rspec_ext'
+require 'micon/spec'
+
+rad.mode = :test
+rad.logger = Logger.new nil
+rad.runtime_path = 'tmp', true
 
 rspec do
-  def self.swap_metadata scope = :all
-    old_metadata = nil
-    
-    before scope do
-      old_metadata = Micon.metadata
-      Micon.swap_metadata old_metadata.deep_clone
-    end
+  def self.isolate *args
+    options = args.extract_options!
+    scope = options[:before] || :each
+    components = args.first.is_a?(Array) ? args.first : args    
     
-    after scope do
-      Micon.swap_metadata old_metadata
+    old = {}
+    before :all do
+      components.each do |name|      
+        old[name] = rad[name]      
+      end
     end
-  end
-  
-  def self.with_environment options = {}, &block
-    options = options.to_openobject    
-    runtime_dir = options.delete(:runtime_dir) || './tmp'
-    scope = options.delete(:before) || :each
-    environment = options.delete(:environment) || :test
-    raise "Invalid options :#{options.to_hash.keys.join(', :')}!" unless options.empty?
-    
-    swap_metadata
     
     before scope do
-      rad.clear      
-      Micon.after :config do |config|        
-        config.set! environment: environment, runtime_dir: runtime_dir
+      components.each do |name|
+        rad[name] = old[name].deep_clone
       end
-      
-      block.call if block
-      
-      silence_logger!
-      # Rad.initialize_plugin runtime_dir, environment
     end
-
+    
     after scope do
-      rad.clear  
-    end    
+      components.each do |name|
+        rad[name] = old[name].deep_clone
+      end
+    end
   end
   
-  inject(
-    config: :config, 
-    logger: :logger
-  )
-  
-  def silence_logger!
-    self.logger = Logger.new nil
-  end  
+  inject environment: :environment, logger: :logger
 end

data/lib/rad/spec/http.rb

@@ -1,93 +1,20 @@
-require 'rad/spec/controller'
-
 rspec do
-  def request
-    rad.workspace.request
-  end
-  
-  def self.with_http
-    with_controller
-    
-    before :all do
-      rad.before_scope :cycle do  
-        if defined?(Rad::Processors) and defined?(Rad::Processors::PrepareParams)
-          rad.conveyors.web do |web|
-            web.definitions.delete_if{|pdef, args| pdef == Rad::Processors::PrepareParams}
-            web.build!
-          end
-        end
-      end
+  def self.with_prepare_params
+    before do
+      $with_prepare_params = true
     end
-  end
-  
-  WCALL_OPTIONS = [:controller]
-  attr_writer :wcall_options
-  def wcall_options; @wcall_options ||= {} end
-  
-  def set_wcall options
-    invalid_options = options.keys - WCALL_OPTIONS
-    raise "Unsupported options #{invalid_options}!" unless invalid_options.empty?
     
-    self.wcall_options = options
-  end
-  
-  def set_controller controller_class
-    set_wcall controller: controller_class
-  end
-  
-  def self.set_controller &block
-    block.must_be.defined
-    before(:each){set_controller block.call}
-  end
-  
-  def wcall *args, &block    
-    workspace_variables, params = parse_wcall_arguments *args
-    ccall nil, nil, params, workspace_variables, &block
-  end
-  
-  def post_wcall *args, &block
-    params = args.extract_options!
-    raise "_method variable already set!" if params.include?(:_method) or params.include?('_method')
-    wcall(*(args << params.merge(_method: 'post')), &block)
+    after do
+      $with_prepare_params = false
+    end
   end
-  
-  protected
-    def parse_wcall_arguments *args
-      # parsing params
-      params = args.extract_options!
-      first = args.first
+end
 
-      workspace_variables = {}            
-      if args.size == 1 and first.is_a?(String) and first =~ /^\//
-        workspace_variables[:path] = first
-      elsif (first.is_a?(String) or first.is_a?(Symbol)) and args.size <= 2
-        workspace_variables[:path] = '/'
-        workspace_variables[:class] = wcall_options[:controller] || raise("not defined wcall controller (use set_wcall controller: SomeController)!")
-        workspace_variables[:method_name] = first
-        workspace_variables.merge! args[1] if args.size > 1
-      elsif first.is_a?(Class) and args.size <= 3
-        workspace_variables[:path] = '/'
-        workspace_variables[:class] = args[0]
-        workspace_variables[:method_name] = args[1]          
-        workspace_variables.merge! args[2] if args.size > 2
-      else
-        raise "Invalid input!"
-      end
-      
-      # preparing environment
-      workspace_variables[:env] ||= {}
-      workspace_variables[:env].reverse_merge! Rad::HTTPAdapter.mock_environment      
-
-      # setting request method
-      if request_method = params.delete(:_method) || params.delete('_method')
-        request_method = request_method.to_s.upcase
-        raise "invalid request method :#{request}" unless %w(GET POST PUT DELETE).include? request_method.
-        raise "REQUEST_METHOD variable already set!" if workspace_variables[:env].include? 'REQUEST_METHOD'
-        workspace_variables[:env]['REQUEST_METHOD'] = request_method
-      end
-      
-      workspace_variables[:request] = Rad::Request.new(workspace_variables[:env])
-      
-      return workspace_variables, params
+rad.before_scope :cycle do
+  unless $with_prepare_params  
+    rad.conveyors.web do |web|
+      web.definitions.delete_if{|pdef, args| pdef.name =~ /PrepareParams/}
+      web.build!
     end
+  end
 end

data/lib/rad/spec/http_controller.rb

@@ -0,0 +1,105 @@
+require 'rad/spec/controller'
+
+Rspec.configure do |config|
+  config.after :all do |context|
+    context.wcall_options = {}
+  end
+end
+
+rspec do
+  def request
+    rad.workspace.request
+  end
+  
+  # def self.with_http_controller options = {}
+  #   scope = options[:before] || :all
+  #   prepare_params = options[:prepare_params]
+  #   
+  #   with_controller options
+  # 
+  #   unless prepare_params
+  #     before scope do
+  #       
+  #     end    
+  #   end
+  # end
+  
+  WCALL_OPTIONS = [:controller]
+  attr_writer :wcall_options
+  def wcall_options; @wcall_options ||= {} end
+  
+  def set_wcall options
+    invalid_options = options.keys - WCALL_OPTIONS
+    raise "Unsupported options #{invalid_options}!" unless invalid_options.empty?
+    
+    self.wcall_options = options
+  end
+  
+  def set_controller controller_class
+    @controller_class = controller_class
+    set_wcall controller: controller_class
+  end
+  
+  def self.set_controller controller_class
+    before{set_controller controller_class}
+  end
+  
+  def wcall *args, &block    
+    workspace_variables, params = parse_wcall_arguments *args
+    ccall nil, nil, params, workspace_variables, &block
+  end
+  
+  def post_wcall *args, &block
+    params = args.extract_options!
+    raise "_method variable already set!" if params.include?(:_method) or params.include?('_method')
+    wcall(*(args << params.merge(_method: 'post')), &block)
+  end
+  
+  protected
+    def parse_wcall_arguments *args
+      
+      # parsing params
+      params = args.extract_options!
+      first = args.first
+
+      workspace_variables = {}            
+      if args.size == 1 and first.is_a?(String) and first =~ /^\/|^http:/
+        if first =~ /^\//
+          workspace_variables[:path] = first
+        else
+          uri = Uri.parse first          
+          workspace_variables[:path] = uri.path
+          workspace_variables[:params] = uri.query_values
+          workspace_variables[:env] = rad.http.mock_environment(first)      
+        end
+      elsif (first.is_a?(String) or first.is_a?(Symbol)) and args.size <= 2
+        workspace_variables[:path] = '/'
+        workspace_variables[:class] = wcall_options[:controller] || raise("not defined wcall controller (use set_wcall controller: SomeController)!")
+        workspace_variables[:method_name] = first
+        workspace_variables.merge! args[1] if args.size > 1
+      elsif first.is_a?(Class) and args.size <= 3
+        workspace_variables[:path] = '/'
+        workspace_variables[:class] = args[0]
+        workspace_variables[:method_name] = args[1]          
+        workspace_variables.merge! args[2] if args.size > 2
+      else
+        raise "Invalid input!"
+      end
+      
+      # preparing environment
+      workspace_variables[:env] ||= {}
+      workspace_variables[:env].reverse_merge! rad.http.mock_environment      
+
+      # setting request method
+      if request_method = params.delete(:_method) || params.delete('_method')
+        request_method = request_method.to_s.upcase
+        raise "invalid request method :#{request}" unless %w(GET POST PUT DELETE).include? request_method.
+        raise "REQUEST_METHOD variable already set!" if workspace_variables[:env].include? 'REQUEST_METHOD'
+        workspace_variables[:env]['REQUEST_METHOD'] = request_method
+      end
+      
+      workspace_variables[:request] = Rad::Http::Request.new(workspace_variables[:env])
+      
+      return workspace_variables, params
+    end
+end

data/lib/rad/spec/mailer.rb

@@ -0,0 +1,27 @@
+module Rad::MailerSpecHelper
+  def sent_letters
+    Rad::MailerSpecHelper.sent_letters
+  end
+  
+  class << self
+    attr_accessor :sent_letters
+  end    
+end
+
+rspec.include Rad::MailerSpecHelper
+
+Rspec.configure do |config|  
+  config.before do 
+    Rad::MailerSpecHelper.sent_letters = []
+  end
+end
+
+Rad::Mailer.class_eval do
+  def deliver letter
+    Rad::MailerSpecHelper.sent_letters << letter
+  end
+end
+
+Mail.defaults do
+  delivery_method :test
+end

data/lib/rad/spec/remote.rb

@@ -1,9 +1,9 @@
-require 'rad/spec/environment'
+require 'rad'
 
 rspec do
   def rcall klass, method, params = {}      
     rad.conveyors.services.call(
-      class: klass, method_name: method, params: Rad::Params.new(params)
+      class: klass, method_name: method, params: Rad::Conveyors::Params.new(params)
     )
   end
 end

data/lib/rad/spec/router.rb

@@ -1,15 +1,13 @@
-require 'rad/router'
+rspec.include Rad::Router::CoreRoutingHelper
 
-rspec do
-  def self.with_router
-    include Rad::CoreRoutingHelper
-  end  
-end
-
-# Rad::Response.class_eval do
-#   def success?
-#     headers['Location'].blank?
-#   end
+# rspec do
+#   def self.with_router options = {}    
+#     scope = options[:before] || :all
+#         
+#     before scope do
+#       
+#     end
+#   end  
 # end
 
 rspec.define_matcher :redirect_to do |actual, expected|

data/lib/rad/spec/template.rb

@@ -6,7 +6,13 @@ rspec do
       args
     end
     
-    before(:all){list.each{|path| Rad::Template.paths << path}}
-    after(:all){list.each{|path| Rad::Template.paths.delete path}}
+    before do
+      rad.template
+      list.each{|path| rad.template.paths << path}
+    end
+   
+    after do
+      list.each{|path| rad.template.paths.delete path}
+    end
   end
 end

data/lib/rad/spec/xhtml.rb

@@ -28,6 +28,4 @@ require 'nokogiri'
     
     node_attributes.should == attributes
   end
-  
-  
 end

data/lib/rad/spec.rb

@@ -1,11 +1,13 @@
 require 'rspec_ext'
+require 'rad'
 
 %w(
-  controller
   environment
   template
   http
-  mail
+  controller
+  http_controller
   remote
+  mailer
   router
 ).each{|f| require "rad/spec/#{f}"}

data/lib/rad/template/_context.rb

@@ -0,0 +1,92 @@
+class Rad::Template::Context
+  include Tilt::CompileSite, Tilt::ContextExt
+
+  # 
+  # System
+  #
+  attr_accessor :_tilt_template
+  
+  def initialize instance_variables = nil
+    set_instance_variables! instance_variables if instance_variables
+  end    
+   
+  # for saving :format, :current_dir and others
+  attr_accessor :scope_variables
+
+
+  # 
+  # Helpers
+  # 
+  inject(
+    workspace: :workspace,
+    router: :router,
+    template: :template,
+    logger: :logger
+  )
+
+  delegate :render, to: :template
+  delegate :url_for, to: :router        
+
+
+  def j obj
+    obj.to_s.json_escape
+  end
+  
+  def blank? obj
+    obj.is_a?(String) ? !!(obj =~ /\A\s*\z/) : obj.blank?
+  end
+  def present? obj
+    !blank?(obj)
+  end
+
+
+  # 
+  # Content Variables
+  # 
+  attr_accessor :content_block
+  def content_variables; @content_variables ||= {}.to_openobject end    
+  def content_for name, content = nil, &block
+    content ||= capture(&block)
+    (content_variables[name.to_s] ||= "") << content
+    nil
+  end        
+  def prepend_to name, content = nil, &block
+    content ||= capture(&block)
+    (content_variables[name.to_s] ||= "").insert 0, content
+    nil
+  end
+  def wrap_content_for name, &block
+    block.must_be.defined
+    content = capture((content_variables[name.to_s] || ""), &block)
+    content_variables[name.to_s] ||= content
+    nil
+  end
+  def has_content_for? name
+    content_variables.include? name.to_s
+  end    
+    
+  def params
+    workspace.params
+  end
+  
+  def find_relative_template *args
+    self.class.find_relative_template *args
+  end
+  
+  protected
+    def set_instance_variables! instance_variables
+      instance_variables = [instance_variables] unless instance_variables.is_a? Array
+      instance_variables.each do |container|              
+        if container.is_a? Hash
+          container.each do |name, value|
+            instance_variable_set("@#{name}", value)
+          end
+        else
+          container.instance_variables.each do |ivname|
+            iv = container.instance_variable_get(ivname)
+            instance_variable_set(ivname, iv)
+          end
+        end
+      end
+    end
+end

data/lib/rad/template/_relative_path_resolver.rb

@@ -0,0 +1,8 @@
+class Rad::Template::RelativePathResolver
+  def find_relative_template tname, prefixes, format, exact_format, current_dir    
+    raise "You can't use relative template path '#{tname}' without :current_dir!" unless current_dir
+    prefixes = prefixes || rad.template.prefixes
+    rad.template.find_file("/#{tname}", prefixes, format, exact_format, [current_dir])
+  end
+  cache_method_with_params_in_production :find_relative_template
+end

data/lib/rad/template/_require.rb

@@ -0,0 +1,15 @@
+require 'erb'
+require 'haml'
+require 'tilt'
+
+class Rad::Template
+end
+
+%w(
+  _support/tilt
+  _support/tilt_fixes
+
+  _relative_path_resolver
+  _template
+  _context
+).each{|f| require "rad/template/#{f}"}