rad_core 0.2.6 → 0.2.7

data/lib/rad/_support/addressable.rb

@@ -6,11 +6,11 @@ Addressable::URI.class_eval do
       (self.query ? "?#{self.query}" : "")
     )
   end
-  
+
   def self.normalize_host host
     host.gsub(/^www\./, "")
   end
-  
+
   def normalized_host
     host ? host : host.gsub(/^www\./, '')
   end
@@ -19,13 +19,13 @@ Addressable::URI.class_eval do
   def query_values_with_skip_nil= options
     to_delete = []
     options.each{|k, v| to_delete << k if v.nil?}
-    to_delete.each{|k| options.delete k}    
-    
+    to_delete.each{|k| options.delete k}
+
     self.query_values_without_skip_nil = options
   end
   alias_method_chain :query_values=, :skip_nil
-    
-    
+
+
   # Override original to fix:
   # - extra '?' sign (/some_path?) if there's empty but not-nil query
   def to_s

data/lib/rad/_support/class_loader.rb

@@ -6,4 +6,4 @@ rad.after :environment do
 end
 
 lib_path = File.expand_path "#{__FILE__}/../../.."
-autoload_dir lib_path, false
+autoload_path lib_path, false

data/lib/rad/_support/extensions.rb

@@ -2,19 +2,19 @@ class Micon::Core
   def register_extension name, &block
     name.must_be.a Symbol
     block.must_be.defined
-    
+
     raise "extension :#{name} already registered!" if extensions.include? name
 
     extensions[name] = block
   end
-  
-  def extension name, target = nil, *args, &default_extension    
+
+  def extension name, target = nil, *args, &default_extension
     name.must_be.a Symbol
-    
+
     if block = extensions[name] || default_extension
       target ? target.instance_exec(*args, &block) : block.call(*args)
     end
   end
-  
+
   def extensions; @extensions ||= {} end
 end

data/lib/rad/_support/filters.rb

@@ -1,31 +1,31 @@
 module Rad::Filters
-  inherit Rad::Callbacks    
-        
+  inherit RubyExt::Callbacks
+
   module ClassMethods
     def before *args, &block
       opt = args.extract_options!
-      if block       
+      if block
         set_callback :action, :before, opt, &block
-      else 
-        args.each{|executor| set_callback :action, :before, executor, opt}        
+      else
+        args.each{|executor| set_callback :action, :before, executor, opt}
       end
     end
-    
+
     def around *args, &block
       opt = args.extract_options!
-      if block       
+      if block
         set_callback :action, :around, opt, &block
-      else 
-        args.each{|executor| set_callback :action, :around, executor, opt}        
+      else
+        args.each{|executor| set_callback :action, :around, executor, opt}
       end
     end
-    
+
     def after *args, &block
       opt = args.extract_options!
-      if block       
+      if block
         set_callback :action, :after, opt, &block
-      else 
-        args.each{|executor| set_callback :action, :after, executor, opt}        
+      else
+        args.each{|executor| set_callback :action, :after, executor, opt}
       end
     end
   end

data/lib/rad/_support/hacks_and_fixes.rb

@@ -1,8 +1,8 @@
-# 
-# Problem: the Hash::slice method in ActiveSupport works a little differently than in Facets. 
+#
+# Problem: the Hash::slice method in ActiveSupport works a little differently than in Facets.
 # And because Facets is overrides ActiveSupport version this causes problems (for example in to_json method)
 # In ActiveSupport it returns :nil if there's no key in Facets it raises error.
-# 
+#
 # Use Case:
 # hash = {:items=>[], "slug"=>"item-z8w", "name"=>"Item", "created_at"=>"2011-01-10T07:04:01Z", "dependent"=>"false", "viewers"=>["manager", "user:user1"], "updated_at"=>"2011-01-10T07:04:01Z", :icon_url=>"null", "text"=>"null", "tags"=>[], "owner_name"=>"user1", "_type"=>"Selector"}
 # args = ["id", "_type", "slug", "name", "text", "tags", "dependent", "owner_name", "viewers", "created_at", "updated_at"]
