rad_core 0.2.6 → 0.2.7

data/lib/rad/spec/http.rb

@@ -3,7 +3,7 @@ rspec do
     before do
       $with_prepare_params = true
     end
-    
+
     after do
       $with_prepare_params = false
     end
@@ -11,7 +11,7 @@ rspec do
 end
 
 rad.before_scope :cycle do
-  unless $with_prepare_params  
+  unless $with_prepare_params
     rad.conveyors.web do |web|
       web.definitions.delete_if{|pdef, args| pdef.name =~ /PrepareParams/}
       web.build!

data/lib/rad/spec/http_controller.rb

@@ -10,63 +10,63 @@ 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
   # 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    
+    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      
+    def parse_wcall_arguments *args
       # parsing params
       params = args.extract_options!
       first = args.first
 
-      workspace_variables = {}            
+      workspace_variables = {}
       if args.size == 1 and first.is_a?(String) and first =~ /^\/|^http:/
-        uri = Uri.parse first          
+        uri = Uri.parse first
         workspace_variables[:path] = uri.path
         workspace_variables[:env] = Rad::Http::Request.stub_environment(first)
-        
+
         # some params may be defined in :url ans some in :params, merging both
         params = uri.query_values.merge params if uri.query_values
       elsif (first.is_a?(String) or first.is_a?(Symbol)) and args.size <= 2
@@ -77,7 +77,7 @@ rspec do
       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[:method_name] = args[1]
         workspace_variables.merge! args[2] if args.size > 2
       else
         raise "Invalid input!"
@@ -85,7 +85,7 @@ rspec do
 
       # preparing environment
       workspace_variables[:env] ||= {}
-      workspace_variables[:env].reverse_merge! Rad::Http::Request.stub_environment      
+      workspace_variables[:env].reverse_merge! Rad::Http::Request.stub_environment
 
       # setting request method
       if request_method = params.delete(:_method) || params.delete('_method')
@@ -94,9 +94,9 @@ rspec do
         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

@@ -2,16 +2,16 @@ module Rad::MailerSpecHelper
   def sent_letters
     Rad::MailerSpecHelper.sent_letters
   end
-  
+
   class << self
     attr_accessor :sent_letters
-  end    
+  end
 end
 
 rspec.include Rad::MailerSpecHelper
 
-RSpec.configure do |config|  
-  config.before do 
+RSpec.configure do |config|
+  config.before do
     Rad::MailerSpecHelper.sent_letters = []
   end
 end

data/lib/rad/spec/remote.rb

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

data/lib/rad/spec/router.rb

@@ -1,13 +1,13 @@
 rspec.include Rad::Router::CoreRoutingHelper
 
 # rspec do
-#   def self.with_router options = {}    
+#   def self.with_router options = {}
 #     scope = options[:before] || :all
-#         
+#
 #     before scope do
-#       
+#
 #     end
-#   end  
+#   end
 # end
 
 rspec.define_matcher :redirect_to do |actual, expected|

data/lib/rad/spec/template.rb

@@ -5,12 +5,12 @@ rspec do
     else
       args
     end
-    
+
     before do
       rad.template
       list.each{|path| rad.template.paths << path}
     end
-   
+
     after do
       list.each{|path| rad.template.paths.delete path}
     end

data/lib/rad/tasks.rb

@@ -4,10 +4,10 @@ require 'ruby_ext'
 task :environment do
   require 'rad'
   rad.mode = ENV['m'] || ENV['mode'] || ENV['env'] || ENV['environment'] || :development
-  
+
   require 'rad/cli/helper'
   Rad::Cli::Helper.use_runtime_path!
-  
+
   rad.runtime_path = File.expand_path '.'
 
   load "./init.rb"

data/lib/rad/template/_context.rb

@@ -1,22 +1,22 @@
 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    
-   
+  end
+
   # for saving :format, :current_dir and others
   attr_accessor :scope_variables
 
 
-  # 
+  #
   # Helpers
-  # 
+  #
   inject(
     workspace: :workspace,
     router: :router,
@@ -25,13 +25,13 @@ class Rad::Template::Context
   )
 
   delegate :render, to: :template
-  delegate :url_for, to: :router        
+  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
@@ -40,16 +40,16 @@ class Rad::Template::Context
   end
 
 
