rad_core 0.2.6 → 0.2.7

data/lib/rad/html/_helpers/javascript_helper.rb

@@ -1,8 +1,8 @@
-module Rad::Html::JavascriptHelper      
+module Rad::Html::JavascriptHelper
   def javascript_include_tag *scripts
     scripts.collect{|script|
       tag :script, '', src: "#{script}", type: "text/javascript"
-    }.join("\n")      
+    }.join("\n")
   end
 
   def javascript_tag script = nil, options = {}, &block
@@ -13,15 +13,15 @@ module Rad::Html::JavascriptHelper
     html = tag :script, script, {type: "text/javascript"}
     block ? concat(html) : html
   end
-  
+
   def call_deferred_js
     javascript_tag 'rad.callDeferred();', defer: false
   end
 
   # Escape
   def js obj; obj.to_s.js_escape end
-  
-  
+
+
   def self.defer; @defer ||= true end
-  def self.defer= value; @defer = value end        
+  def self.defer= value; @defer = value end
 end

data/lib/rad/html/_helpers/model_helper.rb

@@ -5,18 +5,18 @@ class Rad::Html::ModelHelper
     self.template, self.form_helper, self.model_name, self.model, self.options = template, form_helper, model_name, model, options
   end
 
-  
-  # 
+
+  #
   # Helpers
-  # 
-  def check_box name, options = {}      
+  #
+  def check_box name, options = {}
     render_attribute name, options do |fname, value, o|
       html = form_helper.hidden_field_tag(fname, '0') + "\n"
       html += form_helper.check_box_tag fname, !!value, o
       html
     end
   end
-    
+
   def file_field name, options = {}
     render_attribute name, options do |fname, value, o|
       form_helper.file_field_tag fname, o
@@ -65,7 +65,7 @@ class Rad::Html::ModelHelper
   end
 
   def error_messages
-    merrors = errors[:base]      
+    merrors = errors[:base]
     form_helper.error_messages merrors.to_a unless merrors.blank?
   end
 
@@ -79,11 +79,11 @@ class Rad::Html::ModelHelper
       name.must_be.a Symbol
       ferrors = errors_for(name)
 
-      options = insert_human_readable_label name, options        
+      options = insert_human_readable_label name, options
 
       value = value_of name
       field_name = field_name_for name, value
-      
+
       if form_helper.respond_to? :field_with_errors
         field_html = block.call field_name, value, options
         unless ferrors.blank?
@@ -92,7 +92,7 @@ class Rad::Html::ModelHelper
           field_html
         end
       else
-        options[:errors] = ferrors          
+        options[:errors] = ferrors
         block.call field_name, value, options
       end
     end
@@ -101,17 +101,17 @@ class Rad::Html::ModelHelper
       unless @errors
         @errors = {}
         (
-          (model.respond_to?(:errors) && model.errors) || 
-          (model.respond_to?(:[]) && (model['errors'] || model[:errors])) || 
+          (model.respond_to?(:errors) && model.errors) ||
+          (model.respond_to?(:[]) && (model['errors'] || model[:errors])) ||
           {}
         ).each do |k, v|
           @errors[k.to_sym] = Array.wrap(v)
-        end          
+        end
       end
       @errors
     end
 
-    def errors_for name        
+    def errors_for name
       name.must_be.a Symbol
       errors[name]
     end
@@ -124,16 +124,16 @@ class Rad::Html::ModelHelper
       end
     end
 
-    def value_of name      
-      if model.respond_to? name 
+    def value_of name
+      if model.respond_to? name
         model.send name
       elsif model.respond_to? :[]
         model[name.to_sym] || model[name.to_s]
       else
-        raise "Model not respond to :#{name} nor to :[]!"
+        raise "model does not respond to :#{name} nor to :[] (#{model.inspect})!"
       end
     end
-  
+
     def insert_human_readable_label name, options
       unless options.include?(:label)
         options[:label] = model.t(name) if model.respond_to? :t

data/lib/rad/html/_require.rb