@@ -10,14 +10,14 @@
 #
 # Solution:
 # Redefining :slice the same way as in ActiveSupport.
-# 
+#
 
 # TODO1 remove it, we don't use facets anymore
 
 class Hash
   def slice(*keep_keys)
     hash = {}
-    keep_keys.each do |key|      
+    keep_keys.each do |key|
       # hash[key] = fetch(key)
       hash[key] = self[key]
     end

data/lib/rad/_support/mime.rb

@@ -4,14 +4,14 @@ module Mime
       raise "invalid usage of Mime!" unless args.empty?
       self[m]
     end
-  
+
     def [] type
       type = ".#{type}" unless type =~ /^\./
       Rack::Mime.mime_type(type) || raise("Unknown MIME type: #{type}")
     end
-    
-    def image? file_name      
-      return false if file_name.blank? 
+
+    def image? file_name
+      return false if file_name.blank?
       extension = File.extname(file_name)
       Rack::Mime.mime_type(extension) =~ /image/
     end

data/lib/rad/_support/module.rb

@@ -1,22 +1,22 @@
 class Module
-  
-  # 
+
+  #
   # Dynamically enables cache in :production and disables in another environments.
   # If no environment given uses non-cached version.
-  # 
-  def cache_method_with_params_in_production method        
+  #
+  def cache_method_with_params_in_production method
     escaped_method = escape_method(method)
     method_with_cache, method_without_cache = "#{escaped_method}_with_cache", "#{escaped_method}_without_cache"
     iv = "@#{escaped_method}_cache"
-    
+
     # raise "Method '#{method}' already defined!" if instance_methods.include?(method)
     if instance_methods.include?(method_with_cache) or instance_methods.include?(method_without_cache)
-      warn "can't cache the :#{method} twice!" 
+      warn "can't cache the :#{method} twice!"
     else
-      alias_method method_without_cache, method      
+      alias_method method_without_cache, method
 
       # create cached method
-      define_method method_with_cache do |*args| 
+      define_method method_with_cache do |*args|
         unless results = instance_variable_get(iv)
           results = Hash.new(NotDefined)
           instance_variable_set iv, results
@@ -24,7 +24,7 @@ class Module
 
         result = results[args]
 
-        if result.equal? NotDefined 
+        if result.equal? NotDefined
           result = send method_without_cache, *args
           results[args] = result
         end
@@ -40,7 +40,7 @@ class Module
 
       # by default uses non-cached version
       # alias_method method, method_without_cache
-    end        
+    end
   end
-  
+
 end

data/lib/rad/_support/require.rb

@@ -20,11 +20,12 @@ require 'ruby_ext'
 
 require 'vfs'
 
-require 'ruby_ext/more/open_constructor'
-require 'rad/_support/ruby_ext_with_active_support'
+# require 'ruby_ext/more/open_constructor'
+# require 'rad/_support/ruby_ext_with_active_support'
 
 require 'class_loader'
 
+$dont_create_micon_shortcut = true
 require 'micon'
 # require 'micon/rad'
 require 'rad/_support/micon'
@@ -46,11 +47,10 @@ require 'rad/_support/addressable'
 #
 require 'rad/_support/hacks_and_fixes'
 