-  # 
+  #
   # Content Variables
-  # 
+  #
   attr_accessor :content_block
-  def content_variables; @content_variables ||= {}.to_openobject end    
+  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        
+  end
   def prepend_to name, content = nil, &block
     content ||= capture(&block)
     (content_variables[name.to_s] ||= "").insert 0, content
@@ -64,15 +64,15 @@ class Rad::Template::Context
   def has_content_for? name
     content_variables.include? name.to_s
   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|              
+      instance_variables.each do |container|
         if container.is_a? Hash
           container.each do |name, value|
             instance_variable_set("@#{name}", value)

data/lib/rad/template/_relative_path_resolver.rb

@@ -1,5 +1,5 @@
 class Rad::Template::RelativePathResolver
-  def find_relative_template tname, prefixes, format, exact_format, current_dir    
+  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])

data/lib/rad/template/_support/tilt.rb

@@ -1,40 +1,40 @@
 module Tilt
-  # 
+  #
   # Include it into your template context class for :output, :capture and :concat support
-  # 
+  #
   module ContextExt
     def output
       _tilt_template.class.output(self)
     end
-  
+
     def capture *args, &block
-      _tilt_template.class.capture self, &block      
+      _tilt_template.class.capture self, &block
     end
-  
+
     def concat value
       _tilt_template.class.concat self, value
     end
-  end  
-  
+  end
+
   class Template
     def self.get_output context
       raise "Output variable for #{self.class} not defined!"
     end
-    
+
     def self.capture context, &block
       raise "capture not implemented for #{self.class}!"
     end
-    
+
     def self.concat context, value
       raise "concat not implemented for #{self.class}!"
     end
   end
-  
+
   class ERBTemplate
     def self.get_output context
       context.instance_variable_get "@output"
     end
-    
+
     def self.capture context, &block
       begin
         old_output = context.instance_variable_get "@output"
@@ -44,23 +44,23 @@ module Tilt
         context.instance_variable_get "@output"
       ensure
         context.instance_variable_set "@output", old_output
-      end      
+      end
     end
-    
+
     def self.concat context, value
       get_output(context) << value
-    end    
+    end
   end
-  
+
   class HamlTemplate
     def self.get_output context
       context.haml_buffer.buffer
     end
-    
+
     def self.capture context, &block
       context.capture_haml &block
     end
-    
+
     def self.concat context, value
       context.haml_concat value
     end

data/lib/rad/template/_support/tilt_fixes.rb

@@ -1,13 +1,13 @@
-# 
+#
 # Tilt::HamlTemplate.inspect causes error, fixin it.
-# 
+#
 class Tilt::HamlTemplate
   def inspect
     "#<Tilt::HamlTemplate:#{object_id} ...>"
   end
 end
 
-# 
+#
 # Tilt::HamlTemplate.inspect causes error, fixin it.
 #
 class Haml::Buffer

data/lib/rad/template/_template.rb

@@ -3,72 +3,72 @@ class Rad::Template
 
   attr_accessor :relative_path_resolver, :prefixes
   attr_required :prefixes
-  
+
   def initialize
     @relative_path_resolver = RelativePathResolver.new
   end
-  
+
   def render *args, &block
     result, context = basic_render(parse_arguments(*args), &block)
     result
-  end        
-  
+  end
+
   def exist? tname, options = {}
     !!find_template(tname, options)
   end
-  
+
   def read tname, options = {}
     file = find_template(tname, options) || raise("no template '#{tname}'!")
     File.read file
   end
-  
+
   def basic_render options, &block
     with_context options do |context|
       context.content_block ||= block
 
-      with_scope options, context do |scope|              
+      with_scope options, context do |scope|
         file = (
-          options[:file] || 
+          options[:file] ||
           find_template(options[:template], options.merge(scope)) ||
           (options[:if_not_exist] && find_template(options[:if_not_exist], options.merge(scope))) ||
           raise("no template '#{options[:template]}'!")
         )
-        
+
         scope[:current_dir] = dirname(file)
-        
+
         template = create_tilt_template file
-        
+
         result = with_template context, template do
           render_template template, context, options, &context.content_block
         end
-        
+
         return result, context