@@ -5,7 +5,7 @@ end
 
 %w(
   _flash
-  
+
   _helpers/basic_html_helper
   _helpers/form_helper
   _helpers/model_helper

data/lib/rad/html/processors/prepare_flash.rb

@@ -6,15 +6,15 @@ class PrepareFlash < Rad::Conveyors::Processor
   def call
     workspace.request.must_be.present
     workspace.params.must_be.defined
-    
+
     previous_messages = workspace.request.session.delete 'flash'
     if previous_messages.present?
       previous_messages = JSON.load previous_messages
       rad[:flash] = Rad::Html::Flash.new workspace.params.format, previous_messages
     end
-    
+
     next_processor.call
-    
+
     if rad.include? :flash
       flash = rad[:flash]
       messages = flash.messages_for_next_request

data/lib/rad/html/processors/scoped_params.rb

@@ -1,15 +1,15 @@
 rad.html
 
 # Converts {'model[attribute]' => value} into {'model' => {'attribute' => value}}
-class ScopedParams < Rad::Conveyors::Processor      
+class ScopedParams < Rad::Conveyors::Processor
   def call
     if workspace.params?
       to_delete = []
       to_add = {}
       workspace.params.each do |name, value|
         name.to_s.scan /(.+)\[(.+)\]/ do |scope_name, name_in_scope|
-          logger.warn "RAD owerriding :#{scope} param!" if workspace.params.include? scope_name              
-          scope = to_add[scope_name.to_sym] ||= {}                          
+          logger.warn "RAD owerriding :#{scope} param!" if workspace.params.include? scope_name
+          scope = to_add[scope_name.to_sym] ||= {}
           scope[name_in_scope] = value
           to_delete << name
         end
@@ -17,7 +17,7 @@ class ScopedParams < Rad::Conveyors::Processor
       workspace.params.merge! to_add
       to_delete.each{|n| workspace.params.delete n}
     end
-            
+
     next_processor.call
   end
 end

data/lib/rad/http/_http.rb

@@ -1,15 +1,15 @@
 class Rad::Http
   # inject environment: :environment
   attr_reader :rack_adapter, :http_adapter
-  
+
   attr_writer :browser_generated_types, :browser_generated_formats
   def browser_generated_types; @browser_generated_types ||= [] end
   def browser_generated_formats; @browser_generated_formats ||= [] end
-  
+
   def initialize
     @rack_adapter, @http_adapter = Rad::Http::RackAdapter.new, Rad::Http::HttpAdapter.new
-  end    
-  
+  end
+
   delegate :configure_rack!, :stack, :run, to: :rack_adapter
   delegate :call, to: :http_adapter
 end

data/lib/rad/http/_http_adapter.rb

@@ -7,18 +7,18 @@ class Rad::Http::HttpAdapter
       {env: env, response: Rad::Http::Response.new}.merge(workspace),
       &block
     )
-  
+
     response = workspace.response.must_be.defined
     result = response.finish
-          
+
     result
   end
   # synchronize_method :call
 
   # def mock_call env = {}, workspace = {}, &block
   #   env['PATH_INFO'] ||= '/'
-  #   env['rack.input'] ||= StringIO.new        
-  #   
+  #   env['rack.input'] ||= StringIO.new
+  #
   #   call env, workspace, &block
-  # end  
+  # end
 end

data/lib/rad/http/_request.rb

@@ -3,11 +3,11 @@ class Rad::Http::Request < Rack::Request
   # def accept
   #   @env['HTTP_ACCEPT'].to_s.split(',').map { |a| a.split(';')[0].strip }
   # end
-  # 
+  #
   # def secure?
   #   (@env['HTTP_X_FORWARDED_PROTO'] || @env['rack.url_scheme']) == 'https'
   # end
-  
+
   # Returns all the \subdomains as an array, so <tt>["dev", "www"]</tt> would be
   # returned for "dev.www.rubyonrails.org". You can specify a different <tt>tld_length</tt>,
   # such as 2 to catch <tt>["www"]</tt> instead of <tt>["www", "rubyonrails"]</tt>
@@ -31,21 +31,21 @@ class Rad::Http::Request < Rack::Request
     @cookies_with_memory ||= cookies_without_memory
   end
   alias_method_chain :cookies, :memory
-  
+
   def normalized_domain
     return nil unless named_host?(host)
     host.sub('www.', '').downcase
   end
-  
+
   def from_browser?
     # format = workspace.params.format
     # (format.present? and !rad.http.browser_generated_formats.include?(format)) or
     content_type.present? and rad.http.browser_generated_types.include?(content_type.downcase)
   end
 
-  # 
+  #
   # Need this to access original, not normalized with Utils.normalize_params params
-  # 
+  #
   def raw_params
     post = {}
     @env['rack.input'].read.split('&').each do |tuple|
@@ -56,13 +56,13 @@ class Rad::Http::Request < Rack::Request
   rescue EOFError
     self.GET
   end
-  
-  class << self        
+
+  class << self
     def stub url = '/'
       env = stub_environment(url)
       Rad::Http::Request.new env
     end
-    
+
     def stub_environment url = nil
       env = {
         'rack.url_scheme' => 'http',
@@ -77,14 +77,14 @@ class Rad::Http::Request < Rack::Request
           # 'REQUEST_PATH' => uri.path,
           'PATH_INFO'    => uri.path,
           # 'REQUEST_URI'  => uri.path,
-          'QUERY_STRING' => uri.query            
+          'QUERY_STRING' => uri.query
         )
       end
       env
     end
   end
 