-[  
+[
   'module',
-  'callbacks',
   'filters',
-  'mime',  
+  'mime',
   'string',
   'rson',
   'exception',

data/lib/rad/_support/rson.rb

@@ -16,7 +16,7 @@ end
     def to_rson options = {}
       self
     end
-    
+
     def rson?
       true
     end
@@ -27,12 +27,12 @@ Array.class_eval do
   def to_rson options = {}
     collect{|v| v.to_rson(options)}
   end
-  
+
   def rson?
     all?{|v| v.rson?}
   end
 end
-  
+
 [Hash, OpenObject].each do |klass|
   klass.class_eval do
     def to_rson options = {}
@@ -42,7 +42,7 @@ end
       end
       r
     end
-  
+
     def rson?
       each do |k, v|
         return false unless k.rson? and v.rson?

data/lib/rad/_support/string.rb

@@ -2,26 +2,26 @@ class String
   def json_escape
     ERB::Util.json_escape self
   end
-  
+
   HTML_ESCAPE_MAP = { '&' => '&amp;',  '>' => '&gt;',   '<' => '&lt;', '"' => '&quot;' }
   def html_escape
     # ERB and Rack both are replacing '/' character, and it's wrong because it destroys links (like '/default/my_item')
     # ERB::Util.html_escape self
     # Rack::Utils.escape_html self
-    
+
     gsub(/[&"><]/){|special| HTML_ESCAPE_MAP[special]}
   end
-  
+
   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 = {
     '\\'    => '\\\\',
     '</'    => '<\/',
@@ -29,12 +29,12 @@ class String
     "\n"    => '\n',
     "\r"    => '\n',
     '"'     => '\\"',
-    "'"     => "\\'" 
-  }  
+    "'"     => "\\'"
+  }
   def js_escape
     gsub(/(\\|<\/|\r\n|[\n\r"'])/){JS_ESCAPE_MAP[$1]}
   end
-  
-  # String marks, like :format, :safe 
+
+  # String marks, like :format, :safe
   def marks; @marks ||= OpenObject.new end
 end

data/lib/rad/cli/helper.rb

@@ -3,20 +3,20 @@ module Helper
 
   class << self
     inject logger: :logger
-    
+
     def run_console
       prepare_running_environment
 
       require 'irb'
-      IRB.start        
+      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
@@ -25,7 +25,7 @@ module Helper
     protected
       def prepare_running_environment
         use_runtime_path!
-        
+
         require 'rack'
         app, options = Rack::Builder.parse_file 'config.ru'
         app

data/lib/rad/configurators/_require.rb

@@ -5,8 +5,8 @@
 # ).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      
+  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

data/lib/rad/configurators/abstract.rb

@@ -4,21 +4,21 @@ 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        
+
+  protected
     attr_reader :dir #, :after_config, :after_environment
 end

data/lib/rad/configurators/web.rb

@@ -1,6 +1,6 @@
 rad.configurators
 
-class Web < Abstract      
+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|
@@ -8,7 +8,7 @@ class Web < Abstract
       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|
@@ -16,19 +16,19 @@ class Web < Abstract
       $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      
+    relative_paths = relative_paths.first if relative_paths.first.is_a? Array
+    relative_paths.each{|d| autoload_path "#{dir}/#{d}", true}
+  end
 end

data/lib/rad/controller/_abstract.rb

@@ -1,5 +1,5 @@
 module Rad::Controller::Abstract
-  inherit OpenConstructor
+  inherit RubyExt::OpenConstructor
   inherit Rad::Filters
   inherit Rad::Controller::Abstract::Render, Rad::Controller::Abstract::Miscellaneous
 
@@ -7,13 +7,14 @@ module Rad::Controller::Abstract
 
   attr_accessor :action_name
   attr_required :action_name
-  
+
   attr_writer :params
   def params; @params ||= Rad::Conveyors::Params.new end
-    
+
   def call action, *args
+    action.must_be.a Symbol
     catch :halt do
-      run_callbacks :action, method: action do          
+      run_callbacks :action, method: action do
         send action, *args
         render action: action
       end
@@ -22,24 +23,24 @@ module Rad::Controller::Abstract
 
   module ClassMethods
     inject workspace: :workspace, logger: :logger
-  
-    def controller_name      
-      self.namespace ? "#{self.namespace.name}::#{self.alias}" : self.alias     
-    end      
+
+    def controller_name
+      self.namespace ? "#{self.namespace.name}::#{self.alias}" : self.alias
+    end
 
     def helper *args
-      args.to_a.each do |mod| 
+      args.to_a.each do |mod|
         mod.must_be.a Module
         context_class.inherit mod
-      end 
+      end
     end
-  
+
     def helper_method *args
       args = args.first if args.size == 1 and args.first.is_a?(Array)
       # args.each{|m| m.to_s.must_be.in self.instance_methods}
-      args.each do |m|          
+      args.each do |m|
         context_class.delegate m, to: :controller
-      end      
+      end
     end
-  end    
+  end
 end