-      end            
+      end
     end
   end
-  
+
   def parse_arguments *args
     options = args.extract_options!
     if args.size == 1
       options[:template] = args.first
-    else 
+    else
       raise "Invalid input" if args.size != 0
-    end     
+    end
 
     options
   end
-  
+
   def find_file tname, prefixes, format, exact_format, directories
     prefixes = prefixes || self.prefixes
     prefixes.each do |prefix|
       tname = template_name_with_prefix("#{directory_name}#{tname}", prefix)
       file = if tname.include? '.'
         _find_file(tname, directories) || _find_file("#{tname}.*", directories)
-      else            
+      else
         if format
           _find_file("#{tname}.#{format}.*", directories) or
             _find_file("#{tname}.*", directories, exact_format)
-        else          
+        else
           _find_file("#{tname}.*", directories)
         end
       end
@@ -76,40 +76,40 @@ class Rad::Template
     end
     return nil
   end
-  
+
   def directory_name; "" end
-  
+
   def paths; @paths ||= [] end
-  
-  protected            
-    # with_one_extension - 'tname.*' matches not only 'tname.erb' but also 'tname.html.erb', 
+
+  protected
+    # with_one_extension - 'tname.*' matches not only 'tname.erb' but also 'tname.html.erb',
     # with this option enabled it will not match 'tname.html.erb', only 'tname.erb'
-    def _find_file pattern, directories, with_one_extension = false      
+    def _find_file pattern, directories, with_one_extension = false
       files = rad.environment.find_files_by_pattern_without_cache pattern, directories
-      files = files.select{|f| f !~ /\.[^\.\/]+\.[^\.\/]+$/} if with_one_extension          
+      files = files.select{|f| f !~ /\.[^\.\/]+\.[^\.\/]+$/} if with_one_extension
       raise "multiple templates for '#{pattern}'!" if files.size > 1
-      files.first      
+      files.first
     end
-    
-    def template_name_with_prefix tname, prefix      
+
+    def template_name_with_prefix tname, prefix
       index = tname.rindex('/')
       index = index ? index + 1 : 0
       tname = tname.clone
       tname.insert index, prefix
     end
-    
+
     def with_context options, &block
       context = Thread.current[:render_context] || options[:context] || Context.new(options[:instance_variables])
-      
+
       old = Thread.current[:render_context]
-      begin            
+      begin
         Thread.current[:render_context] = context
         block.call context
       ensure
         Thread.current[:render_context] = old
       end
     end
-    
+
     def with_scope options, context, &block
       initial = context.scope_variables
 
@@ -126,22 +126,22 @@ class Rad::Template
         context.scope_variables = old if initial
       end
     end
-    
+
     def with_template context, template, &block
       old = context._tilt_template
-      begin            
+      begin
         context._tilt_template = template
         block.call context
       ensure
         context._tilt_template = old
       end
     end
-    
-    def dirname path; 
+
+    def dirname path;
       File.dirname path
-    end        
-    cache_method_with_params_in_production :dirname                    
-    
+    end
+    cache_method_with_params_in_production :dirname
+
     def find_template tname, options
       tname.must_be.a String
       # splitted into two to optimize cache
@@ -152,18 +152,18 @@ class Rad::Template
         resolver.find_relative_template tname, options[:prefixes], options[:format], options[:exact_format], options[:current_dir]
       end
     end
-            
-    def find_absolute_template tname, prefixes, format, exact_format                    
+
+    def find_absolute_template tname, prefixes, format, exact_format
       prefixes = prefixes || self.prefixes
       find_file(tname, prefixes, format, exact_format, paths)
     end
-    cache_method_with_params_in_production :find_absolute_template                
-    
-    def create_tilt_template path      
+    cache_method_with_params_in_production :find_absolute_template
+
+    def create_tilt_template path
       Tilt.new(path, nil, ugly: true, outvar: "@output"){|t| File.read(t.file)}
     end
     cache_method_with_params_in_production :create_tilt_template
-    
+
     def render_template template, context, options, &block
       locals = options[:locals] || {}
       if object = options[:object]
@@ -171,5 +171,5 @@ class Rad::Template
       end
 
       template.render context, locals, &block
-    end        
+    end
 end