-  protected    
+  protected
     def named_host?(host)
       !(host.nil? || /\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/.match(host))
     end

data/lib/rad/http/_require.rb

@@ -1,14 +1,14 @@
-# 
+#
 # Dependencies
-# 
+#
 require 'rack'
 require 'rack/builder'
 
 class Rad::Http
   attr_accessor :host, :port, :static, :url_root, :default_format, :session
   attr_required :host, :port, :url_root, :default_format
-  def static?; !!@static end  
-  
+  def static?; !!@static end
+
   attr_writer :public_path
   def public_path
     @public_path || "#{rad.runtime_path}/public"
@@ -16,18 +16,18 @@ class Rad::Http
   def public_path?; !!public_path end
 end
 
-%w(  
+%w(
   rack_adapter
   fixes
 ).each{|f| require "rad/http/_support/rack/#{f}"}
 
 
-# 
+#
 # Libraries
-# 
+#
 %w(
   _request
   _response
   _http_adapter
-  _http  
+  _http
 ).each{|f| require "rad/http/#{f}"}

data/lib/rad/http/_response.rb

@@ -1,5 +1,5 @@
 class Rad::Http::Response < Rack::Response
-  include ::OpenConstructor
+  include RubyExt::OpenConstructor
 
   STATUS_MESSAGES = {
     ok: 200,
@@ -23,7 +23,7 @@ class Rad::Http::Response < Rack::Response
 
   # def to_a
   #   [status, headers, body]
-  # end 
+  # end
 
   def body_as_string
     if @body.is_a? String
@@ -44,13 +44,13 @@ class Rad::Http::Response < Rack::Response
   def cookies
     self['Set-Cookie']
   end
-    
+
   def clear
     @status = 200
-    @header = Rack::Utils::HeaderHash.new("Content-Type" => nil)    
+    @header = Rack::Utils::HeaderHash.new("Content-Type" => nil)
     @length = 0
     @body = []
-  end    
+  end
 
   def status= code_or_message
     @status = if code_or_message.is_a? Numeric

data/lib/rad/http/_support/rack/fixes.rb

@@ -1,7 +1,7 @@
 #
 # Rack doesn't works well with ruby 1.9.2
 # there's no :each method in String anymore
-# 
+#
 class Rack::Response
   def each(&callback)
     if @body.is_a? String
@@ -19,9 +19,9 @@ class Rack::Request
   def params
     @params ||= encode_in_utf8(params_with_wrong_encoding)
   end
-  
+
   # it returns "application/x-www-form-urlencoded; charset=UTF-8" instead of "application/x-www-form-urlencoded"
-  def content_type_with_fix    
+  def content_type_with_fix
     content_type_without_fix && content_type_without_fix.split(';').first
   end
   alias_method_chain :content_type, :fix

data/lib/rad/http/_support/rack/rack_adapter.rb

@@ -8,12 +8,12 @@ class Rad::Http::RackAdapter
 
   # class << self
   inject logger: :logger
-  
+
   def configure_rack! builder
     raise "Rack stack not defined! Use profiles (see rad/profiles/web.rb), or use your own configuration!" if stack.empty?
     stack.each{|conf| conf.call builder}
   end
-  
+
   def stack
     @rack_stack ||= []
   end
@@ -33,10 +33,10 @@ class Rad::Http::RackAdapter
   def quit!(server, handler_name)
     ## Use thins' hard #stop! if available, otherwise just #stop
     server.respond_to?(:stop!) ? server.stop! : server.stop
-    puts "\nRad stopped" unless handler_name =~/cgi/i        
+    puts "\nRad stopped" unless handler_name =~/cgi/i
   end
 
-  protected        
+  protected
     def detect_rack_handler
       return Rack::Handler.get('thin')
       SERVERS.each do |server_name|
@@ -48,6 +48,6 @@ class Rad::Http::RackAdapter
       end
       fail "  Server handler (#{SERVERS.join(', ')}) not found."
     end
-    
+
   # end
 end

data/lib/rad/http/processors/evaluate_format.rb

@@ -1,19 +1,19 @@
 rad.http
 
 class EvaluateFormat < Rad::Conveyors::Processor
-  def call    
+  def call
     path = workspace.path.must_be.defined
     params = workspace.params.must_be.defined
-    parts = path.split('.')        
+    parts = path.split('.')
     if parts.size > 1
       format = parts.last
-      logger.warn "RAD two :format parameters!" if params.include?(:format) 
+      logger.warn "RAD two :format parameters!" if params.include?(:format)
       workspace.params = params.clone
       workspace.params.format = format
     else
       params.format ||= rad.http.default_format
     end
-    
+
     next_processor.call
   end
 end